Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme

code/modules/lore_codex/codex.dm

@@ -24,6 +24,13 @@
 	has the words 'Don't Panic' in small, friendly letters on the cover."
 	icon_state = "codex"
 	root_type = /datum/lore/codex/category/main_vir_lore
+
+/obj/item/weapon/book/codex/lore/news
+	name = "Daedalus Pocket Newscaster"
+	desc = "A regularly-updating compendium of articles on current events. Essential for new arrivals in the Vir system and anyone interested in politics."
+	icon_state = "newscodex"
+	root_type = /datum/lore/codex/category/main_news
+
 /* //VORESTATION REMOVAL
 // Combines SOP/Regs/Law
 /obj/item/weapon/book/codex/corp_regs

code/modules/lore_codex/lore_data/main.dm

@@ -28,5 +28,5 @@
 	to an immigrant from another system or even from outside human space, and anyone inbetween.  The publisher wishes to note that any opinions expressed \
 	in this text does not reflect the opinions of the publisher, and are instead the author's.\
 	<br><br>\
-	Eshi Tache has also written other <i>The Traveler's Guide</i> books, including <i>Sol Edition</i>, <i>Tau Ceti Edition</i>, <i>Sirius Edition</i>, and more, \
+	Eshi Tache has also written other <i>The Traveler's Guide</i> books, including <i>Sol Edition</i>, <i>Tau Ceti Edition</i>, <i>Alpha Centauri Edition</i>, and more, \
 	which you can find in your local book store, library, or e-reader device."

code/modules/lore_codex/news_data/main.dm

@@ -0,0 +1,34 @@
+/datum/lore/codex/category/main_news // The top-level categories for the news thing
+	name = "Index"
+	data = "Below you'll find a list of articles relevant to the current (as of 2562) political climate, especially concerning the Almach Rim \
+	region. Each is labled by date of publication and title. This list is self-updating, and from time to time the publisher will push new \
+	articles. You are encouraged to check back frequently."
+	children = list(
+		/datum/lore/codex/page/article1,
+		/datum/lore/codex/page/about_news,
+		)
+
+/datum/lore/codex/page/about_news
+	name = "About the Publisher"
+	data = "The <i>Daedalus Pocket Newscaster</i> is produced and maintained by Occulum Broadcast, the foremost authority on media distribution \
+	and owner-operator of the award-winning Daedalus Dispatch newsletter. We use our unparalleled network of freelance reporters, political scientists, \
+	and other experts to deliver hour-by-hour analysis of a complex interstellar political climate, an analysis which you now hold in your hands. For more \
+	information, feel free to visit our homepage at oc.about.tsc, or the sites of any of our constituents."
+
+/datum/lore/codex/page/article1
+	name = "08/30/61-- VGA Legalizes Prometheans; Nanotrasen Begins Manufacture and Testing"
+	data = "Today's meeting of the Vir Bicameral led to the passing of the Wynther-Helsey Bill, an implementation of the legal framework \
+	used in Aetolus to handle the production and cultivation of the Macrolimbus species dubbed \"Prometheans\". These ill-researched organisms \
+	possess cognitive abilities easily equaling those of A-class drones, but so far have not been included under the EIO's list of dangerous \
+	intelligences and are thus much more profitable for manufacture as expert systems by corporations such as NanoTrasen.\
+	<br></br>\
+	While many systems in the Almach Rim have already passed similar bills, this is the first system so close to Sol to have done so. More\
+	concerning still is NanoTrasen's business practice regarding the intelligences: much like their positronic lines, sources within the\
+	company indicate that they will be \"farmed out\" to employees of the corporation and residents of their Northern Star and Cynosure\
+	habitation complexes. Quote our source, who wishes to remain anonymous, \"\[we\] call the program 'Lend-Lease', sometimes. The whole idea\
+	is that we only have to pay the\ cost of the Promethean core, which is about 2000-3000 thalers after startup costs, and we still get\
+	the data we need while \[our\] own employees pay to feed 'em and put hours into raising them.\"\
+	<br></br>\
+	The bill passed fairly quietly this afternoon, owing to the closed nature of the Bicamarial. A post-facto Occulum poll of voting-age\
+	VGA citizens suggest that fully 80% of them did not even know what a Promethean was prior to the most recent general election. A\
+	follow-up poll indicates that an appreciable number of Sivians do not support the framework's current implementation."