From 6b1e20ea19277f92ffb608db02d64a1a8ca326a8 Mon Sep 17 00:00:00 2001 From: palpatine213 Date: Tue, 8 Sep 2015 17:09:54 -0700 Subject: [PATCH] Changed the switch to an istype check. Also modified the clone hijack objective for consistency. --- code/game/gamemodes/objective.dm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 59b8fd3081a..e485a62657d 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -224,9 +224,8 @@ for(var/mob/living/player in player_list) if(player.mind && player.mind != owner) if(player.stat != DEAD) - switch(player.type) - if(/mob/living/silicon) //Borgs are technically dead anyways - continue + if(istype(player, /mob/living/silicon)) //Borgs are technically dead anyways + continue if(get_area(player) == A) if(!player.mind.special_role && !istype(get_turf(player.mind.current), /turf/simulated/floor/plasteel/shuttle/red)) return 0 @@ -248,9 +247,8 @@ for(var/mob/living/player in player_list) //Make sure nobody else is onboard if(player.mind && player.mind != owner) if(player.stat != DEAD) - switch(player.type) - if(/mob/living/silicon/ai, /mob/living/silicon/pai) - continue + if(istype(player, /mob/living/silicon)) + continue if(get_area(player) == A) if(player.real_name != owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/floor/plasteel/shuttle/red)) return 0 @@ -258,9 +256,8 @@ for(var/mob/living/player in player_list) //Make sure at least one of you is onboard if(player.mind && player.mind != owner) if(player.stat != DEAD) - switch(player.type) - if(/mob/living/silicon/ai, /mob/living/silicon/pai) - continue + if(istype(player, /mob/living/silicon)) + continue if(get_area(player) == A) if(player.real_name == owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/floor/plasteel/shuttle/red)) return 1