From 1d235c0a721ac105eda09250cc1e4b6c97b685c1 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 3 Jan 2018 10:25:02 -0800 Subject: [PATCH 1/2] Merge pull request #34031 from ShizCalev/narsie-summons Prevents Nar-Sie from being double-summoned --- code/game/gamemodes/cult/runes.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 4feee3f23b..2da551fb07 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -484,8 +484,9 @@ structure_check() searches for nearby cultist structures required for the invoca if(locate(/obj/singularity/narsie) in GLOB.poi_list) for(var/M in invokers) - to_chat(M, "Nar-Sie is already on this plane!") - log_game("Summon Nar-Sie rune failed - already summoned") + to_chat(M, "[src] fizzles uselessly, Nar-Sie is already on this plane!") + playsound(src, 'sound/items/welder.ogg', 50, 1) + log_game("Summon Nar-Sie rune at [COORD(src)] failed - already summoned") return //BEGIN THE SUMMONING used = TRUE @@ -493,6 +494,10 @@ structure_check() searches for nearby cultist structures required for the invoca sound_to_playing_players('sound/effects/dimensional_rend.ogg') var/turf/T = get_turf(src) sleep(40) + if(locate(/obj/singularity/narsie) in GLOB.poi_list) + T.visible_message("A faint fizzle could be heard echoing along with a soft chorus of screams and chanting...") + playsound(T, 'sound/items/welder.ogg', 25, 1) + return if(src) color = RUNE_COLOR_RED new /obj/singularity/narsie/large/cult(T) //Causes Nar-Sie to spawn even if the rune has been removed