From b29a1418ab1c225d279f23ede6c59061935fd2c2 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Mon, 8 Oct 2018 12:20:31 +0100 Subject: [PATCH] updates resting var to use StopResting() --- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/living/carbon/alien/alien_defense.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 2 +- code/modules/mob/living/simple_animal/posessed_object.dm | 2 +- code/modules/surgery/other.dm | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 83718395e68..36afcd3868e 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -170,7 +170,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp response = alert(src, alertmsg,"Are you sure you want to ghost?","Stay in body","Ghost") if(response != "Ghost") return //didn't want to ghost after-all - resting = 1 + StartResting() var/mob/dead/observer/ghost = ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3 ghost.timeofdeath = world.time // Because the living mob won't have a time of death and we want the respawn timer to work properly. var/obj/structure/morgue/Morgue = locate() in M.loc diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm index 9e29acd9282..ec2d96ed880 100644 --- a/code/modules/mob/living/carbon/alien/alien_defense.dm +++ b/code/modules/mob/living/carbon/alien/alien_defense.dm @@ -17,7 +17,7 @@ In all, this is a lot like the monkey code. /N switch(M.a_intent) if(INTENT_HELP) AdjustSleeping(-5) - resting = 0 + StopResting() AdjustParalysis(-3) AdjustStunned(-3) AdjustWeakened(-3) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 5b0adca02e5..c5557028896 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -269,7 +269,7 @@ H.w_uniform.add_fingerprint(M) AdjustSleeping(-5) if(sleeping == 0) - resting = 0 + StopResting() AdjustParalysis(-3) AdjustStunned(-3) AdjustWeakened(-3) diff --git a/code/modules/mob/living/simple_animal/posessed_object.dm b/code/modules/mob/living/simple_animal/posessed_object.dm index 6fa2e65e207..7afb3b01cbc 100644 --- a/code/modules/mob/living/simple_animal/posessed_object.dm +++ b/code/modules/mob/living/simple_animal/posessed_object.dm @@ -40,7 +40,7 @@ var/response = alert(src, "End your possession of this object? (It will not stop you from respawning later)","Are you sure you want to ghost?","Ghost","Stay in body") if(response != "Ghost") return - resting = 1 + StartResting() var/mob/dead/observer/ghost = ghostize(1) ghost.timeofdeath = world.time death(0) // Turn back into a regular object. diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index bcb5151d359..f959732427a 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -307,7 +307,7 @@ to_chat(target, "NOT LIKE THIS!") user.visible_message("[target] suddenly slams upward and knocks down [user]!", \ "[target] suddenly bolts up and slams you with tremendous force!") - user.resting = 0 //Remove all stuns + user.StopResting() //Remove all stuns user.SetSleeping(0) user.SetStunned(0) user.SetWeakened(0)