From 8d0c29f9dadb3e2d74830759be928ed893b6e87d Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Tue, 29 Aug 2017 19:56:27 -0700 Subject: [PATCH] ok --- code/modules/mob/living/carbon/human/human_helpers.dm | 8 ++++---- code/modules/mob/living/carbon/monkey/monkey.dm | 4 ++-- code/modules/mob/living/living.dm | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 98dc9b33a1..1c44c96d64 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -143,19 +143,19 @@ var/protection = (prot["head"] + prot["arms"] + prot["feet"] + prot["legs"] + prot["groin"] + prot["chest"] + prot["hands"])/7 return protection -/mob/living/carbon/human/can_use_guns(var/obj/item/G) +/mob/living/carbon/human/can_use_guns(obj/item/G) . = ..() if(G.trigger_guard == TRIGGER_GUARD_NORMAL) if(src.dna.check_mutation(HULK)) to_chat(src, "Your meaty finger is much too large for the trigger guard!") - return 0 + return FALSE if(NOGUNS in src.dna.species.species_traits) to_chat(src, "Your fingers don't fit in the trigger guard!") - return 0 + return FALSE if(mind) if(mind.martial_art && mind.martial_art.no_guns) //great dishonor to famiry to_chat(src, "Use of ranged weaponry would bring dishonor to the clan.") - return 0 + return FALSE return . diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index fd7e087ac4..8adde0b69c 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -140,8 +140,8 @@ return 0 return 1 -/mob/living/carbon/monkey/can_use_guns(var/obj/item/G) - return 1 +/mob/living/carbon/monkey/can_use_guns(obj/item/G) + return TRUE /mob/living/carbon/monkey/angry aggressive = TRUE diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 364c141abf..cd6231094c 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -241,7 +241,7 @@ return 1 /mob/living/proc/InCritical() - return (health < 0 && health > -100 && stat == UNCONSCIOUS) + return (health < HEALTH_THRESHOLD_CRIT && health > HEALTH_THRESHOLD_DEAD && stat == UNCONSCIOUS) //This proc is used for mobs which are affected by pressure to calculate the amount of pressure that actually //affects them once clothing is factored in. ~Errorage @@ -798,11 +798,11 @@ else to_chat(src, "You don't have the dexterity to do this!") return -/mob/living/proc/can_use_guns(var/obj/item/G) +/mob/living/proc/can_use_guns(obj/item/G) if (G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser()) to_chat(src, "You don't have the dexterity to do this!") - return 0 - return 1 + return FALSE + return TRUE /mob/living/carbon/proc/update_stamina() if(staminaloss)