Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix runtimes and multitool bricking if a sentry_computer is deleted #5345

Merged
merged 1 commit into from
Jan 1, 2024
Merged

Fix runtimes and multitool bricking if a sentry_computer is deleted #5345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions code/modules/defenses/sentry_computer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@
last_camera_turf = null
current = null
registered_tools = null
for(var/obj/structure/machinery/defenses/sentry/sentrygun as anything in paired_sentry)
unpair_sentry(sentrygun)
paired_sentry = null

/obj/item/device/sentry_computer/proc/camera_mapname_update(source, value)
Expand Down Expand Up @@ -211,7 +213,7 @@
for(var/key_id in tool.encryption_keys)
var/datum/weakref/ref = tool.encryption_keys[key_id]
var/obj/item/device/sentry_computer/key_object = ref.resolve()
key_object.registered_tools -= id
key_object?.registered_tools -= id
tool.encryption_keys = list()
to_chat(user, SPAN_NOTICE("Existing encryption keys cleared."))
to_chat(usr, SPAN_NOTICE("You begin encryption key to \the [tool]."))
Expand Down Expand Up @@ -319,9 +321,8 @@
.["sentry_static"] = list()
.["mapRef"] = camera_map_name
var/index = 1
for(var/sentry in paired_sentry)
for(var/obj/structure/machinery/defenses/sentry/sentrygun as anything in paired_sentry)
var/list/sentry_holder = list()
var/obj/structure/machinery/defenses/sentry/sentrygun = sentry
sentry_holder["selection_menu"] = list()
sentry_holder["index"] = index
sentry_holder["name"] = sentrygun.name
Expand Down
Loading