Merge pull request #4872 from VOREStation/upstream-merge-6018

[MIRROR] Fixes elevators deleting AI eyes
This commit is contained in:
Novacat
2019-03-28 22:10:05 -04:00
committed by GitHub
+7 -7
View File
@@ -154,12 +154,12 @@
return 0
for(var/turf/T in destination)
for(var/I in T)
if(istype(I, /mob/living))
var/mob/living/L = I
L.gib()
else if(istype(I,/obj))
qdel(I)
for(var/atom/movable/AM in T)
if(istype(AM, /mob/living))
var/mob/living/M = AM
M.gib()
else if(AM.simulated && !(istype(AM, /mob/observer)))
qdel(AM)
origin.move_contents_to(destination)
@@ -180,4 +180,4 @@
// TODO: dummy machine ('lift mechanism') in powered area for functionality/blackout checks.
/datum/turbolift/proc/is_functional()
return 1
return 1