diff --git a/code/datums/underwear/undershirts.dm b/code/datums/underwear/undershirts.dm index 9b7571e1d1..41b0499b3a 100644 --- a/code/datums/underwear/undershirts.dm +++ b/code/datums/underwear/undershirts.dm @@ -252,3 +252,33 @@ name = "Leotard" icon_state = "leotard" has_color = TRUE + +/datum/category_item/underwear/undershirt/tshirt + name = "Feminine T-Shirt" + icon_state = "t-shirt_full" + has_color = TRUE + +/datum/category_item/underwear/undershirt/tshirt_midriff + name = "Feminine T-Shirt (midriff)" + icon_state = "t-shirt_midriff" + has_color = TRUE + +/datum/category_item/underwear/undershirt/tshirt_shoulders + name = "Feminine T-Shirt (black with shoulders)" + icon_state = "t-shirt_full_shoulders" + has_color = TRUE + +/datum/category_item/underwear/undershirt/tshirt_midriff_shoulders + name = "Feminine T-Shirt (midriff, black with shoulders)" + icon_state = "t-shirt_midriff_shoulders" + has_color = TRUE + +/datum/category_item/underwear/undershirt/tshirt_shoulders_text + name = "Feminine T-Shirt (black with shoulders and text)" + icon_state = "t-shirt_full_shoulders_text" + has_color = TRUE + +/datum/category_item/underwear/undershirt/tshirt_midriff_shoulders_text + name = "Feminine T-Shirt (midriff, black with shoulders and text)" + icon_state = "t-shirt_midriff_shoulders_text" + has_color = TRUE diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 0fd6852bc7..745d25c2e3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -555,3 +555,17 @@ Talon pin ) gear_tweaks += new/datum/gear_tweak/path(insignia) +/datum/gear/accessory/belt_selection + display_name = "belts (selection, colorable)" + path = /obj/item/clothing/accessory/belt + +/datum/gear/accessory/belt_selection/New() + ..() + var/list/wristband_lists = list( + "Thin Belt" = /obj/item/clothing/accessory/belt, + "Thick Belt" = /obj/item/clothing/accessory/belt/thick, + "Strap Belt" = /obj/item/clothing/accessory/belt/strap, + "Studded Belt" = /obj/item/clothing/accessory/belt/studded + ) + gear_tweaks += new/datum/gear_tweak/path(wristband_lists) + gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 2c7975bebe..1fd4ff3e87 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -186,7 +186,9 @@ Talon jumpsuit "high skirt"=/obj/item/clothing/under/skirt/colorable/high, "swept skirt"=/obj/item/clothing/under/skirt/colorable/swept, "jumper skirt"=/obj/item/clothing/under/skirt/colorable/jumper, - "jumper dress"=/obj/item/clothing/under/skirt/colorable/jumperdress + "jumper dress"=/obj/item/clothing/under/skirt/colorable/jumperdress, + "short skirt"=/obj/item/clothing/under/skirt/colorable/short, + "short skirt (split)"=/obj/item/clothing/under/skirt/colorable/short_split ) gear_tweaks += list(new/datum/gear_tweak/path(skirts), gear_tweak_free_color_choice) diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index e44ff943f4..b2b3f41d2d 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -1200,3 +1200,31 @@ flags_inv = HIDEHOLSTER to_chat(user, "You adjust your poncho.") update_clothing_icon() + +/obj/item/clothing/accessory/belt + name = "Thin Belt" + desc = "A thin belt for holding your pants up." + icon = 'icons/inventory/accessory/item.dmi' + icon_override = 'icons/inventory/accessory/mob.dmi' + icon_state = "belt_thin" + item_state = "belt_thin" + slot_flags = SLOT_TIE | SLOT_BELT + slot = ACCESSORY_SLOT_DECOR + +/obj/item/clothing/accessory/belt/thick + name = "Thick Belt" + desc = "A thick belt for holding your pants up." + icon_state = "belt_thick" + item_state = "belt_thick" + +/obj/item/clothing/accessory/belt/strap + name = "Strap Belt" + desc = "A belt with no bucklet for holding your pants up." + icon_state = "belt_strap" + item_state = "belt_strap" + +/obj/item/clothing/accessory/belt/studded + name = "Studded Belt" + desc = "A studded belt for holding your pants up and looking cool." + icon_state = "belt_studded" + item_state = "belt_studded" diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index bfb1dade74..922d32a8d3 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -524,6 +524,20 @@ item_state = "skirt_jumperdress" worn_state = "skirt_jumperdress" +/obj/item/clothing/under/skirt/colorable/short + name = "short skirt" + desc = "A far too short pleated skirt." + icon_state = "skirt_short" + item_state = "skirt_short" + worn_state = "skirt_short" + +/obj/item/clothing/under/skirt/colorable/short_split + name = "short skirt (split)" + desc = "A far too short pleated skirt with an open split down one side." + icon_state = "skirt_short_split" + item_state = "skirt_short_split" + worn_state = "skirt_short_split" + // Gwen Beedell's clown outfit /obj/item/clothing/under/stripeddungarees diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 4495d004d0..04bfcf0594 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -622,6 +622,10 @@ /obj/item/clothing/accessory/wristbandcollection/trans = 5, /obj/item/clothing/accessory/wristbandcollection/ace = 5, /obj/item/clothing/accessory/wristband_spiked = 5, + /obj/item/clothing/accessory/belt = 5, + /obj/item/clothing/accessory/belt/thick = 5, + /obj/item/clothing/accessory/belt/strap = 5, + /obj/item/clothing/accessory/belt/studded = 5, /obj/item/weapon/storage/wallet = 5, /obj/item/weapon/storage/wallet/poly = 5, /obj/item/weapon/storage/wallet/womens = 5, @@ -763,6 +767,10 @@ /obj/item/clothing/accessory/wristbandcollection/trans = 30, /obj/item/clothing/accessory/wristbandcollection/ace = 30, /obj/item/clothing/accessory/wristband_spiked = 20, + /obj/item/clothing/accessory/belt = 50, + /obj/item/clothing/accessory/belt/thick = 50, + /obj/item/clothing/accessory/belt/strap = 50, + /obj/item/clothing/accessory/belt/studded = 50, /obj/item/weapon/storage/wallet = 50, /obj/item/weapon/storage/wallet/poly = 50, /obj/item/weapon/storage/wallet/womens = 50, @@ -911,6 +919,8 @@ /obj/item/clothing/under/ascetic = 5, /obj/item/clothing/under/dress/white3 = 5, /obj/item/clothing/under/skirt/pleated = 5, + /obj/item/clothing/under/skirt/colorable/short = 5, + /obj/item/clothing/under/skirt/colorable/short_split = 5, /obj/item/clothing/under/dress/darkred = 5, /obj/item/clothing/under/dress/redeveninggown = 5, /obj/item/clothing/under/dress/red_swept_dress = 5, @@ -1095,6 +1105,8 @@ /obj/item/clothing/under/ascetic = 50, /obj/item/clothing/under/dress/white3 = 50, /obj/item/clothing/under/skirt/pleated = 50, + /obj/item/clothing/under/skirt/colorable/short = 50, + /obj/item/clothing/under/skirt/colorable/short_split = 50, /obj/item/clothing/under/dress/darkred = 50, /obj/item/clothing/under/dress/redeveninggown = 50, /obj/item/clothing/under/dress/red_swept_dress = 50, @@ -2220,6 +2232,8 @@ /obj/item/clothing/under/skirt/red = 5, /obj/item/clothing/under/skirt/denim = 5, /obj/item/clothing/under/skirt/pleated = 5, + /obj/item/clothing/under/skirt/colorable/short = 5, + /obj/item/clothing/under/skirt/colorable/short_split = 5, /obj/item/clothing/under/skirt/outfit/plaid_blue = 5, /obj/item/clothing/under/skirt/outfit/plaid_red = 5, /obj/item/clothing/under/skirt/outfit/plaid_purple = 5, diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi index b2f5303784..2782922a7a 100644 Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi index b2bd322770..587ec87128 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ diff --git a/icons/inventory/uniform/item_vr.dmi b/icons/inventory/uniform/item_vr.dmi index 6e0d72e90a..59176816e6 100644 Binary files a/icons/inventory/uniform/item_vr.dmi and b/icons/inventory/uniform/item_vr.dmi differ diff --git a/icons/inventory/uniform/mob_vr.dmi b/icons/inventory/uniform/mob_vr.dmi index 487a0d9e17..aad2c467f9 100644 Binary files a/icons/inventory/uniform/mob_vr.dmi and b/icons/inventory/uniform/mob_vr.dmi differ diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi index 1fc987773e..22bfb58bd1 100644 Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