diff --git a/code/modules/client/preference_setup/loadout/loadout_gloves.dm b/code/modules/client/preference_setup/loadout/loadout_gloves.dm index 6530edf321..00eaa73629 100644 --- a/code/modules/client/preference_setup/loadout/loadout_gloves.dm +++ b/code/modules/client/preference_setup/loadout/loadout_gloves.dm @@ -65,6 +65,7 @@ ..() var/list/selector_uniforms = list( "black"=/obj/item/clothing/gloves/fingerless, + "black, alt" =/obj/item/clothing/gloves/fingerless/alt, "recolourable white"=/obj/item/clothing/gloves/fingerless_recolourable ) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 447c11da19..8e04fc6dcc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -419,3 +419,18 @@ /datum/gear/head/giantbow/New() ..() gear_tweaks += gear_tweak_free_color_choice + + +/datum/gear/head/bows + display_name = "hair bow selection, colorable" + path = /obj/item/clothing/head/bow + +/datum/gear/head/bows/New() + ..() + var/list/bows = list( + "large bow"=/obj/item/clothing/head/bow, + "small bow"=/obj/item/clothing/head/bow/small, + "back bow"=/obj/item/clothing/head/bow/back, + "sweet bow"=/obj/item/clothing/head/bow/sweet + ) + gear_tweaks += list(new/datum/gear_tweak/path(bows), gear_tweak_free_color_choice) diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index 2b4a55b53c..6376f2f134 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -37,6 +37,14 @@ display_name = "jackboots. thigh-length" path = /obj/item/clothing/shoes/boots/jackboots/thigh +/datum/gear/shoes/colorboots + display_name = "jackboots, recolorable" + path = /obj/item/clothing/shoes/boots/jackboots/recolorable + +/datum/gear/shoes/colorboots/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + /datum/gear/shoes/workboots display_name = "workboots" path = /obj/item/clothing/shoes/boots/workboots @@ -264,3 +272,11 @@ /datum/gear/shoes/halfmoon display_name = "half moon boots" path = /obj/item/clothing/shoes/boots/half_moon + +/datum/gear/shoes/sandals + display_name = "sandals, colorable" + path = /obj/item/clothing/shoes/sandals + +/datum/gear/shoes/sandals/New() + ..() + gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index e40d768c3f..6cd36ceb4a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -324,6 +324,15 @@ ) gear_tweaks += new/datum/gear_tweak/path(ranger_ponchos) +/datum/gear/suit/neo_ranger //colorable ranger poncho + display_name = "ranger poncho, colorable" + path = /obj/item/clothing/accessory/poncho/roles/neo_ranger + cost = 1 + +/datum/gear/suit/neo_ranger/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + /datum/gear/suit/unathi_robe display_name = "roughspun robe" path = /obj/item/clothing/suit/unathi/robe @@ -737,7 +746,15 @@ ) gear_tweaks += new/datum/gear_tweak/path(hoodedcloaks) -//nerdy shirt +//oversized shirts /datum/gear/suit/nerdshirt display_name = "nerdy shirt" path = /obj/item/clothing/suit/nerdshirt + +/datum/gear/suit/ianshirt + display_name = "worn corgi shirt" + path = /obj/item/clothing/suit/ianshirt + +/datum/gear/suit/wornshirt + display_name = "worn shirt" + path = /obj/item/clothing/suit/wornshirt diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 8c24a62bd3..8f2a228974 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -594,6 +594,19 @@ ) gear_tweaks += list(new/datum/gear_tweak/path(turtlebaggys)) +//colorable sweaters +/datum/gear/uniform/bigsweaters + display_name = "sweater selection, colorable" + path = /obj/item/clothing/under/bigsweater + +/datum/gear/uniform/bigsweaters/New() + ..() + var/list/bigsweaters = list( + "cableknit sweater"=/obj/item/clothing/under/bigsweater, + "keyhole sweater"=/obj/item/clothing/under/bigsweater/keyhole + ) + gear_tweaks += list(new/datum/gear_tweak/path(bigsweaters), gear_tweak_free_color_choice) + //half-moon outfit /datum/gear/uniform/halfmoon display_name = "half moon outfit" 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 015de2ae95..13df77c683 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -178,6 +178,7 @@ Talon jumpsuit "puffy skirt"=/obj/item/clothing/under/skirt/colorable/puffy, "skater skirt"=/obj/item/clothing/under/skirt/colorable/skater, "pleated skirt"=/obj/item/clothing/under/skirt/colorable/pleated, + "pleated skirt, alt"=/obj/item/clothing/under/skirt/colorable/pleated/alt, "pencil skirt"=/obj/item/clothing/under/skirt/colorable/pencil, "plaid skirt"=/obj/item/clothing/under/skirt/colorable/plaid, "tube skirt"=/obj/item/clothing/under/skirt/colorable/tube, diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 6ea23547a0..00ad6d86c6 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -162,8 +162,11 @@ icon_state = "fingerlessgloves" fingerprint_chance = 100 +/obj/item/clothing/gloves/fingerless/alt + icon_state = "fingerlessgloves_alt" + /obj/item/clothing/gloves/fingerless_recolourable desc = "A pair of gloves that don't actually cover the fingers." name = "fingerless gloves" icon_state = "fingerlessgloves_rc" - fingerprint_chance = 100 \ No newline at end of file + fingerprint_chance = 100 diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index e4d98893b9..a19acc8786 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -563,3 +563,26 @@ icon_state = "redtag" flags_inv = HIDEEARS|BLOCKHEADHAIR body_parts_covered = HEAD|EYES + +//hair bows + +/obj/item/clothing/head/bow + name = "large bow" + desc = "A large bow that you can place on top of your head." + icon_state = "large_bow" + body_parts_covered = 0 + +/obj/item/clothing/head/bow/small + name = "small bow" + desc = "A small compact bow that you can place on the side of your hair." + icon_state = "small_bow" + +/obj/item/clothing/head/bow/back + name = "back bow" + desc = "A large bow that you can place on the back of your head." + icon_state = "back_bow" + +/obj/item/clothing/head/bow/sweet + name = "sweet bow" + desc = "A sweet bow that you can place on the back of your head." + icon_state = "sweet_bow" diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index c9cddd3367..cb9a5be0e8 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -95,6 +95,9 @@ item_state_slots = list(slot_r_hand_str = "jackboots", slot_l_hand_str = "jackboots") species_restricted = null +/obj/item/clothing/shoes/boots/jackboots/recolorable + icon_state = "boots_recolor" + /obj/item/clothing/shoes/boots/workboots name = "workboots" desc = "A pair of steel-toed work boots designed for use in industrial settings. Safety first." diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index a34b471866..75b8f5da70 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -48,6 +48,11 @@ wizard_garb = 1 +/obj/item/clothing/shoes/sandals + desc = "A pair of simple sandals." + name = "sandals" + icon_state = "sandals_recolor" + /obj/item/clothing/shoes/flipflop name = "flip flops" desc = "A pair of foam flip flops. For those not afraid to show a little ankle." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 4871b3aedd..381aef499f 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -320,7 +320,7 @@ H.drop_from_inventory(H.handcuffed) /obj/item/clothing/suit/ianshirt - name = "worn shirt" + name = "worn corgi shirt" desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in." icon_state = "ianshirt" item_state_slots = list(slot_r_hand_str = "labcoat", slot_l_hand_str = "labcoat") //placeholder -S2- @@ -333,6 +333,11 @@ desc = "A comfy white t-shirt with a picture of a cartoon hedgehog on it. Although clean, it still seems like the wearer should be embarrassed for owning it." icon_state = "nerdshirt" +/obj/item/clothing/suit/wornshirt + name = "worn shirt" + desc = "A worn out (or perhaps just baggy), curiously comfortable t-shirt." + icon_state = "wornshirt" + /* * Kimonos */ diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 48ab4635f4..80f2f639fa 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -1172,3 +1172,31 @@ desc = "Barely more than a pair of long stirrup sleeves joined by a turtleneck. Has decorative red accents." icon_state = "gestaltjacket" item_state = "gestaltjacket" + +//Neo Ranger Poncho + +/obj/item/clothing/accessory/poncho/roles/neo_ranger + name = "ranger poncho" + desc = "Aim for the Heart, Ramon." + icon_state = "neo_ranger" + item_state = "neo_ranger" + action_button_name = "Adjust Poncho" + +/obj/item/clothing/accessory/poncho/roles/neo_ranger/update_clothing_icon() + . = ..() + if(ismob(src.loc)) + var/mob/M = src.loc + M.update_inv_wear_suit() + +/obj/item/clothing/accessory/poncho/roles/neo_ranger/attack_self(mob/user as mob) + if(src.icon_state == initial(icon_state)) + src.icon_state = "[icon_state]_open" + src.item_state = "[item_state]_open" + flags_inv = HIDETIE|HIDEHOLSTER + to_chat(user, "You adjust your poncho.") + else + src.icon_state = initial(icon_state) + src.item_state = initial(item_state) + flags_inv = HIDEHOLSTER + to_chat(user, "You adjust your poncho.") + update_clothing_icon() diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 8d88893235..331b0395a2 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -1694,6 +1694,24 @@ name = "feminine black baggy turtleneck" icon_state = "bb_turtleblk_fem" +//more big sweaters + +/obj/item/clothing/under/bigsweater + name = "cableknit sweater" + desc = "Why trade style for comfort?" + icon_state = "cableknit" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + +/obj/item/clothing/under/bigsweater/keyhole + icon_state = "keyhole" + +/obj/item/clothing/under/keyhole + name = "cableknit sweater" + desc = "Why trade style for comfort?." + icon_state = "cableknit" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + + //half-moon outfit /obj/item/clothing/under/half_moon name = "half moon outfit" diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 26cdc0334d..bfb1dade74 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -465,6 +465,11 @@ item_state = "skirt_pleated" worn_state = "skirt_pleated" +/obj/item/clothing/under/skirt/colorable/pleated/alt + icon_state = "skirt_pleated_alt" + item_state = "skirt_pleated_alt" + worn_state = "skirt_pleated_alt" + /obj/item/clothing/under/skirt/colorable/pencil name = "pencil skirt" desc = "A short skirt that's almost as thin as a pencil. Almost." diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi index 22d585b770..75e7676a56 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 a8281d1a2e..b831971994 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ diff --git a/icons/inventory/feet/item.dmi b/icons/inventory/feet/item.dmi index 4d245a97a7..c11f0908da 100644 Binary files a/icons/inventory/feet/item.dmi and b/icons/inventory/feet/item.dmi differ diff --git a/icons/inventory/feet/mob.dmi b/icons/inventory/feet/mob.dmi index f53d917139..72b1822963 100644 Binary files a/icons/inventory/feet/mob.dmi and b/icons/inventory/feet/mob.dmi differ diff --git a/icons/inventory/feet/mob_digi.dmi b/icons/inventory/feet/mob_digi.dmi index c2a1a9ab82..71cecdb2cd 100644 Binary files a/icons/inventory/feet/mob_digi.dmi and b/icons/inventory/feet/mob_digi.dmi differ diff --git a/icons/inventory/hands/item.dmi b/icons/inventory/hands/item.dmi index dab4fb8cca..228d799923 100644 Binary files a/icons/inventory/hands/item.dmi and b/icons/inventory/hands/item.dmi differ diff --git a/icons/inventory/hands/mob.dmi b/icons/inventory/hands/mob.dmi index 676ed2fe54..e1825ca97c 100644 Binary files a/icons/inventory/hands/mob.dmi and b/icons/inventory/hands/mob.dmi differ diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index 7897ed2207..45f1e9807e 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 8f7e232b3d..af3083f5f7 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index 3d92d18214..771fdd6451 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index 9a1f2e9f4d..fae81888ac 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index 9e143e828c..16b3b53f64 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/item_vr.dmi b/icons/inventory/uniform/item_vr.dmi index 26b5ff60a3..6e0d72e90a 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 90c0f33c65..487a0d9e17 100644 Binary files a/icons/inventory/uniform/mob_vr.dmi and b/icons/inventory/uniform/mob_vr.dmi differ