made AI tracking cancel-able, fixed folder labelling

This commit is contained in:
Tastyfish
2015-11-29 19:40:23 -05:00
parent 340068a25a
commit 57ae7e1c9a
3 changed files with 10 additions and 7 deletions
+1 -1
View File
@@ -495,7 +495,7 @@
if("Track With Camera")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
var/target_name = input(AI) in AI.trackable_mobs()
var/target_name = input(AI) as null|anything in AI.trackable_mobs()
AI.ai_camera_track(target_name)
if("Toggle Camera Light")
+3 -4
View File
@@ -157,7 +157,7 @@
src.track = TB
return targets
/mob/living/silicon/ai/proc/ai_camera_track(var/target_name in trackable_mobs())
/mob/living/silicon/ai/proc/ai_camera_track(target_name in trackable_mobs())
set category = "AI Commands"
set name = "Track With Camera"
set desc = "Select who you would like to track."
@@ -187,7 +187,7 @@
U.cameraFollow = target
U << "Now tracking [target.name] on camera."
target.tracking_initiated()
spawn (0)
while (U.cameraFollow == target)
if (U.cameraFollow == null)
@@ -229,7 +229,7 @@
return 0
if(istype(M.loc,/obj/effect/dummy))
return 0
if((T && (T.z in config.contact_levels)) && ((hassensorlevel(M, SUIT_SENSOR_TRACKING) || M in aibots)))
return 1
@@ -259,4 +259,3 @@
tracking_entities--
if(!tracking_entities && has_zeroth_law())
src << "<span class='notice'>Internal camera is no longer being accessed.</span>"
+6 -2
View File
@@ -35,8 +35,12 @@
user << "<span class='notice'>You put the [W] into \the [src].</span>"
update_icon()
else if(istype(W, /obj/item/weapon/pen))
var/n_name = sanitize(copytext(input(usr, "What would you like to label the folder?", "Folder Labelling", null) as text, 1, MAX_NAME_LEN))
if((loc == usr && usr.stat == 0))
var/n_name = input(usr, "What would you like to label the folder?", "Folder Labelling", null) as text|null
if(!n_name)
return
n_name = sanitize(copytext(n_name, 1, MAX_NAME_LEN))
if((loc == usr || Adjacent(usr)) && usr.stat == 0)
name = "folder[(n_name ? text("- '[n_name]'") : null)]"
return