Bot attack fix

- Fixes bots attacking through windows

Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/secbot.dm
This commit is contained in:
Loganbacca
2014-05-26 06:11:25 -04:00
committed by ZomgPonies
parent 172055dcfc
commit 6ea88aecfd
3 changed files with 4 additions and 7 deletions
+1 -3
View File
@@ -271,9 +271,7 @@ Auto Patrol: []"},
walk_to(src,0)
if (target) // make sure target exists
if(!istype(target.loc, /turf))
return
if (get_dist(src, src.target) <= 1) // if right next to perp
if (Adjacent(target)) // if right next to perp
playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
src.icon_state = "[lasercolor]ed209-c"
spawn(2)
+2 -1
View File
@@ -285,7 +285,8 @@
if(!src.path)
src.path = new()
if(src.patient && (get_dist(src,src.patient) <= 1))
if(src.patient && Adjacent(patient))
if(!src.currently_healing)
src.currently_healing = 1
src.frustration = 0
+1 -3
View File
@@ -219,9 +219,7 @@ Auto Patrol: []"},
walk_to(src,0)
if(target) // make sure target exists
if(!istype(target.loc, /turf))
return
if(get_dist(src, src.target) <= 1) // if right next to perp
if(Adjacent(target)) // if right next to perp
if(istype(src.target,/mob/living/carbon))
playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
src.icon_state = "secbot-c"