Merge pull request #4872 from Citadel-Station-13/upstream-merge-34401

[MIRROR] Stray bullets and explosions don't blow up the entire syndi lava base anymore
This commit is contained in:
LetterJay
2018-01-16 13:49:32 -06:00
committed by GitHub
3 changed files with 13 additions and 5 deletions
+3
View File
@@ -14,6 +14,7 @@ GLOBAL_LIST_EMPTY(explosions)
/datum/explosion
var/explosion_id
var/atom/explosion_source
var/started_at
var/running = TRUE
var/stopped = 0 //This is the number of threads stopped !DOESN'T COUNT THREAD 2!
@@ -37,6 +38,7 @@ GLOBAL_LIST_EMPTY(explosions)
var/id = ++id_counter
explosion_id = id
explosion_source = epicenter
epicenter = get_turf(epicenter)
if(!epicenter)
@@ -323,6 +325,7 @@ GLOBAL_LIST_EMPTY(explosions)
if(stopped < 2) //wait for main thread and spiral_range thread
return QDEL_HINT_IWILLGC
GLOB.explosions -= src
explosion_source = null
return ..()
/client/proc/check_bomb_impacts()