Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport

Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/datums/ai_laws.dm

@@ -3,6 +3,7 @@
 	var/name = "Unknown Laws"
 	var/randomly_selectable = 0
 	var/zeroth = null
+	var/zeroth_borg = null
 	var/list/inherent = list()
 	var/list/supplied = list()
 	var/list/ion = list()
@@ -79,8 +80,10 @@
 
 /* General ai_law functions */
 
-/datum/ai_laws/proc/set_zeroth_law(var/law)
+/datum/ai_laws/proc/set_zeroth_law(var/law, var/law_borg = null)
 	src.zeroth = law
+	if(law_borg) //Making it possible for slaved borgs to see a different law 0 than their AI. --NEO
+		src.zeroth_borg = law_borg
 
 /datum/ai_laws/proc/add_inherent_law(var/law)
 	if (!(law in src.inherent))

code/datums/datumvars.dm

@@ -559,7 +559,6 @@ client
 				return
 
 			if(ishuman(MOB))
-				world << "derp"
 				var/mob/living/carbon/human/HUMANMOB = MOB
 				HUMANMOB.makeSkeleton()
 

code/datums/mind.dm

@@ -725,6 +725,11 @@ datum/mind
 						special_role = null
 						current << "\red <FONT size = 3><B>You have been brainwashed! You are no longer a traitor!</B></FONT>"
 						log_admin("[key_name_admin(usr)] has de-traitor'ed [current].")
+						if(isAI(current))
+							var/mob/living/silicon/ai/A = current
+							A.set_zeroth_law("")
+							A.show_laws()
+
 
 				if("traitor")
 					if(!(src in ticker.mode.traitors))
@@ -732,6 +737,10 @@ datum/mind
 						special_role = "traitor"
 						current << "<B>\red You are a traitor!</B>"
 						log_admin("[key_name_admin(usr)] has traitor'ed [current].")
+						if(isAI(current))
+							var/mob/living/silicon/ai/A = current
+							call(/datum/game_mode/proc/add_law_zero)(A)
+							A.show_laws()
 
 				if("autoobjectives")
 					ticker.mode.forge_traitor_objectives(src)