Polaris December Sync

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

@@ -21,7 +21,7 @@ var/list/gear_datums = list()
 		if(!use_name)
 			error("Loadout - Missing display name: [G]")
 			continue
-		if(!initial(G.cost))
+		if(isnull(initial(G.cost)))
 			error("Loadout - Missing cost: [G]")
 			continue
 		if(!initial(G.path))

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

@@ -38,6 +38,10 @@
 	display_name = "Security HUD, prescription (Security)"
 	path = /obj/item/clothing/glasses/hud/security/prescription
 
+/datum/gear/eyes/security/sunglasshud
+	display_name = "Security HUD, sunglasses (Security)"
+	path = /obj/item/clothing/glasses/sunglasses/sechud
+
 /datum/gear/eyes/secaviators
 	display_name = "Security HUD Aviators"
 	path = /obj/item/clothing/glasses/sunglasses/sechud/aviator

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

@@ -57,3 +57,13 @@
 /datum/gear/gloves/evening/New()
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/gloves/duty
+	display_name = "gloves, work"
+	path = /obj/item/clothing/gloves/duty
+	cost = 3
+
+/datum/gear/gloves/forensic
+	display_name = "gloves, forensic"
+	path = /obj/item/clothing/gloves/forensic
+	allowed_roles = list("Detective")

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

@@ -117,11 +117,35 @@
 	display_name = "cap, white"
 	path = /obj/item/clothing/head/soft/mime
 
+/datum/gear/head/cap/mbill
+	display_name = "cap, bill"
+	path = /obj/item/clothing/head/soft/mbill
+
+/datum/gear/head/cap/sol
+	display_name = "cap, sol"
+	path = /obj/item/clothing/head/soft/sol
+
+/datum/gear/head/cap/expdition
+	display_name = "cap, expedition"
+	path = /obj/item/clothing/head/soft/sol/expedition
+
+/datum/gear/head/cap/fleet
+	display_name = "cap, fleet"
+	path = /obj/item/clothing/head/soft/sol/fleet
+
 /datum/gear/head/cowboy
 	display_name = "cowboy, rodeo"
 	path = /obj/item/clothing/head/cowboy_hat
 	cost = 3
 
+/datum/gear/head/cowboy/black
+	display_name = "cowboy, black"
+	path = /obj/item/clothing/head/cowboy_hat/black
+
+/datum/gear/head/cowboy/wide
+	display_name = "cowboy, wide"
+	path = /obj/item/clothing/head/cowboy_hat/wide
+
 /datum/gear/head/fedora
 	display_name = "fedora, brown"
 	path = /obj/item/clothing/head/fedora/brown
@@ -154,6 +178,14 @@
 	display_name = "hair flower pin, orange"
 	path = /obj/item/clothing/head/hairflower/orange
 
+/datum/gear/head/hairflower/white
+	display_name = "hair flower pin"
+	path = /obj/item/clothing/head/hairflower/white
+
+/datum/gear/head/hairflower/white/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
 /datum/gear/head/hardhat
 	display_name = "hardhat, yellow"
 	path = /obj/item/clothing/head/hardhat
@@ -198,7 +230,7 @@
 /datum/gear/head/santahat
 	display_name = "santa hat, red (holiday)"
 	path = /obj/item/clothing/head/santa
-	cost = 11
+	cost = 2
 
 /datum/gear/head/santahat/green
 	display_name = "santa hat, green (holiday)"
@@ -233,6 +265,14 @@
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
 
+/datum/gear/head/taqiyah
+	display_name = "taqiyah"
+	path = /obj/item/clothing/head/taqiyah
+
+/datum/gear/head/taqiyah/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
 /datum/gear/head/beanie
 	display_name = "beanie"
 	path = /obj/item/clothing/head/beanie
@@ -275,4 +315,42 @@
 
 /datum/gear/head/bow/New()
 	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/head/welding/
+	display_name = "welding, normal (engineering/robotics)"
+	path = /obj/item/clothing/head/welding
+	cost = 2
+	allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist")
+
+/datum/gear/head/welding/demon
+	display_name = "welding, demon (engineering/robotics)"
+	path = /obj/item/clothing/head/welding/demon
+	allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist")
+
+/datum/gear/head/welding/knight
+	display_name = "welding, knight (engineering/robotics)"
+	path = /obj/item/clothing/head/welding/knight
+	allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist")
+
+/datum/gear/head/welding/fancy
+	display_name = "welding, fancy (engineering/robotics)"
+	path = /obj/item/clothing/head/welding/fancy
+	allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist")
+
+/datum/gear/head/welding/engie
+	display_name = "welding, engie (engineering/robotics)"
+	path = /obj/item/clothing/head/welding/engie
+	allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist")
+
+/datum/gear/head/beret/sol
+	display_name = "beret sol, selection"
+	path = /obj/item/clothing/head/beret/sol
+
+/datum/gear/head/beret/sol/New()
+	..()
+	var/list/sols = list()
+	for(var/sol_style in typesof(/obj/item/clothing/head/beret/sol))
+		var/obj/item/clothing/head/beret/sol/sol = sol_style
+		sols[initial(sol.name)] = sol
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))

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

@@ -131,4 +131,26 @@
 
 /datum/gear/shoes/flats/color/New()
 	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/shoes/cowboy
+	display_name = "cowboy boots"
+	path = /obj/item/clothing/shoes/cowboy
+
+/datum/gear/shoes/jungle
+	display_name = "jungle boots"
+	path = /obj/item/clothing/shoes/jungleboots
+	cost = 2
+
+/datum/gear/shoes/duty
+	display_name = "duty boots"
+	path = 	/obj/item/clothing/shoes/dutyboots
+	cost = 2
+
+/datum/gear/shoes/dress
+	display_name = "shoes, dress"
+	path = 	/obj/item/clothing/shoes/dress
+
+/datum/gear/shoes/dress/white
+	display_name = "shoes, dress white"
+	path = 	/obj/item/clothing/shoes/dress/white

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

