Merge pull request #7876 from Aurorablade/Clothes

Obligatory Vox in a Corset

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

@@ -142,5 +142,17 @@
 	display_name = "simple necklace"
 	path = /obj/item/clothing/accessory/necklace
 
+/datum/gear/accessory/corset
+	display_name = "corset, black"
+	path = /obj/item/clothing/accessory/corset
+
+/datum/gear/accessory/corsetred
+	display_name = "corset, red"
+	path = /obj/item/clothing/accessory/corset/red
+
+/datum/gear/accessory/corsetblue
+	display_name = "corset, blue"
+	path = /obj/item/clothing/accessory/corset/blue
+
 
 

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

@@ -147,4 +147,12 @@
 /datum/gear/hat/surgicalcap_green
 	display_name = "surgical cap, green"
 	path = /obj/item/clothing/head/surgery/green
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor")
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor")
+
+/datum/gear/hat/flowerpin
+	display_name = "hair flower"
+	path = /obj/item/clothing/head/hairflower
+
+/datum/gear/hat/flowerpinpurp
+	display_name = "hair flower, purple"
+	path = /obj/item/clothing/head/hairflower/purple

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

@@ -8,6 +8,7 @@
 	display_name = "embroidered veil"
 	description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races."
 	path = /obj/item/clothing/glasses/tajblind
+	cost = 1
 
 /datum/gear/racial/tajsec
 	display_name = "sleek veil"
@@ -37,4 +38,9 @@
 	display_name = "khaki veil"
 	description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. It is light and comfy!"
 	path = /obj/item/clothing/glasses/tajblind/cargo
-	allowed_roles = list("Quartermaster","Cargo Technician", "Miner")
+	allowed_roles = list("Quartermaster","Cargo Technician", "Miner")
+
+/datum/gear/racial/footwraps
+	display_name = "cloth footwraps"
+	path = /obj/item/clothing/shoes/footwraps
+	cost = 1

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

@@ -223,3 +223,4 @@
 /datum/gear/uniform/pants/caopants
 	display_name = "pants, camo"
 	path = /obj/item/clothing/under/pants/camo
+

code/modules/clothing/shoes/miscellaneous.dm

@@ -244,3 +244,12 @@
 	desc = "For a Rustlin' tustlin' cowgirl."
 	icon_state = "cowboyboots_pink"
 	item_color = "cowboyboots_pink"
+
+/obj/item/clothing/shoes/footwraps
+ 	name = "cloth footwraps"
+ 	desc = "A roll of treated canvas used for wrapping claws or paws."
+ 	icon_state = "clothwrap"
+ 	item_state = "clothwrap"
+ 	force = 0
+ 	silence_steps = TRUE
+ 	w_class = WEIGHT_CLASS_SMALL

code/modules/clothing/under/accessories/accessory.dm

@@ -550,11 +550,35 @@
 	icon_state = "cowboyshirt_reds"
 	item_state = "cowboyshirt_reds"
 	item_color = "cowboyshirt_reds"
-	species_fit = list("Vox")
+	species_fit = list("Vox", "Drask", "Grey")
 	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		"Vox" = 'icons/mob/species/vox/suit.dmi',
+		"Drask" = 'icons/mob/species/drask/suit.dmi',
+		"Grey" = 'icons/mob/species/grey/suit.dmi'
 		)
 
+/obj/item/clothing/accessory/corset
+	name = "black corset"
+	desc = "A black corset for those fancy nights out."
+	icon_state = "corset"
+	item_state = "corset"
+	item_color = "corset"
+
+
+/obj/item/clothing/accessory/corset/red
+	name = "red corset"
+	desc = "A red corset those fancy nights out."
+	icon_state = "corset_red"
+	item_state = "corset_red"
+	item_color = "corset_red"
+
+/obj/item/clothing/accessory/corset/blue
+	name = "blue corset"
+	desc = "A blue corset for those fancy nights out."
+	icon_state = "corset_blue"
+	item_state = "corset_blue"
+	item_color = "corset_blue"
+
 /obj/item/clothing/accessory/petcollar
 	name = "pet collar"
 	desc = "The latest fashion accessory for your favorite pets!"

code/modules/clothing/under/miscellaneous.dm

@@ -829,4 +829,4 @@
 	icon_state = "medicalgown"
 	item_state = "medicalgown"
 	item_color = "medicalgown"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO