From d2e4c54bb608e179e2e84b4f73abfb8fa60cbdd9 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 2 Jan 2017 16:30:44 -0600 Subject: [PATCH] Might fix changeling bans --- code/game/antagonist/station/changeling.dm | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/code/game/antagonist/station/changeling.dm b/code/game/antagonist/station/changeling.dm index 7ace822b1a..4f60792810 100644 --- a/code/game/antagonist/station/changeling.dm +++ b/code/game/antagonist/station/changeling.dm @@ -56,23 +56,24 @@ return /datum/antagonist/changeling/can_become_antag(var/datum/mind/player, var/ignore_role) - if(..()) - if(player.current) - if(ishuman(player.current)) - var/mob/living/carbon/human/H = player.current - if(H.isSynthetic()) + if(!..()) + return 0 + if(player.current) + if(ishuman(player.current)) + var/mob/living/carbon/human/H = player.current + if(H.isSynthetic()) + return 0 + if(H.species.flags & NO_SCAN) + return 0 + return 1 + else if(isnewplayer(player.current)) + if(player.current.client && player.current.client.prefs) + var/datum/species/S = all_species[player.current.client.prefs.species] + if(S && (S.flags & NO_SCAN)) return 0 - if(H.species.flags & NO_SCAN) + if(player.current.client.prefs.organ_data["torso"] == "cyborg") // Full synthetic. return 0 return 1 - else if(isnewplayer(player.current)) - if(player.current.client && player.current.client.prefs) - var/datum/species/S = all_species[player.current.client.prefs.species] - if(S && (S.flags & NO_SCAN)) - return 0 - if(player.current.client.prefs.organ_data["torso"] == "cyborg") // Full synthetic. - return 0 - return 1 return 0 /datum/antagonist/changeling/print_player_full(var/datum/mind/ply)