shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Fixes the doomsday device announcements (#2789)

Browse Source 
* Fixes the doomsday device announcements

* Fixes the doomsday device announcements
This commit is contained in:
CitadelStationBot
2017-09-16 04:31:46 -05:00
committed by Poojawa
parent ccd55bb779
commit a91f7efe5e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/malfunction/Malf_Modules.dm
+7 -7
View File
@@ -1,4 +1,5 @@
#define DEFAULT_DOOMSDAY_TIMER 4500
#define DOOMSDAY_ANNOUNCE_INTERVAL 600
GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
/obj/machinery/field/containment,
@@ -324,12 +325,11 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
var/timing = FALSE
var/obj/effect/countdown/doomsday/countdown
var/detonation_timer
var/list/milestones
var/next_announce
/obj/machinery/doomsday_device/Initialize()
. = ..()
countdown = new(src)
milestones = list()
/obj/machinery/doomsday_device/Destroy()
QDEL_NULL(countdown)
@@ -344,6 +344,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
/obj/machinery/doomsday_device/proc/start()
detonation_timer = world.time + DEFAULT_DOOMSDAY_TIMER
next_announce = world.time + DOOMSDAY_ANNOUNCE_INTERVAL
timing = TRUE
countdown.start()
START_PROCESSING(SSfastprocess, src)
@@ -367,11 +368,9 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
if(!sec_left)
timing = FALSE
detonate(T.z)
else
var/key = num2text(sec_left)
if(!(sec_left % 60) && !(key in milestones))
milestones[key] = TRUE
minor_announce("[key] SECONDS UNTIL DOOMSDAY DEVICE ACTIVATION!", "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4", TRUE)
else if(world.time >= next_announce)
minor_announce("[sec_left] SECONDS UNTIL DOOMSDAY DEVICE ACTIVATION!", "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4", TRUE)
next_announce += DOOMSDAY_ANNOUNCE_INTERVAL
/obj/machinery/doomsday_device/proc/detonate(z_level = ZLEVEL_STATION_PRIMARY)
sound_to_playing_players('sound/machines/alarm.ogg')
@@ -828,3 +827,4 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
AI.eyeobj.relay_speech = TRUE
#undef DEFAULT_DOOMSDAY_TIMER
#undef DOOMSDAY_ANNOUNCE_INTERVAL