Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018

# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	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/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme

code/modules/client/preference_setup/general/04_equipment.dm

@@ -11,12 +11,14 @@
 	S["all_underwear_metadata"] >> pref.all_underwear_metadata
 	S["backbag"]	>> pref.backbag
 	S["pdachoice"]	>> pref.pdachoice
+	S["communicator_visibility"]	>> pref.communicator_visibility
 
 /datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S)
 	S["all_underwear"] << pref.all_underwear
 	S["all_underwear_metadata"] << pref.all_underwear_metadata
 	S["backbag"]	<< pref.backbag
 	S["pdachoice"]	<< pref.pdachoice
+	S["communicator_visibility"]	<< pref.communicator_visibility
 
 // Moved from /datum/preferences/proc/copy_to()
 /datum/category_item/player_setup_item/general/equipment/copy_to_mob(var/mob/living/carbon/human/character)
@@ -86,6 +88,7 @@
 		. += "<br>"
 	. += "Backpack Type: <a href='?src=\ref[src];change_backpack=1'><b>[backbaglist[pref.backbag]]</b></a><br>"
 	. += "PDA Type: <a href='?src=\ref[src];change_pda=1'><b>[pdachoicelist[pref.pdachoice]]</b></a><br>"
+	. += "Communicator Visibility: <a href='?src=\ref[src];toggle_comm_visibility=1'><b>[(pref.communicator_visibility) ? "Yes" : "No"]</b></a><br>"
 
 	return jointext(.,null)
 
@@ -139,5 +142,10 @@
 		if(new_metadata)
 			set_metadata(underwear, gt, new_metadata)
 			return TOPIC_REFRESH_UPDATE_PREVIEW
+	else if(href_list["toggle_comm_visibility"])
+		if(CanUseTopic(user))
+			pref.communicator_visibility = !pref.communicator_visibility
+			return TOPIC_REFRESH
+
 
 	return ..()

code/modules/client/preference_setup/global/04_communicators.dm

@@ -1,26 +0,0 @@
-/datum/category_item/player_setup_item/player_global/communicators
-	name = "Communicators"
-	sort_order = 4
-
-/datum/category_item/player_setup_item/player_global/communicators/load_preferences(var/savefile/S)
-	S["communicator_visibility"]	>> pref.communicator_visibility
-
-
-/datum/category_item/player_setup_item/player_global/communicators/save_preferences(var/savefile/S)
-	S["communicator_visibility"]	<< pref.communicator_visibility
-
-
-/datum/category_item/player_setup_item/player_global/communicators/sanitize_preferences()
-	pref.communicator_visibility	= sanitize_integer(pref.communicator_visibility, 0, 1, initial(pref.communicator_visibility))
-
-/datum/category_item/player_setup_item/player_global/communicators/content(var/mob/user)
-	. += "<b>Communicator Identity:</b><br>"
-	. += "Visibility: <a href='?src=\ref[src];toggle_comm_visibility=1'><b>[(pref.communicator_visibility) ? "Yes" : "No"]</b></a><br>"
-
-/datum/category_item/player_setup_item/player_global/communicators/OnTopic(var/href,var/list/href_list, var/mob/user)
-	if(href_list["toggle_comm_visibility"])
-		if(CanUseTopic(user))
-			pref.communicator_visibility = !pref.communicator_visibility
-			return TOPIC_REFRESH
-
-	return ..()

code/modules/client/preference_setup/global/04_ooc.dm

@@ -1,6 +1,6 @@
 /datum/category_item/player_setup_item/player_global/ooc
 	name = "OOC"
-	sort_order = 5
+	sort_order = 4
 
 /datum/category_item/player_setup_item/player_global/ooc/load_preferences(var/savefile/S)
 	S["ignored_players"]	>> pref.ignored_players

code/modules/client/preference_setup/global/05_media.dm

@@ -4,7 +4,7 @@
 
 /datum/category_item/player_setup_item/player_global/media
 	name = "Media"
-	sort_order = 6
+	sort_order = 5
 
 /datum/category_item/player_setup_item/player_global/media/load_preferences(var/savefile/S)
 	S["media_volume"]	>> pref.media_volume

code/modules/client/preference_setup/loadout/loadout_utility.dm

@@ -46,6 +46,12 @@
 	path = /obj/item/weapon/book/codex/corp_regs
 	cost = 0
 */
+
+/datum/gear/utility/robutt
+	display_name = "a buyer's guide to artificial bodies"
+	path = /obj/item/weapon/book/codex/lore/robutt
+	cost = 0
+
 /datum/gear/utility/folder_blue
 	display_name = "folder, blue"
 	path = /obj/item/weapon/folder/blue