cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-15 01:54:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reverts soft crit (#30260)

Browse Source
This commit is contained in:
Leo
2017-08-28 17:09:29 -03:00
committed by Remie Richards
parent e89917c3db
commit 53a89cb3fd
6 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
-3
View File
@@ -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()
code/modules/mob/living/carbon/life.dm
+1 -1
View File
@@ -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
code/modules/mob/living/living.dm
+1 -4
View File
@@ -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
code/modules/mob/living/say.dm
+1 -5
View File
@@ -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)