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

Merge pull request #4646 from Citadel-Station-13/upstream-merge-34031

Browse Source 
[MIRROR] Prevents Nar-Sie from being double-summoned
This commit is contained in:
deathride58
2018-01-03 18:56:31 +00:00
committed by GitHub
parent 5d336ede48 3264569d71
commit 94eeb5981d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/cult/runes.dm
+7 -2
View File
@@ -484,8 +484,9 @@ structure_check() searches for nearby cultist structures required for the invoca
if(locate(/obj/singularity/narsie) in GLOB.poi_list) if(locate(/obj/singularity/narsie) in GLOB.poi_list)
for(var/M in invokers) for(var/M in invokers)
to_chat(M, "<span class='warning'>Nar-Sie is already on this plane!</span>") to_chat(M, "<span class='warning'>[src] fizzles uselessly, Nar-Sie is already on this plane!</span>")
log_game("Summon Nar-Sie rune failed - already summoned") playsound(src, 'sound/items/welder.ogg', 50, 1)
log_game("Summon Nar-Sie rune at [COORD(src)] failed - already summoned")
return return
//BEGIN THE SUMMONING //BEGIN THE SUMMONING
used = TRUE 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') sound_to_playing_players('sound/effects/dimensional_rend.ogg')
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
sleep(40) sleep(40)
if(locate(/obj/singularity/narsie) in GLOB.poi_list)
T.visible_message("<span class='warning'>A faint fizzle could be heard echoing along with a soft chorus of screams and chanting...</span>")
playsound(T, 'sound/items/welder.ogg', 25, 1)
return
if(src) if(src)
color = RUNE_COLOR_RED color = RUNE_COLOR_RED
new /obj/singularity/narsie/large/cult(T) //Causes Nar-Sie to spawn even if the rune has been removed new /obj/singularity/narsie/large/cult(T) //Causes Nar-Sie to spawn even if the rune has been removed