From 06f2ec39363032a9bd926d266b4dd290a5fd1f3f Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 31 Aug 2024 19:31:01 +0100 Subject: [PATCH] real 1:1 fix --- code/game/machinery/ARES/ARES_interface.dm | 4 ++-- tgui/packages/tgui/interfaces/AresInterface.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm index a2b69cb0012b..6b3f8739a3d6 100644 --- a/code/game/machinery/ARES/ARES_interface.dm +++ b/code/game/machinery/ARES/ARES_interface.dm @@ -330,7 +330,7 @@ datacore.records_talking += convo if("clear_conversation") - var/datum/ares_record/talk_log/conversation = locate(params["active_convo"]) + var/datum/ares_record/talk_log/conversation = locate(params["passed_active_convo"]) if(!istype(conversation)) return FALSE var/datum/ares_record/deleted_talk/deleted = new @@ -343,7 +343,7 @@ if("message_ares") var/message = tgui_input_text(user, "What do you wish to say to ARES?", "ARES Message", encode = FALSE) if(message) - message_ares(message, user, params["active_convo"]) + message_ares(message, user, params["passed_active_convo"]) if("read_record") var/datum/ares_record/deleted_talk/conversation = locate(params["record"]) diff --git a/tgui/packages/tgui/interfaces/AresInterface.jsx b/tgui/packages/tgui/interfaces/AresInterface.jsx index 241abb93a68b..cd3d9a6f58f7 100644 --- a/tgui/packages/tgui/interfaces/AresInterface.jsx +++ b/tgui/packages/tgui/interfaces/AresInterface.jsx @@ -1023,7 +1023,7 @@ const ARESTalk = (props) => { px="2rem" bold onClick={() => - act('message_ares', { local_active_convo: local_active_ref }) + act('message_ares', { passed_active_convo: local_active_ref }) } > Send Message @@ -1039,7 +1039,7 @@ const ARESTalk = (props) => { fontSize="1.5rem" bold onClick={() => - act('clear_conversation', { local_active_convo: local_active_ref }) + act('clear_conversation', { passed_active_convo: local_active_ref }) } disabled={!local_active_convo.length} >