Merge pull request #8560 from PsiOmegaDelta/PCAILaws

PC AI laws.

code/modules/mob/living/silicon/ai/ai.dm

@@ -311,13 +311,6 @@ var/list/ai_verbs_default = list(
 			//usr <<"You can only change your display once!"
 			//return
 
-/mob/living/silicon/ai/proc/is_malf()
-	if(ticker.mode.name == "AI malfunction")
-		for (var/datum/mind/malfai in malf.current_antagonists)
-			if (mind == malfai)
-				return malf
-	return 0
-
 // displays the malf_ai information if the AI is the malf
 /mob/living/silicon/ai/show_malf_ai()
 	if(malf && malf.hacked_apcs.len >= 3)

code/modules/mob/living/silicon/ai/laws.dm

@@ -16,8 +16,7 @@
 	src.laws.show_laws(who)
 
 /mob/living/silicon/ai/add_ion_law(var/law)
-	src.laws_sanity_check()
-	src.laws.add_ion_law(law)
+	..()
 	for(var/mob/living/silicon/robot/R in mob_list)
 		if(R.lawupdate && (R.connected_ai == src))
 			R.show_laws()

code/modules/mob/living/silicon/laws.dm

@@ -12,6 +12,7 @@
 /mob/living/silicon/proc/set_zeroth_law(var/law, var/law_borg)
 	laws_sanity_check()
 	laws.set_zeroth_law(law, law_borg)
+	log_and_message_admins("has given [src] the zeroth laws: [law]/[law_borg ? law_borg : "N/A"]")
 
 /mob/living/silicon/robot/set_zeroth_law(var/law, var/law_borg)
 	..()
@@ -21,28 +22,39 @@
 /mob/living/silicon/proc/add_ion_law(var/law)
 	laws_sanity_check()
 	laws.add_ion_law(law)
+	log_and_message_admins("has given [src] the ion law: [law]")
 
-/mob/living/silicon/proc/add_inherent_law(var/law, var/state_law = 1)
+/mob/living/silicon/proc/add_inherent_law(var/law)
 	laws_sanity_check()
-	laws.add_inherent_law(law, state_law)
+	laws.add_inherent_law(law)
+	log_and_message_admins("has given [src] the inherent law: [law]")
+
+/mob/living/silicon/proc/add_supplied_law(var/number, var/law)
+	laws_sanity_check()
+	laws.add_supplied_law(number, law)
+	log_and_message_admins("has given [src] the supplied law: [law]")
+
+/mob/living/silicon/proc/delete_law(var/datum/ai_law/law)
+	laws_sanity_check()
+	laws.delete_law(law)
+	log_and_message_admins("has deleted a law belonging to [src]: [law.law]")
 
 /mob/living/silicon/proc/clear_inherent_laws()
 	laws_sanity_check()
 	laws.clear_inherent_laws()
+	log_and_message_admins("cleared the inherent laws of [src]")
 
 /mob/living/silicon/proc/clear_ion_laws()
 	laws_sanity_check()
 	laws.clear_ion_laws()
-
-/mob/living/silicon/proc/add_supplied_law(var/number, var/law, var/state_law = 1)
-	laws_sanity_check()
-	laws.add_supplied_law(number, law, state_law)
+	log_and_message_admins("cleared the ion laws of [src]")
 
 /mob/living/silicon/proc/clear_supplied_laws()
 	laws_sanity_check()
 	laws.clear_supplied_laws()
+	log_and_message_admins("cleared the supplied laws of [src]")
 
-/mob/living/silicon/proc/statelaws(var/datum/ai_laws/laws, var/use_statement_order = 1) // -- TLE
+/mob/living/silicon/proc/statelaws(var/datum/ai_laws/laws)
 	var/prefix = ""
 	switch(lawchannel)
 		if(MAIN_CHANNEL) prefix = ";"
@@ -50,9 +62,9 @@
 		else
 			prefix = get_radio_key_from_channel(lawchannel == "Holopad" ? "department" : lawchannel) + " "
 
-	dostatelaws(lawchannel, prefix, laws, use_statement_order)
+	dostatelaws(lawchannel, prefix, laws)
 
-/mob/living/silicon/proc/dostatelaws(var/method, var/prefix, var/datum/ai_laws/laws, var/use_statement_order)
+/mob/living/silicon/proc/dostatelaws(var/method, var/prefix, var/datum/ai_laws/laws)
 	if(stating_laws[prefix])
 		src << "<span class='notice'>[method]: Already stating laws using this communication method.</span>"
 		return
@@ -62,7 +74,7 @@
 	var/can_state = statelaw("[prefix]Current Active Laws:")
 
 	for(var/datum/ai_law/law in laws.laws_to_state())
-		can_state = statelaw("[prefix][law.get_index(use_statement_order)]. [law.law]")
+		can_state = statelaw("[prefix][law.get_index()]. [law.law]")
 
 	if(!can_state)
 		src << "<span class='danger'>[method]: Unable to state laws. Communication method unavailable.</span>"
@@ -81,3 +93,7 @@
 	channels += common_radio.channels
 	channels += additional_law_channels
 	return channels
+
+/mob/living/silicon/proc/lawsync()
+	laws_sanity_check()
+	laws.sort_laws()

code/modules/mob/living/silicon/robot/laws.dm

@@ -38,11 +38,12 @@
 		who << "<b>Remember, you are not bound to any AI, you are not required to listen to them.</b>"
 
 
-/mob/living/silicon/robot/proc/lawsync()
+/mob/living/silicon/robot/lawsync()
 	laws_sanity_check()
-	var/datum/ai_laws/master = connected_ai ? connected_ai.laws : null
+	var/datum/ai_laws/master = connected_ai && lawupdate ? connected_ai.laws : null
 	if (master)
 		master.sync(src)
+	..()
 	return
 
 /mob/living/silicon/robot/proc/robot_checklaws()

code/modules/mob/living/silicon/robot/robot.dm

@@ -1200,6 +1200,7 @@
 
 /mob/living/silicon/robot/proc/disconnect_from_ai()
 	if(connected_ai)
+		sync() // One last sync attempt
 		connected_ai.connected_robots -= src
 		connected_ai = null
 

code/modules/mob/living/silicon/silicon.dm

@@ -333,3 +333,14 @@
 	for(var/obj/machinery/camera/C in A.cameras())
 		cameratext += "[(cameratext == "")? "" : "|"]<A HREF=?src=\ref[src];switchcamera=\ref[C]>[C.c_tag]</A>"
 	src << "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])"
+
+
+/mob/living/silicon/proc/is_traitor()
+	return mind && (mind in traitors.current_antagonists)
+
+/mob/living/silicon/proc/is_malf()
+	return mind && (mind in malf.current_antagonists)
+
+/mob/living/silicon/proc/is_malf_or_traitor()
+	return is_traitor() || is_malf()
+