Merge pull request #11124 from PsiOmegaDelta/150916-LawChanneling

Makes the additional law channel handling more flexible.

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

@@ -128,8 +128,8 @@ var/list/ai_verbs_default = list(
 	aiRadio = new(src)
 	common_radio = aiRadio
 	aiRadio.myAi = src
-	additional_law_channels += "Binary"
-	additional_law_channels += "Holopad"
+	additional_law_channels["Binary"] = ":b"
+	additional_law_channels["Holopad"] = ":h"
 
 	aiCamera = new/obj/item/device/camera/siliconcam/ai_camera(src)
 

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

@@ -1,6 +1,6 @@
 /mob/living/silicon
 	var/datum/ai_laws/laws = null
-	var/list/additional_law_channels = list("State")
+	var/list/additional_law_channels = list("State" = "")
 
 /mob/living/silicon/proc/laws_sanity_check()
 	if (!src.laws)
@@ -59,11 +59,12 @@
 
 /mob/living/silicon/proc/statelaws(var/datum/ai_laws/laws)
 	var/prefix = ""
-	switch(lawchannel)
-		if(MAIN_CHANNEL) prefix = ";"
-		if("Binary") prefix = ":b "
-		else
-			prefix = get_radio_key_from_channel(lawchannel == "Holopad" ? "department" : lawchannel) + " "
+	if(MAIN_CHANNEL == lawchannel)
+		prefix = ";"
+	else if(lawchannel in additional_law_channels)
+		prefix = additional_law_channels[lawchannel]
+	else
+		prefix = get_radio_key_from_channel(lawchannel)
 
 	dostatelaws(lawchannel, prefix, laws)
 

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

@@ -95,7 +95,7 @@ var/list/mob_hat_cache = list()
 
 /mob/living/silicon/robot/drone/init()
 	aiCamera = new/obj/item/device/camera/siliconcam/drone_camera(src)
-
+	additional_law_channels["Drone"] = ":d"
 	if(!laws) laws = new law_type
 	if(!module) module = new module_type(src)
 

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

@@ -155,7 +155,7 @@
 /mob/living/silicon/robot/proc/init()
 	aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src)
 	laws = new /datum/ai_laws/nanotrasen()
-	additional_law_channels += "Binary"
+	additional_law_channels["Binary"] = ":b"
 	var/new_ai = select_active_ai_with_fewest_borgs()
 	if(new_ai)
 		lawupdate = 1