From 8bfda9aa4d2ffcaf7666d5f183b57da458de7f15 Mon Sep 17 00:00:00 2001
From: Roxy <75404941+TealSeer@users.noreply.github.com>
Date: Sun, 25 May 2025 20:08:58 -0400
Subject: [PATCH] Remove obsolete override code in /mob/living/silicon/Topic
This tracking code was merged into upstream, also fixes a case where
switching between AI and shell and trying to answer door requests wouldnt
work
---
modular_zubbers/code/game/machinery/doors/door.dm | 4 ++--
modular_zubbers/code/modules/silicons/silicon.dm | 5 -----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/modular_zubbers/code/game/machinery/doors/door.dm b/modular_zubbers/code/game/machinery/doors/door.dm
index 18dea49e138..6f6440c03bc 100644
--- a/modular_zubbers/code/game/machinery/doors/door.dm
+++ b/modular_zubbers/code/game/machinery/doors/door.dm
@@ -32,10 +32,10 @@
if(AI.deployed_shell)
if(!is_station_level(AI.deployed_shell.registered_z))
continue
- to_chat(AI.deployed_shell, "[user] is requesting you to open the [src] [LINK_DENY][LINK_OPEN][LINK_BOLT][LINK_SHOCK]")
+ to_chat(AI.deployed_shell, "[user] is requesting you to open the [src] [LINK_DENY][LINK_OPEN][LINK_BOLT][LINK_SHOCK]")
if(!is_station_level(AI.registered_z))
continue
- to_chat(AI, "[user] is requesting you to open the [src] [LINK_DENY][LINK_OPEN][LINK_BOLT][LINK_SHOCK]")
+ to_chat(AI, "[user] is requesting you to open the [src] [LINK_DENY][LINK_OPEN][LINK_BOLT][LINK_SHOCK]")
requesters[user.name] = world.time
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
diff --git a/modular_zubbers/code/modules/silicons/silicon.dm b/modular_zubbers/code/modules/silicons/silicon.dm
index d1372ee9ffe..90b62935b7b 100644
--- a/modular_zubbers/code/modules/silicons/silicon.dm
+++ b/modular_zubbers/code/modules/silicons/silicon.dm
@@ -9,11 +9,6 @@
if(!door)
return
fulfill_door_request(requester, door, href_list["action"])
- if(href_list["track"])
- var/mob/living/silicon/ai/AI = src
- if(AI.deployed_shell)
- AI.deployed_shell.undeploy()
- AI.ai_tracking_tool.track_name(src, href_list["track"])
/// Allows the AI to interact somewhat with a door if the requester can be tracked by cameras and the AI can normally access it.
/mob/living/silicon/proc/fulfill_door_request(mob/living/requester, obj/machinery/door/airlock/door, action)