diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 87664f68beb..a307a0819dd 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -43,7 +43,6 @@ //Health Defines #define HEALTH_THRESHOLD_CRIT 0 -#define HEALTH_THRESHOLD_FULLCRIT -30 #define HEALTH_THRESHOLD_DEAD -100 //Actual combat defines diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm index 29c299e4b63..396ff64be9f 100644 --- a/code/__DEFINES/stat.dm +++ b/code/__DEFINES/stat.dm @@ -3,10 +3,9 @@ */ //mob/var/stat things -#define CONSCIOUS 0 -#define SOFT_CRIT 1 -#define UNCONSCIOUS 2 -#define DEAD 3 +#define CONSCIOUS 0 +#define UNCONSCIOUS 1 +#define DEAD 2 //mob disabilities stat diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index ce51964df20..94ce9f04a67 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -687,9 +687,6 @@ return if(IsUnconscious() || IsSleeping() || getOxyLoss() > 50 || (status_flags & FAKEDEATH) || health <= HEALTH_THRESHOLD_CRIT) if(stat == CONSCIOUS) - stat = SOFT_CRIT - update_canmove() - if(health <= HEALTH_THRESHOLD_FULLCRIT && stat == SOFT_CRIT) stat = UNCONSCIOUS blind_eyes(1) update_canmove() diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index a9ca9139360..0c4f74d03d7 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -53,7 +53,7 @@ var/datum/gas_mixture/breath - if(health <= HEALTH_THRESHOLD_FULLCRIT || (pulledby && pulledby.grab_state >= GRAB_KILL && !getorganslot("breathing_tube"))) + if(health <= HEALTH_THRESHOLD_CRIT || (pulledby && pulledby.grab_state >= GRAB_KILL && !getorganslot("breathing_tube"))) losebreath++ //Suffocate diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 8d973e4567c..cffc1f3a84c 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -241,10 +241,7 @@ return 1 /mob/living/proc/InCritical() - return (health < HEALTH_THRESHOLD_CRIT && health > HEALTH_THRESHOLD_DEAD && (stat == SOFT_CRIT || stat == UNCONSCIOUS)) - -/mob/living/proc/InFullCritical() - return (health < HEALTH_THRESHOLD_FULLCRIT && health > HEALTH_THRESHOLD_DEAD && 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 diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 8d86081176c..5c47a35ea62 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -108,11 +108,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(check_emote(original_message) || !can_speak_basic(original_message)) return - var/in_full_critical = InFullCritical() - if(in_critical) - if(!in_full_critical && !message_mode) - message_mode = MODE_WHISPER if(!(crit_allowed_modes[message_mode])) return else if(stat == UNCONSCIOUS) @@ -153,7 +149,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( message_range = 1 spans |= SPAN_ITALICS log_talk(src,"[key_name(src)] : [message]",LOGWHISPER) - if(in_full_critical) + if(in_critical) var/health_diff = round(-HEALTH_THRESHOLD_DEAD + health) // If we cut our message short, abruptly end it with a-.. var/message_len = length(message)