From 992d611b51840f08e5801b0833da39d1ffde8efa Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue, 28 Sep 2021 17:04:02 +0200
Subject: [PATCH] [MIRROR] Fixes check AI laws collapsing, making them
 unreadable [MDB IGNORE] (#8455)

* Fixes check AI laws collapsing, making them unreadable (#61724)

Previously, this would be putting (x2) next to the first 3 laws, and it would look like the 2nd cyborg had no laws.

* Fixes check AI laws collapsing, making them unreadable

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
---
 code/modules/admin/admin.dm | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 41413dd2771..db3a10da818 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -138,20 +138,28 @@
 	for(var/i in GLOB.silicon_mobs)
 		var/mob/living/silicon/S = i
 		ai_number++
+
+		var/message = ""
+
 		if(isAI(S))
-			to_chat(usr, "<b>AI [key_name(S, usr)]'s laws:</b>", confidential = TRUE)
+			message += "<b>AI [key_name(S, usr)]'s laws:</b>"
 		else if(iscyborg(S))
 			var/mob/living/silicon/robot/R = S
-			to_chat(usr, "<b>CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [key_name(R.connected_ai)])":"(Independent)"]: laws:</b>", confidential = TRUE)
+			message += "<b>CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [key_name(R.connected_ai)])":"(Independent)"]: laws:</b>"
 		else if (ispAI(S))
-			to_chat(usr, "<b>pAI [key_name(S, usr)]'s laws:</b>", confidential = TRUE)
+			message += "<b>pAI [key_name(S, usr)]'s laws:</b>"
 		else
-			to_chat(usr, "<b>SOMETHING SILICON [key_name(S, usr)]'s laws:</b>", confidential = TRUE)
+			message += "<b>SOMETHING SILICON [key_name(S, usr)]'s laws:</b>"
+
+		message += "<br>"
 
 		if (S.laws == null)
-			to_chat(usr, "[key_name(S, usr)]'s laws are null?? Contact a coder.", confidential = TRUE)
+			message += "[key_name(S, usr)]'s laws are null?? Contact a coder."
 		else
-			S.laws.show_laws(usr)
+			message += jointext(S.laws.get_law_list(include_zeroth = TRUE), "<br>")
+
+		to_chat(usr, message, confidential = TRUE)
+
 	if(!ai_number)
 		to_chat(usr, "<b>No AIs located</b>" , confidential = TRUE)