diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 00cb50070bb..9189d9fbc64 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -7325,12 +7325,12 @@ /area/ruin/space/ks13/service/hydro) "VG" = ( /obj/structure/closet/crate, -/obj/item/clothing/head/beanie/rasta, +/obj/item/clothing/head/rasta, /obj/item/clothing/head/beanie/black, /obj/item/clothing/head/beanie/christmas, /obj/item/clothing/head/beanie/darkblue, /obj/item/clothing/head/beanie/red, -/obj/item/clothing/head/beanie/waldo, +/obj/item/clothing/head/waldo, /obj/item/clothing/head/bearpelt, /obj/item/clothing/head/beret, /obj/item/clothing/head/bomb_hood, diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index a3177e1e0dd..6cff299440e 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -2711,7 +2711,7 @@ /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/shoes/winterboots, /obj/item/clothing/shoes/winterboots, -/obj/item/clothing/neck/stripedbluescarf, +/obj/item/clothing/neck/large_scarf/blue, /turf/open/floor/wood, /area/awaymission/cabin) "jv" = ( @@ -2723,7 +2723,7 @@ /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/shoes/winterboots, /obj/item/clothing/shoes/winterboots, -/obj/item/clothing/neck/stripedgreenscarf, +/obj/item/clothing/neck/large_scarf/green, /turf/open/floor/wood, /area/awaymission/cabin) "jw" = ( @@ -2735,7 +2735,7 @@ /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/shoes/winterboots, /obj/item/clothing/shoes/winterboots, -/obj/item/clothing/neck/stripedredscarf, +/obj/item/clothing/neck/large_scarf/red, /turf/open/floor/wood, /area/awaymission/cabin) "jx" = ( diff --git a/_maps/map_files/Blueshift/BlueShift_middle.dmm b/_maps/map_files/Blueshift/BlueShift_middle.dmm index 0b7f78a2799..79335e9eead 100644 --- a/_maps/map_files/Blueshift/BlueShift_middle.dmm +++ b/_maps/map_files/Blueshift/BlueShift_middle.dmm @@ -3396,7 +3396,7 @@ pixel_x = -7 }, /obj/item/clothing/under/pants/denimskirt, -/obj/item/clothing/under/pants/khaki{ +/obj/item/clothing/under/pants/slacks{ pixel_x = 7; pixel_y = -8 }, @@ -10077,14 +10077,14 @@ pixel_x = 8; pixel_y = 8 }, -/obj/item/clothing/under/pants/blackjeans{ +/obj/item/clothing/under/pants/jeans{ pixel_y = -7 }, /obj/item/clothing/under/pants/camo{ pixel_x = -8; pixel_y = -7 }, -/obj/item/clothing/under/pants/classicjeans{ +/obj/item/clothing/under/pants/jeans{ pixel_x = 8; pixel_y = -6 }, @@ -20751,10 +20751,10 @@ pixel_x = -5; pixel_y = 2 }, -/obj/item/clothing/head/beanie/cyan{ +/obj/item/clothing/head/beanie{ pixel_y = 2 }, -/obj/item/clothing/head/beanie/green{ +/obj/item/clothing/head/beanie{ pixel_x = 4; pixel_y = 2 }, @@ -20762,7 +20762,7 @@ pixel_x = -5; pixel_y = -3 }, -/obj/item/clothing/head/beanie/purple{ +/obj/item/clothing/head/beanie{ pixel_y = -3 }, /obj/item/clothing/head/beanie/yellow{ diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 64909ddab0a..b2a1d340493 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -4425,7 +4425,7 @@ dir = 1 }, /obj/structure/cable, -/obj/item/clothing/head/beanie/stripedred, +/obj/item/clothing/head/beanie/red, /turf/open/floor/iron, /area/mine/laborcamp/security) "bse" = ( @@ -50731,7 +50731,7 @@ /obj/structure/closet/secure_closet/personal{ anchored = 1 }, -/obj/item/clothing/under/pants/youngfolksjeans, +/obj/item/clothing/under/pants/jeans, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) "pDi" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 50d86bdb2a0..0d9437741cf 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -5590,7 +5590,7 @@ /obj/item/clothing/accessory/waistcoat, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/shoes/laceup, -/obj/item/clothing/neck/stripedredscarf, +/obj/item/clothing/neck/large_scarf/red, /obj/item/clothing/neck/tie/red, /obj/item/clothing/head/helmet/space/beret, /obj/item/clothing/suit/jacket/curator, @@ -6317,13 +6317,6 @@ }, /turf/open/floor/plating/abductor, /area/centcom/abductor_ship) -"sj" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/airlock/centcom{ - name = "Thunderdome Administration" - }, -/turf/open/floor/plating, -/area/centcom/tdome/administration) "sk" = ( /turf/open/floor/plating/icemoon, /area/centcom/syndicate_mothership/control) @@ -12129,6 +12122,17 @@ }, /turf/open/floor/iron, /area/centcom/tdome/arena) +"Je" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/item/clothing/head/festive{ + pixel_x = -4; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) "Jg" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -58349,7 +58353,7 @@ lo nG iF yd -oM +Je pi FO Tq @@ -66616,7 +66620,7 @@ pO HE Sl SU -sj +Wn Vl bM Wn diff --git a/_maps/map_files/generic/CentCom_skyrat.dmm b/_maps/map_files/generic/CentCom_skyrat.dmm index b61facbb87a..fd34b121170 100644 --- a/_maps/map_files/generic/CentCom_skyrat.dmm +++ b/_maps/map_files/generic/CentCom_skyrat.dmm @@ -5649,7 +5649,7 @@ /obj/item/clothing/accessory/waistcoat, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/shoes/laceup, -/obj/item/clothing/neck/stripedredscarf, +/obj/item/clothing/neck/large_scarf/red, /obj/item/clothing/neck/tie/red, /obj/item/clothing/head/helmet/space/beret, /obj/item/clothing/suit/jacket/curator, diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 6befdad9ed6..97bedf4bc76 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -340,7 +340,7 @@ /area/centcom/holding/cafepark) "agV" = ( /obj/structure/closet/wardrobe/grey, -/obj/item/clothing/under/dress/blacktango, +/obj/item/clothing/under/dress/tango, /obj/item/clothing/under/dress/redeveninggown, /obj/item/clothing/under/misc/polyjumpsuit, /obj/item/clothing/under/misc/polyjumpsuit, diff --git a/_maps/shuttles/whiteship_tram.dmm b/_maps/shuttles/whiteship_tram.dmm index f7dde4430bc..71149933075 100644 --- a/_maps/shuttles/whiteship_tram.dmm +++ b/_maps/shuttles/whiteship_tram.dmm @@ -557,7 +557,7 @@ /obj/item/clothing/shoes/jackboots, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/under/syndicate/coldres, -/obj/item/clothing/neck/stripedbluescarf, +/obj/item/clothing/neck/large_scarf/blue, /obj/item/clothing/head/beret/centcom_formal, /obj/item/clothing/suit/armor/vest, /obj/effect/turf_decal/bot_white, diff --git a/_maps/templates/holodeck_winterwonderland.dmm b/_maps/templates/holodeck_winterwonderland.dmm index af4c5f16e96..6ab85e235b9 100644 --- a/_maps/templates/holodeck_winterwonderland.dmm +++ b/_maps/templates/holodeck_winterwonderland.dmm @@ -78,7 +78,7 @@ /turf/open/floor/holofloor/snow, /area/template_noop) "H" = ( -/obj/item/clothing/neck/stripedredscarf{ +/obj/item/clothing/neck/large_scarf/red{ pixel_x = -3; pixel_y = -5 }, diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index 66662587d04..86949a7ba1a 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/code/datums/greyscale/config_types/greyscale_configs.dm @@ -573,6 +573,116 @@ icon_file = 'icons/mob/clothing/head.dmi' json_config = 'code/datums/greyscale/json_configs/heck_helmet_worn.json' +/datum/greyscale_config/plaidskirt + name = "Plaid Skirt" + icon_file = 'icons/obj/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/plaidskirt.json' + +/datum/greyscale_config/plaidskirt_worn + name = "Worn Plaid Skirt" + icon_file = 'icons/mob/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/plaidskirt_worn.json' + +/datum/greyscale_config/turtleskirt + name = "Skirtleneck" + icon_file = 'icons/obj/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/turtleskirt.json' + +/datum/greyscale_config/turtleskirt_worn + name = "Worn Skirtleneck" + icon_file = 'icons/mob/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/turtleskirt_worn.json' + +/datum/greyscale_config/tango + name = "Tango Dress" + icon_file = 'icons/obj/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/tango.json' + +/datum/greyscale_config/tango_worn + name = "Worn Tango Dress" + icon_file = 'icons/mob/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/tango_worn.json' + +/datum/greyscale_config/sundress + name = "Sundress" + icon_file = 'icons/obj/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/sundress.json' + +/datum/greyscale_config/sundress_worn + name = "Worn Sundress" + icon_file = 'icons/mob/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/sundress_worn.json' + +/datum/greyscale_config/beanie + name = "Beanie" + icon_file = 'icons/obj/clothing/hats.dmi' + json_config = 'code/datums/greyscale/json_configs/beanie.json' + +/datum/greyscale_config/beanie_worn + name = "Worn Beanie" + icon_file = 'icons/mob/clothing/head.dmi' + json_config = 'code/datums/greyscale/json_configs/beanie_worn.json' + +/datum/greyscale_config/scarf + name = "Scarf" + icon_file = 'icons/obj/clothing/neck.dmi' + json_config = 'code/datums/greyscale/json_configs/scarf.json' + +/datum/greyscale_config/scarf_worn + name = "Worn Scarf" + icon_file = 'icons/mob/clothing/neck.dmi' + json_config = 'code/datums/greyscale/json_configs/scarf_worn.json' + +/datum/greyscale_config/large_scarf + name = "Large Scarf" + icon_file = 'icons/obj/clothing/neck.dmi' + json_config = 'code/datums/greyscale/json_configs/large_scarf.json' + +/datum/greyscale_config/large_scarf_worn + name = "Worn Large Scarf" + icon_file = 'icons/mob/clothing/neck.dmi' + json_config = 'code/datums/greyscale/json_configs/large_scarf_worn.json' + +/datum/greyscale_config/slacks + name = "Slacks" + icon_file = 'icons/obj/clothing/under/shorts_pants.dmi' + json_config = 'code/datums/greyscale/json_configs/slacks.json' + +/datum/greyscale_config/slacks_worn + name = "Worn Slacks" + icon_file = 'icons/mob/clothing/under/shorts_pants.dmi' + json_config = 'code/datums/greyscale/json_configs/slacks_worn.json' + +/datum/greyscale_config/shorts + name = "Shorts" + icon_file = 'icons/obj/clothing/under/shorts_pants.dmi' + json_config = 'code/datums/greyscale/json_configs/shorts.json' + +/datum/greyscale_config/shorts_worn + name = "Worn Shorts" + icon_file = 'icons/mob/clothing/under/shorts_pants.dmi' + json_config = 'code/datums/greyscale/json_configs/shorts_worn.json' + +/datum/greyscale_config/jeans + name = "Jeans" + icon_file = 'icons/obj/clothing/under/shorts_pants.dmi' + json_config = 'code/datums/greyscale/json_configs/jeans.json' + +/datum/greyscale_config/jeans_worn + name = "Worn Jeans" + icon_file = 'icons/mob/clothing/under/shorts_pants.dmi' + json_config = 'code/datums/greyscale/json_configs/jeans_worn.json' + +/datum/greyscale_config/jeanshorts + name = "Jean Shorts" + icon_file = 'icons/obj/clothing/under/shorts_pants.dmi' + json_config = 'code/datums/greyscale/json_configs/jeanshorts.json' + +/datum/greyscale_config/jeanshorts_worn + name = "Worn Jean Shorts" + icon_file = 'icons/mob/clothing/under/shorts_pants.dmi' + json_config = 'code/datums/greyscale/json_configs/jeanshorts_worn.json' + /datum/greyscale_config/tape name = "Tape" icon_file = 'icons/obj/tapes.dmi' diff --git a/code/datums/greyscale/json_configs/beanie.json b/code/datums/greyscale/json_configs/beanie.json new file mode 100644 index 00000000000..94865d64cbf --- /dev/null +++ b/code/datums/greyscale/json_configs/beanie.json @@ -0,0 +1,16 @@ +{ + "beanie": [ + { + "type": "icon_state", + "icon_state": "beanie_stripe", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "beanie_base", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/beanie_worn.json b/code/datums/greyscale/json_configs/beanie_worn.json new file mode 100644 index 00000000000..94865d64cbf --- /dev/null +++ b/code/datums/greyscale/json_configs/beanie_worn.json @@ -0,0 +1,16 @@ +{ + "beanie": [ + { + "type": "icon_state", + "icon_state": "beanie_stripe", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "beanie_base", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/jeans.json b/code/datums/greyscale/json_configs/jeans.json new file mode 100644 index 00000000000..a384f52d8f0 --- /dev/null +++ b/code/datums/greyscale/json_configs/jeans.json @@ -0,0 +1,22 @@ +{ + "jeans": [ + { + "type": "icon_state", + "icon_state": "jeans_buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "jeans_belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "jeans_base", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/jeans_worn.json b/code/datums/greyscale/json_configs/jeans_worn.json new file mode 100644 index 00000000000..a384f52d8f0 --- /dev/null +++ b/code/datums/greyscale/json_configs/jeans_worn.json @@ -0,0 +1,22 @@ +{ + "jeans": [ + { + "type": "icon_state", + "icon_state": "jeans_buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "jeans_belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "jeans_base", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/jeanshorts.json b/code/datums/greyscale/json_configs/jeanshorts.json new file mode 100644 index 00000000000..6cb7bd7cbb6 --- /dev/null +++ b/code/datums/greyscale/json_configs/jeanshorts.json @@ -0,0 +1,22 @@ +{ + "jeanshorts": [ + { + "type": "icon_state", + "icon_state": "jeanshorts_buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "jeanshorts_belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "jeanshorts_base", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/jeanshorts_worn.json b/code/datums/greyscale/json_configs/jeanshorts_worn.json new file mode 100644 index 00000000000..6cb7bd7cbb6 --- /dev/null +++ b/code/datums/greyscale/json_configs/jeanshorts_worn.json @@ -0,0 +1,22 @@ +{ + "jeanshorts": [ + { + "type": "icon_state", + "icon_state": "jeanshorts_buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "jeanshorts_belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "jeanshorts_base", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/large_scarf.json b/code/datums/greyscale/json_configs/large_scarf.json new file mode 100644 index 00000000000..f6804e37831 --- /dev/null +++ b/code/datums/greyscale/json_configs/large_scarf.json @@ -0,0 +1,16 @@ +{ + "large_scarf": [ + { + "type": "icon_state", + "icon_state": "large_scarf_stripe", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "large_scarf_base", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/large_scarf_worn.json b/code/datums/greyscale/json_configs/large_scarf_worn.json new file mode 100644 index 00000000000..f6804e37831 --- /dev/null +++ b/code/datums/greyscale/json_configs/large_scarf_worn.json @@ -0,0 +1,16 @@ +{ + "large_scarf": [ + { + "type": "icon_state", + "icon_state": "large_scarf_stripe", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "large_scarf_base", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/plaidskirt.json b/code/datums/greyscale/json_configs/plaidskirt.json new file mode 100644 index 00000000000..9cd6e3e0363 --- /dev/null +++ b/code/datums/greyscale/json_configs/plaidskirt.json @@ -0,0 +1,15 @@ +{ + "plaidskirt": [ + { + "type": "icon_state", + "icon_state": "plaidskirt_plaid", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "plaidskirt_base", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/plaidskirt_worn.json b/code/datums/greyscale/json_configs/plaidskirt_worn.json new file mode 100644 index 00000000000..8be645b21f0 --- /dev/null +++ b/code/datums/greyscale/json_configs/plaidskirt_worn.json @@ -0,0 +1,28 @@ +{ + "plaidskirt": [ + { + "type": "icon_state", + "icon_state": "plaidskirt_plaid", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "plaidskirt_base", + "blend_mode": "overlay" + } + ], + "plaidskirt_d" : [ + { + "type": "icon_state", + "icon_state": "plaidskirt_plaid_d", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "plaidskirt_base_d", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/scarf.json b/code/datums/greyscale/json_configs/scarf.json new file mode 100644 index 00000000000..7fb7a068532 --- /dev/null +++ b/code/datums/greyscale/json_configs/scarf.json @@ -0,0 +1,16 @@ +{ + "scarf": [ + { + "type": "icon_state", + "icon_state": "scarf_stripe", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "scarf_base", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/scarf_worn.json b/code/datums/greyscale/json_configs/scarf_worn.json new file mode 100644 index 00000000000..7fb7a068532 --- /dev/null +++ b/code/datums/greyscale/json_configs/scarf_worn.json @@ -0,0 +1,16 @@ +{ + "scarf": [ + { + "type": "icon_state", + "icon_state": "scarf_stripe", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "scarf_base", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/shorts.json b/code/datums/greyscale/json_configs/shorts.json new file mode 100644 index 00000000000..7e05907121d --- /dev/null +++ b/code/datums/greyscale/json_configs/shorts.json @@ -0,0 +1,22 @@ +{ + "shorts": [ + { + "type": "icon_state", + "icon_state": "shorts_buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "shorts_belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "shorts_base", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/shorts_worn.json b/code/datums/greyscale/json_configs/shorts_worn.json new file mode 100644 index 00000000000..7e05907121d --- /dev/null +++ b/code/datums/greyscale/json_configs/shorts_worn.json @@ -0,0 +1,22 @@ +{ + "shorts": [ + { + "type": "icon_state", + "icon_state": "shorts_buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "shorts_belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "shorts_base", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/slacks.json b/code/datums/greyscale/json_configs/slacks.json new file mode 100644 index 00000000000..5393378daec --- /dev/null +++ b/code/datums/greyscale/json_configs/slacks.json @@ -0,0 +1,22 @@ +{ + "slacks": [ + { + "type": "icon_state", + "icon_state": "slacks_buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "slacks_belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "slacks_base", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/slacks_worn.json b/code/datums/greyscale/json_configs/slacks_worn.json new file mode 100644 index 00000000000..5393378daec --- /dev/null +++ b/code/datums/greyscale/json_configs/slacks_worn.json @@ -0,0 +1,22 @@ +{ + "slacks": [ + { + "type": "icon_state", + "icon_state": "slacks_buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "slacks_belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "slacks_base", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/sundress.json b/code/datums/greyscale/json_configs/sundress.json new file mode 100644 index 00000000000..41435dbb658 --- /dev/null +++ b/code/datums/greyscale/json_configs/sundress.json @@ -0,0 +1,22 @@ +{ + "sundress": [ + { + "type": "icon_state", + "icon_state": "sundress_pistil", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "sundress_pedal", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "sundress_base", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/sundress_worn.json b/code/datums/greyscale/json_configs/sundress_worn.json new file mode 100644 index 00000000000..f655a729f72 --- /dev/null +++ b/code/datums/greyscale/json_configs/sundress_worn.json @@ -0,0 +1,22 @@ +{ + "sundress": [ + { + "type": "icon_state", + "icon_state": "sundress_pistil", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "sundress_pedal", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "sundress_base", + "blend_mode": "overlay", + "color_ids": [3 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/tango.json b/code/datums/greyscale/json_configs/tango.json new file mode 100644 index 00000000000..87e9635e72f --- /dev/null +++ b/code/datums/greyscale/json_configs/tango.json @@ -0,0 +1,16 @@ +{ + "tango": [ + { + "type": "icon_state", + "icon_state": "tango_belt", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "tango_base", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/tango_worn.json b/code/datums/greyscale/json_configs/tango_worn.json new file mode 100644 index 00000000000..87e9635e72f --- /dev/null +++ b/code/datums/greyscale/json_configs/tango_worn.json @@ -0,0 +1,16 @@ +{ + "tango": [ + { + "type": "icon_state", + "icon_state": "tango_belt", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "tango_base", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/turtleskirt.json b/code/datums/greyscale/json_configs/turtleskirt.json new file mode 100644 index 00000000000..f24d5cf6dcd --- /dev/null +++ b/code/datums/greyscale/json_configs/turtleskirt.json @@ -0,0 +1,16 @@ +{ + "turtleskirt": [ + { + "type": "icon_state", + "icon_state": "turtleskirt_top", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "turtleskirt_base", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/turtleskirt_worn.json b/code/datums/greyscale/json_configs/turtleskirt_worn.json new file mode 100644 index 00000000000..f24d5cf6dcd --- /dev/null +++ b/code/datums/greyscale/json_configs/turtleskirt_worn.json @@ -0,0 +1,16 @@ +{ + "turtleskirt": [ + { + "type": "icon_state", + "icon_state": "turtleskirt_top", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "turtleskirt_base", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index fdbf007bf6e..fc100771148 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -90,9 +90,9 @@ "A shipment of scarves was delivered to the station.", ) scarves = typesof(/obj/item/clothing/neck/scarf) + list( - /obj/item/clothing/neck/stripedredscarf, - /obj/item/clothing/neck/stripedgreenscarf, - /obj/item/clothing/neck/stripedbluescarf, + /obj/item/clothing/neck/large_scarf/red, + /obj/item/clothing/neck/large_scarf/green, + /obj/item/clothing/neck/large_scarf/blue, ) RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, .proc/on_job_after_spawn) diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm index e49aa041507..a9a4bec2033 100644 --- a/code/modules/antagonists/fugitive/fugitive_outfits.dm +++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm @@ -25,12 +25,14 @@ name = "Waldo" uniform = /obj/item/clothing/under/pants/jeans suit = /obj/item/clothing/suit/costume/striped_sweater - head = /obj/item/clothing/head/beanie/waldo + head = /obj/item/clothing/head/waldo shoes = /obj/item/clothing/shoes/sneakers/brown ears = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/regular/circle /datum/outfit/waldo/post_equip(mob/living/carbon/human/equipped_on, visualsOnly=FALSE) + equipped_on.w_uniform?.update_greyscale() + equipped_on.update_inv_w_uniform() if(visualsOnly) return equipped_on.fully_replace_character_name(null,"Waldo") diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 2d5efa55992..79154504ff4 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2347,7 +2347,7 @@ name = "Formalwear Crate" desc = "You're gonna like the way you look, I guaranteed it. Contains an asston of fancy clothing." cost = CARGO_CRATE_VALUE * 4 //Lots of very expensive items. You gotta pay up to look good! - contains = list(/obj/item/clothing/under/dress/blacktango, + contains = list(/obj/item/clothing/under/dress/tango, /obj/item/clothing/under/misc/assistantformal, /obj/item/clothing/under/misc/assistantformal, /obj/item/clothing/under/rank/civilian/lawyer/bluesuit, diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm index dc5dc4dcc24..ce1480af9e2 100644 --- a/code/modules/clothing/head/beanie.dm +++ b/code/modules/clothing/head/beanie.dm @@ -3,90 +3,56 @@ //Plus a bobble hat, lets be inclusive!! -/obj/item/clothing/head/beanie //Default is white, this is meant to be seen - name = "white beanie" +/obj/item/clothing/head/beanie + name = "beanie" desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads." - icon_state = "beanie" //Default white + icon_state = "beanie" custom_price = PAYCHECK_CREW * 1.2 + greyscale_colors = "#EEEEEE#EEEEEE" + greyscale_config = /datum/greyscale_config/beanie + greyscale_config_worn = /datum/greyscale_config/beanie_worn + flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/head/beanie/black name = "black beanie" - icon_state = "beanie" - color = "#4A4A4B" //Grey but it looks black + greyscale_colors = "#4A4A4B#4A4A4B" /obj/item/clothing/head/beanie/red name = "red beanie" - icon_state = "beanie" - color = "#D91414" //Red - -/obj/item/clothing/head/beanie/green - name = "green beanie" - icon_state = "beanie" - color = "#5C9E54" //Green + greyscale_colors = "#D91414#D91414" /obj/item/clothing/head/beanie/darkblue name = "dark blue beanie" - icon_state = "beanie" - color = "#1E85BC" //Blue - -/obj/item/clothing/head/beanie/purple - name = "purple beanie" - icon_state = "beanie" - color = "#9557C5" //purple + greyscale_colors = "#1E85BC#1E85BC" /obj/item/clothing/head/beanie/yellow name = "yellow beanie" - icon_state = "beanie" - color = "#E0C14F" //Yellow + greyscale_colors = "#E0C14F#E0C14F" /obj/item/clothing/head/beanie/orange name = "orange beanie" - icon_state = "beanie" - color = "#C67A4B" //orange - -/obj/item/clothing/head/beanie/cyan - name = "cyan beanie" - icon_state = "beanie" - color = "#54A3CE" //Cyan (Or close to it) - -//Striped Beanies have unique sprites + greyscale_colors = "#C67A4B#C67A4B" /obj/item/clothing/head/beanie/christmas name = "christmas beanie" - icon_state = "beaniechristmas" - -/obj/item/clothing/head/beanie/striped - name = "striped beanie" - icon_state = "beaniestriped" - -/obj/item/clothing/head/beanie/stripedred - name = "red striped beanie" - icon_state = "beaniestripedred" - -/obj/item/clothing/head/beanie/stripedblue - name = "blue striped beanie" - icon_state = "beaniestripedblue" - -/obj/item/clothing/head/beanie/stripedgreen - name = "green striped beanie" - icon_state = "beaniestripedgreen" + greyscale_colors = "#038000#960000" /obj/item/clothing/head/beanie/durathread name = "durathread beanie" desc = "A beanie made from durathread, its resilient fibres provide some protection to the wearer." - icon_state = "beaniedurathread" + greyscale_colors = "#8291A1#8291A1" armor = list(MELEE = 15, BULLET = 5, LASER = 15, ENERGY = 25, BOMB = 10, BIO = 0, FIRE = 30, ACID = 5) -/obj/item/clothing/head/beanie/waldo - name = "red striped bobble hat" - desc = "If you're going on a worldwide hike, you'll need some cold protection." - icon_state = "waldo_hat" - -/obj/item/clothing/head/beanie/rasta +/obj/item/clothing/head/rasta name = "rastacap" desc = "Perfect for tucking in those dreadlocks." icon_state = "beanierasta" +/obj/item/clothing/head/waldo + name = "red striped bobble hat" + desc = "If you're going on a worldwide hike, you'll need some cold protection." + icon_state = "waldo_hat" + //No dog fashion sprites yet :( poor Ian can't be dope like the rest of us yet /obj/item/clothing/head/beanie/black/dboy diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 8d96dc4251d..d5eea66064d 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -208,87 +208,81 @@ //SCARVES// /////////// -/obj/item/clothing/neck/scarf //Default white color, same functionality as beanies. - name = "white scarf" +/obj/item/clothing/neck/scarf + name = "scarf" icon_state = "scarf" desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks." w_class = WEIGHT_CLASS_TINY - dog_fashion = /datum/dog_fashion/head custom_price = PAYCHECK_CREW + greyscale_colors = "#EEEEEE#EEEEEE" + greyscale_config = /datum/greyscale_config/scarf + greyscale_config_worn = /datum/greyscale_config/scarf_worn + flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/neck/scarf/black name = "black scarf" - icon_state = "scarf" - color = "#4A4A4B" //Grey but it looks black + greyscale_colors = "#4A4A4B#4A4A4B" /obj/item/clothing/neck/scarf/pink name = "pink scarf" - icon_state = "scarf" - color = "#F699CD" //Pink + greyscale_colors = "#F699CD#F699CD" /obj/item/clothing/neck/scarf/red name = "red scarf" - icon_state = "scarf" - color = "#D91414" //Red + greyscale_colors = "#D91414#D91414" /obj/item/clothing/neck/scarf/green name = "green scarf" - icon_state = "scarf" - color = "#5C9E54" //Green + greyscale_colors = "#5C9E54#5C9E54" /obj/item/clothing/neck/scarf/darkblue name = "dark blue scarf" - icon_state = "scarf" - color = "#1E85BC" //Blue + greyscale_colors = "#1E85BC#1E85BC" /obj/item/clothing/neck/scarf/purple name = "purple scarf" - icon_state = "scarf" - color = "#9557C5" //Purple + greyscale_colors = "#9557C5#9557C5" /obj/item/clothing/neck/scarf/yellow name = "yellow scarf" - icon_state = "scarf" - color = "#E0C14F" //Yellow + greyscale_colors = "#E0C14F#E0C14F" /obj/item/clothing/neck/scarf/orange name = "orange scarf" - icon_state = "scarf" - color = "#C67A4B" //Orange + greyscale_colors = "#C67A4B#C67A4B" /obj/item/clothing/neck/scarf/cyan name = "cyan scarf" - icon_state = "scarf" - color = "#54A3CE" //Cyan - - -//Striped scarves get their own icons + greyscale_colors = "#54A3CE#54A3CE" /obj/item/clothing/neck/scarf/zebra name = "zebra scarf" - icon_state = "zebrascarf" + greyscale_colors = "#333333#EEEEEE" /obj/item/clothing/neck/scarf/christmas name = "christmas scarf" - icon_state = "christmasscarf" + greyscale_colors = "#038000#960000" -//The three following scarves don't have the scarf subtype -//This is because Ian can equip anything from that subtype -//However, these 3 don't have corgi versions of their sprites -/obj/item/clothing/neck/stripedredscarf - name = "striped red scarf" - icon_state = "stripedredscarf" +/obj/item/clothing/neck/large_scarf + name = "large scarf" + icon_state = "large_scarf" custom_price = PAYCHECK_CREW * 0.2 + greyscale_colors = "#C6C6C6#EEEEEE" + greyscale_config = /datum/greyscale_config/large_scarf + greyscale_config_worn = /datum/greyscale_config/large_scarf_worn + flags_1 = IS_PLAYER_COLORABLE_1 -/obj/item/clothing/neck/stripedgreenscarf - name = "striped green scarf" - icon_state = "stripedgreenscarf" - custom_price = PAYCHECK_CREW * 0.2 +/obj/item/clothing/neck/large_scarf/red + name = "large red scarf" + greyscale_colors = "#8A2908#A06D66" -/obj/item/clothing/neck/stripedbluescarf - name = "striped blue scarf" - icon_state = "stripedbluescarf" - custom_price = PAYCHECK_CREW * 0.2 +/obj/item/clothing/neck/large_scarf/green + name = "large green scarf" + greyscale_colors = "#525629#888674" + +/obj/item/clothing/neck/large_scarf/blue + name = "large blue scarf" + greyscale_colors = "#20396C#6F7F91" /obj/item/clothing/neck/petcollar name = "pet collar" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 4b5e159629c..ed6965bbbdc 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -147,21 +147,9 @@ species_exception = list(/datum/species/golem) greyscale_config = /datum/greyscale_config/suspenders greyscale_config_worn = /datum/greyscale_config/suspenders/worn - greyscale_colors = "#ff0000" + greyscale_colors = "#972A2A" flags_1 = IS_PLAYER_COLORABLE_1 -/obj/item/clothing/suit/toggle/suspenders/blue - name = "blue suspenders" - desc = "The symbol of hard labor and dirty jobs." - icon = 'icons/obj/clothing/belts.dmi' - greyscale_colors = "#0000ff" - -/obj/item/clothing/suit/toggle/suspenders/gray - name = "gray suspenders" - desc = "The symbol of hard labor and dirty jobs." - icon = 'icons/obj/clothing/belts.dmi' - greyscale_colors = "#888888" - //Security /obj/item/clothing/suit/jacket/officer/blue name = "security officer's jacket" diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 4e5001eceec..8b9213743c8 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -8,62 +8,31 @@ worn_icon = 'icons/mob/clothing/under/shorts_pants.dmi' species_exception = list(/datum/species/golem) -/obj/item/clothing/under/pants/classicjeans - name = "classic jeans" - desc = "You feel cooler already." - icon_state = "jeansclassic" +/obj/item/clothing/under/pants/slacks + name = "slacks" + desc = "A pair of comfy slacks." + icon_state = "slacks" + greyscale_config = /datum/greyscale_config/slacks + greyscale_config_worn = /datum/greyscale_config/slacks_worn + greyscale_config_worn_digi = /datum/greyscale_config/slacks_worn/digi //SKYRAT EDIT - DigiGreyscale + greyscale_colors = "#575757#3E3E3E#75634F" + flags_1 = IS_PLAYER_COLORABLE_1 -/obj/item/clothing/under/pants/mustangjeans - name = "Must Hang jeans" - desc = "Made in the finest space jeans factory this side of Alpha Centauri." - icon_state = "jeansmustang" - custom_price = PAYCHECK_CREW * 3 - -/obj/item/clothing/under/pants/blackjeans - name = "black jeans" - desc = "Only for those who can pull it off." - icon_state = "jeansblack" - -/obj/item/clothing/under/pants/youngfolksjeans - name = "Young Folks jeans" - desc = "For those tired of boring old jeans. Relive the passion of your youth!" - icon_state = "jeansyoungfolks" - -/obj/item/clothing/under/pants/white - name = "white pants" - desc = "Plain white pants. Boring." - icon_state = "whitepants" - -/obj/item/clothing/under/pants/red - name = "red pants" - desc = "Bright red pants. Overflowing with personality." - icon_state = "redpants" - -/obj/item/clothing/under/pants/black - name = "black pants" - desc = "These pants are dark, like your soul." - icon_state = "blackpants" - -/obj/item/clothing/under/pants/tan - name = "tan pants" - desc = "Some tan pants. You look like a white collar worker with these on." - icon_state = "tanpants" +/obj/item/clothing/under/pants/jeans + name = "jeans" + desc = "A nondescript pair of tough jeans." + icon_state = "jeans" + greyscale_config = /datum/greyscale_config/jeans + greyscale_config_worn = /datum/greyscale_config/jeans_worn + greyscale_config_worn_digi = /datum/greyscale_config/jeans_worn/digi //SKYRAT EDIT - DigiGreyscale + greyscale_colors = "#787878#723E0E#4D7EAC" + flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/under/pants/track name = "track pants" desc = "A pair of track pants, for the athletic." icon_state = "trackpants" -/obj/item/clothing/under/pants/jeans - name = "jeans" - desc = "A nondescript pair of tough blue jeans." - icon_state = "jeans" - -/obj/item/clothing/under/pants/khaki - name = "khaki pants" - desc = "A pair of dust beige khaki pants." - icon_state = "khaki" - /obj/item/clothing/under/pants/camo name = "camo pants" desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station." diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 6c409b98ca1..1faa5b8da33 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -1,35 +1,57 @@ /obj/item/clothing/under/shorts - name = "athletic shorts" - desc = "95% Polyester, 5% Spandex!" + name = "shorts" + desc = "A pair of comfy shorts." + icon_state = "shorts" + greyscale_config = /datum/greyscale_config/shorts + greyscale_config_worn = /datum/greyscale_config/shorts_worn + greyscale_config_worn_digi = /datum/greyscale_config/shorts_worn/digi //SKYRAT EDIT - DigiGreyscale + greyscale_colors = "#575757#3E3E3E#75634F" gender = PLURAL body_parts_covered = GROIN female_sprite_flags = NO_FEMALE_UNIFORM supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION can_adjust = FALSE - icon = 'icons/obj/clothing/under/shorts_pants.dmi' - worn_icon = 'icons/mob/clothing/under/shorts_pants.dmi' species_exception = list(/datum/species/golem) + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/under/jeanshorts + name = "jean shorts" + desc = "A nondescript pair of tough jean shorts." + icon_state = "jeanshorts" + can_adjust = FALSE + female_sprite_flags = NO_FEMALE_UNIFORM + greyscale_config = /datum/greyscale_config/jeanshorts + greyscale_config_worn = /datum/greyscale_config/jeanshorts_worn + greyscale_config_worn_digi = /datum/greyscale_config/jeanshorts_worn/digi //SKYRAT EDIT - DigiGreyscale + greyscale_colors = "#787878#723E0E#4D7EAC" + flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/under/shorts/red - name = "red athletic shorts" - icon_state = "redshorts" + name = "athletic shorts" + desc = "95% Polyester, 5% Spandex!" + greyscale_colors = "#E43F3F#A81818#A81818" /obj/item/clothing/under/shorts/green - name = "green athletic shorts" - icon_state = "greenshorts" + name = "athletic shorts" + desc = "95% Polyester, 5% Spandex!" + greyscale_colors = "#68E43F#3CA818#3CA818" /obj/item/clothing/under/shorts/blue - name = "blue athletic shorts" - icon_state = "blueshorts" + name = "athletic shorts" + desc = "95% Polyester, 5% Spandex!" + greyscale_colors = "#3F68E4#183CA8#183CA8" /obj/item/clothing/under/shorts/black - name = "black athletic shorts" - icon_state = "blackshorts" + name = "athletic shorts" + desc = "95% Polyester, 5% Spandex!" + greyscale_colors = "#606060#353535#353535" /obj/item/clothing/under/shorts/grey - name = "grey athletic shorts" - icon_state = "greyshorts" + name = "athletic shorts" + desc = "95% Polyester, 5% Spandex!" + greyscale_colors = "#EFEFEF#B2B2B2#B2B2B2" /obj/item/clothing/under/shorts/purple - name = "purple athletic shorts" - icon_state = "purpleshorts" + name = "athletic shorts" + desc = "95% Polyester, 5% Spandex!" + greyscale_colors = "#B847FF#8F36C6#8F36C6" diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm index 825674434cc..ace1335747f 100644 --- a/code/modules/clothing/under/skirt_dress.dm +++ b/code/modules/clothing/under/skirt_dress.dm @@ -6,18 +6,6 @@ icon = 'icons/obj/clothing/under/dress.dmi' worn_icon = 'icons/mob/clothing/under/dress.dmi' -/obj/item/clothing/under/dress/sundress - name = "sundress" - desc = "Makes you want to frolic in a field of daisies." - icon_state = "sundress" - inhand_icon_state = "sundress" - -/obj/item/clothing/under/dress/blacktango - name = "black tango dress" - desc = "Filled with Latin fire." - icon_state = "black_tango" - inhand_icon_state = "wcoat" - /obj/item/clothing/under/dress/striped name = "striped dress" desc = "Fashion in space." @@ -50,50 +38,45 @@ desc = "A black skirt, very fancy!" icon_state = "blackskirt" -/obj/item/clothing/under/dress/skirt/blue - name = "blue skirt" - desc = "A blue, casual skirt." - icon_state = "blueskirt" - inhand_icon_state = "b_suit" - custom_price = PAYCHECK_CREW - -/obj/item/clothing/under/dress/skirt/red - name = "red skirt" - desc = "A red, casual skirt." - icon_state = "redskirt" - inhand_icon_state = "r_suit" - custom_price = PAYCHECK_CREW - -/obj/item/clothing/under/dress/skirt/purple - name = "purple skirt" - desc = "A purple, casual skirt." - icon_state = "purpleskirt" - inhand_icon_state = "p_suit" - custom_price = PAYCHECK_CREW - /obj/item/clothing/under/dress/skirt/plaid - name = "red plaid skirt" - desc = "A preppy red skirt with a white blouse." - icon_state = "plaid_red" - inhand_icon_state = "plaid_red" + name = "plaid skirt" + desc = "A preppy plaid skirt with a white blouse." + icon_state = "plaidskirt" can_adjust = TRUE alt_covers_chest = TRUE custom_price = PAYCHECK_CREW + greyscale_colors = "#CC2102" + greyscale_config = /datum/greyscale_config/plaidskirt + greyscale_config_worn = /datum/greyscale_config/plaidskirt_worn + greyscale_config_worn_digi = /datum/greyscale_config/plaidskirt_worn/digi //SKYRAT EDIT - DigiGreyscale + flags_1 = IS_PLAYER_COLORABLE_1 -/obj/item/clothing/under/dress/skirt/plaid/blue - name = "blue plaid skirt" - desc = "A preppy blue skirt with a white blouse." - icon_state = "plaid_blue" - inhand_icon_state = "plaid_blue" +/obj/item/clothing/under/dress/skirt/turtleskirt + name = "turtleneck skirt" + desc = "A casual turtleneck skirt." + icon_state = "turtleskirt" + custom_price = PAYCHECK_CREW + greyscale_colors = "#cc0000#5f5f5f" + greyscale_config = /datum/greyscale_config/turtleskirt + greyscale_config_worn = /datum/greyscale_config/turtleskirt_worn + flags_1 = IS_PLAYER_COLORABLE_1 -/obj/item/clothing/under/dress/skirt/plaid/purple - name = "purple plaid skirt" - desc = "A preppy purple skirt with a white blouse." - icon_state = "plaid_purple" - inhand_icon_state = "plaid_purple" +/obj/item/clothing/under/dress/tango + name = "tango dress" + desc = "Filled with Latin fire." + icon_state = "tango" + custom_price = PAYCHECK_CREW + greyscale_colors = "#ff0000#1c1c1c" + greyscale_config = /datum/greyscale_config/tango + greyscale_config_worn = /datum/greyscale_config/tango_worn + flags_1 = IS_PLAYER_COLORABLE_1 -/obj/item/clothing/under/dress/skirt/plaid/green - name = "green plaid skirt" - desc = "A preppy green skirt with a white blouse." - icon_state = "plaid_green" - inhand_icon_state = "plaid_green" +/obj/item/clothing/under/dress/sundress + name = "sundress" + desc = "Makes you want to frolic in a field of daisies." + icon_state = "sundress" + custom_price = PAYCHECK_CREW + greyscale_colors = "#FFE60F#9194A5#1F243C" + greyscale_config = /datum/greyscale_config/sundress + greyscale_config_worn = /datum/greyscale_config/sundress_worn + flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/code/modules/mob_spawn/ghost_roles/mining_roles.dm index 6cef42d1bcf..5a51970b308 100644 --- a/code/modules/mob_spawn/ghost_roles/mining_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/mining_roles.dm @@ -100,7 +100,7 @@ glasses = /obj/item/clothing/glasses/sunglasses r_pocket = /obj/item/storage/wallet/random l_pocket = /obj/item/food/pizzaslice/dank - uniform = /obj/item/clothing/under/pants/youngfolksjeans + uniform = /obj/item/clothing/under/pants/jeans id = /obj/item/card/id/advanced /datum/outfit/beachbum/post_equip(mob/living/carbon/human/bum, visualsOnly = FALSE) diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index f5a9630b3bf..06128b77690 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -7,115 +7,82 @@ product_slogans = "Dress for success!;Prepare to look swagalicious!;Look at all this swag!;Why leave style up to fate? Use the ClothesMate!" vend_reply = "Thank you for using the ClothesMate!" products = list( - /obj/item/clothing/head/beanie = 3, - /obj/item/clothing/head/beanie/black = 3, - /obj/item/clothing/head/beanie/red = 3, - /obj/item/clothing/head/beanie/green = 3, - /obj/item/clothing/head/beanie/darkblue = 3, - /obj/item/clothing/head/beanie/purple = 3, - /obj/item/clothing/head/beanie/yellow = 3, - /obj/item/clothing/head/beanie/orange = 3, - /obj/item/clothing/head/beanie/cyan = 3, - /obj/item/clothing/head/beanie/christmas = 3, - /obj/item/clothing/head/beanie/striped = 3, - /obj/item/clothing/head/beanie/stripedred = 3, - /obj/item/clothing/head/beanie/stripedblue = 3, - /obj/item/clothing/head/beanie/stripedgreen = 3, - /obj/item/clothing/head/beanie/rasta = 3, + /obj/item/clothing/head/wig/natural = 4, + /obj/item/clothing/head/beanie = 8, /obj/item/clothing/head/beret/black = 3, - /obj/item/clothing/head/kippah = 3, - /obj/item/clothing/head/taqiyahred = 3, /obj/item/clothing/mask/bandana = 3, /obj/item/clothing/mask/bandana/striped = 3, /obj/item/clothing/mask/bandana/skull = 3, - /obj/item/clothing/gloves/fingerless = 2, - /obj/item/clothing/neck/scarf/pink = 3, - /obj/item/clothing/neck/scarf/red = 3, - /obj/item/clothing/neck/scarf/green = 3, - /obj/item/clothing/neck/scarf/darkblue = 3, - /obj/item/clothing/neck/scarf/purple = 3, - /obj/item/clothing/neck/scarf/yellow = 3, - /obj/item/clothing/neck/scarf/orange = 3, - /obj/item/clothing/neck/scarf/cyan = 3, - /obj/item/clothing/neck/scarf = 3, - /obj/item/clothing/neck/scarf/black = 3, - /obj/item/clothing/neck/scarf/zebra = 3, - /obj/item/clothing/neck/scarf/christmas = 3, - /obj/item/clothing/neck/stripedredscarf = 3, - /obj/item/clothing/neck/stripedbluescarf = 3, - /obj/item/clothing/neck/stripedgreenscarf = 3, + /obj/item/clothing/neck/scarf = 6, + /obj/item/clothing/neck/large_scarf = 6, /obj/item/clothing/neck/tie = 6, - /obj/item/clothing/neck/tie/horrible = 3, /obj/item/clothing/accessory/pride = 15, - /obj/item/storage/belt/fannypack = 3, - /obj/item/storage/belt/fannypack/blue = 3, - /obj/item/storage/belt/fannypack/red = 3, - /obj/item/clothing/under/misc/overalls = 2, - /obj/item/clothing/under/pants/jeans = 2, - /obj/item/clothing/under/pants/classicjeans = 2, - /obj/item/clothing/under/pants/camo = 2, - /obj/item/clothing/under/pants/blackjeans = 2, - /obj/item/clothing/under/pants/khaki = 2, - /obj/item/clothing/under/pants/white = 2, - /obj/item/clothing/under/pants/red = 2, - /obj/item/clothing/under/pants/black = 2, - /obj/item/clothing/under/pants/tan = 2, - /obj/item/clothing/under/pants/track = 2, + /obj/item/clothing/suit/toggle/suspenders = 4, + /obj/item/clothing/under/pants/slacks = 5, + /obj/item/clothing/under/shorts = 5, + /obj/item/clothing/under/pants/jeans = 5, + /obj/item/clothing/under/jeanshorts = 5, + /obj/item/clothing/under/dress/sundress = 2, + /obj/item/clothing/under/dress/tango = 2, + /obj/item/clothing/under/dress/skirt/plaid = 4, + /obj/item/clothing/under/dress/skirt/turtleskirt = 4, + /obj/item/clothing/suit/hooded/wintercoat/custom = 2, /obj/item/clothing/shoes/sneakers/black = 4, - /obj/item/clothing/head/wig/natural = 4, - /obj/item/clothing/under/dress/skirt/plaid = 2, - /obj/item/clothing/under/dress/skirt/plaid/blue = 2, - /obj/item/clothing/under/dress/skirt/plaid/green = 2, - /obj/item/clothing/under/dress/skirt/plaid/purple = 2, - /obj/item/clothing/under/dress/skirt = 2, - /obj/item/clothing/under/dress/skirt/blue = 2, - /obj/item/clothing/under/dress/skirt/red = 2, - /obj/item/clothing/under/dress/skirt/purple = 2, - /obj/item/clothing/under/suit/white/skirt = 2, - /obj/item/clothing/under/rank/captain/suit/skirt = 2, - /obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2, - /obj/item/clothing/suit/jacket = 2, - //obj/item/clothing/suit/hooded/wintercoat/custom = 2, SKYRAT EDIT - Moved to modular equivalent - /obj/item/clothing/suit/jacket/puffer/vest = 2, - /obj/item/clothing/suit/jacket/puffer = 2, - /obj/item/clothing/suit/jacket/letterman = 2, - /obj/item/clothing/suit/jacket/letterman_red = 2, + /obj/item/clothing/suit/mothcoat = 3, + /obj/item/clothing/suit/mothcoat/winter = 3, + /obj/item/clothing/head/mothcap = 3, + /obj/item/clothing/head/rasta = 3, + /obj/item/clothing/head/kippah = 3, + /obj/item/clothing/head/taqiyahred = 3, + /obj/item/clothing/head/that = 1, + /obj/item/clothing/head/fedora = 1, + /obj/item/clothing/head/cowboy_hat_white = 1, + /obj/item/clothing/head/cowboy_hat_grey = 1, + /obj/item/clothing/head/sombrero = 1, + /obj/item/clothing/neck/tie/horrible = 3, /obj/item/clothing/glasses/regular = 2, /obj/item/clothing/glasses/regular/jamjar = 1, /obj/item/clothing/glasses/orange = 1, /obj/item/clothing/glasses/red = 1, + /obj/item/clothing/glasses/monocle = 1, + /obj/item/clothing/gloves/fingerless = 2, + /obj/item/clothing/accessory/waistcoat = 1, + /obj/item/storage/belt/fannypack = 3, + /obj/item/storage/belt/fannypack/blue = 3, + /obj/item/storage/belt/fannypack/red = 3, + /obj/item/clothing/under/misc/overalls = 2, + /obj/item/clothing/under/pants/camo = 2, + /obj/item/clothing/under/pants/track = 2, + /obj/item/clothing/under/costume/kilt = 1, + /obj/item/clothing/under/dress/striped = 1, + /obj/item/clothing/under/dress/sailor = 1, + /obj/item/clothing/under/dress/redeveninggown = 1, + /obj/item/clothing/under/dress/skirt = 2, + /obj/item/clothing/under/suit/white/skirt = 2, + /obj/item/clothing/under/rank/captain/suit/skirt = 2, + /obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2, /obj/item/clothing/under/suit/navy = 1, /obj/item/clothing/under/suit/black_really = 1, /obj/item/clothing/under/suit/burgundy = 1, /obj/item/clothing/under/suit/charcoal = 1, /obj/item/clothing/under/suit/white = 1, /obj/item/clothing/under/suit/sl = 1, - /obj/item/clothing/accessory/waistcoat = 1, - /obj/item/clothing/head/that = 1, - /obj/item/clothing/head/fedora = 1, - /obj/item/clothing/head/cowboy_hat_white = 1, - /obj/item/clothing/head/cowboy_hat_grey = 1, - /obj/item/clothing/glasses/monocle = 1, - /obj/item/clothing/head/sombrero = 1, + /obj/item/clothing/under/rank/civilian/bartender/purple = 2, + /obj/item/clothing/suit/apron/purple_bartender = 2, + /obj/item/clothing/suit/jacket = 2, + /obj/item/clothing/suit/jacket/puffer/vest = 2, + /obj/item/clothing/suit/jacket/puffer = 2, + /obj/item/clothing/suit/jacket/letterman = 2, + /obj/item/clothing/suit/jacket/letterman_red = 2, /obj/item/clothing/suit/costume/poncho = 1, - /obj/item/clothing/under/costume/kilt = 1, - /obj/item/clothing/under/dress/sundress = 1, - /obj/item/clothing/under/dress/striped = 1, - /obj/item/clothing/under/dress/sailor = 1, - /obj/item/clothing/under/dress/redeveninggown = 1, - /obj/item/clothing/under/dress/blacktango = 1, /obj/item/clothing/suit/costume/ianshirt = 1, - /obj/item/clothing/shoes/laceup = 2, + /obj/item/clothing/suit/jacket/miljacket = 1, /obj/item/clothing/shoes/sandal = 2, + /obj/item/clothing/shoes/laceup = 2, /obj/item/clothing/shoes/winterboots = 2, /obj/item/clothing/shoes/cowboy = 2, /obj/item/clothing/shoes/cowboy/white = 2, /obj/item/clothing/shoes/cowboy/black = 2, - /obj/item/clothing/suit/jacket/miljacket = 1, - /obj/item/clothing/suit/apron/purple_bartender = 2, - /obj/item/clothing/under/rank/civilian/bartender/purple = 2, - /obj/item/clothing/suit/toggle/suspenders/blue = 2, - /obj/item/clothing/suit/toggle/suspenders/gray = 2, /obj/item/storage/backpack/henchmen = 20, /obj/item/clothing/under/suit/henchmen = 20, /obj/item/clothing/under/costume/yakuza = 20, @@ -176,9 +143,6 @@ /obj/item/clothing/under/costume/basil_boys = 20, /obj/item/clothing/head/basil_boys = 20, /obj/item/clothing/shoes/basil_boys = 20, - /obj/item/clothing/suit/mothcoat = 3, - /obj/item/clothing/suit/mothcoat/winter = 3, - /obj/item/clothing/head/mothcap = 3, ) contraband = list( /obj/item/clothing/under/syndicate/tacticool = 1, @@ -198,7 +162,6 @@ /obj/item/clothing/under/misc/mailman = 1, /obj/item/clothing/suit/jacket/leather = 1, /obj/item/clothing/suit/jacket/leather/overcoat = 1, - /obj/item/clothing/under/pants/mustangjeans = 1, /obj/item/clothing/neck/necklace/dope = 3, /obj/item/clothing/suit/jacket/letterman_nanotrasen = 1, /obj/item/clothing/under/costume/swagoutfit = 1, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index cae1a68d500..37d2deaefd4 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -29,7 +29,7 @@ /obj/item/clothing/gloves/color/black = 3, /obj/item/clothing/under/rank/security/officer/skirt = 3, /obj/item/clothing/under/rank/security/officer/grey = 3, - /obj/item/clothing/under/pants/khaki = 3, + /obj/item/clothing/under/pants/slacks = 3, /obj/item/clothing/under/rank/security/officer/blueshirt = 3, ) premium = list( @@ -433,7 +433,7 @@ /obj/item/clothing/head/taqiyahwhite = 1, /obj/item/clothing/head/taqiyahred = 3, /obj/item/clothing/suit/chaplainsuit/monkrobeeast = 1, - /obj/item/clothing/head/beanie/rasta = 1, + /obj/item/clothing/head/rasta = 1, ) contraband = list( /obj/item/toy/plush/ratplush = 1, diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 462dea7cf10..ecd4a6daa04 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 4567a356198..8ef24f07369 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi index 788648b248c..09fdc14e585 100644 Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ diff --git a/icons/mob/clothing/suits/utility.dmi b/icons/mob/clothing/suits/utility.dmi index 7e5bce03658..19b276a2a11 100644 Binary files a/icons/mob/clothing/suits/utility.dmi and b/icons/mob/clothing/suits/utility.dmi differ diff --git a/icons/mob/clothing/under/dress.dmi b/icons/mob/clothing/under/dress.dmi index 018b9c4b4a8..be6e7715c48 100644 Binary files a/icons/mob/clothing/under/dress.dmi and b/icons/mob/clothing/under/dress.dmi differ diff --git a/icons/mob/clothing/under/shorts_pants.dmi b/icons/mob/clothing/under/shorts_pants.dmi index 3baa75d7d84..87793521173 100644 Binary files a/icons/mob/clothing/under/shorts_pants.dmi and b/icons/mob/clothing/under/shorts_pants.dmi differ diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index accde869ce5..1ee6a999644 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index d37de9664f8..e72ae309874 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 0a1ffe0848e..2caece11cd7 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index dc9347565e8..18343d20854 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ diff --git a/icons/obj/clothing/under/centcom.dmi b/icons/obj/clothing/under/centcom.dmi index ccf56643241..9690a65202b 100644 Binary files a/icons/obj/clothing/under/centcom.dmi and b/icons/obj/clothing/under/centcom.dmi differ diff --git a/icons/obj/clothing/under/dress.dmi b/icons/obj/clothing/under/dress.dmi index 48d7d418783..d38b53746be 100644 Binary files a/icons/obj/clothing/under/dress.dmi and b/icons/obj/clothing/under/dress.dmi differ diff --git a/icons/obj/clothing/under/shorts_pants.dmi b/icons/obj/clothing/under/shorts_pants.dmi index 45be0b36584..31c76f02ae5 100644 Binary files a/icons/obj/clothing/under/shorts_pants.dmi and b/icons/obj/clothing/under/shorts_pants.dmi differ diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm index 7df8a6fcf15..f6b852bdbab 100644 --- a/modular_skyrat/modules/GAGS/greyscale_configs.dm +++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm @@ -379,6 +379,30 @@ name = "Worn Prison Jumpsuit - Teshari" icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_teshari.dmi' +// PANTS / SHORTS + +/datum/greyscale_config/slacks_worn/digi + name = "Worn Slacks - Digitigrade" + icon_file = 'modular_skyrat/modules/GAGS/icons/shorts_pants.dmi' + +/datum/greyscale_config/jeans_worn/digi + name = "Worn Jeans - Digitigrade" + icon_file = 'modular_skyrat/modules/GAGS/icons/shorts_pants.dmi' + +/datum/greyscale_config/shorts_worn/digi + name = "Worn Shorts - Digitigrade" + icon_file = 'modular_skyrat/modules/GAGS/icons/shorts_pants.dmi' + +/datum/greyscale_config/jeanshorts_worn/digi + name = "Worn Jean Shorts - Digitigrade" + icon_file = 'modular_skyrat/modules/GAGS/icons/shorts_pants.dmi' + +// DRESSES / SKIRTS + +/datum/greyscale_config/plaidskirt_worn/digi + name = "Worn Plaid Skirt - Digitigrade" + icon_file = 'modular_skyrat/modules/GAGS/icons/dress.dmi' + // KILT /datum/greyscale_config/kilt diff --git a/modular_skyrat/modules/GAGS/icons/dress.dmi b/modular_skyrat/modules/GAGS/icons/dress.dmi new file mode 100644 index 00000000000..b5ea7f363b0 Binary files /dev/null and b/modular_skyrat/modules/GAGS/icons/dress.dmi differ diff --git a/modular_skyrat/modules/GAGS/icons/shorts_pants.dmi b/modular_skyrat/modules/GAGS/icons/shorts_pants.dmi new file mode 100644 index 00000000000..41d68bff0b4 Binary files /dev/null and b/modular_skyrat/modules/GAGS/icons/shorts_pants.dmi differ diff --git a/modular_skyrat/modules/customization/modules/clothing/under/pants.dm b/modular_skyrat/modules/customization/modules/clothing/under/pants.dm index bccb0b2e1b9..70bc444b9f7 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/pants.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/pants.dm @@ -5,13 +5,6 @@ desc = "If you're wearing this you're poor or a rebel" icon_state = "jean_ripped" -/obj/item/clothing/under/pants/jeanshort - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "jean shorts" - desc = "These are really just jeans cut in half" - icon_state = "jean_shorts" - /obj/item/clothing/under/pants/denimskirt icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' diff --git a/modular_skyrat/modules/customization/modules/clothing/under/skirts_dresses.dm b/modular_skyrat/modules/customization/modules/clothing/under/skirts_dresses.dm index 13482509aec..9c71480b9ca 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/skirts_dresses.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/skirts_dresses.dm @@ -1,9 +1,3 @@ -/obj/item/clothing/under/dress/sundress/white - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "white sundress" - icon_state = "sundress_white" - /obj/item/clothing/under/dress/green icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' @@ -24,16 +18,6 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY can_adjust = FALSE -/obj/item/clothing/under/dress/blacktango - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "black tango dress" - desc = "Filled with Latin fire." - icon_state = "black_tango" - inhand_icon_state = "wcoat" - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - can_adjust = FALSE - /obj/item/clothing/under/dress/westernbustle icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' @@ -54,17 +38,6 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY can_adjust = FALSE -/obj/item/clothing/under/dress/striped - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "striped dress" - desc = "Fashion in space." - icon_state = "striped_dress" - inhand_icon_state = "stripeddress" - body_parts_covered = CHEST|GROIN|ARMS - female_sprite_flags = FEMALE_UNIFORM_FULL - can_adjust = FALSE - /obj/item/clothing/under/dress/flower icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index 5d00c574299..c16cc479ed4 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -168,6 +168,9 @@ worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi' icon_state = "polyshortpants" supports_variations_flags = NONE + greyscale_config = null //Temporary measures while Polychrom is gutted. + greyscale_config_worn = null + greyscale_config_worn_digi = null var/list/poly_colors = list("#FFFFFF", "#FF8888", "#FFFFFF") /obj/item/clothing/under/shorts/polychromic/ComponentInitialize() diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm index 8c2ea87a39c..95b7da042b1 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm @@ -24,65 +24,37 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea * BEANIES */ +/datum/loadout_item/head/white_beanie + name = "Recolorable Beanie" + item_path = /obj/item/clothing/head/beanie + /datum/loadout_item/head/black_beanie name = "Black Beanie" item_path = /obj/item/clothing/head/beanie/black -/datum/loadout_item/head/christmas_beanie - name = "Christmas Beanie" - item_path = /obj/item/clothing/head/beanie/christmas - -/datum/loadout_item/head/cyan_beanie - name = "Cyan Beanie" - item_path = /obj/item/clothing/head/beanie/cyan - -/datum/loadout_item/head/dark_blue_beanie - name = "Dark Blue Beanie" - item_path = /obj/item/clothing/head/beanie/darkblue - -/datum/loadout_item/head/green_beanie - name = "Green Beanie" - item_path = /obj/item/clothing/head/beanie/green - -/datum/loadout_item/head/orange_beanie - name = "Orange Beanie" - item_path = /obj/item/clothing/head/beanie/orange - -/datum/loadout_item/head/purple_beanie - name = "Purple Beanie" - item_path = /obj/item/clothing/head/beanie/purple - /datum/loadout_item/head/red_beanie name = "Red Beanie" item_path = /obj/item/clothing/head/beanie/red -/datum/loadout_item/head/white_beanie - name = "White Beanie" - item_path = /obj/item/clothing/head/beanie +/datum/loadout_item/head/dark_blue_beanie + name = "Dark Blue Beanie" + item_path = /obj/item/clothing/head/beanie/darkblue /datum/loadout_item/head/yellow_beanie name = "Yellow Beanie" item_path = /obj/item/clothing/head/beanie/yellow -/datum/loadout_item/head/striped_beanie - name = "Striped Beanie" - item_path = /obj/item/clothing/head/beanie/striped - -/datum/loadout_item/head/striped_red_beanie - name = "Striped Red Beanie" - item_path = /obj/item/clothing/head/beanie/stripedred - -/datum/loadout_item/head/striped_blue_beanie - name = "Striped Blue Beanie" - item_path = /obj/item/clothing/head/beanie/stripedblue - -/datum/loadout_item/head/striped_green_beanie - name = "Striped Green Beanie" - item_path = /obj/item/clothing/head/beanie/stripedgreen +/datum/loadout_item/head/orange_beanie + name = "Orange Beanie" + item_path = /obj/item/clothing/head/beanie/orange /datum/loadout_item/head/rastafarian name = "Rastafarian Cap" - item_path = /obj/item/clothing/head/beanie/rasta + item_path = /obj/item/clothing/head/rasta + +/datum/loadout_item/head/christmas_beanie + name = "Christmas Beanie" + item_path = /obj/item/clothing/head/beanie/christmas /* * BERETS diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm index 8e538e7d67d..a3dd13451d5 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm @@ -53,18 +53,6 @@ GLOBAL_LIST_INIT(loadout_necks, generate_loadout_items(/datum/loadout_item/neck) name = "Red Scarf" item_path = /obj/item/clothing/neck/scarf/red -/datum/loadout_item/neck/scarf_blue_striped - name = "Striped Blue Scarf" - item_path = /obj/item/clothing/neck/stripedbluescarf - -/datum/loadout_item/neck/scarf_green_striped - name = "Striped Green Scarf" - item_path = /obj/item/clothing/neck/stripedgreenscarf - -/datum/loadout_item/neck/scarf_red_striped - name = "Striped Red Scarf" - item_path = /obj/item/clothing/neck/stripedredscarf - /datum/loadout_item/neck/scarf_orange name = "Orange Scarf" item_path = /obj/item/clothing/neck/scarf/orange @@ -77,6 +65,18 @@ GLOBAL_LIST_INIT(loadout_necks, generate_loadout_items(/datum/loadout_item/neck) name = "White Scarf" item_path = /obj/item/clothing/neck/scarf +/datum/loadout_item/neck/scarf_red_striped + name = "Striped Red Scarf" + item_path = /obj/item/clothing/neck/large_scarf/red + +/datum/loadout_item/neck/scarf_blue_striped + name = "Striped Blue Scarf" + item_path = /obj/item/clothing/neck/large_scarf/blue + +/datum/loadout_item/neck/scarf_green_striped + name = "Striped Green Scarf" + item_path = /obj/item/clothing/neck/large_scarf/green + /datum/loadout_item/neck/scarf_zebra name = "Zebra Scarf" item_path = /obj/item/clothing/neck/scarf/zebra diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm index f768be548b5..43ffe831cad 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -80,16 +80,8 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su * SUSPENDERS */ -/datum/loadout_item/suit/suspenders_blue - name = "Blue Suspenders" - item_path = /obj/item/clothing/suit/toggle/suspenders/blue - -/datum/loadout_item/suit/suspenders_grey - name = "Grey Suspenders" - item_path = /obj/item/clothing/suit/toggle/suspenders/gray - -/datum/loadout_item/suit/suspenders_red - name = "Red Suspenders" +/datum/loadout_item/suit/suspenders + name = "Recolorable Suspenders" item_path = /obj/item/clothing/suit/toggle/suspenders /* diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm index bc649b06c35..efa3f8bc812 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -237,85 +237,103 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ //christmas ends, because every christmas is last christmas -/datum/loadout_item/under/miscellaneous/camo - name = "Camo Pants" - item_path = /obj/item/clothing/under/pants/camo - -/datum/loadout_item/under/miscellaneous/jeans_classic - name = "Classic Jeans" - item_path = /obj/item/clothing/under/pants/classicjeans - -/datum/loadout_item/under/miscellaneous/jeans_black - name = "Black Jeans" - item_path = /obj/item/clothing/under/pants/blackjeans - -/datum/loadout_item/under/miscellaneous/black - name = "Black Pants" - item_path = /obj/item/clothing/under/pants/black - -/datum/loadout_item/under/miscellaneous/black_short - name = "Black Shorts" - item_path = /obj/item/clothing/under/shorts/black - -/datum/loadout_item/under/miscellaneous/blue_short - name = "Blue Shorts" - item_path = /obj/item/clothing/under/shorts/blue - -/datum/loadout_item/under/miscellaneous/green_short - name = "Green Shorts" - item_path = /obj/item/clothing/under/shorts/green - -/datum/loadout_item/under/miscellaneous/grey_short - name = "Grey Shorts" - item_path = /obj/item/clothing/under/shorts/grey +/datum/loadout_item/under/miscellaneous/slacks + name = "Recolorable Slacks" + item_path = /obj/item/clothing/under/pants/slacks /datum/loadout_item/under/miscellaneous/jeans - name = "Jeans" + name = "Recolorable Jeans" item_path = /obj/item/clothing/under/pants/jeans -/datum/loadout_item/under/miscellaneous/jeansripped - name = "Ripped Jeans" - item_path = /obj/item/clothing/under/pants/jeanripped - -/datum/loadout_item/under/miscellaneous/khaki - name = "Khaki Pants" - item_path = /obj/item/clothing/under/pants/khaki - -/datum/loadout_item/under/miscellaneous/jeans_musthang - name = "Must Hang Jeans" - item_path = /obj/item/clothing/under/pants/mustangjeans - -/datum/loadout_item/under/miscellaneous/pants/blackshorts - name = "Black ripped shorts" - item_path = /obj/item/clothing/under/pants/blackshorts - -/datum/loadout_item/under/miscellaneous/purple_short - name = "Purple Shorts" - item_path = /obj/item/clothing/under/shorts/purple - -/datum/loadout_item/under/miscellaneous/red - name = "Red Pants" - item_path = /obj/item/clothing/under/pants/red - -/datum/loadout_item/under/miscellaneous/red_short - name = "Red Shorts" - item_path = /obj/item/clothing/under/shorts/red - -/datum/loadout_item/under/miscellaneous/tam - name = "Tan Pants" - item_path = /obj/item/clothing/under/pants/tan - /datum/loadout_item/under/miscellaneous/track name = "Track Pants" item_path = /obj/item/clothing/under/pants/track -/datum/loadout_item/under/miscellaneous/jeans_youngfolk - name = "Young Folks Jeans" - item_path = /obj/item/clothing/under/pants/youngfolksjeans +/datum/loadout_item/under/miscellaneous/camo + name = "Camo Pants" + item_path = /obj/item/clothing/under/pants/camo -/datum/loadout_item/under/miscellaneous/white - name = "White Pants" - item_path = /obj/item/clothing/under/pants/white +/datum/loadout_item/under/miscellaneous/shorts + name = "Recolorable Shorts" + item_path = /obj/item/clothing/under/shorts + +/datum/loadout_item/under/miscellaneous/jeanshorts //This doesnt look like a word. Short. Jean-Short. Eugh. + name = "Recolorable Jean Shorts" + item_path = /obj/item/clothing/under/jeanshorts + +/datum/loadout_item/under/miscellaneous/red_short + name = "Red Shorts" + item_path = /obj/item/clothing/under/shorts/red + +/datum/loadout_item/under/miscellaneous/green_short + name = "Green Shorts" + item_path = /obj/item/clothing/under/shorts/green + +/datum/loadout_item/under/miscellaneous/blue_short + name = "Blue Shorts" + item_path = /obj/item/clothing/under/shorts/blue + +/datum/loadout_item/under/miscellaneous/black_short + name = "Black Shorts" + item_path = /obj/item/clothing/under/shorts/black + +/datum/loadout_item/under/miscellaneous/grey_short + name = "Grey Shorts" + item_path = /obj/item/clothing/under/shorts/grey + +/datum/loadout_item/under/miscellaneous/purple_short + name = "Purple Shorts" + item_path = /obj/item/clothing/under/shorts/purple + +/datum/loadout_item/under/miscellaneous/jeansripped + name = "Ripped Jeans" + item_path = /obj/item/clothing/under/pants/jeanripped + +/datum/loadout_item/under/miscellaneous/pants_blackshorts + name = "Black ripped shorts" + item_path = /obj/item/clothing/under/pants/blackshorts + +//TODO: split loadout's miscellaneous to have "Pants/Shorts" and "Dresses/Skirts" as options too. Misc is stupid. + +/datum/loadout_item/under/miscellaneous/dress_striped + name = "Striped Dress" + item_path = /obj/item/clothing/under/dress/striped + +/datum/loadout_item/under/miscellaneous/skirt_black + name = "Black Skirt" + item_path = /obj/item/clothing/under/dress/skirt + +/datum/loadout_item/under/miscellaneous/skirt_plaid + name = "Recolorable Plaid Skirt" + item_path = /obj/item/clothing/under/dress/skirt/plaid + +/datum/loadout_item/under/miscellaneous/skirt_turtleneck + name = "Recolorable Turtleneck Skirt" + item_path = /obj/item/clothing/under/dress/skirt/turtleskirt + +/datum/loadout_item/under/miscellaneous/dress_tango + name = "Recolorable Tango Dress" + item_path = /obj/item/clothing/under/dress/tango + +/datum/loadout_item/under/miscellaneous/dress_sun + name = "Recolorable Sundress" + item_path = /obj/item/clothing/under/dress/sundress + +/datum/loadout_item/under/miscellaneous/swept_skirt + name = "Swept Skirt" + item_path = /obj/item/clothing/under/dress/skirt/swept + +/datum/loadout_item/under/miscellaneous/denim_skirt + name = "Denim Skirt" + item_path = /obj/item/clothing/under/pants/denimskirt + +/datum/loadout_item/under/miscellaneous/littleblack + name = "Short Black Dress" + item_path = /obj/item/clothing/under/dress/littleblack + +/datum/loadout_item/under/miscellaneous/pinktutu + name = "Pink Tutu" + item_path = /obj/item/clothing/under/dress/pinktutu /datum/loadout_item/under/miscellaneous/kilt name = "Kilt" @@ -537,10 +555,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ item_path = /obj/item/clothing/under/rank/medical/scrubs/skyrat/white restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_SECURITY_MEDIC, JOB_PARAMEDIC) -/datum/loadout_item/under/miscellaneous/swept_skirt - name = "Swept Skirt" - item_path = /obj/item/clothing/under/dress/skirt/swept - /datum/loadout_item/under/miscellaneous/gear_harness name = "Gear Harness" item_path = /obj/item/clothing/under/misc/gear_harness @@ -642,10 +656,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Formal Red Dress" item_path = /obj/item/clothing/under/misc/formaldressred -/datum/loadout_item/under/formal/pinktutu - name = "Pink Tutu" - item_path = /obj/item/clothing/under/dress/pinktutu - /datum/loadout_item/under/formal/assistant name = "Assistant Formal" item_path = /obj/item/clothing/under/misc/assistantformal @@ -662,18 +672,10 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Black Suitskirt" item_path = /obj/item/clothing/under/suit/black/skirt -/datum/loadout_item/under/formal/black_tango - name = "Black Tango Dress" - item_path = /obj/item/clothing/under/dress/blacktango - /datum/loadout_item/under/formal/black_twopiece name = "Black Two-Piece Suit" item_path = /obj/item/clothing/under/suit/blacktwopiece -/datum/loadout_item/under/formal/black_skirt - name = "Black Skirt" - item_path = /obj/item/clothing/under/dress/skirt - /datum/loadout_item/under/formal/black_lawyer_suit name = "Black Lawyer Suit" item_path = /obj/item/clothing/under/rank/civilian/lawyer/black @@ -698,14 +700,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Blue Lawyer Suitskirt" item_path = /obj/item/clothing/under/rank/civilian/lawyer/blue/skirt -/datum/loadout_item/under/formal/blue_skirt - name = "Blue Skirt" - item_path = /obj/item/clothing/under/dress/skirt/blue - -/datum/loadout_item/under/formal/blue_skirt_plaid - name = "Blue Plaid Skirt" - item_path = /obj/item/clothing/under/dress/skirt/plaid/blue - /datum/loadout_item/under/formal/burgundy_suit name = "Burgundy Suit" item_path = /obj/item/clothing/under/suit/burgundy @@ -734,14 +728,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Wide-collared Executive Suitskirt" item_path = /obj/item/clothing/under/suit/skyrat/black_really_collared/skirt -/datum/loadout_item/under/formal/green_suit - name = "Green Suit" - item_path = /obj/item/clothing/under/suit/green - -/datum/loadout_item/under/formal/green_skirt_plaid - name = "Green Plaid Skirt" - item_path = /obj/item/clothing/under/dress/skirt/plaid/green - /datum/loadout_item/under/formal/navy_suit name = "Navy Suit" item_path = /obj/item/clothing/under/suit/navy @@ -762,14 +748,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Purple Suitskirt" item_path = /obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt -/datum/loadout_item/under/formal/purple_skirt - name = "Purple Skirt" - item_path = /obj/item/clothing/under/dress/skirt/purple - -/datum/loadout_item/under/formal/purple_skirt_plaid - name = "Purple Plaid Skirt" - item_path = /obj/item/clothing/under/dress/skirt/plaid/purple - /datum/loadout_item/under/formal/red_suit name = "Red Suit" item_path = /obj/item/clothing/under/suit/red @@ -794,14 +772,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Red Evening Gown" item_path = /obj/item/clothing/under/dress/redeveninggown -/datum/loadout_item/under/formal/red_skirt - name = "Red Skirt" - item_path = /obj/item/clothing/under/dress/skirt/red - -/datum/loadout_item/under/formal/red_skirt_plaid - name = "Red Plaid Skirt" - item_path = /obj/item/clothing/under/dress/skirt/plaid - /datum/loadout_item/under/formal/sailor name = "Sailor Suit" item_path = /obj/item/clothing/under/costume/sailor @@ -814,18 +784,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Scratch Suit" item_path = /obj/item/clothing/under/suit/white_on_white -/datum/loadout_item/under/formal/denim_skirt - name = "Denim Skirt" - item_path = /obj/item/clothing/under/pants/denimskirt - -/datum/loadout_item/under/formal/littleblack - name = "Short Black Dress" - item_path = /obj/item/clothing/under/dress/littleblack - -/datum/loadout_item/under/formal/striped_skirt - name = "Striped Dress" - item_path = /obj/item/clothing/under/dress/striped - /datum/loadout_item/under/formal/sensible_suit name = "Sensible Suit" item_path = /obj/item/clothing/under/rank/civilian/curator @@ -834,14 +792,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Sensible Suitskirt" item_path = /obj/item/clothing/under/rank/civilian/curator/skirt -/datum/loadout_item/under/formal/sundress - name = "Sundress" - item_path = /obj/item/clothing/under/dress/sundress - -/datum/loadout_item/under/formal/sundress/white - name = "White Sundress" - item_path = /obj/item/clothing/under/dress/sundress/white - /datum/loadout_item/under/formal/tuxedo name = "Tuxedo Suit" item_path = /obj/item/clothing/under/suit/tuxedo @@ -858,7 +808,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Fancy Suit" item_path = /obj/item/clothing/under/suit/fancy - /datum/loadout_item/under/formal/kimono name = "Kimono" item_path = /obj/item/clothing/under/costume/kimono @@ -939,10 +888,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Red Victorian Vest" item_path = /obj/item/clothing/under/costume/vic_vest/red_alt -/datum/loadout_item/under/formal/jeanshorts //why are these formal??? who the fuck wears jorts formally?????? - name = "Jean Shorts" - item_path = /obj/item/clothing/under/pants/jeanshort - //FAMILIES GEAR /datum/loadout_item/under/formal/osi name = "OSI Uniform" diff --git a/modular_skyrat/modules/modular_vending/code/clothesmate.dm b/modular_skyrat/modules/modular_vending/code/clothesmate.dm index c90310fe077..fc01e3eaa42 100644 --- a/modular_skyrat/modules/modular_vending/code/clothesmate.dm +++ b/modular_skyrat/modules/modular_vending/code/clothesmate.dm @@ -7,7 +7,6 @@ /obj/item/clothing/suit/toggle/jacket/flannel/red = 5, /obj/item/clothing/suit/toggle/jacket/flannel/aqua = 5, /obj/item/clothing/suit/toggle/jacket/flannel/brown = 5, - /obj/item/clothing/suit/hooded/wintercoat/custom = 5, /obj/item/clothing/suit/toggle/jacket/hoodie = 5, /obj/item/clothing/suit/toggle/jacket/hoodie/trim = 5, /obj/item/clothing/suit/toggle/jacket/hoodie/trim/alt = 5, diff --git a/tools/UpdatePaths/Scripts/68111_GAGs_clothesmate.txt b/tools/UpdatePaths/Scripts/68111_GAGs_clothesmate.txt new file mode 100644 index 00000000000..ed033e933df --- /dev/null +++ b/tools/UpdatePaths/Scripts/68111_GAGs_clothesmate.txt @@ -0,0 +1,11 @@ +#comment This replaces various clothing items with GAGs version https://github.com/tgstation/tgstation/pull/68111 + +/obj/item/clothing/head/beanie/rasta : /obj/item/clothing/head/rasta{@OLD} +/obj/item/clothing/head/beanie/waldo : /obj/item/clothing/head/waldo{@OLD} +/obj/item/clothing/neck/stripedbluescarf : /obj/item/clothing/neck/large_scarf/blue{@OLD} +/obj/item/clothing/neck/stripedgreenscarf : /obj/item/clothing/neck/large_scarf/green{@OLD} +/obj/item/clothing/neck/stripedredscarf : /obj/item/clothing/neck/large_scarf/red{@OLD} +/obj/item/clothing/head/beanie/stripedred : /obj/item/clothing/head/beanie/red{@OLD} +/obj/item/clothing/under/pants/youngfolksjeans : /obj/item/clothing/under/pants/jeans{@OLD} +/obj/item/clothing/under/pants/classicjeans : /obj/item/clothing/under/pants/jeans{@OLD} +/obj/item/clothing/under/dress/blacktango : /obj/item/clothing/under/dress/tango{@OLD}