diff --git a/_maps/map_files/Blueshift/BlueShift_middle.dmm b/_maps/map_files/Blueshift/BlueShift_middle.dmm index 87d9227eca2..5f1a850ccc0 100644 --- a/_maps/map_files/Blueshift/BlueShift_middle.dmm +++ b/_maps/map_files/Blueshift/BlueShift_middle.dmm @@ -19016,11 +19016,6 @@ dir = 1 }, /area/station/security/prison/upper) -"fPN" = ( -/obj/structure/table, -/obj/item/clothing/under/misc/tactical1, -/turf/open/floor/plating, -/area/station/maintenance/department/security/prison_lower) "fQg" = ( /obj/item/kirbyplants/random, /obj/machinery/firealarm/directional/south, @@ -120545,7 +120540,7 @@ jDM jDM jDM fXT -fPN +uFd uNm nVh uNm diff --git a/_maps/map_files/Blueshift/BlueShift_upper.dmm b/_maps/map_files/Blueshift/BlueShift_upper.dmm index 8e712e75105..afbd6e598c2 100644 --- a/_maps/map_files/Blueshift/BlueShift_upper.dmm +++ b/_maps/map_files/Blueshift/BlueShift_upper.dmm @@ -18670,7 +18670,7 @@ "gbN" = ( /obj/structure/rack/shelf, /obj/effect/turf_decal/bot, -/obj/item/clothing/under/costume/bathrobe, +/obj/item/clothing/under/costume/skyrat/bathrobe, /turf/open/floor/iron, /area/station/commons/dorms) "gbO" = ( @@ -22010,8 +22010,8 @@ dir = 4 }, /obj/structure/closet/secure_closet/personal, -/obj/item/clothing/under/costume/bathrobe, -/obj/item/clothing/under/costume/bathrobe, +/obj/item/clothing/under/costume/skyrat/bathrobe, +/obj/item/clothing/under/costume/skyrat/bathrobe, /obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/sandal, /turf/open/floor/wood, @@ -41818,7 +41818,7 @@ /obj/structure/closet/secure_closet/personal, /obj/structure/window/reinforced, /obj/effect/turf_decal/bot, -/obj/item/clothing/under/costume/bathrobe, +/obj/item/clothing/under/costume/skyrat/bathrobe, /turf/open/floor/iron/dark, /area/station/commons/dorms) "ode" = ( @@ -53103,7 +53103,7 @@ "rZz" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/turf_decal/bot, -/obj/item/clothing/under/costume/bathrobe, +/obj/item/clothing/under/costume/skyrat/bathrobe, /turf/open/floor/iron/dark, /area/station/commons/dorms) "rZH" = ( @@ -69354,7 +69354,7 @@ /area/station/hallway/primary/upper) "xGT" = ( /obj/structure/rack, -/obj/item/clothing/under/costume/bathrobe, +/obj/item/clothing/under/costume/skyrat/bathrobe, /obj/item/clothing/shoes/sandal, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 21554f7fd55..ecde97f8917 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -63142,7 +63142,7 @@ "suE" = ( /obj/structure/closet, /obj/structure/window/reinforced, -/obj/item/clothing/under/costume/bathrobe, +/obj/item/clothing/under/costume/skyrat/bathrobe, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, /obj/effect/turf_decal/bot, @@ -80023,7 +80023,7 @@ /area/station/engineering/atmos/storage) "xos" = ( /obj/structure/closet, -/obj/item/clothing/under/costume/bathrobe, +/obj/item/clothing/under/costume/skyrat/bathrobe, /obj/effect/turf_decal/bot, /turf/open/floor/iron/white/small, /area/station/common/pool) diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index 880df2ad0d7..1f5d227bb4e 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -300,6 +300,7 @@ can_adjust = FALSE greyscale_config = /datum/greyscale_config/football_suit greyscale_config_worn = /datum/greyscale_config/football_suit_worn + greyscale_config_worn_digi = /datum/greyscale_config/football_suit_worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale greyscale_colors = "#D74722" flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/icons/obj/clothing/under/costume.dmi b/icons/obj/clothing/under/costume.dmi index 1c2ac134051..0e418eee444 100644 Binary files a/icons/obj/clothing/under/costume.dmi and b/icons/obj/clothing/under/costume.dmi differ diff --git a/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm b/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm index 5108d2ae7f9..45d1e39103a 100644 --- a/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm +++ b/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm @@ -210,10 +210,6 @@ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON gets_cropped_on_taurs = FALSE - -/obj/item/clothing/under/costume/draculass - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - /obj/item/clothing/under/rank/prisoner/skirt supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON gets_cropped_on_taurs = FALSE @@ -257,12 +253,3 @@ /obj/item/clothing/under/changeling supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -/** - * NONE(Squash) - * Clothing that does not have a digitigrade version, and thus will squash legs to fit. - */ -/obj/item/clothing/under/costume/swagoutfit - supports_variations_flags = NONE - - diff --git a/modular_skyrat/master_files/code/modules/clothing/under/costume.dm b/modular_skyrat/master_files/code/modules/clothing/under/costume.dm new file mode 100644 index 00000000000..89f60e87685 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/clothing/under/costume.dm @@ -0,0 +1,105 @@ +/obj/item/clothing/under/costume + worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/under/costume_digi.dmi' + +/obj/item/clothing/under/costume/russian_officer + worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi' + +/obj/item/clothing/under/costume/skyrat + icon = 'modular_skyrat/master_files/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/costume.dmi' + can_adjust = FALSE + +//My least favorite file. Just... try to keep it sorted. And nothing over the top (The victorian dresses were way too much) + +/* +* UNSORTED +*/ + +/obj/item/clothing/under/costume/deckers/alt //not even going to bother re-pathing this one because its such a unique case of 'TGs item has something but this alt doesnt' + name = "deckers maskless outfit" + desc = "A decker jumpsuit with neon blue coloring." + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + icon_state = "decking_jumpsuit" + can_adjust = FALSE + +/obj/item/clothing/under/costume/skyrat/bathrobe + name = "bathrobe" + desc = "A warm fluffy bathrobe, perfect for relaxing after finally getting clean." + icon_state = "bathrobe" + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + greyscale_colors = "#434d7a" //THATS RIGHT, FUCK YOU! THE BATHROBE CAN BE RECOLORED! + greyscale_config = /datum/greyscale_config/bathrobe + greyscale_config_worn = /datum/greyscale_config/bathrobe/worn + greyscale_config_worn_digi = /datum/greyscale_config/bathrobe/worn/digi + flags_1 = IS_PLAYER_COLORABLE_1 + +/* +* LUNAR AND JAPANESE CLOTHES +*/ + +/obj/item/clothing/under/costume/skyrat/qipao + name = "qipao" + desc = "A qipao, traditionally worn in ancient Earth China by women during social events and lunar new years." + icon_state = "qipao" + body_parts_covered = CHEST|GROIN|LEGS + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + greyscale_colors = "#2b2b2b" + greyscale_config = /datum/greyscale_config/qipao + greyscale_config_worn = /datum/greyscale_config/qipao/worn + greyscale_config_worn_digi = /datum/greyscale_config/qipao/worn/digi + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/under/costume/skyrat/cheongsam + name = "cheongsam" + desc = "A cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years." + icon_state = "cheongsam" + body_parts_covered = CHEST|GROIN|LEGS + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + greyscale_colors = "#2b2b2b" + greyscale_config = /datum/greyscale_config/cheongsam + greyscale_config_worn = /datum/greyscale_config/cheongsam/worn + greyscale_config_worn_digi = /datum/greyscale_config/cheongsam/worn/digi + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/under/costume/skyrat/yukata + name = "yukata" + desc = "A traditional ancient Earth Japanese yukata, typically worn in casual settings." + icon_state = "yukata" + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + greyscale_colors = "#2b2b2b" + greyscale_config = /datum/greyscale_config/yukata + greyscale_config_worn = /datum/greyscale_config/yukata/worn + greyscale_config_worn_digi = /datum/greyscale_config/yukata/worn/digi + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/under/costume/skyrat/kamishimo + name = "kamishimo" + desc = "A traditional ancient Earth Japanese Kamishimo." + icon_state = "kamishimo" + +/* +* CHRISTMAS CLOTHES +*/ + +/obj/item/clothing/under/costume/skyrat/christmas + name = "christmas costume" + desc = "Can you believe it guys? Christmas. Just a lightyear away!" //Lightyear is a measure of distance I hate it being used for this joke :( + icon_state = "christmas" + +/obj/item/clothing/under/costume/skyrat/christmas/green + name = "green christmas costume" + desc = "4:00, wallow in self-pity. 4:30, stare into the abyss. 5:00, solve world hunger, tell no one. 5:30, jazzercize; 6:30, dinner with me. I can't cancel that again. 7:00, wrestle with my self-loathing. I'm booked. Of course, if I bump the loathing to 9, I could still be done in time to lay in bed, stare at the ceiling and slip slowly into madness." + icon_state = "christmas_green" + +/obj/item/clothing/under/costume/skyrat/christmas/croptop + name = "sexy christmas costume" + desc = "About 550 years since the release of Mariah Carey's \"All I Want For Christmas is You\", society has yet to properly recover from its repercussions. Some still keep a gun as their christmas mantlepiece, just in case she's heard singing on their rooftop late in the night..." + icon_state = "christmas_crop" + body_parts_covered = CHEST|GROIN + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + +/obj/item/clothing/under/costume/skyrat/christmas/croptop/green + name = "sexy green christmas costume" + desc = "Stupid. Ugly. Out of date. If I can't find something nice to wear I'm not going." + icon_state = "christmas_crop_green" diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/costume.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/costume.dmi new file mode 100644 index 00000000000..f1116b0cdd4 Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/under/costume.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/costume_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/costume_digi.dmi new file mode 100644 index 00000000000..44c85b0f67b Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/under/costume_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi index 31f7cb2672f..de0220ecfd8 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses_digi.dmi index 291f3b653c5..e7b0f3a4e18 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/costume.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/costume.dmi new file mode 100644 index 00000000000..299547afe55 Binary files /dev/null and b/modular_skyrat/master_files/icons/obj/clothing/under/costume.dmi differ diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm index 190e084e250..142f82ae031 100644 --- a/modular_skyrat/modules/GAGS/greyscale_configs.dm +++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm @@ -542,7 +542,64 @@ name = "Worn Pentagram Strapped Dress" icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi' -// KILT +// COSTUMES + +/datum/greyscale_config/football_suit_worn/digi + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/costume_digi.dmi' + +/datum/greyscale_config/qipao + name = "Qipao" + icon_file = 'modular_skyrat/master_files/icons/obj/clothing/under/costume.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/lunar_japanese.json' + +/datum/greyscale_config/qipao/worn + name = "Worn Qipao" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/costume.dmi' + +/datum/greyscale_config/qipao/worn/digi + name = "Worn Qipao - Digitigrade" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/costume_digi.dmi' + +/datum/greyscale_config/cheongsam + name = "Cheongsam" + icon_file = 'modular_skyrat/master_files/icons/obj/clothing/under/costume.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/lunar_japanese.json' + +/datum/greyscale_config/cheongsam/worn + name = "Worn Cheongsam" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/costume.dmi' + +/datum/greyscale_config/cheongsam/worn/digi + name = "Worn Cheongsam - Digitigrade" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/costume_digi.dmi' + +/datum/greyscale_config/yukata + name = "Yukata" + icon_file = 'modular_skyrat/master_files/icons/obj/clothing/under/costume.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/lunar_japanese.json' + +/datum/greyscale_config/yukata/worn + name = "Worn Yukata" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/costume.dmi' + +/datum/greyscale_config/yukata/worn/digi + name = "Worn Yukata - Digitigrade" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/costume_digi.dmi' + +// MISC UNDER + +/datum/greyscale_config/bathrobe + name = "Bathrobe" + icon_file = 'modular_skyrat/master_files/icons/obj/clothing/under/costume.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/costumes/misc.json' + +/datum/greyscale_config/bathrobe/worn + name = "Worn Bathrobe" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/costume.dmi' + +/datum/greyscale_config/bathrobe/worn/digi + name = "Worn Bathrobe - Digitigrade" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/costume_digi.dmi' /datum/greyscale_config/kilt name = "Kilt" diff --git a/modular_skyrat/modules/GAGS/json_configs/costumes/lunar_japanese.json b/modular_skyrat/modules/GAGS/json_configs/costumes/lunar_japanese.json new file mode 100644 index 00000000000..364474ecfcd --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/costumes/lunar_japanese.json @@ -0,0 +1,43 @@ +{ + "qipao": [ + { + "type": "icon_state", + "icon_state": "qipao_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "qipao_trim", + "blend_mode": "overlay" + } + ], + + "cheongsam": [ + { + "type": "icon_state", + "icon_state": "cheongsam_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cheongsam_trim", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "cheongsam_pants", + "blend_mode": "overlay" + } + ], + + "yukata": [ + { + "type": "icon_state", + "icon_state": "yukata_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/costumes/misc.json b/modular_skyrat/modules/GAGS/json_configs/costumes/misc.json new file mode 100644 index 00000000000..882966a9ac8 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/costumes/misc.json @@ -0,0 +1,10 @@ +{ + "bathrobe": [ + { + "type": "icon_state", + "icon_state": "bathrobe_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_uniform.dm b/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_uniform.dm index 9bb18d94c07..5b7af6f02b7 100644 --- a/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_uniform.dm +++ b/modular_skyrat/modules/blastwave_outfits/code/clothing/blastwave_uniform.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/under/blastwave +/obj/item/clothing/under/blastwave //ORION TODO: remove (these can all use Utility uniforms and have the helmet/suit be the color; they already pretty much do) name = "blastwave uniform" desc = "An utilitarian uniform of rugged warfare." icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' diff --git a/modular_skyrat/modules/curatorbundle/Ronin.dm b/modular_skyrat/modules/curatorbundle/Ronin.dm index c62d46238ee..1b09ce27cca 100644 --- a/modular_skyrat/modules/curatorbundle/Ronin.dm +++ b/modular_skyrat/modules/curatorbundle/Ronin.dm @@ -3,7 +3,7 @@ desc = "Anyone can give up, it's the easiest thing in the world to do. But to hold it together when everyone else would understand if you fell apart, that's true strength. Become the wandering swordsman you were always meant to be!" /obj/item/storage/box/hero/ronin/PopulateContents() - new /obj/item/clothing/under/costume/kamishimo(src) + new /obj/item/clothing/under/costume/skyrat/kamishimo(src) new /obj/item/clothing/head/rice_hat(src) new /obj/item/katana/weak/curator(src) new /obj/item/clothing/shoes/sandal(src) diff --git a/modular_skyrat/modules/customization/modules/clothing/under/costumes.dm b/modular_skyrat/modules/customization/modules/clothing/under/costumes.dm index f0972512cae..15170668a22 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/costumes.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/costumes.dm @@ -1,60 +1,3 @@ -// Lunar Clothes -/obj/item/clothing/under/costume/qipao - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "black qipao" - desc = "A qipao, traditionally worn in ancient Earth China by women during social events and lunar new years. This one is black." - icon_state = "qipao" - body_parts_covered = CHEST|GROIN - can_adjust = FALSE - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - supports_variations_flags = NONE - -/obj/item/clothing/under/costume/qipao/white - name = "white qipao" - desc = "A qipao, traditionally worn in ancient Earth China by women during social events and lunar new years. This one is white." - icon_state = "qipao_white" - body_parts_covered = CHEST|GROIN - can_adjust = FALSE - -/obj/item/clothing/under/costume/deckers/alt - name = "deckers maskless outfit" - desc = "A decker jumpsuit with neon blue coloring." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "decking_jumpsuit" - can_adjust = FALSE - -/obj/item/clothing/under/costume/qipao/red - name = "red qipao" - desc = "A qipao, traditionally worn in ancient Earth China by women during social events and lunar new years. This one is red." - icon_state = "qipao_red" - body_parts_covered = CHEST|GROIN - can_adjust = FALSE - -/obj/item/clothing/under/costume/cheongsam - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "black cheongsam" - desc = "A cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years. This one is black." - icon_state = "cheong" - body_parts_covered = CHEST|GROIN - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - can_adjust = FALSE - supports_variations_flags = NONE - -/obj/item/clothing/under/costume/cheongsam/white - name = "white cheongsam" - desc = "A cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years. This one is white." - icon_state = "cheongw" - body_parts_covered = CHEST|GROIN - -/obj/item/clothing/under/costume/cheongsam/red - name = "red cheongsam" - desc = "A cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years. This one is red.." - icon_state = "cheongr" - body_parts_covered = CHEST|GROIN - //Cyberpunk PI Costume - Sprites from Eris, slightly modified /obj/item/clothing/under/costume/cybersleek name = "sleek modern coat" @@ -70,17 +13,3 @@ name = "long modern coat" icon_state = "cyberpunksleek_long" //End Cyberpunk PI port - -/obj/item/clothing/under/costume/arthur - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "dutch assistant uniform" - desc = "Dedicate yourself to something better. To loyalty, honour, for it only dies when everyone abandons it." - icon_state = "arthur_morgan" - -/obj/item/clothing/under/pants/tactical - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "tactical pants" - desc = "A pair of tactical pants, designed for military use." - icon_state = "tactical_pants" diff --git a/modular_skyrat/modules/customization/modules/clothing/under/misc.dm b/modular_skyrat/modules/customization/modules/clothing/under/misc.dm index 1555c3e0f6d..96eda31deb5 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/misc.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/misc.dm @@ -27,16 +27,6 @@ icon_state = "whitebunnysuit" can_adjust = FALSE -/obj/item/clothing/under/croptop //ORION TODO: remove (undershirt of choice + jeanshorts achieves this item much better, and recolorable) - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "crop top" - desc = "We've saved money by giving you half a shirt!" - icon_state = "croptop" - body_parts_covered = CHEST|GROIN|ARMS - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - can_adjust = FALSE - /obj/item/clothing/under/misc/gear_harness icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' @@ -58,58 +48,6 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/under/misc/royalkilt - name = "royal kilt" - desc = "A far more modern kilt, the tunic's been tossed for a combat sweater, the Hunting tartan swapped for Royal Stuart, the itchy green socks are now not itchy or green!" - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "royalkilt" - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - body_parts_covered = CHEST|GROIN|ARMS|LEGS - -/obj/item/clothing/under/misc/tactical1 - name = "irish tactical uniform" - desc = "The SAM missiles are in the sky! Faint whiffs of cheap booze and Libyan semtex come off this getup, someone was so kind as to leave a book in one of the pockets, too bad it's all in Gaelic!" - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "tactical1" - body_parts_covered = CHEST|GROIN|ARMS|LEGS - -/obj/item/clothing/under/rank/security/blackwatch - name = "security kilt" - desc = "Youve heard about the B-men, the cruel RUC. Well theres another regiment the devil calls his own. Theyre known as the Black Watch commissioned by the Crown" - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "blackwatch" - inhand_icon_state = "kilt" - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - armor = list(MELEE = 30, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 10, ACID = 20, WOUND = 10) - body_parts_covered = CHEST|GROIN|ARMS|LEGS - -/obj/item/clothing/under/misc/kimunder - name = "aerostatic suit" - desc = "A crisp and well-pressed suit; professional, comfortable and curiously authoritative." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "aerostatic_suit" - -/obj/item/clothing/under/misc/countess - name = "countess dress" - desc = "A wide flowing dress fitting for a countess, maybe not for anyone who enjoys a dress that doesn't catch on things." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "countess_s" - body_parts_covered = CHEST|GROIN|LEGS|ARMS - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - flags_inv = HIDESHOES - -/obj/item/clothing/under/misc/peakyblinder - name = "birmingham bling" - desc = "A grey suit with a white vest, maybe you run a whiskey plant, maybe you have a frenemy relationship with that guy out of that one film, whatever it is, it's still a nice looking suit." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "peakyblinder" - /obj/item/clothing/under/misc/taccas name = "tacticasual uniform" desc = "A white wifebeater on top of some cargo pants. For when you need to carry various beers." @@ -118,7 +56,7 @@ icon_state = "tac_s" supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION -/obj/item/clothing/under/misc/bluetracksuit +/obj/item/clothing/under/misc/bluetracksuit //ORION TODO: sort out a recolorable solution to this? (Upstream? They have trackpants already...) name = "blue tracksuit" desc = "Found on a dead homeless man squatting in an alleyway, the classic design has been mass produced to bring terror to the galaxy." icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' @@ -161,81 +99,6 @@ icon_state = "doug_dimmadome" supports_variations_flags = NONE -/obj/item/clothing/under/westender - name = "westender outfit" - desc = "An outfit harking back to a pre-industrial revolution era." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "westender" - supports_variations_flags = NONE - -/obj/item/clothing/under/rank/pmarsrobe - name = "priestess robe" - desc = "A thick woolly robe adorned with black furs of a wolf. Keepers of the Flame of utter boredom. Sadly not flameproof" - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "pmars_robe" - body_parts_covered = CHEST|GROIN|ARMS|LEGS - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - flags_inv = HIDESHOES - -///COWBOY -/obj/item/clothing/under/rancher - name = "rancher outfit" - desc = "An outfit from the desert outback, phrases around family murder or revenge seem to echo from this get-up." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "rancher" - -/obj/item/clothing/under/rancher/pioneer - name = "pioneer outfit" - desc = "An outfit from the desert outback, this one seems like one on the frontline, don't trust a german, or anyone trying to get you to go to Callifornia." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "pioneer" - -/obj/item/clothing/under/rancher/worker - name = "western worker outfit" - desc = "An outfit from the desert outback, this one seems something a coffin maker would wear, hope you're good at eyeballing size." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "worker" - -/obj/item/clothing/under/rancher/cowboy - name = "cowboy outfit" - desc = "An outfit from the desert outback, this one seems fitting for a hat and poncho, maybe a long flowing coat." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "cowboy" - -/obj/item/clothing/under/rancher/checkered - name = "western checkered outfit" - desc = "An outfit from the desert outback, this one seems like something someone with no fashion sense would wear." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "checkered" - -/obj/item/clothing/under/uvf - name = "british combat sweater" - desc = "Thankfully doesn't include the sash your father wore." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "uvf" - -/obj/item/clothing/under/whiterussian - name = "army baron uniform" - desc = "Space Communism? That's just like...your opinion man." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "rusuni" - -/obj/item/clothing/under/nostalgiacritic - name = "nostalgic outfit" - desc = "He remembers it so you don't have to." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "cia" - /obj/item/clothing/under/misc/gear_harness/eve name = "collection of leaves" desc = "Three leaves, designed to cover the nipples and genetalia of the wearer. A foe so proud will first the weaker seek." @@ -248,13 +111,6 @@ body_parts_covered = GROIN female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY -/obj/item/clothing/under/rank/medical/doctor/white //ORION TODO: move to skyrat medical file - name = "white scrubs" - desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in a cream white colour." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "scrubswhite" - /obj/item/clothing/under/rank/security/peacekeeper/trousers name = "peacekeeper's trousers" desc = "Some light blue combat trousers, however you get protected by these, I have no idea." @@ -272,29 +128,3 @@ icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' icon_state = "workpants_red" - -/obj/item/clothing/under/costume/christmas - name = "christmas costume" - desc = "Can you believe it guys? Christmas. Just a lightyear away!" - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "christmasmaler" - -/obj/item/clothing/under/costume/christmas/green - name = "green christmas costume" - desc = "Alright buddy, you have two options here. You can be a saint, or you can be a Grinch. Those are your two choices. Choose wisely." - icon_state = "christmasmaleg" - -/obj/item/clothing/under/croptop/christmas - name = "sexy christmas costume" - desc = "Can you believe it guys? Christmas. Just a lightyear away!" - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "christmasfemaler" - -/obj/item/clothing/under/croptop/christmas/green - name = "sexy green christmas costume" - desc = "Alright buddy, you have two options here. You can be a saint, or you can be a Grinch. Those are your two choices. Choose wisely." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "christmasfemaleg" 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 b971f5500cc..45350031815 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/skirts_dresses.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/skirts_dresses.dm @@ -1,23 +1,3 @@ -/obj/item/clothing/under/dress/westernbustle //ORION TODO: move to costume - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "western bustle dress" - desc = "Filled with Western fire." - icon_state = "western_bustle" - inhand_icon_state = "wcoat" - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - can_adjust = FALSE - -/obj/item/clothing/under/dress/flamenco //ORION TODO: move to costume - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "flamenco dress" - desc = "Filled with Latin fire." - icon_state = "flamenco" - inhand_icon_state = "wcoat" - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - can_adjust = FALSE - /obj/item/clothing/under/dress/corset //ORION TODO: move to undershirt 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/utility_port/other_port.dm b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/other_port.dm index 2c85a1cfd7d..2889360c9e9 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/other_port.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/other_port.dm @@ -1,42 +1,3 @@ -//Japanese Clothes -/obj/item/clothing/under/costume/kimono - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "kimono" - desc = "A traditional ancient Earth Japanese Kimono" - icon_state = "kimono" - body_parts_covered = CHEST|GROIN - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY //Stop cutting a hole in the Kimono, please :) - -/obj/item/clothing/under/costume/kimono/dark - name = "dark kimono" - icon_state = "kimono_a" - -/obj/item/clothing/under/costume/kimono/sakura - name = "sakura kimono" - icon_state = "sakura_kimono" - body_parts_covered = CHEST|GROIN|ARMS - -/obj/item/clothing/under/costume/kimono/fancy - name = "fancy kimono" - icon_state = "fancy_kimono" - body_parts_covered = CHEST|GROIN|ARMS - -/obj/item/clothing/under/costume/kamishimo - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "kamishimo" - desc = "A traditional ancient Earth Japanese Kamishimo." - icon_state = "kamishimo" - body_parts_covered = CHEST|GROIN|ARMS - -/obj/item/clothing/under/costume/bathrobe - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "bathrobe" - desc = "A warm fluffy bathrobe, perfect for relaxing after finally getting clean." - icon_state = "bathrobe" - body_parts_covered = CHEST|GROIN /obj/item/clothing/suit/costume/samurai icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' @@ -54,83 +15,6 @@ icon_state = "kabuto" supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON -//Victorian Clothes -/obj/item/clothing/under/costume/vic_vest - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "victorian vest" - desc = "An extremely old-style suit, worn during ancient Earth's victorian period." - icon_state = "victorianvest" - body_parts_covered = CHEST|GROIN|ARMS|LEGS - -/obj/item/clothing/under/costume/vic_vest/red - name = "red-sleeved victorian vest" - icon_state = "victorianvest_red" - -/obj/item/clothing/under/costume/vic_vest/green - name = "green-sleeved victorian vest" - icon_state = "victorianvest_green" - -/obj/item/clothing/under/costume/vic_vest/blue - name = "blue-sleeved victorian vest" - icon_state = "victorianvest_blue" - -/obj/item/clothing/under/costume/vic_vest/red_alt - name = "red victorian vest" - icon_state = "victorianvest_red_alt" - -/obj/item/clothing/under/costume/vic_dress - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "black victorian dress" - desc = "An extremely old-style dress, worn during ancient Earth's victorian period." - icon_state = "victorianblackdress" - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - body_parts_covered = CHEST|GROIN|ARMS|LEGS - -/obj/item/clothing/under/costume/vic_dress/red - name = "red victorian dress" - icon_state = "victorianreddress" - -/obj/item/clothing/under/costume/dutch - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "dutch suit" - desc = "A dapper Dutch suit, for when you gotta have faith." - icon_state = "dutch" - body_parts_covered = CHEST|GROIN|ARMS|LEGS - -/obj/item/clothing/suit/costume/tailcoat - icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' - name = "victorian tailcoat" - desc = "A fancy tailcoat to make your suit seem even more lavish." - icon_state = "tailcoat" - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -/obj/item/clothing/suit/costume/vic_dresscoat - icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' - name = "victorian dresscoat" - desc = "An elaborate coat to go over an old-Earth Victorian Period dress. Much thinner fabric than you'd expected." - icon_state = "vickyblack" - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -/obj/item/clothing/suit/costume/vic_dresscoat/red - icon_state = "vickyred" - -/obj/item/clothing/head/costume/widehat - icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' - name = "wide black hat" - desc = "A fancy old hat to match fancy old dresses." - icon_state = "widehat_black" - supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON - -/obj/item/clothing/head/costume/widehat/red - name = "wide red hat" - icon_state = "widehat_red" - //Misc /obj/item/clothing/under/misc/greyshirt icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.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 9a2b00bb9f7..c9b447e077b 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -131,21 +131,6 @@ . = ..() AddElement(/datum/element/polychromic, list("#888888", "#FF3333", "#FFFFFF")) -/obj/item/clothing/under/misc/polysweater - name = "polychromic sweater" - desc = "Why trade style for comfort? Now you can go commando down south and still be cozy up north, AND do it in whatever color you choose." - icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi' - worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi' - icon_state = "poly_turtle" - worn_icon_state = "poly_turtle" - body_parts_covered = CHEST|GROIN|ARMS //Commando sweater is long but still doesnt have pants - can_adjust = FALSE - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -/obj/item/clothing/under/misc/polysweater/Initialize(mapload) - . = ..() - AddElement(/datum/element/polychromic, list("#FFFFFF")) - /obj/item/clothing/under/misc/poly_tanktop name = "polychromic tank top" desc = "For those lazy summer days." 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 7a2d29d3ced..a81bfde660a 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm @@ -366,14 +366,6 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea item_path = /obj/item/clothing/head/maidheadband additional_tooltip_contents = list("Larger headband from the maid rework. Fits around head and ears.") -/datum/loadout_item/head/widehat - name = "Wide Black Hat" - item_path = /obj/item/clothing/head/costume/widehat - -/datum/loadout_item/head/widehat_red - name = "Wide Red Hat" - item_path = /obj/item/clothing/head/costume/widehat/red - /datum/loadout_item/head/wig name = "Wig" item_path = /obj/item/clothing/head/wig 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 1414333a4a2..757ce8c9754 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -279,10 +279,6 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su name = "Worn Shirt" item_path = /obj/item/clothing/suit/wornshirt -/datum/loadout_item/suit/tailcoat - name = "Tailcoat" - item_path = /obj/item/clothing/suit/costume/tailcoat - /datum/loadout_item/suit/duster name = "Colorable Duster" item_path = /obj/item/clothing/suit/duster @@ -291,14 +287,6 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su name = "Colorable Peacoat" item_path = /obj/item/clothing/suit/toggle/peacoat -/datum/loadout_item/suit/dresscoat - name = "Black Dresscoat" - item_path = /obj/item/clothing/suit/costume/vic_dresscoat - -/datum/loadout_item/suit/dresscoat_red - name = "Red Dresscoat" - item_path = /obj/item/clothing/suit/costume/vic_dresscoat/red - /datum/loadout_item/suit/trackjacket name = "Track Jacket" item_path = /obj/item/clothing/suit/toggle/trackjacket 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 c505ea235b5..8ee4ecac23e 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 @@ -134,10 +134,10 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ item_path = /obj/item/clothing/under/rank/security/detective/disco restricted_roles = list(JOB_DETECTIVE) -/datum/loadout_item/under/jumpsuit/seckilt - name = "Security Kilt" - item_path = /obj/item/clothing/under/rank/security/blackwatch - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_SECURITY_MEDIC) +/datum/loadout_item/under/jumpsuit/kim + name = "Aerostatic Suit" + item_path = /obj/item/clothing/under/rank/security/detective/kim + restricted_roles = list(JOB_DETECTIVE) /datum/loadout_item/under/jumpsuit/paramed_dark name = "Dark Paramedic Jumpsuit" @@ -208,34 +208,28 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ item_path = /obj/item/clothing/under/rank/captain/skyrat/utility restricted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER) -/datum/loadout_item/under/jumpsuit/polysweater - name = "Polychromic Sweater" - item_path = /obj/item/clothing/under/misc/polysweater - /* * MISC UNDERSUITS */ /datum/loadout_item/under/miscellaneous -//christmas stuff, remove afterword -/*/datum/loadout_item/under/miscellaneous/christmas +/datum/loadout_item/under/miscellaneous/christmas name = "Christmas Suit" - item_path = /obj/item/clothing/under/costume/christmas + item_path = /obj/item/clothing/under/costume/skyrat/christmas + required_season = CHRISTMAS /datum/loadout_item/under/miscellaneous/christmas/green name = "Green Christmas Suit" - item_path = /obj/item/clothing/under/costume/christmas/green + item_path = /obj/item/clothing/under/costume/skyrat/christmas/green /datum/loadout_item/under/miscellaneous/christmas/female name = "Revealing Christmas Suit" - item_path = /obj/item/clothing/under/croptop/christmas + item_path = /obj/item/clothing/under/costume/skyrat/christmas/croptop /datum/loadout_item/under/miscellaneous/christmas/female/green name = "Revealing Green Christmas Suit" - item_path = /obj/item/clothing/under/croptop/christmas/green*/ - -//christmas ends, because every christmas is last christmas + item_path = /obj/item/clothing/under/costume/skyrat/christmas/croptop/green /datum/loadout_item/under/miscellaneous/buttondown name = "Recolorable Buttondown Shirt with Slacks" @@ -427,29 +421,17 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Maid Costume" item_path = /obj/item/clothing/under/costume/maid -/datum/loadout_item/under/miscellaneous/croptop - name = "Croptop" - item_path = /obj/item/clothing/under/croptop - -/datum/loadout_item/under/miscellaneous/royalkilt - name = "Royal Kilt" - item_path = /obj/item/clothing/under/misc/royalkilt +/datum/loadout_item/under/miscellaneous/yukata + name = "Recolorable Yukata" + item_path = /obj/item/clothing/under/costume/skyrat/yukata /datum/loadout_item/under/miscellaneous/qipao_black - name = "Qipao, Black" - item_path = /obj/item/clothing/under/costume/qipao - -/datum/loadout_item/under/miscellaneous/qipao_white - name = "Qipao, White" - item_path = /obj/item/clothing/under/costume/qipao/white - -/datum/loadout_item/under/miscellaneous/qipao_red - name = "Qipao, Red" - item_path = /obj/item/clothing/under/costume/qipao/red + name = "Recolorable Qipao" + item_path = /obj/item/clothing/under/costume/skyrat/qipao /datum/loadout_item/under/miscellaneous/cheongsam - name = "Cheongsam, Black" - item_path = /obj/item/clothing/under/costume/cheongsam + name = "Recolorable Cheongsam" + item_path = /obj/item/clothing/under/costume/skyrat/cheongsam /datum/loadout_item/under/miscellaneous/chaps name = "Black Chaps" @@ -471,10 +453,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Dutch Suit" item_path = /obj/item/clothing/under/costume/dutch -/datum/loadout_item/under/miscellaneous/arthur - name = "Dutch Assistant Suit" - item_path = /obj/item/clothing/under/costume/arthur - /datum/loadout_item/under/miscellaneous/tacticool_turtleneck name = "Tacticool Turtleneck" item_path = /obj/item/clothing/under/syndicate/tacticool //This has been rebalanced in modular_skyrat\master_files\code\modules\clothing\under\syndicate.dm @@ -483,10 +461,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Tacticool Skirtleneck" item_path = /obj/item/clothing/under/syndicate/tacticool/skirt //This has been rebalanced in modular_skyrat\master_files\code\modules\clothing\under\syndicate.dm -/datum/loadout_item/under/miscellaneous/tactical_pants - name = "Tactical Pants" - item_path = /obj/item/clothing/under/pants/tactical - /datum/loadout_item/under/miscellaneous/blastwave_uniform name = "Blastwave Uniform" item_path = /obj/item/clothing/under/blastwave @@ -511,17 +485,9 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/miscellaneous/villain name = "Villain Suit" item_path = /obj/item/clothing/under/costume/villain -//November 1st -/datum/loadout_item/under/miscellaneous/tactical_irish - name = "Irish Tactical Sweater" - item_path = /obj/item/clothing/under/misc/tactical1 - -/datum/loadout_item/under/miscellaneous/tactical_british - name = "British Tactical Sweater" - item_path = /obj/item/clothing/under/uvf /datum/loadout_item/under/miscellaneous/sweater - name = "Sweater" + name = "Cableknit Sweater" //Different than the Suit item ("Sweater")!! item_path = /obj/item/clothing/under/sweater /datum/loadout_item/under/miscellaneous/keyhole @@ -567,42 +533,10 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Gear Harness" item_path = /obj/item/clothing/under/misc/gear_harness -/datum/loadout_item/under/miscellaneous/kimunder - name = "Aerostatic Suit" - item_path = /obj/item/clothing/under/misc/kimunder - -/datum/loadout_item/under/miscellaneous/countess - name = "Countess Dress" - item_path = /obj/item/clothing/under/misc/countess - -/datum/loadout_item/under/miscellaneous/peakyblinder - name = "Birmingham Bling" - item_path = /obj/item/clothing/under/misc/peakyblinder - /datum/loadout_item/under/miscellaneous/taccas name = "Tacticasual Uniform" item_path = /obj/item/clothing/under/misc/taccas -/datum/loadout_item/under/miscellaneous/rancher - name = "Rancher Outfit" - item_path = /obj/item/clothing/under/rancher - -/datum/loadout_item/under/miscellaneous/rancher_pioneer - name = "Pioneer Outfit" - item_path = /obj/item/clothing/under/rancher/pioneer - -/datum/loadout_item/under/miscellaneous/rancher_worker - name = "Western Worker Outfit" - item_path = /obj/item/clothing/under/rancher/worker - -/datum/loadout_item/under/miscellaneous/rancher_cowboy - name = "Cowboy Outfit" - item_path = /obj/item/clothing/under/rancher/cowboy - -/datum/loadout_item/under/miscellaneous/rancher_checkered - name = "Western Checkered Outfit" - item_path = /obj/item/clothing/under/rancher/checkered - /datum/loadout_item/under/miscellaneous/cargo_casual name = "Cargo Tech Casualwear" item_path = /obj/item/clothing/under/rank/cargo/tech/skyrat/casualman @@ -652,14 +586,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/formal -/datum/loadout_item/under/formal/vic_dress - name = "Black victorian dress" - item_path = /obj/item/clothing/under/costume/vic_dress - -/datum/loadout_item/under/formal/vic_dress_red - name = "Red victorian dress" - item_path = /obj/item/clothing/under/costume/vic_dress/red - /datum/loadout_item/under/formal/amish_suit name = "Amish Suit" item_path = /obj/item/clothing/under/suit/sl @@ -820,26 +746,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 - -/datum/loadout_item/under/formal/kimono_dark - name = "Dark Kimono" - item_path = /obj/item/clothing/under/costume/kimono/dark - -/datum/loadout_item/under/formal/kimono_sakura - name = "Sakura Kimono" - item_path = /obj/item/clothing/under/costume/kimono/sakura - -/datum/loadout_item/under/formal/kimono_fancy - name = "Fancy Kimono" - item_path = /obj/item/clothing/under/costume/kimono/fancy - -/datum/loadout_item/under/formal/trek - name = "Trekkie Uniform" - item_path = /obj/item/clothing/under/trek - /datum/loadout_item/under/formal/trek_command name = "Trekkie Command Uniform" item_path = /obj/item/clothing/under/trek/command @@ -880,26 +786,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "French Marshall's Uniform" item_path = /obj/item/clothing/under/trek/q -/datum/loadout_item/under/formal/vic_vest - name = "Victorian Vest" - item_path = /obj/item/clothing/under/costume/vic_vest - -/datum/loadout_item/under/formal/vic_vest/red - name = "Red Victorian Shirt with Vest" - item_path = /obj/item/clothing/under/costume/vic_vest/red - -/datum/loadout_item/under/formal/vic_vest/green - name = "Green victorian vest" - item_path = /obj/item/clothing/under/costume/vic_vest/green - -/datum/loadout_item/under/formal/vic_vest/blue - name = "Blue Victorian Vest" - item_path = /obj/item/clothing/under/costume/vic_vest/blue - -/datum/loadout_item/under/formal/vic_vest/red/shirt - name = "Red Victorian Vest" - item_path = /obj/item/clothing/under/costume/vic_vest/red_alt - //FAMILIES GEAR /datum/loadout_item/under/formal/osi name = "OSI Uniform" diff --git a/modular_skyrat/modules/modular_vending/code/autodrobe.dm b/modular_skyrat/modules/modular_vending/code/autodrobe.dm index 76cafa1e536..e457d28c131 100644 --- a/modular_skyrat/modules/modular_vending/code/autodrobe.dm +++ b/modular_skyrat/modules/modular_vending/code/autodrobe.dm @@ -1,28 +1,9 @@ /obj/machinery/vending/autodrobe skyrat_products = list( - /obj/item/clothing/under/costume/kimono = 5, - /obj/item/clothing/under/costume/kimono/dark = 5, - /obj/item/clothing/under/costume/kimono/sakura = 5, - /obj/item/clothing/under/costume/kimono/fancy = 5, - /obj/item/clothing/under/costume/kamishimo = 5, + /obj/item/clothing/under/costume/skyrat/yukata = 5, + /obj/item/clothing/under/costume/skyrat/kamishimo = 5, /obj/item/clothing/head/costume/kabuto = 5, /obj/item/clothing/suit/costume/samurai = 5, - /obj/item/clothing/under/costume/vic_vest = 5, - /obj/item/clothing/under/costume/vic_vest/red = 5, - /obj/item/clothing/under/costume/vic_vest/blue = 5, - /obj/item/clothing/under/costume/vic_vest/red_alt = 5, - /obj/item/clothing/suit/costume/tailcoat = 5, - /obj/item/clothing/head/costume/widehat = 5, - /obj/item/clothing/under/costume/vic_dress = 5, - /obj/item/clothing/suit/costume/vic_dresscoat = 5, - /obj/item/clothing/head/costume/widehat/red = 5, - /obj/item/clothing/under/costume/vic_dress/red = 5, - /obj/item/clothing/suit/costume/vic_dresscoat/red = 5, - /obj/item/clothing/under/costume/dutch = 5, - /obj/item/clothing/under/costume/arthur = 5, - /obj/item/clothing/under/whiterussian = 5, - /obj/item/clothing/under/misc/tactical1 = 5, - /obj/item/clothing/under/uvf = 5, /obj/item/clothing/under/doug_dimmadome = 5, /obj/item/clothing/glasses/biker = 5, //remind me to give these an up state later /obj/item/clothing/head/cowboyhat/blackwide = 5, @@ -44,10 +25,10 @@ /obj/item/clothing/under/rank/civilian/clown/jester/alt = 1, /obj/item/clothing/head/christmas = 5, /obj/item/clothing/head/christmas/green = 5, - /obj/item/clothing/under/costume/christmas = 5, - /obj/item/clothing/under/costume/christmas/green = 5, - /obj/item/clothing/under/croptop/christmas = 5, - /obj/item/clothing/under/croptop/christmas/green = 5, + /obj/item/clothing/under/costume/skyrat/christmas = 5, + /obj/item/clothing/under/costume/skyrat/christmas/green = 5, + /obj/item/clothing/under/costume/skyrat/christmas/croptop = 5, + /obj/item/clothing/under/costume/skyrat/christmas/croptop/green = 5, /obj/item/clothing/suit/hooded/wintercoat/christmas = 5, /obj/item/clothing/suit/hooded/wintercoat/christmas/green = 5, /obj/item/clothing/suit/hooded/wintercoat/christmas/gamerpc = 5, @@ -58,8 +39,6 @@ /obj/item/clothing/head/fedora/beige = 5, /obj/item/clothing/head/fedora/fedblack = 5, /obj/item/clothing/head/fedora/fedbrown = 5, - /obj/item/clothing/under/misc/royalkilt = 5, - /obj/item/clothing/under/pants/tactical = 5, ) skyrat_contraband = list( diff --git a/modular_skyrat/modules/modular_vending/code/clothesmate.dm b/modular_skyrat/modules/modular_vending/code/clothesmate.dm index 27c2ab3399d..df8409454bb 100644 --- a/modular_skyrat/modules/modular_vending/code/clothesmate.dm +++ b/modular_skyrat/modules/modular_vending/code/clothesmate.dm @@ -47,13 +47,7 @@ /obj/item/clothing/under/dress/skirt/polychromic = 5, /obj/item/clothing/under/dress/skirt/polychromic/pleated = 5, /obj/item/clothing/under/suit/fancy = 5, - /obj/item/clothing/under/rancher = 5, - /obj/item/clothing/under/rancher/pioneer = 5, - /obj/item/clothing/under/rancher/worker = 5, - /obj/item/clothing/under/rancher/cowboy = 5, - /obj/item/clothing/under/rancher/checkered = 5, /obj/item/clothing/under/texas = 5, - /obj/item/clothing/under/westender = 5, /obj/item/clothing/under/sweater = 5, /obj/item/clothing/under/keyhole_sweater = 5, /obj/item/clothing/under/tachawaiian = 5, @@ -137,7 +131,7 @@ "products" = list( /obj/item/clothing/under/costume/deckers/alt = 5, - /obj/item/clothing/under/costume/bathrobe = 5, + /obj/item/clothing/under/costume/skyrat/bathrobe = 5, ) ) ) @@ -148,5 +142,4 @@ /obj/item/clothing/suit/brownbattlecoat = 1, /obj/item/clothing/suit/blackfurrich = 1, /obj/item/clothing/suit/frenchtrench = 1, - /obj/item/clothing/under/misc/royalkilt = 5, ) diff --git a/modular_skyrat/modules/modular_vending/code/wardrobes.dm b/modular_skyrat/modules/modular_vending/code/wardrobes.dm index fd23a75a5bd..8026af4425d 100644 --- a/modular_skyrat/modules/modular_vending/code/wardrobes.dm +++ b/modular_skyrat/modules/modular_vending/code/wardrobes.dm @@ -87,7 +87,6 @@ /obj/item/clothing/suit/costume/nemes = 1, /obj/item/clothing/head/nemes = 1, /obj/item/clothing/head/pharaoh = 1, //dont google camel by camel worst mistake of my life - /obj/item/clothing/under/rank/pmarsrobe = 1 ) skyrat_contraband = list( diff --git a/tgstation.dme b/tgstation.dme index 19fd0bc3195..5cd6a45415a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4918,6 +4918,7 @@ #include "modular_skyrat\master_files\code\modules\clothing\suits\_suits.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\_under.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\color.dm" +#include "modular_skyrat\master_files\code\modules\clothing\under\costume.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\shorts_pants.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\skirts_dresses.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\syndicate.dm"