Merge remote-tracking branch 'upstream/master' into ports-tailoring

code/modules/client/preference/loadout/loadout_cosmetics.dm

@@ -21,12 +21,4 @@
 
 /datum/gear/lipstick/lime
 	display_name = "lipstick, lime"
-	path = /obj/item/lipstick/lime
-
-/datum/gear/monocle
-	display_name = "monocle"
-	path = /obj/item/clothing/glasses/monocle
-
-/datum/gear/sunglasses
-	display_name = "cheap sunglasses"
-	path = /obj/item/clothing/glasses/sunglasses_fake
+	path = /obj/item/lipstick/lime

code/modules/client/preference/loadout/loadout_donor.dm

@@ -18,12 +18,10 @@
 /datum/gear/donor/furcape
 	display_name = "Fur Cape"
 	path = /obj/item/clothing/suit/furcape
-	cost = 2
 
 /datum/gear/donor/furcoat
 	display_name = "Fur Coat"
 	path = /obj/item/clothing/suit/furcoat
-	cost = 2
 
 /datum/gear/donor/kamina
 	display_name = "Spiky Orange-tinted Shades"
@@ -33,10 +31,6 @@
 	display_name = "Spiky Green-tinted Shades"
 	path = /obj/item/clothing/glasses/fluff/kamina/green
 
-/datum/gear/donor/hipster
-	display_name = "Hipster Glasses"
-	path = /obj/item/clothing/glasses/regular/hipster
-
 /datum/gear/donor/threedglasses
 	display_name = "Threed Glasses"
 	path = /obj/item/clothing/glasses/threedglasses

code/modules/client/preference/loadout/loadout_glasses.dm

@@ -0,0 +1,24 @@
+/datum/gear/glasses
+	subtype_path = /datum/gear/glasses
+	slot = slot_glasses
+	sort_category = "Glasses"
+
+/datum/gear/glasses/sunglasses
+	display_name = "cheap sunglasses"
+	path = /obj/item/clothing/glasses/sunglasses_fake
+
+/datum/gear/glasses/eyepatch
+	display_name = "Eyepatch"
+	path = /obj/item/clothing/glasses/eyepatch
+
+/datum/gear/glasses/hipster
+	display_name = "Hipster glasses"
+	path = /obj/item/clothing/glasses/regular/hipster
+
+/datum/gear/glasses/monocle
+	display_name = "Monocle"
+	path = /obj/item/clothing/glasses/monocle
+
+/datum/gear/glasses/prescription
+	display_name = "Prescription glasses"
+	path = /obj/item/clothing/glasses/regular

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

@@ -0,0 +1,8 @@
+/datum/gear/gloves
+	subtype_path = /datum/gear/gloves
+	slot = slot_gloves
+	sort_category = "Gloves"
+
+/datum/gear/gloves/fingerless
+	display_name = "Fingerless Gloves"
+	path = /obj/item/clothing/gloves/fingerless

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

@@ -27,25 +27,32 @@
 
 /datum/gear/shoes/cowboyboots
 	display_name = "cowboy boots, brown"
-	cost = 1
 	path = /obj/item/clothing/shoes/cowboy
 
 /datum/gear/shoes/cowboyboots_black
 	display_name = "cowboy boots, black"
-	cost = 1
 	path = /obj/item/clothing/shoes/cowboy/black
 
 /datum/gear/shoes/cowboyboots/white
 	display_name = "cowboy boots, white"
-	cost = 1
 	path = /obj/item/clothing/shoes/cowboy/white
 
 /datum/gear/shoes/cowboyboots/pink
 	display_name = "cowboy boots, pink"
-	cost = 1
 	path = /obj/item/clothing/shoes/cowboy/pink
 
 /datum/gear/shoes/laceup
 	display_name = "laceup shoes"
-	cost = 1
 	path = /obj/item/clothing/shoes/laceup
+
+/datum/gear/shoes/blackshoes
+	display_name = "Black shoes"
+	path = /obj/item/clothing/shoes/black
+
+/datum/gear/shoes/brownshoes
+	display_name = "Brown shoes"
+	path = /obj/item/clothing/shoes/brown
+
+/datum/gear/shoes/whiteshoes
+	display_name = "White shoes"
+	path = /obj/item/clothing/shoes/white

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

@@ -1,7 +1,6 @@
 /datum/gear/suit
 	subtype_path = /datum/gear/suit
 	slot = slot_wear_suit
-	cost = 2
 	sort_category = "External Wear"
 
 //WINTER COATS
@@ -105,6 +104,10 @@
 	path = /obj/item/clothing/suit/armor/secjacket
 	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
 
+/datum/gear/suit/ianshirt
+	display_name = "Ian Shirt"
+	path = /obj/item/clothing/suit/ianshirt
+
 /datum/gear/suit/poncho
 	display_name = "poncho, classic"
 	path = /obj/item/clothing/suit/poncho

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

@@ -2,7 +2,6 @@
 /datum/gear/uniform
 	subtype_path = /datum/gear/uniform
 	slot = slot_w_uniform
-	cost = 2
 	sort_category = "Uniforms and Casual Dress"
 
 /datum/gear/uniform/skirt