Skip to content

Commit d5adb44

Browse files
Allows AI to retrack people who come back on cameras (#37210)
* Allows AI to retrack people who come back on cameras * forgot to uncomment these too
1 parent 1e2b9a4 commit d5adb44

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

code/game/dna/genes/goon_powers.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
INVOKE_EVENT(M, /event/camera_sight_changed, "mover" = M)
2727
return 1
2828

29-
/*/datum/dna/gene/basic/psychic_resist/deactivate(var/mob/M, var/connected, var/flags)
29+
/datum/dna/gene/basic/psychic_resist/deactivate(var/mob/M, var/connected, var/flags)
3030
if(!..())
3131
return 0
3232
INVOKE_EVENT(M, /event/camera_sight_changed, "mover" = M)
33-
return 1*/ // Allows retracking, uncomment to enable
33+
return 1
3434

3535
/////////////////////////
3636
// Stealth Enhancers

code/game/machinery/camera/tracking.dm

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
currently_tracking.register_event(/event/after_move,src,nameof(src::on_camera_change()))
198198
currently_tracking.register_event(/event/destroyed,src,nameof(src::stop_ai_tracking()))
199199
currently_tracking.register_event(/event/equipped,src,nameof(src::on_camera_change()))
200-
//currently_tracking.register_event(/event/unequipped,src,nameof(src::on_camera_change()))
200+
currently_tracking.register_event(/event/unequipped,src,nameof(src::on_camera_change()))
201201
currently_tracking.register_event(/event/camera_sight_changed,src,nameof(src::on_camera_change()))
202202
to_chat(src, "Now tracking [currently_tracking.name] on camera.")
203203

@@ -206,21 +206,20 @@
206206
/mob/living/silicon/ai/proc/on_camera_change()
207207
if(eyeobj && currently_tracking)
208208
var/cantrack = can_track_atom(currently_tracking)
209-
/*if(!eyeobj.locked_to && cantrack) // Retracking code
209+
if(!eyeobj.locked_to && cantrack)
210210
to_chat(src, "Target is trackable again.")
211211
currently_tracking.lock_atom(eyeobj,/datum/locking_category/ai_eye)
212-
else */if(!cantrack && eyeobj.locked_to == currently_tracking)
212+
else if(!cantrack && eyeobj.locked_to == currently_tracking)
213213
to_chat(src, "Target is no longer trackable.")
214-
//eyeobj.unlock_from()
215-
stop_ai_tracking() // remove this if you want retracking
214+
eyeobj.unlock_from()
216215

217216
/mob/living/silicon/ai/proc/stop_ai_tracking()
218217
if(currently_tracking)
219218
to_chat(src, "No longer tracking [currently_tracking.name] on camera.")
220219
currently_tracking.unregister_event(/event/after_move,src,nameof(src::on_camera_change()))
221220
currently_tracking.unregister_event(/event/destroyed,src,nameof(src::stop_ai_tracking()))
222221
currently_tracking.unregister_event(/event/equipped,src,nameof(src::on_camera_change()))
223-
//currently_tracking.unregister_event(/event/unequipped,src,nameof(src::on_camera_change()))
222+
currently_tracking.unregister_event(/event/unequipped,src,nameof(src::on_camera_change()))
224223
currently_tracking.unregister_event(/event/camera_sight_changed,src,nameof(src::on_camera_change()))
225224
if(eyeobj?.locked_to == currently_tracking)
226225
eyeobj.unlock_from()

code/game/objects/items/devices/megaphone.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ var/list/megaphone_channels = list("DISABLE" = 0) + stationchannels
5555
/obj/item/device/megaphone/madscientist/pickup(mob/user)
5656
INVOKE_EVENT(user, /event/camera_sight_changed, "mover" = user)
5757

58-
/*/obj/item/device/megaphone/madscientist/dropped(mob/user)
58+
/obj/item/device/megaphone/madscientist/dropped(mob/user)
5959
..()
60-
INVOKE_EVENT(user, /event/camera_sight_changed, "mover" = user)*/ // Allows retracking, uncomment to enable
60+
INVOKE_EVENT(user, /event/camera_sight_changed, "mover" = user)
6161

6262
/obj/item/device/megaphone/madscientist/attack_self(mob/living/user as mob)
6363
show_ui(user)

0 commit comments

Comments
 (0)