From 31217ee591e0ab48d14ab1a890c519c2bfd1c3bd Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sun, 4 Jan 2026 18:16:45 -0700 Subject: [PATCH] [MIRROR] Fixes some places that paralyze should KO as well (#12210) Co-authored-by: Cameron Lennox --- code/datums/components/disabilities/epilepsy.dm | 1 + code/datums/components/traits/unlucky.dm | 3 ++- code/game/gamemodes/technomancer/instability.dm | 1 + .../gamemodes/technomancer/spells/audible_deception.dm | 1 + code/game/machinery/cloning.dm | 2 ++ code/modules/admin/topic.dm | 5 +++++ code/modules/admin/verbs/randomverbs.dm | 1 + code/modules/admin/verbs/secrets.dm | 1 + code/modules/awaymissions/gateway.dm | 2 ++ code/modules/emotes/definitions/visible.dm | 1 + code/modules/mob/_modifiers/modifiers_misc.dm | 1 + code/modules/mob/living/carbon/human/human.dm | 2 ++ code/modules/mob/living/carbon/human/life.dm | 7 +++++++ code/modules/mob/living/living_defense.dm | 1 + code/modules/multiz/portals_vr.dm | 2 ++ code/modules/organs/blood.dm | 1 + code/modules/organs/internal/brain.dm | 1 + code/modules/reagents/reagents/dispenser.dm | 1 + code/modules/resleeving/machines.dm | 1 + code/modules/spells/targeted/mind_transfer.dm | 1 + code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm | 1 + maps/expedition_vr/alienship/_alienship.dm | 1 + 22 files changed, 37 insertions(+), 1 deletion(-) diff --git a/code/datums/components/disabilities/epilepsy.dm b/code/datums/components/disabilities/epilepsy.dm index ee8d026f84..e640dad40a 100644 --- a/code/datums/components/disabilities/epilepsy.dm +++ b/code/datums/components/disabilities/epilepsy.dm @@ -26,6 +26,7 @@ continue O.show_message(span_danger("[owner] starts having a seizure!"), 1) owner.Paralyse(10) + owner.Sleeping(10) owner.make_jittery(1000) /datum/component/epilepsy_disability/Destroy(force = FALSE) diff --git a/code/datums/components/traits/unlucky.dm b/code/datums/components/traits/unlucky.dm index c503f6be24..a59a5b1e64 100644 --- a/code/datums/components/traits/unlucky.dm +++ b/code/datums/components/traits/unlucky.dm @@ -146,7 +146,8 @@ if(darth_airlock.locked || !darth_airlock.arePowerSystemsOn()) continue to_chat(living_guy, span_warning("The airlock suddenly closes on you!")) - living_guy.Paralyse(1 SECONDS) + living_guy.Paralyse(5) + living_guy.Sleeping(5) slam_airlock(darth_airlock) consume_omen() return diff --git a/code/game/gamemodes/technomancer/instability.dm b/code/game/gamemodes/technomancer/instability.dm index 79cf88066c..ddae942514 100644 --- a/code/game/gamemodes/technomancer/instability.dm +++ b/code/game/gamemodes/technomancer/instability.dm @@ -241,6 +241,7 @@ visible_message(span_warning("\The [src] suddenly collapses!"), span_danger("You suddenly feel very light-headed, and faint!")) Paralyse(instability * 0.1) + Sleeping(instability * 0.1) if(2) if(can_feel_pain()) apply_effect(instability, AGONY) diff --git a/code/game/gamemodes/technomancer/spells/audible_deception.dm b/code/game/gamemodes/technomancer/spells/audible_deception.dm index c3d291cc99..5f1bbe30d6 100644 --- a/code/game/gamemodes/technomancer/spells/audible_deception.dm +++ b/code/game/gamemodes/technomancer/spells/audible_deception.dm @@ -91,6 +91,7 @@ if(prob(30)) M.Stun(10) M.Paralyse(4) + M.Sleeping(4) else M.make_jittery(50) to_chat(M, span_red(span_massive(span_bold("HONK")))) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index a454b69898..ad2d954596 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -124,6 +124,7 @@ var/damage_to_deal = H.getMaxHealth() * 1.5 //If you have 100, you get 150. Have 200? Get 300. 25hp? get 37.5 H.adjustCloneLoss(damage_to_deal) // New damage var so you can't eject a clone early then stab them to abuse the current damage system --NeoFite H.Paralyse(4) + H.Sleeping(4) H.updatehealth() H.set_cloned_appearance() @@ -172,6 +173,7 @@ else if(occupant.health < heal_level && occupant.getCloneLoss() > 0) occupant.Paralyse(4) + occupant.Sleeping(4) //Slowly get that clone healed and finished. occupant.adjustCloneLoss(-2 * heal_rate) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index bfacac7c3d..a95c4c06c3 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -950,6 +950,7 @@ //so they black out before warping M.Paralyse(5) + M.Sleeping(5) sleep(5) if(!M) return @@ -1004,6 +1005,7 @@ M.drop_from_inventory(I) M.Paralyse(5) + M.Sleeping(5) sleep(5) M.loc = pick(GLOB.tdome1) spawn(50) @@ -1029,6 +1031,7 @@ M.drop_from_inventory(I) M.Paralyse(5) + M.Sleeping(5) sleep(5) M.loc = pick(GLOB.tdome2) spawn(50) @@ -1051,6 +1054,7 @@ return M.Paralyse(5) + M.Sleeping(5) sleep(5) M.loc = pick(GLOB.tdomeadmin) spawn(50) @@ -1080,6 +1084,7 @@ observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(observer), slot_w_uniform) observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), slot_shoes) M.Paralyse(5) + M.Sleeping(5) sleep(5) M.loc = pick(GLOB.tdomeobserve) spawn(50) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 62e479cb81..9aec5ed467 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -32,6 +32,7 @@ ADMIN_VERB(drop_everything, R_ADMIN, "Drop Everything", ADMIN_VERB_NO_DESCRIPTIO M.drop_from_inventory(W) //teleport person to cell M.Paralyse(5) + M.Sleeping(5) sleep(5) //so they black out before warping M.loc = pick(GLOB.prisonwarp) if(ishuman(M)) diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 2bcd256447..94888f4698 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -115,6 +115,7 @@ ADMIN_VERB(secrets, R_HOLDER, "Secrets", "Abuse harder than you ever have before //don't warp them if they aren't ready or are already there continue H.Paralyse(5) + H.Sleeping(5) if(H.wear_id) var/obj/item/card/id/id = H.get_idcard() for(var/A in id.GetAccess()) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index a781669456..b30081125c 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -209,6 +209,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) MI.forceMove(finaldest.loc) sleep(1) MI.Paralyse(10) + MI.Sleeping(10) MI << 'sound/effects/bamf.ogg' to_chat(MI,span_warning("You're starting to come to. You feel like you've been out for a few minutes, at least...")) for(var/obj/item/I in L) @@ -219,6 +220,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) L.forceMove(finaldest.loc) sleep(1) L.Paralyse(10) + L.Sleeping(10) L << 'sound/effects/bamf.ogg' to_chat(L,span_warning("You're starting to come to. You feel like you've been out for a few minutes, at least...")) //VOREStation Addition End diff --git a/code/modules/emotes/definitions/visible.dm b/code/modules/emotes/definitions/visible.dm index 780d1373c0..fcd221a3b8 100644 --- a/code/modules/emotes/definitions/visible.dm +++ b/code/modules/emotes/definitions/visible.dm @@ -57,6 +57,7 @@ ..() if(istype(user)) user.Paralyse(2) + user.Sleeping(2) /decl/emote/visible/flash key = "flash" diff --git a/code/modules/mob/_modifiers/modifiers_misc.dm b/code/modules/mob/_modifiers/modifiers_misc.dm index 0b3a64f082..355a0bd1bb 100644 --- a/code/modules/mob/_modifiers/modifiers_misc.dm +++ b/code/modules/mob/_modifiers/modifiers_misc.dm @@ -107,6 +107,7 @@ the artifact triggers the rage. if(prob(last_shock_stage)) to_chat(holder, span_warning("You pass out from the pain you were suppressing.")) holder.Paralyse(5) + holder.Sleeping(5) if(ishuman(holder)) var/mob/living/carbon/human/H = holder diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index fedbb9ea7a..8b97e9aca3 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -210,6 +210,7 @@ deaf_loop.start() // CHOMPEnable: Ear Ringing/Deafness if (prob(70) && !shielded) Paralyse(10) + Sleeping(10) if(3.0) b_loss += 30 @@ -221,6 +222,7 @@ deaf_loop.start() // CHOMPEnable: Ear Ringing/Deafness if (prob(50) && !shielded) Paralyse(10) + Sleeping(10) var/update = 0 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index bdccb1b740..83d64b7805 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -202,6 +202,7 @@ if(prob(50)) to_chat(src, span_danger("You suddenly black out!")) Paralyse(10) + Sleeping(10) else if(!lying) to_chat(src, span_danger("Your legs won't respond properly, you fall down!")) Weaken(10) @@ -401,6 +402,7 @@ if(!paralysis && prob(30) && prob(100 * RADIATION_SPEED_COEFFICIENT)) //CNS is shutting down. to_chat(src, span_critical("You have a seizure!")) Paralyse(10) + Sleeping(10) make_jittery(1000) if(!lying) emote("collapse") @@ -461,6 +463,7 @@ if(!paralysis && prob(1) && prob(100 * RADIATION_SPEED_COEFFICIENT)) //1 in 1000 chance per tick. to_chat(src, span_critical("You have a seizure!")) Paralyse(10) + Sleeping(10) make_jittery(1000) if(!lying) emote("collapse") @@ -727,6 +730,7 @@ // 3 gives them one second to wake up and run away a bit! Paralyse(3) + Sleeping(1) // Enough to make us sleep as well if(SA_pp > SA_sleep_min) @@ -1265,6 +1269,7 @@ var/in_crit = FALSE if((getOxyLoss() > (getMaxHealth()/2)) || (health <= (get_crit_point() * species.crit_mod))) Paralyse(3) + Sleeping(3) set_stat(UNCONSCIOUS) blinded = TRUE in_crit = TRUE @@ -1292,6 +1297,7 @@ to_chat(src, span_notice("You're in too much pain to keep going...")) src.visible_message(span_infoplain(span_bold("[src]") + " slumps to the ground, too weak to continue fighting.")) Paralyse(10) + Sleeping(10) setHalLoss(getMaxHealth() - 1) if(tiredness) //tiredness for vore drain @@ -1959,6 +1965,7 @@ if(prob(40) && !isbelly(loc)) emote("pain") Paralyse(5) + Sleeping(5) if(shock_stage == 150) if(!isbelly(loc)) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 1474db964e..90652af125 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -384,6 +384,7 @@ /mob/living/proc/lightning_act() // The actual damage/electrocution is handled by the tesla_zap() that accompanies this. Paralyse(5) + Sleeping(5) stuttering += 20 make_jittery(150) emp_act(1) diff --git a/code/modules/multiz/portals_vr.dm b/code/modules/multiz/portals_vr.dm index 4ebaed16f1..8f6c834dd1 100644 --- a/code/modules/multiz/portals_vr.dm +++ b/code/modules/multiz/portals_vr.dm @@ -215,6 +215,7 @@ MI.forceMove(finaldest.loc) sleep(1) MI.Paralyse(10) + MI.Sleeping(10) MI << 'sound/effects/bamf.ogg' to_chat(MI,span_warning("You're starting to come to. You feel like you've been out for a few minutes, at least...")) for(var/obj/item/I in L) @@ -225,6 +226,7 @@ L.forceMove(finaldest.loc) sleep(1) L.Paralyse(10) + L.Sleeping(10) L << 'sound/effects/bamf.ogg' to_chat(L,span_warning("You're starting to come to. You feel like you've been out for a few minutes, at least...")) return diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index fa62635382..27150c90e3 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -150,6 +150,7 @@ BLOOD_VOLUME_SURVIVE = 40 update_icons_body() eye_blurry = max(eye_blurry,6) Paralyse(3) + Sleeping(3) adjustToxLoss(3 * dmg_coef) adjustOxyLoss(75 * dmg_coef) // 15 more than dexp fixes (also more than dex+dexp+tricord) diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 4b88089903..a1bdf2424f 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -283,6 +283,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) H.adjustBruteLoss(40) H.adjustFireLoss(40) H.Paralyse(4) + H.Sleeping(4) H.updatehealth() for(var/obj/item/organ/external/E in H.organs) //They've still gotta congeal, but it's faster than the clone sickness they'd normally get. if(E && E.organ_tag == BP_L_ARM || E.organ_tag == BP_R_ARM || E.organ_tag == BP_L_LEG || E.organ_tag == BP_R_LEG) diff --git a/code/modules/reagents/reagents/dispenser.dm b/code/modules/reagents/reagents/dispenser.dm index 3ec9b1e1c7..0a0f766a82 100644 --- a/code/modules/reagents/reagents/dispenser.dm +++ b/code/modules/reagents/reagents/dispenser.dm @@ -259,6 +259,7 @@ continue O.show_message(span_danger("[M] starts having a seizure!"), 1) M.Paralyse(10) + M.Sleeping(10) M.make_jittery(1000) else if(current_addiction <= 50) to_chat(M, span_warning("You're really craving some alcohol. You feel nauseated.")) diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 6752d6f1cd..05812e1f63 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -51,6 +51,7 @@ set_occupant(H) H.adjustCloneLoss((H.getMaxHealth() - (H.getMaxHealth()))*-0.75) H.Paralyse(4) + H.Sleeping(4) H.updatehealth() //Machine specific stuff at the end diff --git a/code/modules/spells/targeted/mind_transfer.dm b/code/modules/spells/targeted/mind_transfer.dm index 1d4a81f3a0..5a4bcc7233 100644 --- a/code/modules/spells/targeted/mind_transfer.dm +++ b/code/modules/spells/targeted/mind_transfer.dm @@ -75,6 +75,7 @@ //Target is handled in ..(), so we handle the caster here caster.Paralyse(amt_paralysis) + caster.Sleeping(amt_paralysis) //After a certain amount of time the victim gets a message about being in a different body. spawn(msg_wait) diff --git a/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm b/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm index d0c4710191..336c476861 100644 --- a/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm +++ b/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm @@ -68,6 +68,7 @@ if(stored_blood && last_touched && last_touched.stat != DEAD) //We have been activated (have some energy), an owner and they are alive. They are going to feel pain. to_chat(last_touched, span_cult("You feel as though your mind is suddenly being torn apart at the seams as the [src] is destroyed!")) last_touched.Paralyse(10) + last_touched.Sleeping(10) last_touched.make_jittery(1000) last_touched.eye_blurry += 10 last_touched.add_modifier(/datum/modifier/agonize, 30 SECONDS) diff --git a/maps/expedition_vr/alienship/_alienship.dm b/maps/expedition_vr/alienship/_alienship.dm index a43aa86b31..ec55d44b2c 100644 --- a/maps/expedition_vr/alienship/_alienship.dm +++ b/maps/expedition_vr/alienship/_alienship.dm @@ -168,6 +168,7 @@ abduct(M) L.drop_from_inventory(I, loc) L.Paralyse(10) + L.Sleeping(10) L.forceMove(get_turf(pick(teleport_to))) L << 'sound/effects/bamf.ogg' to_chat(L,span_warning("You're starting to come to. You feel like you've been out for a few minutes, at least..."))