From e85c1586531bfd5f88641ba77cae832f759a7282 Mon Sep 17 00:00:00 2001 From: Casper3667 <8396443+Casper3667@users.noreply.github.com> Date: Sun, 30 Jan 2022 00:56:11 +0100 Subject: [PATCH] fixes suit sensor interaction with telecomms (#12997) Co-authored-by: TGW --- code/game/machinery/telecomms/broadcaster.dm | 4 ++-- .../file_system/programs/medical/suit_sensors.dm | 2 +- .../file_system/programs/security/penalmechs.dm | 2 +- code/modules/nano/modules/crew_monitor.dm | 2 +- html/changelogs/SuitSensorFix.yml | 6 ++++++ 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/SuitSensorFix.yml diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 5bb598b2c44..514f891c0e3 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -663,7 +663,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept return signal -/proc/telecomms_process_active() +/proc/telecomms_process_active(var/level = 5) // First, we want to generate a new radio signal var/datum/signal/signal = new @@ -678,7 +678,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept "type" = 4, // determines what type of radio input it is: test broadcast "reject" = 0, "done" = 0, - "level" = 5 // The level it is being broadcasted at. + "level" = level // The level it is being broadcasted at. ) signal.frequency = PUB_FREQ// Common channel diff --git a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm index 666b479ba3e..cc2ddef0b70 100644 --- a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm +++ b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm @@ -38,7 +38,7 @@ . = data var/datum/signal/signal - signal = telecomms_process_active() + signal = telecomms_process_active(user.loc.z) VUEUI_SET_CHECK(data["isAI"], isAI(user), ., data) data["crewmembers"] = list() diff --git a/code/modules/modular_computers/file_system/programs/security/penalmechs.dm b/code/modules/modular_computers/file_system/programs/security/penalmechs.dm index 59b27888f43..036c6365057 100644 --- a/code/modules/modular_computers/file_system/programs/security/penalmechs.dm +++ b/code/modules/modular_computers/file_system/programs/security/penalmechs.dm @@ -37,7 +37,7 @@ data["_PC"] = get_header_data(data["_PC"]) var/datum/signal/signal - signal = telecomms_process_active() + signal = telecomms_process_active(user.loc.z) var/list/mechs = list() var/list/robots = list() diff --git a/code/modules/nano/modules/crew_monitor.dm b/code/modules/nano/modules/crew_monitor.dm index f74a108306b..4dc1b4454e9 100644 --- a/code/modules/nano/modules/crew_monitor.dm +++ b/code/modules/nano/modules/crew_monitor.dm @@ -17,7 +17,7 @@ // This checks if TCOMS is online using the test proc. If it isn't, the suit sensor data isn't loaded. var/datum/signal/signal - signal = telecomms_process_active() + signal = telecomms_process_active(user.loc.z) data["signal"] = 0 if(signal.data["done"] == 1) data["isAI"] = isAI(user) diff --git a/html/changelogs/SuitSensorFix.yml b/html/changelogs/SuitSensorFix.yml new file mode 100644 index 00000000000..0dc74823106 --- /dev/null +++ b/html/changelogs/SuitSensorFix.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "Fixed suit sensors acting weirdly with telecomms"