Update sensory.dm

2017-12-06 13:18:45 -05:00
parent 988dbe87da
commit 3f92e40503
1 changed files with 0 additions and 3 deletions
@@ -70,12 +70,9 @@ Bonus

 	if(brain_heal && A.stage >= 5)
 		M.adjustBrainLoss(-3)
-<<<<<<< HEAD
-=======
 		if(trauma_heal && iscarbon(M))
 			var/mob/living/carbon/C = M
 			if(prob(30) && C.has_trauma_type(BRAIN_TRAUMA_SPECIAL))
 				C.cure_trauma_type(BRAIN_TRAUMA_SPECIAL)
 			if(prob(10) && C.has_trauma_type(BRAIN_TRAUMA_MILD))
 				C.cure_trauma_type(BRAIN_TRAUMA_MILD)
->>>>>>> 550d711... Brain Traumas (#31727)