cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge Conflict Fix

Browse Source
This commit is contained in:
Firecage
2016-01-20 14:07:14 +02:00
parent d1327d4076 02a6c6cdef
commit d2bd6871d5
65 changed files with 1590 additions and 1531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/interactive.dm
+3 -1
View File
@@ -407,7 +407,7 @@
if(prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
TARGET = pick(target_filter(ultra_range(MIN_RANGE_FIND,src,1)))
else
TARGET = pick(get_area_turfs(job2area(myjob)))
TARGET = safepick(get_area_turfs(job2area(myjob)))
tryWalk(TARGET)
LAST_TARGET = TARGET
@@ -424,6 +424,8 @@
/mob/living/carbon/human/interactive/proc/walk2derpless(target)
set background = 1
if(!target)
return 0
var/turf/T = get_turf(target)
var/turf/D = get_step(src,dir)
if(D)