From 2e3dbdfa9a2012c2decd2edffd1654f26ba1289b Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 30 Jul 2020 15:33:47 -0400
Subject: [PATCH] Update life.dm

---
 code/modules/mob/living/life.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index d330ec1ba7..b6a4c46fcd 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -126,14 +126,10 @@
 
 /mob/living/proc/handle_weakened()
 	if(weakened)
-<<<<<<< HEAD
-		weakened = max(weakened-1,0)
+		AdjustWeakened(-1)
 		throw_alert("weakened", /obj/screen/alert/weakened)
 	else
 		clear_alert("weakened")
-=======
-		AdjustWeakened(-1)
->>>>>>> 55b2c8d... Merge pull request #7354 from Neerti/status_indicators
 	return weakened
 
 /mob/living/proc/handle_stuttering()