cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Having no lungs now deals damage when you can't breathe (#16921)

Browse Source
This commit is contained in:
MadmanMartian
2017-12-29 20:42:00 +00:00
committed by sood
parent 8962a71cda
commit ac2bb0416a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mob/living/carbon/human/life/handle_breath.dm
View File

@@ -24,7 +24,7 @@
var/datum/gas_mixture/environment = loc.return_air()
var/datum/gas_mixture/breath
//HACK NEED CHANGING LATER
if(health < config.health_threshold_crit)
if(health < config.health_threshold_crit || !L)
losebreath++
if(losebreath > 0) //Suffocating so do not take a breath
losebreath--
@@ -142,8 +142,8 @@
/mob/living/carbon/human/proc/handle_breath(var/datum/gas_mixture/breath)
if((status_flags & GODMODE) || (flags & INVULNERABLE))
return 0
if(!breath || (breath.total_moles() == 0) || suiciding)
var/datum/organ/internal/lungs/L = internal_organs_by_name["lungs"]
if(!breath || (breath.total_moles() == 0) || suiciding || !L)
if(reagents.has_reagent(INAPROVALINE))
return 0
if(suiciding)
@@ -163,7 +163,7 @@
return 0
// Lungs now handle processing atmos shit.
for(var/datum/organ/internal/lungs/L in internal_organs)
if(L)
L.handle_breath(breath,src)
return 1