From d9c955b018687202ad88c61b88d5cc62e40215f6 Mon Sep 17 00:00:00 2001 From: AnturK Date: Tue, 28 May 2019 14:59:22 +0200 Subject: [PATCH 1/2] Fixes transform runtimes. --- code/modules/mob/transform_procs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index af538cac605..2d9e54c7cda 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -302,8 +302,8 @@ O.Knockdown(AmountKnockdown(), ignore_canstun = TRUE) O.Immobilize(AmountImmobilized(), ignore_canstun = TRUE) O.Paralyze(AmountParalyzed(), ignore_canstun = TRUE) - O.Unconscious(AmountUnconscious(), ignore_canstun = TRUE) - O.Sleeping(AmountSleeping(), ignore_canstun = TRUE) + O.Unconscious(AmountUnconscious(), ignore_canunconscious = TRUE) + O.Sleeping(AmountSleeping(), ignore_sleepimmune = TRUE) //transfer reagents if(tr_flags & TR_KEEPREAGENTS) From e2e47066e06d810ae1ad58314cb537050f2705b1 Mon Sep 17 00:00:00 2001 From: AnturK Date: Tue, 28 May 2019 19:07:08 +0200 Subject: [PATCH 2/2] You're right didn't notice these were off --- code/modules/mob/living/carbon/human/status_procs.dm | 4 ++-- code/modules/mob/transform_procs.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/status_procs.dm b/code/modules/mob/living/carbon/human/status_procs.dm index 733de2922aa..aa0b39b982d 100644 --- a/code/modules/mob/living/carbon/human/status_procs.dm +++ b/code/modules/mob/living/carbon/human/status_procs.dm @@ -15,13 +15,13 @@ amount = dna.species.spec_stun(src, amount) return ..() -/mob/living/carbon/human/Unconscious(amount, updating = 1, ignore_canunconscious = 0) +/mob/living/carbon/human/Unconscious(amount, updating = 1, ignore_canstun = 0) amount = dna.species.spec_stun(src,amount) if(HAS_TRAIT(src, TRAIT_HEAVY_SLEEPER)) amount *= rand(1.25, 1.3) return ..() -/mob/living/carbon/human/Sleeping(amount, updating = 1, ignore_sleepimmune = 0) +/mob/living/carbon/human/Sleeping(amount, updating = 1, ignore_canstun = 0) if(HAS_TRAIT(src, TRAIT_HEAVY_SLEEPER)) amount *= rand(1.25, 1.3) return ..() diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 2d9e54c7cda..af538cac605 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -302,8 +302,8 @@ O.Knockdown(AmountKnockdown(), ignore_canstun = TRUE) O.Immobilize(AmountImmobilized(), ignore_canstun = TRUE) O.Paralyze(AmountParalyzed(), ignore_canstun = TRUE) - O.Unconscious(AmountUnconscious(), ignore_canunconscious = TRUE) - O.Sleeping(AmountSleeping(), ignore_sleepimmune = TRUE) + O.Unconscious(AmountUnconscious(), ignore_canstun = TRUE) + O.Sleeping(AmountSleeping(), ignore_canstun = TRUE) //transfer reagents if(tr_flags & TR_KEEPREAGENTS)