Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	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-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme

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

@@ -7,4 +7,8 @@
 
 /datum/gear/ears/headphones
 	display_name = "headphones"
-	path = /obj/item/clothing/ears/earmuffs/headphones
+	path = /obj/item/clothing/ears/earmuffs/headphones
+
+/datum/gear/ears/circuitry
+	display_name = "earwear, circuitry (empty)"
+	path = /obj/item/clothing/ears/circuitry

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

@@ -121,3 +121,7 @@
 /datum/gear/eyes/sun/prescriptionsun
 	display_name = "sunglasses, presciption (Security/Command)"
 	path = /obj/item/clothing/glasses/sunglasses/prescription
+
+/datum/gear/eyes/circuitry
+	display_name = "goggles, circuitry (empty)"
+	path = /obj/item/clothing/glasses/circuitry

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

@@ -98,4 +98,8 @@
 	ringtype["ring, glass"] = /obj/item/clothing/gloves/ring/material/glass
 	ringtype["ring, wood"] = /obj/item/clothing/gloves/ring/material/wood
 	ringtype["ring, plastic"] = /obj/item/clothing/gloves/ring/material/plastic
-	gear_tweaks += new/datum/gear_tweak/path(ringtype)
+	gear_tweaks += new/datum/gear_tweak/path(ringtype)
+
+/datum/gear/gloves/circuitry
+	display_name = "gloves, circuitry (empty)"
+	path = /obj/item/clothing/gloves/circuitry

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

@@ -372,3 +372,7 @@
 /datum/gear/head/surgical/purple
 	display_name = "surgical cap, purple"
 	path = /obj/item/clothing/head/surgery/purple
+
+/datum/gear/head/circuitry
+	display_name = "headwear, circuitry (empty)"
+	path = /obj/item/clothing/head/circuitry

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

@@ -227,3 +227,7 @@
 	display_name = "hydroponics winter boots"
 	path = /obj/item/clothing/shoes/boots/winter/hydro
 	allowed_roles = list("Botanist", "Xenobiologist")
+
+/datum/gear/shoes/circuitry
+	display_name = "boots, circuitry (empty)"
+	path = /obj/item/clothing/shoes/circuitry

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

@@ -456,4 +456,8 @@
 
 /datum/gear/uniform/westernbustle
 	display_name = "western bustle"
-	path = /obj/item/clothing/under/dress/westernbustle
+	path = /obj/item/clothing/under/dress/westernbustle
+
+/datum/gear/uniform/circuitry
+	display_name = "jumpsuit, circuitry (empty)"
+	path = /obj/item/clothing/under/circuitry

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

@@ -107,29 +107,29 @@
 
 /datum/gear/uniform/undercoat
 	display_name = "undercoat selection (Teshari)"
-	path = /obj/item/clothing/under/seromi/undercoat
+	path = /obj/item/clothing/under/seromi/undercoat/standard
 	whitelisted = SPECIES_TESHARI
 	sort_category = "Xenowear"
 
 /datum/gear/uniform/undercoat/New()
 	..()
 	var/list/undercoats = list()
-	for(var/undercoat in typesof(/obj/item/clothing/under/seromi/undercoat))
-		var/obj/item/clothing/under/seromi/undercoat/undercoat_type = undercoat
+	for(var/undercoat in typesof(/obj/item/clothing/under/seromi/undercoat/standard))
+		var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat
 		undercoats[initial(undercoat_type.name)] = undercoat_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats))
 
 /datum/gear/suit/cloak
 	display_name = "cloak selection (Teshari)"
-	path = /obj/item/clothing/suit/storage/seromi/cloak
+	path = /obj/item/clothing/suit/storage/seromi/cloak/standard
 	whitelisted = SPECIES_TESHARI
 	sort_category = "Xenowear"
 
 /datum/gear/suit/cloak/New()
 	..()
 	var/list/cloaks = list()
-	for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak))
-		var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak
+	for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/standard))
+		var/obj/item/clothing/suit/storage/seromi/cloak/standard/cloak_type = cloak
 		cloaks[initial(cloak_type.name)] = cloak_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
 
