real 1:1 fix

cmss13-devs · Aug 31, 2024 · 06f2ec3 · 06f2ec3
1 parent 6a70675
commit 06f2ec3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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}
         >