From 2410930b2bd075e61bf8ac93336fe5a61ed86d02 Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Thu, 13 Oct 2022 15:45:42 -0400 Subject: [PATCH] fixes radios (#19367) --- code/game/objects/items/devices/radio/intercom.dm | 2 +- code/game/objects/items/devices/radio/radio.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index e12fe861e3b..f3bb4f95741 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -207,7 +207,7 @@ /obj/item/radio/intercom/wirecutter_act(mob/user, obj/item/I) if(!(buildstage == 3 && b_stat && wires.is_all_cut())) - return + return ..() . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index bb37a165248..842f5cbd1b4 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -118,13 +118,14 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( return interact(user) /obj/item/radio/attack_self(mob/user) - ui_interact(user) + interact(user) /obj/item/radio/interact(mob/user) if(!user) return 0 if(b_stat) wires.Interact(user) + return ui_interact(user) /obj/item/radio/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)