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

Runtime fix (hopefully), less dangerous qdel loop for pods.

Browse Source
This commit is contained in:
Zuhayr
2015-08-22 03:53:03 +09:30
parent 4257eb41fc
commit 8e0ff6c69f
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/random_map/drop/droppod.dm
View File

@@ -83,7 +83,7 @@
var/turf/T = locate((origin_x + n_ceil(limit_x / 2)-1), (origin_y + n_ceil(limit_y / 2)-1), origin_z)
if(istype(T))
explosion(T, placement_explosion_dev, placement_explosion_heavy, placement_explosion_light, placement_explosion_flash)
sleep(5) // Let the explosion finish proccing before we ChangeTurf(), otherwise it might destroy our spawned objects.
sleep(15) // Let the explosion finish proccing before we ChangeTurf(), otherwise it might destroy our spawned objects.
return ..()
/datum/random_map/droppod/get_appropriate_path(var/value)
@@ -111,14 +111,9 @@
// Splatter anything under us that survived the explosion.
if(value != SD_EMPTY_TILE && T.contents.len)
for(var/atom/A in T)
if(!A.simulated || istype(A, /mob/dead))
continue
if(istype(A, /mob/living))
var/mob/living/M = A
M.gib()
else
qdel(A)
for(var/atom/movable/AM in T)
if(AM.simulated && !istype(AM, /mob/dead))
qdel(AM)
// Also spawn doors and loot.
if(value == SD_DOOR_TILE)