diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm index 6272e40204..0ecb49aed4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm @@ -96,3 +96,15 @@ display_name = "white wedding dress (Wolf/Horse-taur)" path = /obj/item/clothing/suit/taur_dress/white sort_category = "Xenowear" +<<<<<<< HEAD +======= + +/datum/gear/suit/taur/colorable_skirt + display_name = "colorable skirt (Wolf/Horse-taur)" + path = /obj/item/clothing/suit/taur/skirt + sort_category = "Xenowear" + +/datum/gear/suit/taur/colorable_skirt/New() + ..() + gear_tweaks += gear_tweak_free_color_choice +>>>>>>> 15b60b17e2... Merge pull request #13710 from Novacat/nova-basicfixes diff --git a/code/modules/clothing/suits/miscellaneous_vr.dm b/code/modules/clothing/suits/miscellaneous_vr.dm index 94fb746d94..9073889148 100644 --- a/code/modules/clothing/suits/miscellaneous_vr.dm +++ b/code/modules/clothing/suits/miscellaneous_vr.dm @@ -85,6 +85,12 @@ icon_state = "whitedress1" flags_inv = HIDESHOES +/obj/item/clothing/suit/taur/skirt + name = "taur skirt" + desc = "A skirt with a corset, fit for those with four legs." + icon_state = "skirt_colorable" + flags_inv = HIDESHOES + /obj/item/clothing/suit/storage/det_trench/alt name = "sleek modern coat" desc = "A sleek overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside." diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index ef719641c9..5cbc95ef9f 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -376,4 +376,8 @@ name = "Central Command undersuit" desc = "A very descript undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for NanoTrasen Central Command officers, and comes with a swanky gold trim and other fancy markings." icon_state = "bodysuit_cent" - item_state = "bodysuit_cent" \ No newline at end of file +<<<<<<< HEAD + item_state = "bodysuit_cent" +======= + item_state = "bodysuit_cent" +>>>>>>> 15b60b17e2... Merge pull request #13710 from Novacat/nova-basicfixes