Skip to content

Commit

Permalink
1
Browse files Browse the repository at this point in the history
  • Loading branch information
Lexanx committed Aug 13, 2024
1 parent 91b8ffb commit 25bbc9f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 4 additions & 0 deletions code/game/atoms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,11 @@
*/
/atom/proc/visible_message(message, blind_message, range = world.view, checkghosts = null, list/exclude_objs = null, list/exclude_mobs = null)
set waitfor = FALSE

var/turf/T = get_turf(src)
if(GLOB.explosion_in_process)
if(T)
return
var/list/mobs = list()
var/list/objs = list()
get_mobs_and_objs_in_view_fast(T,range, mobs, objs, checkghosts)
Expand Down
7 changes: 3 additions & 4 deletions code/game/objects/explosion_recursive.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define EXPLFX_SOUND 2
#define EXPLFX_SHAKE 1
#define EXPLFX_NONE 0
GLOBAL_VAR_INIT(explosion_in_process, FALSE)

SUBSYSTEM_DEF(explosives)
name = "Explosives"
Expand All @@ -15,13 +16,11 @@ SUBSYSTEM_DEF(explosives)
var/list/work_queue = list()
var/ticks_without_work = 0
var/list/explosion_turfs
var/explosion_in_progress

var/mc_notified = FALSE

/datum/controller/subsystem/explosives/Recover()
work_queue = SSexplosives.work_queue
explosion_in_progress = SSexplosives.explosion_in_progress
explosion_turfs = SSexplosives.explosion_turfs

/datum/controller/subsystem/explosives/fire(resumed = FALSE)
Expand Down Expand Up @@ -224,7 +223,7 @@ SUBSYSTEM_DEF(explosives)
log_debug("iexpl: Beginning discovery phase.")
var/time = world.time

explosion_in_progress = TRUE
GLOB.explosion_in_process = TRUE
var/list/act_turfs = list()
act_turfs[epicenter] = power

Expand Down Expand Up @@ -380,7 +379,7 @@ SUBSYSTEM_DEF(explosives)

turf_tally++

explosion_in_progress = FALSE
GLOB.explosion_in_process = FALSE
log_debug("iexpl: Application completed in [(world.time-time)/10] seconds; processed [turf_tally] turfs and [movable_tally] movables.")

#undef SEARCH_DIR
Expand Down
1 change: 0 additions & 1 deletion mods/ipc_mods/code/external_cooling_device.dm
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@


/obj/machinery/external_cooling_device/Destroy()
STOP_PROCESSING(SSobj,src)
attached = null
QDEL_NULL(cell)
. = ..()
Expand Down

0 comments on commit 25bbc9f

Please sign in to comment.