From 1a72b23a170cf2a2cd837eddfd9f6a858cba340e Mon Sep 17 00:00:00 2001 From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> Date: Sun, 22 Dec 2024 18:06:29 -0500 Subject: [PATCH] Radio bug (#1164) * fix headsets being off by default * how the fuck did this work??? --- code/__DEFINES/_span.dm | 2 +- code/game/objects/items/devices/radio/headset.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/_span.dm b/code/__DEFINES/_span.dm index 4be9fd756901..d9cb3b6a2b4b 100644 --- a/code/__DEFINES/_span.dm +++ b/code/__DEFINES/_span.dm @@ -114,7 +114,7 @@ #define span_statsgood(str) ("" + str + "") #define span_suicide(str) ("" + str + "") #define span_suppradio(str) ("" + str + "") -#define span_subtle(str) ("" + str + "") +#define span_subtle(str) ("" + str + "") #define span_syndradio(str) ("" + str + "") #define span_tape_recorder(str) ("" + str + "") #define span_tinynotice(str) ("" + str + "") diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index cc90aba744f4..78f3d1e638c1 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( possibly_deactivate_in_loc() /obj/item/radio/headset/proc/possibly_deactivate_in_loc() - if(equipped_to) + if(ismob(loc)) set_listening(should_be_listening) else set_listening(FALSE, actual_setting = FALSE)