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

Things landing on other things fixes

Browse Source 
Turbolifts, and shuttles. Please behave.

Shuttles throw everything to z1 regardless of actual shuttle destination z-level, which is silly. Secondly they literally throw it using Move which is silly. Thirdly, they do it to every atom/movable, which is unacceptable. Especially since that tries to squash lighting overlays out of the way, making weird lighting problems on shuttles.

Turbolifts qdel any 'simulated' atom/movable when they run into it, which is also stupid. This includes things like the AI Eye, which permanently deletes it. A little unfortunate, if you ask me.
This commit is contained in:
Arokha Sieyes
2017-05-14 23:54:57 -04:00
parent 9a894008d6
commit 69dc05731f
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,12 +93,12 @@
return 0
for(var/turf/T in destination)
for(var/atom/movable/AM in T)
if(istype(AM, /mob/living))
var/mob/living/M = AM
M.gib()
else if(AM.simulated)
qdel(AM)
for(var/I in T)
if(istype(I, /mob/living))
var/mob/living/L = I
L.gib()
else if(istype(I,/obj))
qdel(I)
origin.move_contents_to(destination)