Merge pull request #15291 from AmatsuDF/master

3 edited outfits

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

@@ -319,7 +319,8 @@ Talon winter coat
 	var/list/choodies = list(
 		"normal hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable,
 		"sleeveless hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/sleeveless,
-		"cropped hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped
+		"cropped hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped,
+		"shortsleeve hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/shortsleeve
 	)
 	gear_tweaks += gear_tweak_free_color_choice
 	gear_tweaks += new/datum/gear_tweak/path(choodies)

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

@@ -211,4 +211,33 @@ Talon jumpsuit
 
 /datum/gear/uniform/stripeddungarees
 	display_name = "striped dungarees"
-	path = /obj/item/clothing/under/stripeddungarees
+	path = /obj/item/clothing/under/stripeddungarees
+
+// recolorable flame dress
+
+/datum/gear/uniform/cdress_fire
+	display_name = "flame dress, colorable"
+	path = /obj/item/clothing/under/dress/cdress_fire
+
+/datum/gear/uniform/cdress_fire/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
+
+// recolorable yellow dress
+/datum/gear/uniform/cbridesmaid
+	display_name = "fancy dress, colorable"
+	path = /obj/item/clothing/under/dress/cbridesmaid
+
+/datum/gear/uniform/cbridesmaid/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
+// recolorable orange swoop dress
+/datum/gear/uniform/cswoopdress
+	display_name = "swoop dress, recolorable"
+	path = /obj/item/clothing/under/dress/cswoopdress
+
+/datum/gear/uniform/cswoopdress/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice

code/modules/clothing/suits/hooded_vr.dm

@@ -178,4 +178,9 @@
 /obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped
 	name = "cropped hoodie"
 	desc = "It's not that this is a size too small, you just like showing off your tum. I guess."
-	icon_state = "choodie_crop"
+	icon_state = "choodie_crop"
+
+/obj/item/clothing/suit/storage/hooded/toggle/colorable/shortsleeve
+	name = "shortsleeve hoodie"
+	desc = "For the times you can't decide between having sleeves and not having them."
+	icon_state = "choodie_shortsleeve"

code/modules/clothing/under/miscellaneous_vr.dm

@@ -596,3 +596,23 @@
 	icon = 'icons/inventory/uniform/item_vr.dmi'
 	default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
 	icon_state = "striped_clown_uniform"
+
+/obj/item/clothing/under/dress/cdress_fire
+	name = "flame dress"
+	desc = "A small black dress with a flames print on it. Perfect for recoloring!"
+	icon = 'icons/inventory/uniform/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
+	icon_state = "cdress_fire"
+
+/obj/item/clothing/under/dress/cbridesmaid
+	name = "fancy dress"
+	desc = "A cute, flirty dress. Good for weddings and fancy parties, or if you just want to look fashionable. Perfect for recoloring!"
+	icon = 'icons/inventory/uniform/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
+	icon_state = "cbridesmaid"
+
+/obj/item/clothing/under/dress/cswoopdress
+	name = "swoop dress"
+	desc = "A fancy gown for those who like to show leg. Perfect for recoloring!"
+	default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
+	icon_state = "cswoopdress"