Merge pull request #6043 from Heroman3003/zshadow-fixes

Fixes way elevator handles deleting z-shadows
This commit is contained in:
Neerti
2019-04-09 17:47:14 -04:00
committed by GitHub
2 changed files with 3 additions and 0 deletions
+1
View File
@@ -24,6 +24,7 @@
sync_icon(L)
/mob/zshadow/Destroy()
owner.shadow = null
owner = null
..() //But we don't return because the hint is wrong
return QDEL_HINT_QUEUE
+2
View File
@@ -97,6 +97,8 @@
if(istype(AM, /mob/living))
var/mob/living/M = AM
M.gib()
else if(istype(AM, /mob/zshadow))
AM.Destroy() //prevent deleting shadow without deleting shadow's shadows
else if(AM.simulated && !(istype(AM, /mob/observer)))
qdel(AM)