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

Merge pull request #10898 from Heroman3003/incorporeal-fires

Browse Source 
Makes incorporeal things properly immune to bonfires and lava (and tram and elevator...)
This commit is contained in:
Aronai Sieyes
2021-07-05 16:24:54 -04:00
committed by Chompstation Bot
parent b40f14fc6b
commit e9cb44d9ca
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,12 +192,12 @@
for(var/turf/T in destination)
for(var/atom/movable/AM in T)
if(istype(AM, /mob/living))
if(istype(AM, /mob/living) && !(AM.is_incorporeal()))
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)))
else if(AM.simulated && !(istype(AM, /mob/observer)) && !(AM.is_incorporeal()))
qdel(AM)
origin.move_contents_to(destination)