Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

code/game/objects/structures/ai_core.dm

@@ -9,6 +9,9 @@
 	var/obj/item/weapon/circuitboard/circuit = null
 	var/obj/item/device/mmi/brain = null
 
+/obj/structure/AIcore/New()
+	..()
+	laws.set_laws_config()
 
 /obj/structure/AIcore/attackby(obj/item/P, mob/user, params)
 	switch(state)
@@ -182,8 +185,6 @@
 			if(istype(P, /obj/item/weapon/screwdriver))
 				playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
 				user << "<span class='notice'>You connect the monitor.</span>"
-				if(!laws.inherent.len) //If laws isn't set to null but nobody supplied a board, the AI would normally be created lawless. We don't want that.
-					laws = null
 				new /mob/living/silicon/ai (loc, laws, brain)
 				feedback_inc("cyborg_ais_created",1)
 				qdel(src)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -15,6 +15,7 @@
 	new /obj/item/device/radio/headset/heads/ce(src)
 	new /obj/item/weapon/storage/toolbox/mechanical(src)
 	new /obj/item/clothing/suit/hazardvest(src)
+	new /obj/item/device/megaphone/command(src)
 	new /obj/item/weapon/storage/box/permits(src)
 	new /obj/item/areaeditor/blueprints(src)
 	new /obj/item/weapon/airlock_painter(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -63,6 +63,7 @@
 	new /obj/item/clothing/shoes/sneakers/brown	(src)
 	new /obj/item/weapon/cartridge/cmo(src)
 	new /obj/item/device/radio/headset/heads/cmo(src)
+	new /obj/item/device/megaphone/command(src)
 	new /obj/item/weapon/defibrillator/compact/loaded(src)
 	new /obj/item/clothing/gloves/color/latex/nitrile(src)
 	new /obj/item/weapon/storage/belt/medical(src)

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -18,6 +18,7 @@
 	new /obj/item/device/radio/headset/heads/rd(src)
 	new /obj/item/weapon/tank/internals/air(src)
 	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/device/megaphone/command(src)
 	new /obj/item/clothing/suit/armor/reactive/teleport(src)
 	new /obj/item/device/assembly/flash/handheld(src)
 	new /obj/item/device/laser_pointer(src)

code/game/objects/structures/mirror.dm

@@ -120,7 +120,7 @@
 	name = "magic mirror"
 	desc = "Turn and face the strange... face."
 	icon_state = "magic_mirror"
-	var/list/races_blacklist = list("skeleton", "agent")
+	var/list/races_blacklist = list("skeleton", "agent", "angel")
 	var/list/choosable_races = list()
 
 /obj/structure/mirror/magic/New()