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

Moves several clothing-specific flags from /atom to their proper type

Browse Source
This commit is contained in:
vuonojenmustaturska
2018-04-28 21:22:28 +03:00
committed by CitadelStationBot
parent 811cc06188
commit 3f6167d08e
44 changed files with 202 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/monkey/life.dm
+6 -1
View File
@@ -18,8 +18,13 @@
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(!resisting && prob(MONKEY_RESIST_PROB))
resisting = TRUE
walk_to(src,0)
@@ -146,7 +151,7 @@
/mob/living/carbon/monkey/has_smoke_protection()
if(wear_mask)
if(wear_mask.flags_1 & BLOCK_GAS_SMOKE_EFFECT_1)
if(wear_mask.clothing_flags & BLOCK_GAS_SMOKE_EFFECT)
return 1
/mob/living/carbon/monkey/handle_fire()