diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index c39bcd9a8adb..c8e93570858f 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -687,13 +687,13 @@
 	if(crit_percent() < 100 || HAS_TRAIT(src, TRAIT_NOSOFTCRIT)) // melbert todo
 		if(HAS_TRAIT_FROM(src, TRAIT_SOFT_CRIT, PAINCRIT))
 			Paralyze(2 SECONDS)
-			remove_traits(list(TRAIT_SOFT_CRIT, TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED, TRAIT_FLOORED, TRAIT_HANDS_BLOCKED), PAINCRIT)
+			remove_traits(list(TRAIT_SOFT_CRIT, TRAIT_LABOURED_BREATHING, TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED, TRAIT_FLOORED, TRAIT_HANDS_BLOCKED), PAINCRIT)
 		return
 
 	if(HAS_TRAIT_FROM(src, TRAIT_SOFT_CRIT, PAINCRIT))
 		return
 	var/is_standing = body_position == STANDING_UP
-	add_traits(list(TRAIT_SOFT_CRIT, TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED, TRAIT_FLOORED, TRAIT_HANDS_BLOCKED), PAINCRIT)
+	add_traits(list(TRAIT_SOFT_CRIT, TRAIT_LABOURED_BREATHING, TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED, TRAIT_FLOORED, TRAIT_HANDS_BLOCKED), PAINCRIT)
 	if(stat == DEAD)
 		return
 	if(buckled)
diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
index 182da8e200bd..850154b8766d 100644
--- a/code/modules/mob/living/living_say.dm
+++ b/code/modules/mob/living/living_say.dm
@@ -113,8 +113,9 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		return
 
 	switch(stat)
-		if(SOFT_CRIT)
-			message_mods[WHISPER_MODE] = MODE_WHISPER
+		// NON-MODULE CHANGE
+		// if(SOFT_CRIT)
+		// 	message_mods[WHISPER_MODE] = MODE_WHISPER
 		if(UNCONSCIOUS)
 			return
 		if(HARD_CRIT)
diff --git a/code/modules/mob/mob_say.dm b/code/modules/mob/mob_say.dm
index 3f11742a4827..ac1d216df432 100644
--- a/code/modules/mob/mob_say.dm
+++ b/code/modules/mob/mob_say.dm
@@ -237,4 +237,10 @@
 			return
 	return message
 
+/mob/living/carbon/human/get_message_mods(message, list/mods)
+	// NON-MODULE CHANGE
+	if(losebreath > 2 || failed_last_breath)
+		mods[WHISPER_MODE] = MODE_WHISPER
+	return ..()
+
 #undef MESSAGE_MODS_LENGTH