cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

-Fixed an AI eye issue where tracking a person from your core won't set your eye.dm

Browse Source 
-Tracking now works like it has again. The else if weren't working because the "else if human" check would make them pass all of it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4563 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-08-27 11:52:21 +00:00
parent 62124b989f
commit a6fa7ad176
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/game/machinery/camera.dm
View File

@@ -44,6 +44,9 @@
var/obj/item/clothing/head/helmet/space/space_ninja/hood = H.head
if(!hood.canremove)
continue
if(!isturf(M.loc))
continue
// Now, are they viewable by a camera? (This is last because it's the most intensive check)
if(!cameranet.checkCameraVis(M))
continue
@@ -84,7 +87,7 @@
while (U.cameraFollow == target)
if (U.cameraFollow == null)
return
else if (istype(target, /mob/living/carbon/human))
if (istype(target, /mob/living/carbon/human))
if(istype(target:wear_id, /obj/item/weapon/card/id/syndicate))
U << "Follow camera mode terminated."
U.cameraFollow = null
@@ -98,17 +101,17 @@
U.cameraFollow = null
return
else if(istype(target.loc,/obj/effect/dummy))
if(istype(target.loc,/obj/effect/dummy))
U << "Follow camera mode ended."
U.cameraFollow = null
return
else if (!target || !istype(target.loc, /turf)) //in a closet
if (!isturf(target.loc)) //in a closet
U << "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb)."
sleep(30) //because we're sleeping another second after this (a few lines down)
sleep(50) //because we're sleeping another second after this (a few lines down)
continue
else if(!cameranet.checkCameraVis(target))
if(!cameranet.checkCameraVis(target))
U << "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb)."
sleep(30) //because we're sleeping another second after this (a few lines down)
sleep(50) //because we're sleeping another second after this (a few lines down)
continue
U.eyeobj.setLoc(get_turf(target))

3
code/modules/mob/living/silicon/ai/freelook/eye.dm
View File

@@ -37,6 +37,9 @@
T = get_turf(T)
loc = T
cameranet.visibility(src)
if(ai)
if(ai.client)
ai.client.eye = src
// AI MOVEMENT