From bc8c97d6c490e5e86a8c90cbffc0ef2b04725a8b Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 12 Apr 2018 05:27:35 -0400 Subject: [PATCH] Adds an period to point messages --- code/modules/mob/living/living.dm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index cbf093e815..1273ca6083 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -320,16 +320,16 @@ //same as above /mob/living/pointed(atom/A as mob|obj|turf in view()) if(incapacitated()) - return 0 - if(src.has_trait(TRAIT_FAKEDEATH)) - return 0 + return FALSE + if(has_trait(TRAIT_FAKEDEATH)) + return FALSE if(!..()) - return 0 - visible_message("[src] points to [A]") - return 1 + return FALSE + visible_message("[src] points at [A].", "You point at [A].") + return TRUE /mob/living/verb/succumb(whispered as null) - set hidden = 1 + set hidden = TRUE if (InCritical()) log_message("Has [whispered ? "whispered his final words" : "succumbed to death"] while in [InFullCritical() ? "hard":"soft"] critical with [round(health, 0.1)] points of health!", INDIVIDUAL_ATTACK_LOG) adjustOxyLoss(health - HEALTH_THRESHOLD_DEAD) @@ -339,8 +339,13 @@ death() /mob/living/incapacitated(ignore_restraints, ignore_grab) +<<<<<<< HEAD if(stat || IsUnconscious() || IsStun() || IsKnockdown() || recoveringstam || (!ignore_restraints && restrained(ignore_grab))) // CIT CHANGE - adds recoveringstam check here return 1 +======= + if(stat || IsUnconscious() || IsStun() || IsKnockdown() || (!ignore_restraints && restrained(ignore_grab))) + return TRUE +>>>>>>> fbdbd51... Adds an period to point messages (#37113) /mob/living/proc/InCritical() return (health <= HEALTH_THRESHOLD_CRIT && (stat == SOFT_CRIT || stat == UNCONSCIOUS))