diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm index e5157c936d1..9d5860f78bc 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm @@ -3155,8 +3155,8 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/winterboots, /obj/item/clothing/shoes/jackboots, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility, +/obj/item/clothing/under/misc/skyrat/utility, +/obj/item/clothing/under/misc/skyrat/utility, /obj/item/storage/backpack, /obj/item/storage/backpack/duffelbag, /obj/item/storage/backpack/satchel, @@ -3649,8 +3649,8 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/winterboots, /obj/item/clothing/shoes/jackboots, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility, +/obj/item/clothing/under/misc/skyrat/utility, +/obj/item/clothing/under/misc/skyrat/utility, /obj/item/storage/backpack, /obj/item/storage/backpack/duffelbag, /obj/item/storage/backpack/satchel, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm index 66492938910..30bd59ae2a1 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm @@ -3156,8 +3156,8 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/winterboots, /obj/item/clothing/shoes/jackboots, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility, +/obj/item/clothing/under/misc/skyrat/utility, +/obj/item/clothing/under/misc/skyrat/utility, /obj/item/storage/backpack, /obj/item/storage/backpack/duffelbag, /obj/item/storage/backpack/satchel, @@ -3629,8 +3629,8 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/winterboots, /obj/item/clothing/shoes/jackboots, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility, +/obj/item/clothing/under/misc/skyrat/utility, +/obj/item/clothing/under/misc/skyrat/utility, /obj/item/storage/backpack, /obj/item/storage/backpack/duffelbag, /obj/item/storage/backpack/satchel, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm index 524eeaadc3e..787d3d621ff 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm @@ -2727,8 +2727,8 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/winterboots, /obj/item/clothing/shoes/jackboots, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility, +/obj/item/clothing/under/misc/skyrat/utility, +/obj/item/clothing/under/misc/skyrat/utility, /obj/item/storage/backpack, /obj/item/storage/backpack/duffelbag, /obj/item/storage/backpack/satchel, @@ -3164,8 +3164,8 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/winterboots, /obj/item/clothing/shoes/jackboots, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility, +/obj/item/clothing/under/misc/skyrat/utility, +/obj/item/clothing/under/misc/skyrat/utility, /obj/item/storage/backpack, /obj/item/storage/backpack/duffelbag, /obj/item/storage/backpack/satchel, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm index 198c6e550d3..e5175169966 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm @@ -2973,8 +2973,8 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/winterboots, /obj/item/clothing/shoes/jackboots, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility, +/obj/item/clothing/under/misc/skyrat/utility, +/obj/item/clothing/under/misc/skyrat/utility, /obj/item/storage/backpack, /obj/item/storage/backpack/duffelbag, /obj/item/storage/backpack/satchel, @@ -3401,8 +3401,8 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/winterboots, /obj/item/clothing/shoes/jackboots, -/obj/item/clothing/under/utility, -/obj/item/clothing/under/utility, +/obj/item/clothing/under/misc/skyrat/utility, +/obj/item/clothing/under/misc/skyrat/utility, /obj/item/storage/backpack, /obj/item/storage/backpack/duffelbag, /obj/item/storage/backpack/satchel, diff --git a/_maps/map_files/Blueshift/BlueShift_upper.dmm b/_maps/map_files/Blueshift/BlueShift_upper.dmm index c5169b653f9..1bd5b37dcf6 100644 --- a/_maps/map_files/Blueshift/BlueShift_upper.dmm +++ b/_maps/map_files/Blueshift/BlueShift_upper.dmm @@ -47283,7 +47283,7 @@ /area/command/heads_quarters/captain/private/nt_rep) "pYA" = ( /obj/structure/table, -/obj/item/clothing/under/utility, +/obj/item/clothing/under/misc/skyrat/utility, /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/maintenance/aft/upper) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index c40788ebed0..133a498d7f6 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -197,7 +197,7 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \ new/datum/stack_recipe("biker jacket", /obj/item/clothing/suit/jacket/leather/biker, 7), \ new/datum/stack_recipe("saddle", /obj/item/saddle, 5), \ //SKYRAT EDIT ADDITION BEGIN - new/datum/stack_recipe("gear harness", /obj/item/clothing/under/misc/gear_harness, 6), \ + new/datum/stack_recipe("gear harness", /obj/item/clothing/under/misc/skyrat/gear_harness, 6), \ new/datum/stack_recipe("xenoarch belt", /obj/item/storage/belt/utility/xenoarch, 4), \ //SKYRAT EDIT ADDITION END new/datum/stack_recipe("sheriff vest", /obj/item/clothing/accessory/vest_sheriff, 4), \ diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm index cbd34604864..d0cf3083b6f 100644 --- a/code/modules/clothing/under/trek.dm +++ b/code/modules/clothing/under/trek.dm @@ -15,6 +15,7 @@ inhand_icon_state = "y_suit" greyscale_config = /datum/greyscale_config/trek greyscale_config_worn = /datum/greyscale_config/trek/worn + greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale greyscale_colors = "#fab342" /obj/item/clothing/under/trek/engsec @@ -24,6 +25,7 @@ inhand_icon_state = "r_suit" greyscale_config = /datum/greyscale_config/trek greyscale_config_worn = /datum/greyscale_config/trek/worn + greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale greyscale_colors = "#B72B2F" /obj/item/clothing/under/trek/medsci @@ -33,6 +35,7 @@ inhand_icon_state = "b_suit" greyscale_config = /datum/greyscale_config/trek greyscale_config_worn = /datum/greyscale_config/trek/worn + greyscale_config_worn_digi = /datum/greyscale_config/trek/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale greyscale_colors = "#5FA4CC" /* diff --git a/modular_skyrat/master_files/code/modules/clothing/under/misc.dm b/modular_skyrat/master_files/code/modules/clothing/under/misc.dm new file mode 100644 index 00000000000..d7889d13651 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/clothing/under/misc.dm @@ -0,0 +1,57 @@ +//DO NOT ADD TO THIS FILE UNLESS THE SITUATION IS DIRE +//MISC FILES = UNSORTED FILES. EVEN TG HATES THIS ONE. + +/obj/item/clothing/under/misc + worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/under/misc_digi.dmi' + +/obj/item/clothing/under/misc/skyrat + icon = 'modular_skyrat/master_files/icons/obj/clothing/under/misc.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/misc.dmi' + can_adjust = FALSE + +/* + Do we even bother sorting these? We don't want to use the file, it's for emergencies and in-betweens. + Just... don't lose your stuff. +*/ + +/obj/item/clothing/under/misc/skyrat/gear_harness + name = "gear harness" + desc = "A simple, inconspicuous harness replacement for a jumpsuit." + icon_state = "gear_harness" + body_parts_covered = CHEST|GROIN + can_adjust = FALSE + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/under/misc/skyrat/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." + icon_state = "eve" + +/obj/item/clothing/under/misc/skyrat/gear_harness/adam + name = "leaf" + desc = "A single leaf, designed to cover the genitalia of the wearer. Seek not temptation." + icon_state = "adam" + body_parts_covered = GROIN + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + +/obj/item/clothing/under/misc/skyrat/taccas + name = "tacticasual uniform" + desc = "A white wifebeater on top of some cargo pants. For when you need to carry various beers." + icon_state = "tac_s" + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + +/obj/item/clothing/under/misc/skyrat/mechanic + name = "mechanic's overalls" + desc = "An old-fashioned pair of brown overalls, along with assorted pockets and belt-loops." + icon_state = "mechanic" + +/obj/item/clothing/under/misc/skyrat/utility + name = "general utility uniform" + desc = "A utility uniform worn by civilian-ranked crew." + icon_state = "utility" + body_parts_covered = CHEST|ARMS|GROIN|LEGS + can_adjust = FALSE + +/obj/item/clothing/under/misc/skyrat/utility/syndicate + armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 40) //Same stats as the tactical turtleneck. + has_sensor = NO_SENSORS diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/color_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/color_digi.dmi new file mode 100644 index 00000000000..1d7d6c0e933 Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/under/color_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/costume.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/costume.dmi index ea6a4cbeff5..629a301931b 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/costume.dmi 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 index a6663c212bd..161d805d06d 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/costume_digi.dmi 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/misc.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/misc.dmi new file mode 100644 index 00000000000..376bd97c17e Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/under/misc.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/misc_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/misc_digi.dmi new file mode 100644 index 00000000000..b4903b31dda Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/under/misc_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/trek_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/trek_digi.dmi new file mode 100644 index 00000000000..98277e597ab Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/under/trek_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/underwear.dmi b/modular_skyrat/master_files/icons/mob/clothing/underwear.dmi index e6c2a847669..25255313884 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/underwear.dmi and b/modular_skyrat/master_files/icons/mob/clothing/underwear.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/accessories.dmi b/modular_skyrat/master_files/icons/obj/clothing/accessories.dmi index 7e7714c1890..7249537c0e2 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/accessories.dmi and b/modular_skyrat/master_files/icons/obj/clothing/accessories.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 index b5dc22a143b..276bcd9604f 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/under/costume.dmi and b/modular_skyrat/master_files/icons/obj/clothing/under/costume.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/misc.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/misc.dmi new file mode 100644 index 00000000000..608dced902f Binary files /dev/null and b/modular_skyrat/master_files/icons/obj/clothing/under/misc.dmi differ diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm index 5bf650e59b3..c4197378546 100644 --- a/modular_skyrat/modules/GAGS/greyscale_configs.dm +++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm @@ -427,11 +427,11 @@ /datum/greyscale_config/jumpsuit_worn/digi name = "Worn Jumpsuit - Digitigrade" - icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_digi.dmi' + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/color_digi.dmi' /datum/greyscale_config/jumpsuit_prison_worn/digi name = "Worn Prison Jumpsuit - Digitigrade" - icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_digi.dmi' + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/color_digi.dmi' /datum/greyscale_config/jumpsuit_worn/vox name = "Worn Jumpsuit - Vox" @@ -677,6 +677,14 @@ name = "Kilt (Worn)" json_config = 'modular_skyrat/modules/GAGS/json_configs/kilt/kilt_worn.json' +/* +TREK +*/ + +/datum/greyscale_config/trek/worn/digi + name = "Worn Trek Uniform - Digitigrade" + icon_file = 'modular_skyrat/master_files/icons/mob/clothing/under/trek_digi.dmi' + /* * SHOES */ diff --git a/modular_skyrat/modules/GAGS/icons/jumpsuit_digi.dmi b/modular_skyrat/modules/GAGS/icons/jumpsuit_digi.dmi deleted file mode 100644 index 3a64fc2b86c..00000000000 Binary files a/modular_skyrat/modules/GAGS/icons/jumpsuit_digi.dmi and /dev/null differ diff --git a/modular_skyrat/modules/customization/modules/clothing/under/misc.dm b/modular_skyrat/modules/customization/modules/clothing/under/misc.dm index 96eda31deb5..92c66844a0e 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/misc.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/misc.dm @@ -1,42 +1,3 @@ -/obj/item/clothing/under/misc/stripper - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "pink stripper outfit" - icon_state = "stripper_p" - body_parts_covered = CHEST|GROIN - can_adjust = FALSE - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -/obj/item/clothing/under/misc/stripper/green - name = "green stripper outfit" - icon_state = "stripper_g" - -/obj/item/clothing/under/misc/stripper/mankini - name = "pink mankini" - icon_state = "mankini" - -/obj/item/clothing/under/misc/stripper/bunnysuit - name = "bunny suit" - desc = "Makes the wearer more attractive, even men." - icon_state = "bunnysuit" - can_adjust = TRUE - alt_covers_chest = FALSE - -/obj/item/clothing/under/misc/stripper/bunnysuit/white - name = "white bunny suit" - icon_state = "whitebunnysuit" - 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' - name = "gear harness" - desc = "A simple, inconspicuous harness replacement for a jumpsuit." - icon_state = "gear_harness" - body_parts_covered = CHEST|GROIN - can_adjust = FALSE - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - /obj/item/clothing/under/misc/colourable_kilt name = "colourable kilt" desc = "It's not a skirt!" @@ -48,14 +9,6 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/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." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - icon_state = "tac_s" - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION - /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." @@ -99,18 +52,6 @@ icon_state = "doug_dimmadome" supports_variations_flags = NONE -/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." - icon_state = "eve" - -/obj/item/clothing/under/misc/gear_harness/adam - name = "leaf" - desc = "A single leaf, designed to cover the genitalia of the wearer. Seek not temptation." - icon_state = "adam" - body_parts_covered = GROIN - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - /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." diff --git a/modular_skyrat/modules/customization/modules/clothing/under/security.dm b/modular_skyrat/modules/customization/modules/clothing/under/security.dm index 61836b01f3d..4cfc0a64e18 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/security.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/security.dm @@ -128,8 +128,9 @@ /obj/item/clothing/under/rank/prisoner/classic name = "classic prisoner jumpsuit" desc = "A black and white striped jumpsuit, like something out of a movie." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + icon = 'modular_skyrat/master_files/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/costume.dmi' + worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/under/costume_digi.dmi' icon_state = "prisonerclassic" greyscale_colors = null greyscale_config = null diff --git a/modular_skyrat/modules/customization/modules/clothing/under/skirts_dresses.dm b/modular_skyrat/modules/customization/modules/clothing/under/skirts_dresses.dm deleted file mode 100644 index 45350031815..00000000000 --- a/modular_skyrat/modules/customization/modules/clothing/under/skirts_dresses.dm +++ /dev/null @@ -1,9 +0,0 @@ -/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' - name = "black corset" - desc = "Nanotrasen is not resposible for any organ damage." - icon_state = "corset" - body_parts_covered = CHEST|GROIN - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - can_adjust = FALSE 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 206b7b03c09..d5c805a4ea3 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 @@ -14,12 +14,3 @@ desc = "An ancient-Japan armored helmet - or a replica of one, at least." icon_state = "kabuto" supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON - -//Misc -/obj/item/clothing/under/misc/mechanic - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "mechanic's overalls" - desc = "An old-fashioned pair of brown overalls, along with assorted pockets and belt-loops." - icon_state = "mechanic" - diff --git a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/utility.dm b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/utility.dm deleted file mode 100644 index 9774884bc18..00000000000 --- a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/utility.dm +++ /dev/null @@ -1,12 +0,0 @@ -/obj/item/clothing/under/utility - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - name = "general utility uniform" - desc = "A utility uniform worn by civilian-ranked crew." - icon_state = "util_gen" - body_parts_covered = CHEST|ARMS|GROIN|LEGS - can_adjust = FALSE - -/obj/item/clothing/under/utility/syndicate - armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 40) //Same stats as the tactical turtleneck. - has_sensor = NO_SENSORS diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm index 10191e0acfc..1ce188ae253 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm @@ -704,6 +704,12 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files) gender = FEMALE use_static = null +/datum/sprite_accessory/undershirt/corset + name = "Corset" + icon_state = "corset" + gender = FEMALE + use_static = TRUE + /datum/sprite_accessory/undershirt/chastbra name = "Chastity Bra" icon_state = "chastbra" diff --git a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index bd8e43377e8..f678f46608b 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -267,7 +267,7 @@ /datum/loadout_item/under/jumpsuit/mechanic name = "Mechanic's Overalls" - item_path = /obj/item/clothing/under/misc/mechanic + item_path = /obj/item/clothing/under/misc/skyrat/mechanic ckeywhitelist = list("cypressb") /datum/loadout_item/under/jumpsuit/mikubikini 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 d4b5296ec19..6b68b3f1421 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 @@ -176,7 +176,7 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/jumpsuit/utility name = "Utility Uniform" - item_path = /obj/item/clothing/under/utility + item_path = /obj/item/clothing/under/misc/skyrat/utility /datum/loadout_item/under/jumpsuit/utility_eng name = "Engineering Utility Uniform" @@ -535,11 +535,11 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/miscellaneous/gear_harness name = "Gear Harness" - item_path = /obj/item/clothing/under/misc/gear_harness + item_path = /obj/item/clothing/under/misc/skyrat/gear_harness /datum/loadout_item/under/miscellaneous/taccas name = "Tacticasual Uniform" - item_path = /obj/item/clothing/under/misc/taccas + item_path = /obj/item/clothing/under/misc/skyrat/taccas /datum/loadout_item/under/miscellaneous/cargo_casual name = "Cargo Tech Casualwear" @@ -573,11 +573,11 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/miscellaneous/eve name = "Collection of Leaves" - item_path = /obj/item/clothing/under/misc/gear_harness/eve + item_path = /obj/item/clothing/under/misc/skyrat/gear_harness/eve /datum/loadout_item/under/miscellaneous/adam name = "Leaf" - item_path = /obj/item/clothing/under/misc/gear_harness/adam + item_path = /obj/item/clothing/under/misc/skyrat/gear_harness/adam /datum/loadout_item/under/miscellaneous/ethereal_tunic name = "Ethereal Tunic" diff --git a/modular_skyrat/modules/mapping/code/mob_spawns.dm b/modular_skyrat/modules/mapping/code/mob_spawns.dm index 7930c4f730c..ecfd5deae56 100644 --- a/modular_skyrat/modules/mapping/code/mob_spawns.dm +++ b/modular_skyrat/modules/mapping/code/mob_spawns.dm @@ -415,7 +415,7 @@ /datum/outfit/tarkon/ensign //jack of all trades, master of none, spent all his credits, every last one name = "Port Tarkon Ensigns Outfit" - uniform = /obj/item/clothing/under/utility + uniform = /obj/item/clothing/under/misc/skyrat/utility ears = /obj/item/radio/headset/tarkon/ensign id = /obj/item/card/id/away/tarkon/ensign neck = /obj/item/clothing/neck/security_cape/armplate diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm index 065dcc0fc81..6c9647fcdc3 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm @@ -64,7 +64,7 @@ /obj/item/clothing/under/costume/lewdmaid, /obj/item/clothing/suit/straight_jacket/shackles, /obj/item/clothing/under/stripper_outfit, - /obj/item/clothing/under/misc/gear_harness, + /obj/item/clothing/under/misc/skyrat/gear_harness, //hands /obj/item/clothing/gloves/ball_mittens, diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm index 7b0d56f703f..89814be112b 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm @@ -94,3 +94,20 @@ wearer.update_worn_oversuit() wearer.fan_hud_set_fandom() return TRUE + +//Not a maid, yeah. I dont care, it's going with the other lewd stuff, and there WONT be a whole new file just for it. +/obj/item/clothing/under/costume/bunnylewd + name = "bunny suit" + desc = "Makes the wearer more attractive, even men." + icon_state = "bunnysuit" + icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_clothing/lewd_uniform.dmi' + worn_icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform.dmi' + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + body_parts_covered = CHEST|GROIN + can_adjust = TRUE + alt_covers_chest = FALSE + +/obj/item/clothing/under/costume/bunnylewd/white + name = "white bunny suit" + icon_state = "whitebunnysuit" + can_adjust = FALSE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm index bd19fc505d7..6b8febff3e1 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm @@ -71,10 +71,9 @@ /obj/item/clothing/under/costume/lewdmaid = 5, /obj/item/clothing/suit/straight_jacket/shackles = 4, /obj/item/clothing/under/stripper_outfit = 5, - /obj/item/clothing/under/misc/stripper/bunnysuit = 5, - /obj/item/clothing/under/misc/stripper/bunnysuit/white = 5, - /obj/item/clothing/under/misc/gear_harness = 4, - /obj/item/clothing/under/dress/corset = 4, + /obj/item/clothing/under/costume/bunnylewd = 5, + /obj/item/clothing/under/costume/bunnylewd/white = 5, + /obj/item/clothing/under/misc/skyrat/gear_harness = 4, //hands /obj/item/clothing/gloves/ball_mittens = 8, diff --git a/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform.dmi b/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform.dmi index efb63afd7df..a7f1a264f70 100644 Binary files a/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform.dmi and b/modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform.dmi differ diff --git a/modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_clothing/lewd_uniform.dmi b/modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_clothing/lewd_uniform.dmi index a8b36e7106c..aaacbad642e 100644 Binary files a/modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_clothing/lewd_uniform.dmi and b/modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_clothing/lewd_uniform.dmi differ diff --git a/modular_skyrat/modules/modular_vending/code/clothesmate.dm b/modular_skyrat/modules/modular_vending/code/clothesmate.dm index 4c894b5f9c8..839304d4232 100644 --- a/modular_skyrat/modules/modular_vending/code/clothesmate.dm +++ b/modular_skyrat/modules/modular_vending/code/clothesmate.dm @@ -36,7 +36,7 @@ /obj/item/clothing/under/pants/skyrat/jeans_ripped = 5, /obj/item/clothing/under/shorts/skyrat/shorts_ripped = 5, /obj/item/clothing/under/pants/skyrat/yoga = 5, - /obj/item/clothing/under/misc/mechanic = 5, + /obj/item/clothing/under/misc/skyrat/mechanic = 5, /obj/item/clothing/under/misc/bluetracksuit = 5, /obj/item/clothing/under/misc/poly_shirt = 5, /obj/item/clothing/under/misc/colourable_kilt = 5, diff --git a/modular_skyrat/modules/modular_vending/code/wardrobes.dm b/modular_skyrat/modules/modular_vending/code/wardrobes.dm index dfb8b3e981f..7d20d924a83 100644 --- a/modular_skyrat/modules/modular_vending/code/wardrobes.dm +++ b/modular_skyrat/modules/modular_vending/code/wardrobes.dm @@ -67,8 +67,8 @@ /obj/machinery/vending/wardrobe/hydro_wardrobe skyrat_contraband = list( /obj/item/clothing/under/suit/skyrat/scarface = 2, - /obj/item/clothing/under/misc/gear_harness/adam = 2, - /obj/item/clothing/under/misc/gear_harness/eve = 2, + /obj/item/clothing/under/misc/skyrat/gear_harness/adam = 2, + /obj/item/clothing/under/misc/skyrat/gear_harness/eve = 2, ) /obj/machinery/vending/wardrobe/bar_wardrobe diff --git a/tgstation.dme b/tgstation.dme index 35e0b9d7654..ca5ac1e6098 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4958,6 +4958,7 @@ #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\misc.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" @@ -5413,13 +5414,11 @@ #include "modular_skyrat\modules\customization\modules\clothing\under\costumes.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\misc.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\security.dm" -#include "modular_skyrat\modules\customization\modules\clothing\under\skirts_dresses.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\suits.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\sweaters.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\tauruniformscolor.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\utility_port\other_port.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\utility_port\suits_port.dm" -#include "modular_skyrat\modules\customization\modules\clothing\under\utility_port\utility.dm" #include "modular_skyrat\modules\customization\modules\clothing\~donator\donator_clothing.dm" #include "modular_skyrat\modules\customization\modules\culture\cultural_info.dm" #include "modular_skyrat\modules\customization\modules\culture\culture\_culture.dm"