cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update turbolift.dm

Browse Source
This commit is contained in:
Novacat
2019-03-28 21:59:10 -04:00
committed by GitHub
parent 5d39900d9f
commit 396199934e
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/turbolift/turbolift.dm
View File

@@ -154,21 +154,12 @@
return 0
for(var/turf/T in destination)
<<<<<<< HEAD
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)
>>>>>>> e4f17ca... Merge pull request #6018 from PrismaticGynoid/naughtyelevators
origin.move_contents_to(destination)