From 57c059128385d405911dc9eb484ff9e3ed841f94 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Mon, 9 Mar 2015 19:22:07 +0100 Subject: [PATCH] Fixes ninja spawn logic. Fixes the logic I re-made after a PR comment without double-checking it. Changes ninjastart to use the actual landmarks instead of locs for consistency. --- code/game/gamemodes/ninja/ninja.dm | 12 ++++++------ code/game/objects/effects/landmarks.dm | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/gamemodes/ninja/ninja.dm b/code/game/gamemodes/ninja/ninja.dm index b4c0c5f5550..f136d63e451 100644 --- a/code/game/gamemodes/ninja/ninja.dm +++ b/code/game/gamemodes/ninja/ninja.dm @@ -32,15 +32,15 @@ if(L.name == "carpspawn") ninjastart.Add(L) - if(ninjastart.len == 0 && latejoin.len > 0) - ninja.current << "\red No spawneable locations could be found. Defaulting to latejoin." + if(ninjastart.len) return 1 - else - ninja.current << "\red No spawneable locations could be found. Aborting." - return 0 - + if(ninjastart.len == 0 && latejoin.len > 0) + ninja.current << "\red No spawn locations could be found. Defaulting to late-join locations." return 1 + ninja.current << "\red No spawn locations could be found. Aborting." + return 0 + /datum/game_mode/ninja/pre_setup() for(var/datum/mind/ninja in ninjas) ninja.current << browse(null, "window=playersetup") diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index b9facb09b87..8df98464e67 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -117,7 +117,7 @@ /obj/effect/landmark/start/ninja/New() ..() - ninjastart += loc + ninjastart += src //Costume spawner landmarks