diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 4b23c9911a0..f4f62d6b0d0 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -6,7 +6,6 @@ /obj/item/clothing/under/color/jumpskirt body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm index ecc26625fc2..7c102bd0f9c 100644 --- a/code/modules/clothing/under/jobs/cargo.dm +++ b/code/modules/clothing/under/jobs/cargo.dm @@ -14,7 +14,6 @@ icon_state = "qm_skirt" inhand_icon_state = "lb_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -34,7 +33,6 @@ inhand_icon_state = "lb_suit" body_parts_covered = CHEST|GROIN|ARMS mutantrace_variation = NO_MUTANTRACE_VARIATION - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm index 19f3bb2c6eb..241295d60b7 100644 --- a/code/modules/clothing/under/jobs/civilian/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian/civilian.dm @@ -23,7 +23,6 @@ icon_state = "barman_skirt" inhand_icon_state = "bar_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -40,7 +39,6 @@ icon_state = "chapblack_skirt" inhand_icon_state = "bl_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -55,7 +53,6 @@ desc = "A skirt which is given only to the most hardcore cooks in space." icon_state = "chef_skirt" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -64,7 +61,6 @@ name = "head of personnel's jumpsuit" icon_state = "hop" inhand_icon_state = "b_suit" - can_adjust = FALSE /obj/item/clothing/under/rank/civilian/head_of_personnel/skirt name = "head of personnel's jumpskirt" @@ -72,7 +68,6 @@ icon_state = "hop_skirt" inhand_icon_state = "b_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -89,7 +84,6 @@ icon_state = "teal_suit_skirt" inhand_icon_state = "g_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -106,7 +100,6 @@ icon_state = "hydroponics_skirt" inhand_icon_state = "g_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -121,7 +114,6 @@ desc = "It's the official skirt of the station's janitor. It has minor protection from biohazards." icon_state = "janitor_skirt" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -209,7 +201,6 @@ icon_state = "bluesuit_skirt" inhand_icon_state = "b_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -226,7 +217,6 @@ icon_state = "lawyer_purp_skirt" inhand_icon_state = "p_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/code/modules/clothing/under/jobs/civilian/clown_mime.dm index 21476deab4e..9df5bf29a8f 100644 --- a/code/modules/clothing/under/jobs/civilian/clown_mime.dm +++ b/code/modules/clothing/under/jobs/civilian/clown_mime.dm @@ -11,7 +11,6 @@ icon_state = "mime_skirt" inhand_icon_state = "mime" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm index bf7f85f66c3..2a73733240f 100644 --- a/code/modules/clothing/under/jobs/command.dm +++ b/code/modules/clothing/under/jobs/command.dm @@ -15,7 +15,6 @@ icon_state = "captain_skirt" inhand_icon_state = "b_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index a6e212a1f97..4f216bddd07 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -18,7 +18,6 @@ icon_state = "chief_skirt" inhand_icon_state = "gy_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -36,7 +35,6 @@ icon_state = "atmos_skirt" inhand_icon_state = "atmos_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -62,7 +60,6 @@ icon_state = "engine_skirt" inhand_icon_state = "engi_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm index bc95656d554..8942a426ba6 100644 --- a/code/modules/clothing/under/jobs/medical.dm +++ b/code/modules/clothing/under/jobs/medical.dm @@ -16,7 +16,6 @@ icon_state = "cmo_skirt" inhand_icon_state = "w_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -34,7 +33,6 @@ icon_state = "virologywhite_skirt" inhand_icon_state = "w_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -81,7 +79,6 @@ icon_state = "medical_skirt" inhand_icon_state = "w_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -99,7 +96,6 @@ icon_state = "chemistrywhite_skirt" inhand_icon_state = "w_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -110,6 +106,7 @@ inhand_icon_state = "w_suit" permeability_coefficient = 0.5 armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 10, RAD = 0, FIRE = 0, ACID = 0) + alt_covers_chest = TRUE /obj/item/clothing/under/rank/medical/paramedic/skirt name = "paramedic jumpskirt" @@ -117,6 +114,5 @@ icon_state = "paramedic_skirt" inhand_icon_state = "w_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm index ab28417a9d8..2fe535416a5 100644 --- a/code/modules/clothing/under/jobs/rnd.dm +++ b/code/modules/clothing/under/jobs/rnd.dm @@ -35,7 +35,6 @@ icon_state = "rdwhimsy_skirt" inhand_icon_state = "rdwhimsy" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -54,7 +53,6 @@ icon_state = "rdturtle_skirt" inhand_icon_state = "p_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -72,7 +70,6 @@ icon_state = "toxinswhite_skirt" inhand_icon_state = "w_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -89,7 +86,6 @@ icon_state = "robotics_skirt" inhand_icon_state = "robotics" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -107,6 +103,5 @@ icon_state = "geneticswhite_skirt" inhand_icon_state = "w_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 8968d15c01a..0b0b53a594e 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -36,7 +36,6 @@ icon_state = "secskirt" inhand_icon_state = "r_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE //you know now that i think of it if you adjust the skirt and the sprite disappears isn't that just like flashing everyone dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -85,7 +84,6 @@ icon_state = "rwarden_skirt" inhand_icon_state = "r_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -116,7 +114,6 @@ icon_state = "detective_skirt" inhand_icon_state = "det" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -133,7 +130,6 @@ icon_state = "greydet_skirt" inhand_icon_state = "greydet" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -157,7 +153,6 @@ icon_state = "rhos_skirt" inhand_icon_state = "r_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -179,7 +174,6 @@ icon_state = "hosalt_skirt" inhand_icon_state = "bl_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP @@ -233,7 +227,6 @@ icon_state = "prisoner_skirt" inhand_icon_state = "o_suit" body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm index e6767cc81bd..59f24b3354f 100644 --- a/code/modules/clothing/under/suits.dm +++ b/code/modules/clothing/under/suits.dm @@ -41,6 +41,7 @@ icon_state = "blacksuit" inhand_icon_state = "blacksuit" can_adjust = TRUE + alt_covers_chest = TRUE /obj/item/clothing/under/suit/black/skirt name = "black suitskirt" diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index dee653875f2..7c8d366e022 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -18,7 +18,6 @@ armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 40) alt_covers_chest = TRUE fitted = FEMALE_UNIFORM_TOP - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT /obj/item/clothing/under/syndicate/bloodred @@ -51,7 +50,6 @@ inhand_icon_state = "bl_suit" armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 40) fitted = FEMALE_UNIFORM_TOP - can_adjust = FALSE dying_key = DYE_REGISTRY_JUMPSKIRT /obj/item/clothing/under/syndicate/sniper diff --git a/icons/mob/clothing/under/captain.dmi b/icons/mob/clothing/under/captain.dmi index bea01b76554..678210b9e65 100644 Binary files a/icons/mob/clothing/under/captain.dmi and b/icons/mob/clothing/under/captain.dmi differ diff --git a/icons/mob/clothing/under/cargo.dmi b/icons/mob/clothing/under/cargo.dmi index 27a5fb0c228..be8b50a5e68 100644 Binary files a/icons/mob/clothing/under/cargo.dmi and b/icons/mob/clothing/under/cargo.dmi differ diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi index 6a1442ef937..7395522fab2 100644 Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ diff --git a/icons/mob/clothing/under/color.dmi b/icons/mob/clothing/under/color.dmi index eb43ed68ef0..14fbd6e4f69 100644 Binary files a/icons/mob/clothing/under/color.dmi and b/icons/mob/clothing/under/color.dmi differ diff --git a/icons/mob/clothing/under/engineering.dmi b/icons/mob/clothing/under/engineering.dmi index fd5e7ad4d4c..04503b03da6 100644 Binary files a/icons/mob/clothing/under/engineering.dmi and b/icons/mob/clothing/under/engineering.dmi differ diff --git a/icons/mob/clothing/under/medical.dmi b/icons/mob/clothing/under/medical.dmi index 58e1446ff67..bcb4c9b9cd3 100644 Binary files a/icons/mob/clothing/under/medical.dmi and b/icons/mob/clothing/under/medical.dmi differ diff --git a/icons/mob/clothing/under/rnd.dmi b/icons/mob/clothing/under/rnd.dmi index 42b360a3495..d0ba72b9c4a 100644 Binary files a/icons/mob/clothing/under/rnd.dmi and b/icons/mob/clothing/under/rnd.dmi differ diff --git a/icons/mob/clothing/under/security.dmi b/icons/mob/clothing/under/security.dmi index 9e1117f49d5..8e115b471b7 100644 Binary files a/icons/mob/clothing/under/security.dmi and b/icons/mob/clothing/under/security.dmi differ diff --git a/icons/mob/clothing/under/suits.dmi b/icons/mob/clothing/under/suits.dmi index 006e0830d7d..3fd5f4da6ce 100644 Binary files a/icons/mob/clothing/under/suits.dmi and b/icons/mob/clothing/under/suits.dmi differ diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi index 41d08a3599c..e1553486b75 100644 Binary files a/icons/mob/clothing/under/syndicate.dmi and b/icons/mob/clothing/under/syndicate.dmi differ