cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 23:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4083 from RavingManiac/master

Browse Source 
Simplified the monkey pulling check as per Giacom's suggestion.
This commit is contained in:
Mloc
2013-12-21 07:19:34 -08:00
parent dfeb32ce79 b26492e66d
commit 4391bda64e
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/monkey/life.dm
+2 -9
View File
@@ -68,16 +68,9 @@
if(!client && stat == CONSCIOUS)
if(prob(33) && canmove && isturf(loc))
if(prob(33) && canmove && isturf(loc) && !pulledby) //won't move if being pulled
var/isBeingPulled = 0
for(var/mob/M in range(src, 1)) //won't move if being pulled
if(M.pulling == src)
isBeingPulled = 1
if(isBeingPulled == 0)
step(src, pick(cardinal))
step(src, pick(cardinal))
if(prob(1))
emote(pick("scratch","jump","roll","tail"))