From bcecb676a52bd4e530d5d2f1a8e2407ea0d68859 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Mon, 3 Dec 2018 14:34:13 +0000 Subject: [PATCH] Compilation --- code/modules/spells/spell_types/curse.dm | 14 +++++--------- strings/phobia.json | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/code/modules/spells/spell_types/curse.dm b/code/modules/spells/spell_types/curse.dm index fdb6c42fc5a..51d4c84c9af 100644 --- a/code/modules/spells/spell_types/curse.dm +++ b/code/modules/spells/spell_types/curse.dm @@ -4,16 +4,12 @@ message_admins("[ADMIN_LOOKUPFLW(user)] sent a curse of madness with the message \"[message]\"!") log_game("[key_name(user)] sent a curse of madness with the message \"[message]\"!") - for(var/M in GLOB.player_list) + deadchat_broadcast("A Curse of Madness has stricken the station, shattering their minds with the awful secret: \"[message]\"") + + for(var/mob/living/carbon/human/H in GLOB.player_list) var/turf/T = get_turf(H) - if(M.stat == DEAD || isobserver(M)) - to_chat(H, "A dark breeze whispers, \"[message]\" into every ear...") + if(H.stat == DEAD) continue - - if(!ishuman(M)) - continue - - var/mob/living/carbon/human/H = M if(T && !is_station_level(T.z)) continue if(H.anti_magic_check(TRUE, FALSE)) @@ -23,7 +19,7 @@ to_chat(H, "Your protective headgear successfully deflects mind controlling brainwaves!") continue H.playsound_local(H,'sound/hallucinations/veryfar_noise.ogg',40,1) - to_chat(H, "[message]") + to_chat(H, "[message]") to_chat(H, "Your mind shatters!") switch(rand(1,10)) if(1 to 3) diff --git a/strings/phobia.json b/strings/phobia.json index 950ab0b7694..601228eb14c 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -25,7 +25,7 @@ "brig", "gulag" ], - + "conspiracies": [ "central command", "command",