diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index dd4edad2e5a..da5a1350dc4 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -2361,7 +2361,7 @@ /obj/structure/table, /obj/structure/bedsheetbin, /obj/item/clothing/neck/tie/black, -/obj/item/clothing/under/suit/black, +/obj/item/clothing/under/costume/buttondown/slacks/service, /obj/effect/turf_decal/tile/blue{ dir = 4 }, diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 6a24589b89c..8e09ab52925 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -43852,7 +43852,7 @@ "nWB" = ( /obj/structure/closet, /obj/item/clothing/under/suit/black, -/obj/item/clothing/under/rank/civilian/lawyer/black/skirt, +/obj/item/clothing/under/suit/black/skirt, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 1370b362fd4..ed653123e2d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -19365,7 +19365,6 @@ /area/station/medical/pharmacy) "hoQ" = ( /obj/structure/table, -/obj/item/clothing/under/suit/black/skirt, /obj/item/clothing/under/suit/black_really, /obj/machinery/light/small/directional/north, /obj/item/radio/intercom/directional/north, @@ -19373,7 +19372,7 @@ /obj/item/clothing/suit/toggle/lawyer/black, /obj/item/clothing/under/suit/red, /obj/item/clothing/neck/tie/black, -/obj/item/clothing/under/suit/black, +/obj/item/clothing/under/costume/buttondown/slacks/service, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -27989,7 +27988,7 @@ /area/station/science/research) "kjL" = ( /obj/structure/table, -/obj/item/clothing/under/suit/sl, +/obj/item/clothing/under/costume/buttondown/slacks/service, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/commons/fitness/recreation) diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm index c07f774637c..db9a792f887 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -332,7 +332,7 @@ /datum/greyscale_config/buttondown_slacks/worn name = "Buttondown with Slacks (Worn)" icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi' - json_config = 'code/datums/greyscale/json_configs/buttondown_slacks_worn.json' + json_config = 'code/datums/greyscale/json_configs/buttondown_slacks_worn.json' //Needed a unique object .json to fix height issues, so the worn is separate /datum/greyscale_config/buttondown_shorts name = "Buttondown with Shorts" @@ -342,7 +342,7 @@ /datum/greyscale_config/buttondown_shorts/worn name = "Buttondown with Shorts (Worn)" icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi' - json_config = 'code/datums/greyscale/json_configs/buttondown_shorts_worn.json' + json_config = 'code/datums/greyscale/json_configs/buttondown_shorts_worn.json' //Ditto // // SUITS diff --git a/code/datums/greyscale/json_configs/buttondown_shorts.json b/code/datums/greyscale/json_configs/buttondown_shorts.json index 8c4f4daf067..3a8bba407fc 100644 --- a/code/datums/greyscale/json_configs/buttondown_shorts.json +++ b/code/datums/greyscale/json_configs/buttondown_shorts.json @@ -8,19 +8,19 @@ }, { "type": "icon_state", - "icon_state": "buckle", + "icon_state": "buttondown_obj_buckle", "blend_mode": "overlay", "color_ids": [ 2 ] }, { "type": "icon_state", - "icon_state": "belt", + "icon_state": "buttondown_obj_belt", "blend_mode": "overlay", "color_ids": [ 3 ] }, { "type": "icon_state", - "icon_state": "shorts", + "icon_state": "buttondown_obj_shorts", "blend_mode": "overlay", "color_ids": [ 4 ] } diff --git a/code/datums/greyscale/json_configs/buttondown_slacks.json b/code/datums/greyscale/json_configs/buttondown_slacks.json index e92706ef5bc..73d091e3d70 100644 --- a/code/datums/greyscale/json_configs/buttondown_slacks.json +++ b/code/datums/greyscale/json_configs/buttondown_slacks.json @@ -8,19 +8,19 @@ }, { "type": "icon_state", - "icon_state": "buckle", + "icon_state": "buttondown_obj_buckle", "blend_mode": "overlay", "color_ids": [ 2 ] }, { "type": "icon_state", - "icon_state": "belt", + "icon_state": "buttondown_obj_belt", "blend_mode": "overlay", "color_ids": [ 3 ] }, { "type": "icon_state", - "icon_state": "slacks", + "icon_state": "buttondown_obj_slacks", "blend_mode": "overlay", "color_ids": [ 4 ] } diff --git a/code/game/objects/effects/spawners/costume.dm b/code/game/objects/effects/spawners/costume.dm index c1581ef9ae9..68f189587b8 100644 --- a/code/game/objects/effects/spawners/costume.dm +++ b/code/game/objects/effects/spawners/costume.dm @@ -65,7 +65,7 @@ name = "butler costume spawner" items = list( /obj/item/clothing/accessory/waistcoat, - /obj/item/clothing/under/suit/black, + /obj/item/clothing/under/costume/buttondown/slacks/service, /obj/item/clothing/neck/tie/black, /obj/item/clothing/head/hats/tophat, ) @@ -95,7 +95,7 @@ /obj/effect/spawner/random/clothing/bowler_or_that, /obj/item/clothing/shoes/sneakers/black, /obj/item/cane, - /obj/item/clothing/under/suit/sl, + /obj/item/clothing/under/costume/buttondown/slacks/service, /obj/item/clothing/mask/fakemoustache, ) @@ -210,7 +210,7 @@ name = "black mafia outfit spawner" items = list( /obj/item/clothing/head/fedora, - /obj/item/clothing/under/suit/blacktwopiece, + /obj/item/clothing/under/suit/black, /obj/item/clothing/shoes/laceup, ) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 34837d8ce3f..696a5891fe5 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -646,7 +646,7 @@ inhand_icon_state = "duffel-syndieammo" /obj/item/storage/backpack/duffelbag/syndie/hitman/PopulateContents() - new /obj/item/clothing/under/suit/black(src) + new /obj/item/clothing/under/costume/buttondown/slacks/service(src) new /obj/item/clothing/neck/tie/red/hitman(src) new /obj/item/clothing/accessory/waistcoat(src) new /obj/item/clothing/suit/toggle/lawyer/black(src) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 61f812a599d..dfd92b17982 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -10,7 +10,7 @@ var/static/items_inside = list( /obj/item/clothing/head/hats/tophat = 2, /obj/item/radio/headset/headset_srv = 2, - /obj/item/clothing/under/suit/sl = 2, + /obj/item/clothing/under/costume/buttondown/slacks/service = 2, /obj/item/clothing/under/rank/civilian/bartender = 2, /obj/item/clothing/accessory/waistcoat = 2, /obj/item/clothing/head/soft/black = 2, @@ -76,7 +76,7 @@ /obj/structure/closet/lawcloset/PopulateContents() ..() - new /obj/item/clothing/under/suit/blacktwopiece(src) + new /obj/item/clothing/under/suit/black(src) new /obj/item/clothing/under/rank/civilian/lawyer/beige(src) new /obj/item/clothing/under/rank/civilian/lawyer/black(src) new /obj/item/clothing/under/rank/civilian/lawyer/red(src) @@ -85,7 +85,7 @@ new /obj/item/clothing/suit/toggle/lawyer(src) new /obj/item/clothing/under/rank/civilian/lawyer/purpsuit(src) new /obj/item/clothing/suit/toggle/lawyer/purple(src) - new /obj/item/clothing/under/suit/black(src) + new /obj/item/clothing/under/costume/buttondown/slacks/service(src) new /obj/item/clothing/neck/tie/black(src) new /obj/item/clothing/suit/toggle/lawyer/black(src) new /obj/item/clothing/shoes/laceup(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index ba1bc1ef471..7ade1df8964 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -55,8 +55,7 @@ /obj/structure/closet/secure_closet/psychology/PopulateContents() ..() - new /obj/item/clothing/under/suit/black(src) - new /obj/item/clothing/under/suit/black/skirt(src) + new /obj/item/clothing/under/costume/buttondown/slacks/service(src) new /obj/item/clothing/neck/tie/black(src) new /obj/item/clothing/shoes/laceup(src) new /obj/item/storage/backpack/medic(src) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 32442ad8b05..7c52adbec74 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -652,7 +652,7 @@ if(ishuman(L)) var/mob/living/carbon/human/observer = L - observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit/black(observer), ITEM_SLOT_ICLOTHING) + observer.equip_to_slot_or_del(new /obj/item/clothing/under/costume/buttondown/slacks/service(observer), ITEM_SLOT_ICLOTHING) observer.equip_to_slot_or_del(new /obj/item/clothing/neck/tie/black/tied(observer), ITEM_SLOT_NECK) observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), ITEM_SLOT_FEET) L.Unconscious(100) diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 01ee43f4d29..a130bc6d09d 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -188,7 +188,7 @@ id = /obj/item/card/id/advanced/chameleon/black id_trim = /datum/id_trim/reaper_assassin - uniform = /obj/item/clothing/under/suit/black + uniform = /obj/item/clothing/under/costume/buttondown/slacks/service neck = /obj/item/clothing/neck/tie/red/hitman/tied belt = /obj/item/modular_computer/pda/heads ears = /obj/item/radio/headset diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index 3edfcb69e85..75b56e5b412 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -276,6 +276,9 @@ greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C" flags_1 = IS_PLAYER_COLORABLE_1 +/obj/item/clothing/under/costume/buttondown/slacks/service //preset one to be a formal white shirt and black pants + greyscale_colors = "#EEEEEE#CBDBFC#17171B#222227" + /obj/item/clothing/under/costume/buttondown/shorts name = "buttondown shirt with shorts" desc = "A fancy buttondown shirt with shorts." @@ -359,3 +362,13 @@ inhand_icon_state = null female_sprite_flags = NO_FEMALE_UNIFORM can_adjust = FALSE + +/obj/item/clothing/under/costume/henchmen + name = "henchmen jumpsuit" + desc = "A very gaudy jumpsuit for a proper Henchman. Guild regulations, you understand." + icon = 'icons/obj/clothing/under/syndicate.dmi' + worn_icon = 'icons/mob/clothing/under/syndicate.dmi' + icon_state = "henchmen" + inhand_icon_state = null + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS|HEAD + flags_inv = HIDEGLOVES|HIDESHOES|HIDEEARS|HIDEEYES|HIDEHAIR diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm index 86860e796c2..31a691668a2 100644 --- a/code/modules/clothing/under/jobs/civilian/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian/civilian.dm @@ -173,6 +173,7 @@ desc = "A tacky suit perfect for a CRIMINAL lawyer!" icon_state = "good_suit" inhand_icon_state = "good_suit" + icon = 'icons/obj/clothing/under/suits.dmi' worn_icon = 'icons/mob/clothing/under/suits.dmi' /obj/item/clothing/under/rank/civilian/lawyer/beige/skirt @@ -180,7 +181,6 @@ desc = "A tacky suitskirt perfect for a CRIMINAL lawyer!" icon_state = "good_suit_skirt" inhand_icon_state = "good_suit" - worn_icon = 'icons/mob/clothing/under/suits.dmi' dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm index 775a37d77d6..02f047c2f48 100644 --- a/code/modules/clothing/under/suits.dm +++ b/code/modules/clothing/under/suits.dm @@ -3,27 +3,81 @@ worn_icon = 'icons/mob/clothing/under/suits.dmi' can_adjust = FALSE female_sprite_flags = FEMALE_UNIFORM_NO_BREASTS - -/obj/item/clothing/under/suit/white_on_white - name = "white suit" - desc = "A white suit, suitable for an excellent host." - icon_state = "scratch" inhand_icon_state = null +/obj/item/clothing/under/suit/green + name = "green suit" + desc = "A green suit and yellow necktie. Baller." + icon = 'icons/obj/clothing/under/captain.dmi' + icon_state = "green_suit" + inhand_icon_state = "dg_suit" + worn_icon = 'icons/mob/clothing/under/captain.dmi' + +/obj/item/clothing/under/suit/red //Also used by the Curator's suit, /obj/item/clothing/under/rank/civilian/curator + name = "red suit" + desc = "A red suit and blue tie. Somewhat formal." + icon_state = "red_suit" + inhand_icon_state = "r_suit" + +/obj/item/clothing/under/suit/charcoal + name = "charcoal suit" + desc = "A charcoal suit and red tie. Very professional." + icon_state = "charcoal_suit" + +/obj/item/clothing/under/suit/navy + name = "navy suit" + desc = "A navy suit and red tie, intended for the station's finest." + icon_state = "navy_suit" + +/obj/item/clothing/under/suit/burgundy + name = "burgundy suit" + desc = "A burgundy suit and black tie. Somewhat formal." + icon_state = "burgundy_suit" + +/obj/item/clothing/under/suit/checkered + name = "checkered suit" + desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?" + icon_state = "checkered_suit" + +/obj/item/clothing/under/suit/beige + name = "beige suit" + desc = "An excellent light colored suit, experts in the field stress that it should not to be confused with the inferior tan suit." + icon_state = "beige_suit" + +/obj/item/clothing/under/suit/black + name = "black two piece suit" + desc = "A black suit with charcoal pants and a red tie. Very formal." + icon_state = "black_suit" + +/obj/item/clothing/under/suit/black/skirt + name = "black two piece suit" + desc = "A black suit with a charcoal skirt and a red tie. Very formal." + icon_state = "black_suit_skirt" + body_parts_covered = CHEST|GROIN|ARMS + dying_key = DYE_REGISTRY_JUMPSKIRT + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/under/suit/white + name = "white suit" + desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!" + icon_state = "white_suit" + inhand_icon_state = "white_suit" + /obj/item/clothing/under/suit/white/skirt name = "white suitskirt" desc = "A white suitskirt, suitable for an excellent host." icon_state = "white_suit_skirt" - inhand_icon_state = null body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/under/suit/sl - desc = "It's a very amish looking suit." - name = "amish suit" - icon_state = "sl_suit" +/obj/item/clothing/under/suit/tan + name = "tan suit" + desc = "A tan suit. Smart, but casual." + icon_state = "tan_suit" + inhand_icon_state = "tan_suit" /obj/item/clothing/under/suit/waiter name = "waiter's outfit" @@ -32,31 +86,6 @@ inhand_icon_state = "waiter" supports_variations_flags = CLOTHING_MONKEY_VARIATION -/obj/item/clothing/under/suit/blacktwopiece - name = "black two piece suit" - desc = "A black suit and red tie. Very formal." - icon_state = "black_suit" - inhand_icon_state = null - -/obj/item/clothing/under/suit/black - name = "black suit" - desc = "A professional looking black suit. Ready for some serious law." - icon_state = "blacksuit" - inhand_icon_state = null - can_adjust = TRUE - alt_covers_chest = TRUE - -/obj/item/clothing/under/suit/black/skirt - name = "black suitskirt" - desc = "A professional black suitskirt. Nanotrasen Investigation Bureau approved!" - icon_state = "blacksuit_skirt" - inhand_icon_state = "bar_suit" - alt_covers_chest = TRUE - body_parts_covered = CHEST|GROIN|ARMS - dying_key = DYE_REGISTRY_JUMPSKIRT - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - /obj/item/clothing/under/suit/black_really name = "executive suit" desc = "A formal black suit, intended for the station's finest." @@ -73,72 +102,6 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/under/suit/green - name = "green suit" - desc = "A green suit and yellow necktie. Baller." - icon = 'icons/obj/clothing/under/captain.dmi' - icon_state = "green_suit" - inhand_icon_state = "dg_suit" - worn_icon = 'icons/mob/clothing/under/captain.dmi' - -/obj/item/clothing/under/suit/red - name = "red suit" - desc = "A red suit and blue tie. Somewhat formal." - icon_state = "red_suit" - inhand_icon_state = "r_suit" - -/obj/item/clothing/under/suit/charcoal - name = "charcoal suit" - desc = "A charcoal suit and red tie. Very professional." - icon_state = "charcoal_suit" - inhand_icon_state = null - -/obj/item/clothing/under/suit/navy - name = "navy suit" - desc = "A navy suit and red tie, intended for the station's finest." - icon_state = "navy_suit" - inhand_icon_state = null - -/obj/item/clothing/under/suit/burgundy - name = "burgundy suit" - desc = "A burgundy suit and black tie. Somewhat formal." - icon_state = "burgundy_suit" - inhand_icon_state = null - -/obj/item/clothing/under/suit/checkered - name = "checkered suit" - desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?" - icon_state = "checkered_suit" - inhand_icon_state = null - -/obj/item/clothing/under/suit/tan - name = "tan suit" - desc = "A tan suit. Smart, but casual." - icon_state = "tan_suit" - inhand_icon_state = "tan_suit" - -/obj/item/clothing/under/suit/white - name = "white suit" - desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!" - icon_state = "white_suit" - inhand_icon_state = "white_suit" - -/obj/item/clothing/under/suit/beige - name = "beige suit" - desc = "An excellent light colored suit, experts in the field stress that it should not to be confused with the inferior tan suit." - icon_state = "beige_suit" - inhand_icon_state = null - -/obj/item/clothing/under/suit/henchmen - name = "henchmen jumpsuit" - desc = "A very gaudy jumpsuit for a proper Henchman. Guild regulations, you understand." - icon = 'icons/obj/clothing/under/syndicate.dmi' - worn_icon = 'icons/mob/clothing/under/syndicate.dmi' - icon_state = "henchmen" - inhand_icon_state = null - body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS|HEAD - flags_inv = HIDEGLOVES|HIDESHOES|HIDEEARS|HIDEEYES|HIDEHAIR - /obj/item/clothing/under/suit/tuxedo name = "tuxedo" desc = "A formal black tuxedo. It exudes classiness." diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm index d35edfb1476..3ece5c84371 100644 --- a/code/modules/jobs/job_types/psychologist.dm +++ b/code/modules/jobs/job_types/psychologist.dm @@ -40,7 +40,7 @@ id = /obj/item/card/id/advanced id_trim = /datum/id_trim/job/psychologist - uniform = /obj/item/clothing/under/suit/black + uniform = /obj/item/clothing/under/costume/buttondown/slacks/service backpack_contents = list( /obj/item/storage/pill_bottle/happinesspsych, /obj/item/storage/pill_bottle/lsdpsych, diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm index ff5749ef43c..43ccfe73a1e 100644 --- a/code/modules/mafia/outfits.dm +++ b/code/modules/mafia/outfits.dm @@ -46,7 +46,7 @@ gloves = /obj/item/clothing/gloves/color/white shoes = /obj/item/clothing/shoes/laceup suit = /obj/item/clothing/suit/costume/gothcoat - uniform = /obj/item/clothing/under/suit/black + uniform = /obj/item/clothing/under/costume/buttondown/slacks/service //town @@ -69,7 +69,7 @@ /datum/outfit/mafia/psychologist name = "Mafia Psychologist" - uniform = /obj/item/clothing/under/suit/black + uniform = /obj/item/clothing/under/costume/buttondown/slacks/service neck = /obj/item/clothing/neck/tie/black/tied shoes = /obj/item/clothing/shoes/laceup diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index c18a77ac1b5..5d6a57315a1 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -46,7 +46,7 @@ /obj/item/clothing/under/costume/referee = 1, /obj/item/clothing/mask/whistle = 1, /obj/item/storage/backpack/henchmen = 5, - /obj/item/clothing/under/suit/henchmen = 5, + /obj/item/clothing/under/costume/henchmen = 5, /obj/item/clothing/head/costume/jackbros = 5, /obj/item/clothing/under/costume/jackbros = 5, /obj/item/clothing/under/costume/deckers = 5, @@ -104,7 +104,6 @@ /obj/item/clothing/shoes/singerb = 1, /obj/item/clothing/under/costume/singer/blue = 1, /obj/item/clothing/head/costume/cueball = 1, - /obj/item/clothing/under/suit/white_on_white = 1, ), ), list( @@ -160,8 +159,7 @@ "name" = "Service", "icon" = "kitchen-set", "products" = list( - /obj/item/clothing/under/suit/black = 1, - /obj/item/clothing/under/suit/sl = 1, + /obj/item/clothing/under/costume/buttondown/slacks/service = 1, /obj/item/clothing/accessory/waistcoat = 1, /obj/item/clothing/under/suit/waiter = 1, /obj/item/clothing/suit/apron = 1, diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 3913832dbf5..b933a55591a 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -100,7 +100,7 @@ /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/under/costume/buttondown/slacks/service = 1, /obj/item/clothing/suit/jacket/bomber = 2, /obj/item/clothing/suit/jacket/puffer/vest = 2, /obj/item/clothing/suit/jacket/puffer = 2, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index c6dc5c9dca0..2cce1ec2296 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -165,7 +165,7 @@ /obj/item/clothing/head/costume/mailman = 1, /obj/item/clothing/under/misc/mailman = 1, /obj/item/clothing/under/rank/cargo/miner = 3, - + ) refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe payment_department = ACCOUNT_CAR @@ -227,7 +227,7 @@ /obj/item/storage/backpack/satchel/science = 3, /obj/item/storage/backpack/duffelbag/science = 3, /obj/item/radio/headset/headset_sci = 3, - + ) refill_canister = /obj/item/vending_refill/wardrobe/science_wardrobe payment_department = ACCOUNT_SCI @@ -348,7 +348,7 @@ /obj/item/clothing/head/hats/tophat = 2, /obj/item/clothing/head/soft/black = 2, /obj/item/clothing/neck/petcollar = 1, - /obj/item/clothing/under/suit/sl = 2, + /obj/item/clothing/under/costume/buttondown/slacks/service = 2, /obj/item/clothing/under/rank/civilian/bartender = 2, /obj/item/clothing/under/rank/civilian/bartender/purple = 2, /obj/item/clothing/under/rank/civilian/bartender/skirt = 2, diff --git a/icons/mob/clothing/under/suits.dmi b/icons/mob/clothing/under/suits.dmi index 16278b33414..e0981dbe580 100644 Binary files a/icons/mob/clothing/under/suits.dmi and b/icons/mob/clothing/under/suits.dmi differ diff --git a/icons/obj/clothing/under/shorts_pants_shirts.dmi b/icons/obj/clothing/under/shorts_pants_shirts.dmi index c9b71d31ce1..36d283dbfc4 100644 Binary files a/icons/obj/clothing/under/shorts_pants_shirts.dmi and b/icons/obj/clothing/under/shorts_pants_shirts.dmi differ diff --git a/icons/obj/clothing/under/suits.dmi b/icons/obj/clothing/under/suits.dmi index 0ebdd51147f..604e3787b24 100644 Binary files a/icons/obj/clothing/under/suits.dmi and b/icons/obj/clothing/under/suits.dmi differ