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

Missed one.

Browse Source
This commit is contained in:
Spades
2019-01-05 17:01:01 -05:00
parent 5cb647993c
commit 1d6d0b75ae
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/shuttles/shuttle.dm
View File

@@ -208,15 +208,6 @@
for(var/turf/T in dstturfs) for(var/turf/T in dstturfs)
var/turf/D = locate(T.x, throwy - 1, T.z) var/turf/D = locate(T.x, throwy - 1, T.z)
<<<<<<< HEAD
for(var/I in T)
if(istype(I,/mob/living))
var/mob/living/L = I
L.gib()
else if(istype(I,/obj))
var/obj/O = I
O.forceMove(D)
=======
for(var/atom/movable/AM as mob|obj in T) for(var/atom/movable/AM as mob|obj in T)
AM.Move(D) AM.Move(D)
@@ -225,7 +216,6 @@
for(var/mob/living/simple_mob/pest in destination) for(var/mob/living/simple_mob/pest in destination)
pest.gib() pest.gib()
>>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync
origin.move_contents_to(destination, direction=direction) origin.move_contents_to(destination, direction=direction)