From 702ccbee5c4009db31f99e01caa8aeb160a5d66d Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Fri, 27 Mar 2020 08:39:57 -0400
Subject: [PATCH] Update lungs.dm

---
 code/modules/organs/internal/lungs.dm | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/code/modules/organs/internal/lungs.dm b/code/modules/organs/internal/lungs.dm
index 71a6bf160e..f123ea127b 100644
--- a/code/modules/organs/internal/lungs.dm
+++ b/code/modules/organs/internal/lungs.dm
@@ -15,31 +15,17 @@
 
 	if(is_bruised())
 		if(prob(4))
-<<<<<<< HEAD
-			spawn()
-				owner?.emote("me", 1, "coughs up blood!")
-			owner.drip(10)
-		if(prob(8))
-			spawn()
-				owner?.emote("me", 1, "gasps for air!")
-=======
 			spawn owner?.emote("me", 1, "coughs up blood!")
 			owner.drip(10)
 		if(prob(8))
 			spawn owner?.emote("me", 1, "gasps for air!")
->>>>>>> 6f2aec5... Merge pull request #6906 from Meghan-Rossi/lungfix
 			owner.AdjustLosebreath(15)
 
 	if(owner.internal_organs_by_name[O_BRAIN]) // As the brain starts having Trouble, the lungs start malfunctioning.
 		var/obj/item/organ/internal/brain/Brain = owner.internal_organs_by_name[O_BRAIN]
 		if(Brain.get_control_efficiency() <= 0.8)
 			if(prob(4 / max(0.1,Brain.get_control_efficiency())))
-<<<<<<< HEAD
-				spawn()
-					owner?.emote("me", 1, "gasps for air!")
-=======
 				spawn owner?.emote("me", 1, "gasps for air!")
->>>>>>> 6f2aec5... Merge pull request #6906 from Meghan-Rossi/lungfix
 				owner.AdjustLosebreath(round(3 / max(0.1,Brain.get_control_efficiency())))
 
 /obj/item/organ/internal/lungs/proc/rupture()