From f17ec09d592b7c1909039c133b79d893de858ab0 Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Wed, 23 Feb 2011 04:58:07 +0000 Subject: [PATCH] Nuke mode should now properly not pick people that have "be syndicate" set to no. Nuke teams once again no longer win if they detonate their nuke on their transit shuttle. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1094 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/nuclear/nuclear.dm | 2 +- code/game/gamemodes/nuclear/nuclearbomb.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 413989bd603..db07b6d9863 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -209,7 +209,7 @@ for(var/mob/new_player/player in world) if((player.client) && (player.ready)) - if(player.be_syndicate) + if(player.preferences.be_syndicate) candidates += player.mind if(candidates.len < 1) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 90372ca96ea..2a9ca136d59 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -146,7 +146,7 @@ if (istype( A, /area)) if (A.name == "Space") derp = 1 - if (A.name == "Syndicate Station") + if (istype(A, /area/syndicate_station)) derp = 1 if (A.name == "Wizard's Den") derp = 1 @@ -155,7 +155,7 @@ for(var/area/target in get_step(src,direction)) if (target.name == "Space") derp = 1 - if (target.name == "Syndicate Station") + if (istype(target, /area/syndicate_station)) derp = 1 if (target.name == "Wizard's Den") derp = 1