mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-12 00:27:31 +01:00
Nuclear bombs now actually detonate (#22586)
* BOOM * Forgot this check * Fix remaining objectives * This is better * MSO params * >When you copy paste directly from the comment * Merge fixes * Revert "Fix remaining objectives" This reverts commit b1d1bf40f615019bb57088c24fae8f89c5d2e834. * Revert "Forgot this check" This reverts commit cea6ad2381d44a44ef3a93064997454cf7b1ccf5. * After all that work I did to make objectives work... * Oh this is important
This commit is contained in:
@@ -8,5 +8,4 @@
|
||||
/datum/round_event/wizard/fake_explosion/start()
|
||||
for(var/mob/M in player_list)
|
||||
M << 'sound/machines/Alarm.ogg'
|
||||
spawn(100)
|
||||
ticker.station_explosion_cinematic(1,"fake") //:o)
|
||||
addtimer(CALLBACK(ticker, /datum/subsystem/ticker/.proc/station_explosion_cinematic, 1, "fake"), 100) //:o)
|
||||
@@ -144,4 +144,4 @@
|
||||
|
||||
var/resize = 1 //Badminnery resize
|
||||
|
||||
var/list/observers = null //The list of people observing this mob.
|
||||
var/list/observers = null //The list of people observing this mob.
|
||||
@@ -345,6 +345,8 @@
|
||||
mode = SHUTTLE_RECALL
|
||||
|
||||
/obj/docking_port/mobile/proc/enterTransit()
|
||||
if(SSshuttle.lockdown && z == ZLEVEL_STATION) //emp went off, no escape
|
||||
return
|
||||
previous = null
|
||||
// if(!destination)
|
||||
// return
|
||||
|
||||
Reference in New Issue
Block a user