From 43578f8172c1d1bd805451452f480d5323e6f67f Mon Sep 17 00:00:00 2001 From: Krausus Date: Mon, 15 Jun 2015 09:58:23 -0400 Subject: [PATCH] Fixes one-click-antag runtimes Should make one-click-wizard stop breaking unpredictably. --- code/modules/admin/verbs/one_click_antag.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index f9940bec995..80c3fef67e7 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -150,7 +150,7 @@ client/proc/one_click_antag() var/time_passed = world.time for(var/mob/G in respawnable_list) - if(G.client.prefs.be_special & BE_WIZARD) + if(istype(G) && G.client && G.client.prefs.be_special & BE_WIZARD) if(!jobban_isbanned(G, "wizard") && !jobban_isbanned(G, "Syndicate")) if(player_old_enough_antag(G.client,BE_WIZARD)) spawn(0) @@ -224,7 +224,7 @@ client/proc/one_click_antag() var/time_passed = world.time for(var/mob/G in respawnable_list) - if(G.client.prefs.be_special & BE_OPERATIVE) + if(istype(G) && G.client && G.client.prefs.be_special & BE_OPERATIVE) if(!jobban_isbanned(G, "operative") && !jobban_isbanned(G, "Syndicate")) if(player_old_enough_antag(G.client,BE_OPERATIVE)) spawn(0) @@ -451,7 +451,7 @@ client/proc/one_click_antag() //Generates a list of candidates from active ghosts. for(var/mob/G in respawnable_list) - if(G.client.prefs.be_special & BE_RAIDER) + if(istype(G) && G.client && G.client.prefs.be_special & BE_RAIDER) if(player_old_enough_antag(G.client,BE_RAIDER)) if(!jobban_isbanned(G, "raider") && !jobban_isbanned(G, "Syndicate")) spawn(0)