diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index d01defcc1cb..d3ecc9e3e1c 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -4,7 +4,7 @@ if(!breath || (breath.total_moles() == 0)) //Aliens breathe in vaccuum - return 0 + return FALSE var/toxins_used = 0 var/tox_detect_threshold = 0.02 diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 63982b86948..55677022309 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -86,9 +86,12 @@ return real_name /mob/living/carbon/human/IsVocal() + // how do species that don't breathe talk? magic, that's what. + if(!(NO_BREATHE in species.species_traits) && !get_organ_slot("lungs")) + return FALSE if(mind) return !mind.miming - return 1 + return TRUE /mob/living/carbon/human/proc/SetSpecialVoice(var/new_voice) if(new_voice) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 7ee55d7357a..87a86e267f8 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -99,7 +99,7 @@ adjustOxyLoss(1) failed_last_breath = TRUE throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy) - return 0 + return FALSE var/safe_oxy_min = 16 var/safe_co2_max = 10 diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index be52c7c3a0d..492384a0089 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -284,7 +284,7 @@ species = "Plasmaman" safe_oxygen_min = 0 //We don't breath this - safe_toxins_min = 16 //We breath THIS! + safe_toxins_min = 16 //We breathe THIS! safe_toxins_max = 0 /obj/item/organ/internal/lungs/vox @@ -292,10 +292,10 @@ desc = "They're filled with dust....wow." species = "Vox" - safe_oxygen_min = 0 - safe_oxygen_max = 1 - safe_nitro_min = 16 - oxy_damage_type = TOX + safe_oxygen_min = 0 //We don't breathe this + safe_oxygen_max = 1 //This is toxic to us + safe_nitro_min = 16 //We breathe THIS! + oxy_damage_type = TOX //And it poisons us /obj/item/organ/internal/lungs/drask icon = 'icons/obj/surgery_drask.dmi' @@ -303,7 +303,7 @@ cold_message = "an invigorating coldness" cold_level_3_threshold = 60 - cold_level_1_damage = -COLD_GAS_DAMAGE_LEVEL_1 //They heal brute when the air is cold + cold_level_1_damage = -COLD_GAS_DAMAGE_LEVEL_1 //They heal when the air is cold cold_level_2_damage = -COLD_GAS_DAMAGE_LEVEL_2 cold_level_3_damage = -COLD_GAS_DAMAGE_LEVEL_3 - cold_damage_type = BRUTE \ No newline at end of file + cold_damage_type = BRUTE //more specifically they heal brute \ No newline at end of file