From c79b364c6392ce2b7af5e7608eba868cc238ef3b Mon Sep 17 00:00:00 2001 From: Wallemations <66052067+Wallemations@users.noreply.github.com> Date: Tue, 4 Feb 2025 20:28:10 -0500 Subject: [PATCH 1/2] heythatsme --- maplestation_modules/code/modules/wiremod/shells.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maplestation_modules/code/modules/wiremod/shells.dm b/maplestation_modules/code/modules/wiremod/shells.dm index f373678de2de..199d94dc90c7 100644 --- a/maplestation_modules/code/modules/wiremod/shells.dm +++ b/maplestation_modules/code/modules/wiremod/shells.dm @@ -27,6 +27,7 @@ var/datum/port/output/spoken_into var/datum/port/output/sent_message var/datum/port/output/failure + var/datum/port/output/entity var/blocking_radio = FALSE var/obj/item/radio/headset/shell/attached_shell @@ -54,6 +55,7 @@ spoken_into = add_output_port("Spoken Into", PORT_TYPE_SIGNAL) failure = add_output_port("Failed To Radio", PORT_TYPE_SIGNAL) sent_message = add_output_port("Successfully Sent Message", PORT_TYPE_SIGNAL) + entity = add_output_port("User", PORT_TYPE_USER) /obj/item/circuit_component/headset/proc/new_message(atom/source, mob/living/user, message, channel) SIGNAL_HANDLER @@ -108,3 +110,8 @@ /obj/item/circuit_component/headset/proc/send_signal(datum/signal/subspace/vocal/signal) signal.send_to_receivers() sent_message.set_output(COMPONENT_SIGNAL) + +/obj/item/circuit_component/headset/equipped(mob/user, slot) + . = ..() + if(iscarbon(user) && slot == ITEM_SLOT_EARS) + entity.set_output(user) From fa8b06624078ab948187760c5970e9719fe4d1d7 Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Fri, 14 Feb 2025 00:51:44 -0600 Subject: [PATCH 2/2] Assuming direct control --- maplestation_modules/code/modules/wiremod/shells.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maplestation_modules/code/modules/wiremod/shells.dm b/maplestation_modules/code/modules/wiremod/shells.dm index 199d94dc90c7..2fb3e89872c9 100644 --- a/maplestation_modules/code/modules/wiremod/shells.dm +++ b/maplestation_modules/code/modules/wiremod/shells.dm @@ -113,5 +113,5 @@ /obj/item/circuit_component/headset/equipped(mob/user, slot) . = ..() - if(iscarbon(user) && slot == ITEM_SLOT_EARS) + if(iscarbon(user) && (slot & ITEM_SLOT_EARS)) entity.set_output(user)