Skip to content

Commit

Permalink
[NO GBP] Clears double Numbed alert (#2017)
Browse files Browse the repository at this point in the history
* Clears double Numbed alert

* Update debuffs.dm

Co-authored-by: Bloop <[email protected]>
Co-authored-by: Iajret <[email protected]>
  • Loading branch information
3 people authored Feb 21, 2024
1 parent ec454ee commit 5b2d5b7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions code/datums/status_effects/debuffs/debuffs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@
if(!.)
return
owner.add_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS, TRAIT_ANALGESIA), TRAIT_STATUS_EFFECT(id)) // NOVA EDIT CHANGE - ORIGINAL: owner.add_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS), TRAIT_STATUS_EFFECT(id))
owner.throw_alert("stasis numbed", /atom/movable/screen/alert/numbed) //NOVA EDIT ADDITION - STASIS APPLIES NUMBED
owner.add_filter("stasis_status_ripple", 2, list("type" = "ripple", "flags" = WAVE_BOUNDED, "radius" = 0, "size" = 2))
var/filter = owner.get_filter("stasis_status_ripple")
animate(filter, radius = 0, time = 0.2 SECONDS, size = 2, easing = JUMP_EASING, loop = -1, flags = ANIMATION_PARALLEL)
Expand All @@ -290,12 +289,13 @@

/datum/status_effect/grouped/stasis/tick(seconds_between_ticks)
update_time_of_death()
if(owner.stat >= UNCONSCIOUS) //NOVA EDIT START - STASIS KEEPS SLEEP GOING
owner.Sleeping(15 SECONDS) //NOVA EDIT END
// NOVA EDIT ADDITION START - STASIS KEEPS SLEEP GOING
if(owner.stat >= UNCONSCIOUS)
owner.Sleeping(15 SECONDS)
//NOVA EDIT ADDITION END

/datum/status_effect/grouped/stasis/on_remove()
owner.remove_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS, TRAIT_ANALGESIA), TRAIT_STATUS_EFFECT(id)) // NOVA EDIT CHANGE - ORIGINAL: owner.remove_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED, TRAIT_STASIS), TRAIT_STATUS_EFFECT(id))
owner.clear_alert("stasis numbed") //NOVA EDIT ADDITION - STASIS APPLIED NUMBED
owner.remove_filter("stasis_status_ripple")
update_time_of_death()
if(iscarbon(owner))
Expand Down

0 comments on commit 5b2d5b7

Please sign in to comment.