@@ -160,4 +160,203 @@
 	for(var/cohesionsuit in (typesof(/obj/item/clothing/under/cohesion)))
 		var/obj/item/clothing/under/cohesion/cohesion_type = cohesionsuit
 		cohesionsuits[initial(cohesion_type.name)] = cohesion_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cohesionsuits))
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cohesionsuits))
+
+/datum/gear/uniform/dept
+	whitelisted = SPECIES_TESHARI
+	sort_category = "Xenowear"
+	
+/datum/gear/uniform/dept/undercoat/ce
+	display_name = "Teshari Chief Engineer Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/ce
+	allowed_roles = list("Chief Engineer")
+
+/datum/gear/uniform/dept/undercoat/ce_w
+	display_name = "Teshari Chief Engineer Undercoat (White)"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/ce_w
+	allowed_roles = list("Chief Engineer")
+/*
+/datum/gear/uniform/undercoat/rd
+	display_name = "cloak, research director"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/rd
+	allowed_roles = list("Research Director")
+*/
+/datum/gear/uniform/dept/undercoat/qm
+	display_name = "Teshari Quarter Master Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/qm
+	allowed_roles = list("Quartermaster")
+
+/datum/gear/uniform/dept/undercoat/command
+	display_name = "Teshari Command Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/command
+	allowed_roles = list("Colony Director","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer")
+
+/datum/gear/uniform/dept/undercoat/command_g
+	display_name = "Teshari Command Undercoat (gold buttons)"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/command_g
+	allowed_roles = list("Colony Director","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer")
+
+/datum/gear/uniform/dept/undercoat/cmo
+	display_name = "Teshari Chief Medical Officer Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/cmo
+	allowed_roles = list("Chief Medical Officer")
+
+/datum/gear/uniform/dept/undercoat/cargo
+	display_name = "Teshari Cargo Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/cargo
+	allowed_roles = list("Cargo Technician","Quartermaster","Shaft Miner")
+
+/datum/gear/uniform/dept/undercoat/mining
+	display_name = "Teshari Mining Undercoat"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/mining
+	allowed_roles = list("Quartermaster","Shaft Miner")
+
+/datum/gear/uniform/dept/undercoat/security
+	display_name = "Teshari Security Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/sec
+	allowed_roles = list("Head of Security","Detective","Warden","Security Officer",)
+
+/datum/gear/uniform/dept/undercoat/service
+	display_name = "Teshari Service Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/service
+	allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian")
+
+/datum/gear/uniform/dept/undercoat/engineer
+	display_name = "Teshari Engineer Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/engineer
+	allowed_roles = list("Chief Engineer","Station Engineer")
+
+/datum/gear/uniform/dept/undercoat/atmos
+	display_name = "Teshari Atmos Tech Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/atmos
+	allowed_roles = list("Chief Engineer","Atmospheric Technician")
+
+/datum/gear/uniform/dept/undercoat/research
+	display_name = "Teshari Science Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/sci
+	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist")
+
+/datum/gear/uniform/dept/undercoat/robo
+	display_name = "Teshari Roboticist Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/robo
+	allowed_roles = list("Roboticist")
+
+/datum/gear/uniform/dept/undercoat/medical
+	display_name = "Teshari Medical Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/medical
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
+
+/datum/gear/uniform/dept/undercoat/chemistry
+	display_name = "Teshari Chemistry Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/chemistry
+	allowed_roles = list("Chemist")
+
+/datum/gear/uniform/dept/undercoat/virology
+	display_name = "Teshari Medical Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/viro
+	allowed_roles = list("Medical Doctor")
+
+/datum/gear/uniform/dept/undercoat/paramedic
+	display_name = "Teshari Paramedic Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/para
+	allowed_roles = list("Paramedic")
+
+/datum/gear/uniform/dept/undercoat/iaa
+	display_name = "Teshari IAA Undercoat"
+	path = /obj/item/clothing/under/seromi/undercoat/jobs/iaa
+	allowed_roles = list("Internal Affairs Agent")
+
+/datum/gear/suit/dept/cloak/
+	whitelisted = SPECIES_TESHARI
+	sort_category = "Xenowear"
+	
+/datum/gear/suit/cloak/dept/ce
+	display_name = "Teshari Chief Engineer Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/ce
+	allowed_roles = list("Chief Engineer")
+/*
+/datum/gear/suit/cloak/rd
+	display_name = "cloak, research director"
+	path = /obj/item/clothing/accessory/poncho/roles/cloak/rd
+	allowed_roles = list("Research Director")
+*/
+
+/datum/gear/suit/dept/cloak/qm
+	display_name = "Teshari Quarter Master Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/qm
+	allowed_roles = list("Quartermaster")
+
+/datum/gear/suit/dept/cloak/command
+	display_name = "Teshari Command Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/command
+	allowed_roles = list("Colony Director","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer")
+
+/datum/gear/suit/dept/cloak/cmo
+	display_name = "Teshari Chief Medical Officer Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo
+	allowed_roles = list("Chief Medical Officer")
+
+/datum/gear/suit/dept/cloak/cargo
+	display_name = "Teshari Cargo Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo
+	allowed_roles = list("Cargo Technician","Quartermaster","Shaft Miner")
+
+/datum/gear/suit/dept/cloak/mining
+	display_name = "Teshari Mining Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/mining
+	allowed_roles = list("Quartermaster","Shaft Miner")
+
+/datum/gear/suit/dept/cloak/security
+	display_name = "Teshari Security Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec
+	allowed_roles = list("Head of Security","Detective","Warden","Security Officer",)
+
+/datum/gear/suit/dept/cloak/service
+	display_name = "Teshari Service Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/service
+	allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian")
+
+/datum/gear/suit/dept/cloak/engineer
+	display_name = "Teshari Engineer Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/eningeer
+	allowed_roles = list("Chief Engineer","Station Engineer")
+
+/datum/gear/suit/dept/cloak/atmos
+	display_name = "Teshari Atmos Tech Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos
+	allowed_roles = list("Chief Engineer","Atmospheric Technician")
+
+/datum/gear/suit/dept/cloak/research
+	display_name = "Teshari Science Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sci
+	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist")
+
+/datum/gear/suit/dept/cloak/robo
+	display_name = "Teshari Roboticist Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/robo
+	allowed_roles = list("Roboticist")
+
+/datum/gear/suit/dept/cloak/medical
+	display_name = "Teshari Medical Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/medical
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
+
+/datum/gear/suit/dept/cloak/chemistry
+	display_name = "Teshari Chemistry Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry
+	allowed_roles = list("Chemist")
+
+/datum/gear/suit/dept/cloak/virology
+	display_name = "Teshari Medical Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/viro
+	allowed_roles = list("Medical Doctor")
+
+/datum/gear/suit/dept/cloak/paramedic
+	display_name = "Teshari Paramedic Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/para
+	allowed_roles = list("Paramedic")
+
+/datum/gear/suit/dept/cloak/iaa
+	display_name = "Teshari IAA Cloak"
+	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa
+	allowed_roles = list("Internal Affairs Agent")