From 5fd5e326281ded2d997df7f0bf90bc9b676e4704 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 21 May 2017 20:30:28 -0500 Subject: [PATCH] [MIRROR] Fixes syndicate borg spawner (#1072) * Fixes syndicate borg spawner * Delete antag_spawner.dm.rej * Update antag_spawner.dm --- code/game/gamemodes/antag_spawner.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index da749b603a..fd2c58fc80 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -142,25 +142,25 @@ /obj/item/weapon/antag_spawner/nuke_ops/proc/check_usability(mob/user) if(used) to_chat(user, "[src] is out of power!") - return 0 + return FALSE if(!(user.mind in SSticker.mode.syndicates)) to_chat(user, "AUTHENTICATION FAILURE. ACCESS DENIED.") - return 0 + return FALSE if(user.z != ZLEVEL_CENTCOM) to_chat(user, "[src] is out of range! It can only be used at your base!") - return 0 - return 1 + return FALSE + return TRUE /obj/item/weapon/antag_spawner/nuke_ops/attack_self(mob/user) if(!(check_usability(user))) return to_chat(user, "You activate [src] and wait for confirmation.") - var/list/nuke_candidates = pollCandidatesForMob("Do you want to play as a syndicate [borg_to_spawn ? "[lowertext(borg_to_spawn)] cyborg":"operative"]?", ROLE_OPERATIVE, null, ROLE_OPERATIVE, 150, POLL_IGNORE_SYNDICATE, src) + var/list/nuke_candidates = pollGhostCandidates("Do you want to play as a syndicate [borg_to_spawn ? "[lowertext(borg_to_spawn)] cyborg":"operative"]?", ROLE_OPERATIVE, null, ROLE_OPERATIVE, 150, POLL_IGNORE_SYNDICATE) if(nuke_candidates.len) if(!(check_usability(user))) return - used = 1 + used = TRUE var/mob/dead/observer/theghost = pick(nuke_candidates) spawn_antag(theghost.client, get_turf(src), "syndieborg") do_sparks(4, TRUE, src)