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

Update ark_of_the_clockwork_justicar.dm

Browse Source
This commit is contained in:
LetterJay
2017-09-27 22:43:32 -05:00
committed by GitHub
parent 193d929e4b
commit 3687ef2d33
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
-11
View File
@@ -65,22 +65,11 @@
/obj/structure/destructible/clockwork/massive/celestial_gateway/Destroy() /obj/structure/destructible/clockwork/massive/celestial_gateway/Destroy()
STOP_PROCESSING(SSprocessing, src) STOP_PROCESSING(SSprocessing, src)
<<<<<<< HEAD
if(!purpose_fulfilled)
var/area/gate_area = get_area(src)
hierophant_message("<span class='large_brass'><b>An Ark of the Clockwork Justicar has fallen at [gate_area.map_name]!</b></span>")
sound_to_playing_players(channel = CHANNEL_JUSTICAR_ARK, S = sound(null, 0))
var/was_stranded = SSshuttle.emergency.mode == SHUTTLE_STRANDED
SSshuttle.clearHostileEnvironment(src)
if(!was_stranded && !purpose_fulfilled)
priority_announce("Massive energy anomaly no longer on short-range scanners.","Anomaly Alert")
=======
SSshuttle.clearHostileEnvironment(src) SSshuttle.clearHostileEnvironment(src)
if(!purpose_fulfilled && istype(SSticker.mode, /datum/game_mode/clockwork_cult)) if(!purpose_fulfilled && istype(SSticker.mode, /datum/game_mode/clockwork_cult))
hierophant_message("<span class='bold large_brass'>The Ark has fallen!</span>") hierophant_message("<span class='bold large_brass'>The Ark has fallen!</span>")
sound_to_playing_players(null, channel = CHANNEL_JUSTICAR_ARK) sound_to_playing_players(null, channel = CHANNEL_JUSTICAR_ARK)
SSticker.force_ending = TRUE //rip SSticker.force_ending = TRUE //rip
>>>>>>> 59e7559... Clockwork cult rework: Post-merge micro-patch (#31044)
if(glow) if(glow)
qdel(glow) qdel(glow)
glow = null glow = null