cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 04:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update life.dm

Browse Source
This commit is contained in:
Novacat
2020-07-30 15:33:47 -04:00
committed by GitHub
parent 057b9fba16
commit 2e3dbdfa9a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/life.dm
View File

@@ -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()