Merge pull request #9770 from Birdtalon/restbugfix

Help intent resting bugfix
This commit is contained in:
variableundefined
2018-10-08 20:17:12 +08:00
committed by GitHub
5 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -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
@@ -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)
+1 -1
View File
@@ -269,7 +269,7 @@
H.w_uniform.add_fingerprint(M)
AdjustSleeping(-5)
if(sleeping == 0)
resting = 0
StopResting()
AdjustParalysis(-3)
AdjustStunned(-3)
AdjustWeakened(-3)
@@ -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.
+1 -1
View File
@@ -307,7 +307,7 @@
to_chat(target, "<span class='shadowling'><b><i>NOT LIKE THIS!</i></b></span>")
user.visible_message("<span class='warning'>[target] suddenly slams upward and knocks down [user]!</span>", \
"<span class='userdanger'>[target] suddenly bolts up and slams you with tremendous force!</span>")
user.resting = 0 //Remove all stuns
user.StopResting() //Remove all stuns
user.SetSleeping(0)
user.SetStunned(0)
user.SetWeakened(0)