shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update life.dm

Browse Source
This commit is contained in:
deathride58
2018-04-29 18:42:17 -04:00
committed by GitHub
parent e03e419b9e
commit 3921590a4b
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/monkey/life.dm
+2 -7
View File
@@ -18,13 +18,8 @@
if(..())
if(!client)
<<<<<<< HEAD
if(stat == CONSCIOUS)
if(on_fire || buckled || restrained() || (resting && canmove))
=======
if(stat == CONSCIOUS)
if(on_fire || buckled || restrained())
>>>>>>> 98f8ca7... Moves several clothing-specific flags from /atom to their proper type (#37486)
if(on_fire || buckled || restrained() || (resting && canmove)) //CIT CHANGE - makes it so monkeys attempt to resist if they're resting
if(!resisting && prob(MONKEY_RESIST_PROB))
resisting = TRUE
walk_to(src,0)
@@ -188,4 +183,4 @@
#undef COLD_DAMAGE_LEVEL_1
#undef COLD_DAMAGE_LEVEL_2
#undef COLD_DAMAGE_LEVEL_3
#undef COLD_DAMAGE_LEVEL_3