@@ -87,9 +87,17 @@
 	path = /obj/item/clothing/suit/storage/trench/grey
 
 /datum/gear/suit/hazard_vest
-	display_name = "hazard vest"
+	display_name = "hazard vest selection"
 	path = /obj/item/clothing/suit/storage/hazardvest
 
+/datum/gear/suit/hazard_vest/New()
+	..()
+	var/list/hazards = list()
+	for(var/hazard_style in typesof(/obj/item/clothing/suit/storage/hazardvest))
+		var/obj/item/clothing/suit/storage/hazardvest/hazardvest = hazard_style
+		hazards[initial(hazardvest.name)] = hazardvest
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hazards))
+
 /datum/gear/suit/hoodie
 	display_name = "hoodie selection"
 	path = /obj/item/clothing/suit/storage/toggle/hoodie
@@ -327,3 +335,16 @@
 /datum/gear/suit/denim_vest/corporate
 	display_name = "denim vest, corporate"
 	path = /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless
+
+/datum/gear/suit/service
+	display_name = "service jacket selection"
+	path = /obj/item/clothing/suit/storage/service
+
+/datum/gear/suit/service/New()
+	..()
+	var/list/services = list()
+	for(var/service_style in typesof(/obj/item/clothing/suit/storage/service))
+		var/obj/item/clothing/suit/storage/service/service = service_style
+		services[initial(service.name)] = service
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(services))
+

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

@@ -380,4 +380,68 @@
 
 /datum/gear/uniform/dresses/janimaid
 	display_name = "maid uniform"
-	path = /obj/item/clothing/under/dress/janimaid
+	path = /obj/item/clothing/under/dress/janimaid
+
+/datum/gear/uniform/pt
+	display_name = "pt uniform"
+	path = /obj/item/clothing/under/pt
+
+/datum/gear/uniform/pt/expeditionary
+	display_name = "pt uniform, expeditionary"
+	path = /obj/item/clothing/under/pt/expeditionary
+
+/datum/gear/uniform/pt/fleet
+	display_name = "pt uniform, fleet"
+	path = /obj/item/clothing/under/pt/fleet
+
+/datum/gear/uniform/utility
+	display_name = "utility, black"
+	path = /obj/item/clothing/under/utility
+	cost = 2
+
+/datum/gear/uniform/utility/fleet
+	display_name = "utility, navy"
+	path = /obj/item/clothing/under/utility/fleet
+
+/datum/gear/uniform/utility/marine
+	display_name = "utility, grey"
+	path = /obj/item/clothing/under/utility/marine
+
+/datum/gear/uniform/sweater
+	display_name = "sweater, grey"
+	path = /obj/item/clothing/under/rank/psych/turtleneck/sweater
+
+/datum/gear/uniform/jumpsuit/aether
+	display_name = "jumpsuit, aether"
+	path = /obj/item/clothing/under/aether
+
+/datum/gear/uniform/jumpsuit/focal
+	display_name = "jumpsuit, focal"
+	path = /obj/item/clothing/under/focal
+
+/datum/gear/uniform/mbill
+	display_name = "outfit, major bill's (Cargo)"
+	path = /obj/item/clothing/under/mbill
+	allowed_roles = list("Quartermaster","Cargo Technician")
+
+/datum/gear/uniform/pcrc
+	display_name = "uniform, PCRC (Security)"
+	path = /obj/item/clothing/under/pcrc
+	cost = 2
+	allowed_roles = list("Security Officer","Head of Security","Warden")
+
+/datum/gear/uniform/jumpsuit/grayson
+	display_name = "outfit, grayson"
+	path = /obj/item/clothing/under/grayson
+
+/datum/gear/uniform/jumpsuit/wardt
+	display_name = "jumpsuit, ward-takahashi"
+	path = /obj/item/clothing/under/wardt
+
+/datum/gear/uniform/frontier
+	display_name = "outfit, frontier"
+	path = 	/obj/item/clothing/under/frontier
+
+/datum/gear/uniform/jumpsuit/hephaestus
+	display_name = "jumpsuit, hephaestus"
+	path = 	/obj/item/clothing/under/hephaestus

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

@@ -11,6 +11,7 @@
 /datum/gear/utility/communicator
 	display_name = "personal communicator"
 	path = /obj/item/device/communicator
+	cost = 0
 
 /datum/gear/utility/folder_blue
 	display_name = "folder, blue"
@@ -39,4 +40,20 @@
 /datum/gear/utility/securecase
 	display_name = "secure briefcase"
 	path =/obj/item/weapon/storage/secure/briefcase
-	cost = 2
+	cost = 2
+
+/datum/gear/utility/flashlight
+	display_name = "flashlight"
+	path = /obj/item/device/flashlight
+
+/datum/gear/utility/maglight
+	display_name = "flashlight, maglight"
+	path = /obj/item/device/flashlight/maglight
+	cost = 2
+
+/datum/gear/utility/implant //This does nothing if you don't actually know EAL.
+	display_name = "implant, language, EAL"
+	path = /obj/item/weapon/implant/language/eal
+	cost = 2
+	slot = "implant"
+	var/implant_type = "EAL"

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

@@ -127,3 +127,4 @@
 	path = /obj/item/clothing/under/shorts/loincloth
 	sort_category = "Xenowear"
 	//whitelisted = list("Tajaran", "Unathi") //VORESTATION EDIT
+