From ac2bb0416a5e08d17e37e8d1323a6d3ce4437ef0 Mon Sep 17 00:00:00 2001
From: MadmanMartian <30557196+MadmanMartian@users.noreply.github.com>
Date: Fri, 29 Dec 2017 20:42:00 +0000
Subject: [PATCH] Having no lungs now deals damage when you can't breathe
 (#16921)

---
 .../modules/mob/living/carbon/human/life/handle_breath.dm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/life/handle_breath.dm b/code/modules/mob/living/carbon/human/life/handle_breath.dm
index 33fe93848e6..b34e9e48bda 100644
--- a/code/modules/mob/living/carbon/human/life/handle_breath.dm
+++ b/code/modules/mob/living/carbon/human/life/handle_breath.dm
@@ -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