diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 7d84cabcf42..ae873d7f315 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -79,8 +79,8 @@ ..() /mob/living/carbon/human/breathe() - if(!dna.species.breathe(src)) - ..() + if(!HAS_TRAIT(src, TRAIT_NOBREATH)) + return ..() /mob/living/carbon/human/check_breath(datum/gas_mixture/breath) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 0e7c0e6c72a..792a51f711e 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1657,14 +1657,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) // called before a projectile hit return 0 -///////////// -//BREATHING// -///////////// - -/datum/species/proc/breathe(mob/living/carbon/human/H) - if(HAS_TRAIT(H, TRAIT_NOBREATH)) - return TRUE - ////////////////////////// // ENVIRONMENT HANDLERS // ////////////////////////// diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 322063de0aa..d32b5cfe1ec 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -506,8 +506,8 @@ desc = "A spongy rib-shaped mass for filtering plasma from the air." icon_state = "lungs-plasma" - safe_oxygen_min = 0 //We don't breath this - safe_toxins_min = 16 //We breath THIS! + safe_oxygen_min = 0 //We don't breathe this + safe_toxins_min = 16 //We breathe THIS! safe_toxins_max = 0 /obj/item/organ/lungs/slime