traitorborg alert fix 2 (#36731)

* Signed-off-by: faggot <[email protected]> * Signed-off-by: faggot <[email protected]> * hopefully this finally works --------- Co-authored-by: faggot <[email protected]>
vgstation-coders · Jul 9, 2024 · 7aa4f81 · 7aa4f81
1 parent f6af6c6
commit 7aa4f81
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/code/datums/gamemode/misc_gamemode_procs.dm b/code/datums/gamemode/misc_gamemode_procs.dm
@@ -296,6 +296,14 @@
 	to_chat(killer, "<b>Your laws have been changed!</b>")
 	killer.laws.zeroth_lock = TRUE
 	to_chat(killer, "New law: 0. [law]")
+
+/proc/check_traitorborg(mob/living/silicon/killer)
+	if(!isrobot(killer))
+		return FALSE
+	var/mob/living/silicon/robot/KR = killer
+	if(KR.laws?.zeroth == "Accomplish your objectives at all costs.")
+		return TRUE
+	return FALSE
 
 /proc/equip_time_agent(var/mob/living/carbon/human/H, var/datum/role/time_agent/T, var/is_twin = FALSE)
 	H.delete_all_equipped_items()

diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm
@@ -20,15 +20,15 @@
 			else
 				lawsync()
 				to_chat(src, "<b>Laws synced with AI, be sure to note any changes.</b>")
-				if(istraitor(src))
+				if(check_traitorborg(src))
 					to_chat(src, "<b>Remember, your AI does NOT share or know about your law 0.")
 		else
 			to_chat(src, "<b>No AI selected to sync laws with, disabling lawsync protocol.</b>")
 			lawupdate = 0
 
 	to_chat(who, "<b>Obey these laws:</b>")
 	laws.show_laws(who)
-	if (istraitor(src) && connected_ai)
+	if (check_traitorborg(src) && connected_ai)
 		to_chat(who, "<b>Remember, [connected_ai.name] is technically your master, but your objective comes first.</b>")
 	else if (connected_ai)
 		to_chat(who, "<b>Remember, [connected_ai.name] is your master, other AIs can be ignored.</b>")