diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index d6159bfa9b3..daf6117270c 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -349,10 +349,6 @@ SUBSYSTEM_DEF(ticker) else LAZYADD(round_end_events, cb) -/datum/controller/subsystem/ticker/proc/station_explosion_detonation(atom/bomb) - if(bomb) //BOOM - qdel(bomb) - /datum/controller/subsystem/ticker/proc/create_characters() for(var/i in GLOB.new_player_list) var/mob/dead/new_player/player = i diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm index 8598a929454..a63979c3bad 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm @@ -597,7 +597,7 @@ GLOBAL_VAR(station_nuke_source) /obj/machinery/nuclearbomb/proc/really_actually_explode(detonation_status) var/cinematic = get_cinematic_type(detonation_status) if(!isnull(cinematic)) - play_cinematic(cinematic, world, CALLBACK(SSticker, TYPE_PROC_REF(/datum/controller/subsystem/ticker, station_explosion_detonation), src)) + play_cinematic(cinematic, world) var/drop_level = TRUE switch(detonation_status) @@ -628,6 +628,7 @@ GLOBAL_VAR(station_nuke_source) if(drop_level) SSsecurity_level.set_level(SEC_LEVEL_RED) + qdel(src) return TRUE /// Cause nuke effects to the passed z-levels.