From 7f5f4243fcbd39035c99504745d7e68c8ea013b5 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 14 Dec 2017 12:15:33 -0500 Subject: [PATCH] proc tweak and name change --- code/__HELPERS/game.dm | 2 +- code/game/gamemodes/miniantags/borer/borer.dm | 2 +- code/game/response_team.dm | 2 +- code/modules/mob/living/carbon/brain/posibrain.dm | 4 ++-- code/modules/mob/living/silicon/pai/recruit.dm | 2 +- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +- .../mob/living/silicon/robot/drone/drone_manufacturer.dm | 2 +- .../living/simple_animal/hostile/terror_spiders/ghost.dm | 2 +- code/modules/mob/mob_helpers.dm | 6 +++--- code/modules/research/xenobiology/xenobiology.dm | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 150eb9baac0..082d473010d 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -457,7 +457,7 @@ proc/pollCandidates(Question, be_special_type, antag_age_check = 0, poll_time = if(config.use_exp_restrictions && min_hours) if(G.client.get_exp_living_num() < min_hours * 60) continue - if(canPosses(G)) + if(cannotPossess(G)) continue spawn(0) G << 'sound/misc/notice2.ogg'//Alerting them to their consideration diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index 210959aeb93..54bdaf1b9cf 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -123,7 +123,7 @@ GrantBorerActions() /mob/living/simple_animal/borer/attack_ghost(mob/user) - if(canPosses(user)) + if(cannotPossess(user)) to_chat(user, "Upon using the antagHUD you forfeited the ability to join the round.") return if(jobban_isbanned(user, "Syndicate")) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 120cca9bbe8..47f026841f7 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -51,7 +51,7 @@ var/ert_request_answered = 0 to_chat(src, "This role is not yet available to you. You need to wait another [player_age_check] days.") return 0 - if(canPosses(src)) + if(cannotPossess(src)) to_chat(src, "Upon using the antagHUD you forfeited the ability to join the round.") return 0 diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 9f6f3a09eec..1c5af7e36f1 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -47,7 +47,7 @@ to_chat(O, "\A [src] has been activated. (Teleport | Sign Up)") /obj/item/device/mmi/posibrain/proc/check_observer(var/mob/dead/observer/O) - if(canPosses(O)) + if(cannotPossess(O)) return 0 if(jobban_isbanned(O, "Cyborg") || jobban_isbanned(O,"nonhumandept")) return 0 @@ -133,7 +133,7 @@ if(!check_observer(O)) to_chat(O, "You cannot be \a [src].") return - if(canPosses(O)) + if(cannotPossess(O)) to_chat(O, "Upon using the antagHUD you forfeited the ability to join the round.") return if(jobban_isbanned(O, "Cyborg") || jobban_isbanned(O,"nonhumandept")) diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index 7f5703ddc22..991bc5c61c7 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -360,7 +360,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates return 0 if(!player_old_enough_antag(O.client,ROLE_PAI)) return 0 - if(canPosses(O)) + if(cannotPossess(O)) return 0 if(!(O in respawnable_list)) return 0 diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 5ac0cd2473e..2099b99f1b1 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -263,7 +263,7 @@ /mob/living/silicon/robot/drone/proc/request_player() for(var/mob/dead/observer/O in player_list) - if(canPosses(O)) + if(cannotPossess(O)) continue if(jobban_isbanned(O,"nonhumandept") || jobban_isbanned(O,"Drone")) continue diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 9aaddcdca2f..790ecaa399a 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -118,7 +118,7 @@ var/joinedasobserver = 0 if(istype(src,/mob/dead/observer)) var/mob/dead/observer/G = src - if(canPosses(G)) + if(cannotPossess(G)) to_chat(usr, "Upon using the antagHUD you forfeited the ability to join the round.") return if(G.started_as_observer == 1) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm index e39e135499b..592f8230edd 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm @@ -16,7 +16,7 @@ humanize_prompt += " Role: [spider_role_summary]" if(user.ckey in ts_ckey_blacklist) error_on_humanize = "You are not able to control any terror spider this round." - else if(canPosses(user)) + else if(cannotPossess(user)) error_on_humanize = "You have enabled antag HUD and are unable to re-enter the round." else if(spider_awaymission) error_on_humanize = "Terror spiders that are part of an away mission cannot be controlled by ghosts." diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 46123015a23..227138e2dfb 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -85,11 +85,11 @@ return 1 -/proc/canPosses(A) +/proc/cannotPossess(A) var/mob/dead/observer/G = A if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted) - return 0 - return 1 + return 1 + return 0 /proc/iscuffed(A) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 93e8fb51b7a..29a7f9746a7 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -458,7 +458,7 @@ return FALSE if(!O.can_reenter_corpse) return FALSE - if(canPosses(O)) + if(cannotPossess(O)) return FALSE return TRUE