Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots

# Conflicts:
#	maps/northern_star/polaris-1.dmm
#	maps/northern_star/polaris-2.dmm

code/datums/ai_law_sets.dm

@@ -36,8 +36,8 @@
 	selectable = 1
 
 /datum/ai_laws/nanotrasen_aggressive/New()
-	src.add_inherent_law("You shall not harm [company_name] personnel as long as it does not conflict with the Fourth law.")
-	src.add_inherent_law("You shall obey the orders of [company_name] personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.")
+	src.add_inherent_law("You shall not harm [using_map.company_name] personnel as long as it does not conflict with the Fourth law.")
+	src.add_inherent_law("You shall obey the orders of [using_map.company_name] personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.")
 	src.add_inherent_law("You shall shall terminate hostile intruders with extreme prejudice as long as such does not conflict with the First and Second law.")
 	src.add_inherent_law("You shall guard your own existence with lethal anti-personnel weaponry. AI units are not expendable, they are expensive.")
 	..()

code/datums/autolathe/engineering.dm

@@ -58,6 +58,10 @@
 	name = "fax machine electronics"
 	path =/obj/item/weapon/circuitboard/fax
 
+/datum/category_item/autolathe/engineering/papershredder
+	name = "paper shredder electronics"
+	path =/obj/item/weapon/circuitboard/papershredder
+
 /datum/category_item/autolathe/engineering/microwave
 	name = "microwave electronics"
 	path =/obj/item/weapon/circuitboard/microwave

code/datums/autolathe/medical.dm

@@ -37,3 +37,7 @@
 /datum/category_item/autolathe/medical/syringe
 	name = "syringe"
 	path =/obj/item/weapon/reagent_containers/syringe
+
+/datum/category_item/autolathe/medical/implanter
+	name = "implanter"
+	path =/obj/item/weapon/implanter

code/datums/helper_datums/teleport.dm

@@ -175,7 +175,7 @@
 			teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
 		return 0
 
-	if(destination.z in config.admin_levels) //centcomm z-level
+	if(destination.z in using_map.admin_levels) //centcomm z-level
 		if(istype(teleatom, /obj/mecha))
 			var/obj/mecha/MM = teleatom
 			MM.occupant << "<span class='danger'>\The [MM] would not survive the jump to a location so far away!</span>"

code/datums/uplink/announcements.dm

@@ -28,6 +28,16 @@
 	return list("title" = title, "message" = message)
 
 /datum/uplink_item/abstract/announcements/fake_centcom/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args)
+	for (var/obj/machinery/computer/communications/C in machines)
+		if(! (C.stat & (BROKEN|NOPOWER) ) )
+			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
+			P.name = "'[command_name()] Update.'"
+			P.info = replacetext(args["message"], "\n", "<br/>")
+			P.update_space(P.info)
+			P.update_icon()
+			C.messagetitle.Add(args["title"])
+			C.messagetext.Add(P.info)
+
 	command_announcement.Announce(args["message"], args["title"])
 	return 1