From 8fa5c5d5a86ffd4d72f63fbf9b1c5da8b5160081 Mon Sep 17 00:00:00 2001 From: Casper3667 Date: Sat, 31 Jul 2021 22:39:03 +0200 Subject: [PATCH] Fixes wrist radio issues (#12280) --- code/game/objects/items/devices/radio/headset.dm | 5 +++++ html/changelogs/WristRadioFix.yml | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 html/changelogs/WristRadioFix.yml diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index cdd474f7b33..644cc699a0d 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -17,6 +17,8 @@ var/ks2type = null var/radio_sound = null + var/EarSound = TRUE + drop_sound = 'sound/items/drop/component.ogg' pickup_sound = 'sound/items/pickup/component.ogg' @@ -69,6 +71,8 @@ var/mob/living/carbon/human/H = src.loc if(H.l_ear == src || H.r_ear == src) return ..(freq, level) + if(!EarSound) + return ..(freq, level) return -1 /obj/item/device/radio/headset/attack_hand(mob/user) @@ -184,6 +188,7 @@ item_state = "wristset" slot_flags = SLOT_WRISTS canhear_range = 1 + EarSound = FALSE /* * Civillian diff --git a/html/changelogs/WristRadioFix.yml b/html/changelogs/WristRadioFix.yml new file mode 100644 index 00000000000..dfb928df195 --- /dev/null +++ b/html/changelogs/WristRadioFix.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "Fixes being unable to hear comms through the wrist radio."