Skip to content

Commit

Permalink
Makes the cherry tree no longer stop you from working or hold your ga…
Browse files Browse the repository at this point in the history
…ined attributes hostage for 10 seconds upon breaching (#2362)

boop
  • Loading branch information
Gboster-0 authored Aug 6, 2024
1 parent db73ddf commit e1789c7
Showing 1 changed file with 4 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,12 @@
There is beauty even in great and terrible things. <br>\
Even the bodies underneath this tree would agree with you."

var/numbermarked = 5
var/number_of_marks = 5


/mob/living/simple_animal/hostile/abnormality/cherry_blossoms/PostWorkEffect(mob/living/carbon/human/user, work_type, pe, work_time)
if(user.sanity_lost)
datum_reference.qliphoth_change(-1)
return

/mob/living/simple_animal/hostile/abnormality/cherry_blossoms/SuccessEffect(mob/living/carbon/human/user, work_type, pe)
. = ..()
Expand All @@ -54,10 +53,9 @@
icon_state = "graveofcherryblossoms_[datum_reference.qliphoth_meter]"

/mob/living/simple_animal/hostile/abnormality/cherry_blossoms/ZeroQliphoth(mob/living/carbon/human/user)
mark_for_death()
INVOKE_ASYNC(src, PROC_REF(mark_for_death))
icon_state = "graveofcherryblossoms_0"
datum_reference.qliphoth_change(3)
return

/mob/living/simple_animal/hostile/abnormality/cherry_blossoms/proc/mark_for_death()
var/list/potentialmarked = list()
Expand All @@ -70,19 +68,17 @@
to_chat(L, span_danger("It's cherry blossom season."))

SLEEP_CHECK_DEATH(10 SECONDS)
for(var/i=numbermarked, i>=1, i--)
for(var/blossoming in 1 to number_of_marks)
var/mob/living/Y = pick(potentialmarked)
if(faction_check_mob(Y, FALSE) || Y.z != z || Y.stat == DEAD)
continue
if(Y in marked)
continue
marked+=Y
marked += Y
new /obj/effect/temp_visual/markedfordeath(get_turf(Y))
to_chat(Y, span_userdanger("You feel like you're going to die!"))
Y.apply_status_effect(STATUS_EFFECT_MARKEDFORDEATH)



//Mark for Death
//A very quick, frantic 10 seconds of instadeath.
/datum/status_effect/markedfordeath
Expand Down

0 comments on commit e1789c7

Please sign in to comment.