cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Add jumpskirt dye flag to all jumpskirt (#1102)

Browse Source 
* Merge pull request #54099 from Hamcha/skirt-dyeing-fix Add jumpskirt dye flag to all jumpskirt

Add jumpskirt dye flag to all jumpskirt

* Add jumpskirt dye flag to all jumpskirt

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-10-01 20:02:46 +02:00
committed by GitHub
co-authored by ShizCalev
parent f4c63f7d3f
commit 3d99043f3d
12 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/color.dm
+1
View File
@@ -7,6 +7,7 @@
/obj/item/clothing/under/color/jumpskirt
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/color/random
code/modules/clothing/under/jobs/cargo.dm
+2
View File
@@ -15,6 +15,7 @@
inhand_icon_state = "lb_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/cargo/tech
@@ -34,6 +35,7 @@
body_parts_covered = CHEST|GROIN|ARMS
mutantrace_variation = NO_MUTANTRACE_VARIATION
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/cargo/miner
code/modules/clothing/under/jobs/civilian/civilian.dm
+13
View File
@@ -24,6 +24,7 @@
inhand_icon_state = "bar_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/chaplain
@@ -40,6 +41,7 @@
inhand_icon_state = "bl_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/chef
@@ -54,6 +56,7 @@
icon_state = "chef_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/head_of_personnel
@@ -70,6 +73,7 @@
inhand_icon_state = "b_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit
@@ -86,6 +90,7 @@
inhand_icon_state = "g_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/hydroponics
@@ -102,6 +107,7 @@
inhand_icon_state = "g_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/janitor
@@ -116,6 +122,7 @@
icon_state = "janitor_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/janitor/maid
@@ -147,6 +154,7 @@
name = "lawyer black suitskirt"
icon_state = "lawyer_black_skirt"
inhand_icon_state = "lawyer_black"
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/lawyer/female
@@ -160,6 +168,7 @@
icon_state = "black_suit_fem_skirt"
inhand_icon_state = "black_suit_fem_skirt"
worn_icon = 'icons/mob/clothing/under/suits.dmi'
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/lawyer/red
@@ -171,6 +180,7 @@
name = "lawyer red suitskirt"
icon_state = "lawyer_red_skirt"
inhand_icon_state = "lawyer_red"
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/lawyer/blue
@@ -182,6 +192,7 @@
name = "lawyer blue suitskirt"
icon_state = "lawyer_blue_skirt"
inhand_icon_state = "lawyer_blue"
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/lawyer/bluesuit
@@ -199,6 +210,7 @@
inhand_icon_state = "b_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/lawyer/purpsuit
@@ -215,6 +227,7 @@
inhand_icon_state = "p_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/lawyer/galaxy
code/modules/clothing/under/jobs/civilian/clown_mime.dm
+1
View File
@@ -12,6 +12,7 @@
inhand_icon_state = "mime"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/mime/sexy
code/modules/clothing/under/jobs/civilian/curator.dm
+1
View File
@@ -16,6 +16,7 @@
worn_icon = 'icons/mob/clothing/under/suits.dmi'
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/civilian/curator/treasure_hunter
code/modules/clothing/under/jobs/command.dm
+2
View File
@@ -16,6 +16,7 @@
inhand_icon_state = "b_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/captain/suit
@@ -32,6 +33,7 @@
inhand_icon_state = "dg_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/captain/parade
code/modules/clothing/under/jobs/engineering.dm
+3
View File
@@ -19,6 +19,7 @@
inhand_icon_state = "gy_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/engineering/atmospheric_technician
@@ -36,6 +37,7 @@
inhand_icon_state = "atmos_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/engineering/engineer
@@ -60,5 +62,6 @@
inhand_icon_state = "engi_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
code/modules/clothing/under/jobs/medical.dm
+5
View File
@@ -17,6 +17,7 @@
inhand_icon_state = "w_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/medical/virologist
@@ -34,6 +35,7 @@
inhand_icon_state = "w_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/medical/doctor/nurse
@@ -80,6 +82,7 @@
inhand_icon_state = "w_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/medical/chemist
@@ -97,6 +100,7 @@
inhand_icon_state = "w_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/medical/paramedic
@@ -114,4 +118,5 @@
inhand_icon_state = "w_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
code/modules/clothing/under/jobs/rnd.dm
+6
View File
@@ -17,6 +17,7 @@
inhand_icon_state = "lb_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/rnd/research_director/alt
@@ -35,6 +36,7 @@
inhand_icon_state = "rdwhimsy"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/rnd/research_director/turtleneck
@@ -53,6 +55,7 @@
inhand_icon_state = "p_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/rnd/scientist
@@ -70,6 +73,7 @@
inhand_icon_state = "w_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/rnd/roboticist
@@ -86,6 +90,7 @@
inhand_icon_state = "robotics"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/rnd/geneticist
@@ -103,4 +108,5 @@
inhand_icon_state = "w_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
code/modules/clothing/under/jobs/security.dm
+7
View File
@@ -37,6 +37,7 @@
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
/obj/item/clothing/under/rank/security/officer/blueshirt
@@ -85,6 +86,7 @@
inhand_icon_state = "r_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/security/warden/formal
@@ -115,6 +117,7 @@
inhand_icon_state = "det"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/security/detective/grey
@@ -131,6 +134,7 @@
inhand_icon_state = "greydet"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/*
@@ -154,6 +158,7 @@
inhand_icon_state = "r_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/security/head_of_security/grey
@@ -175,6 +180,7 @@
inhand_icon_state = "bl_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/security/head_of_security/parade
@@ -228,6 +234,7 @@
inhand_icon_state = "o_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/security/officer/beatcop
code/modules/clothing/under/suits.dm
+3
View File
@@ -15,6 +15,7 @@
icon_state = "white_suit_skirt"
inhand_icon_state = "scratch"
body_parts_covered = CHEST|GROIN|ARMS
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/suit/sl
@@ -47,6 +48,7 @@
icon_state = "blacksuit_skirt"
inhand_icon_state = "bar_suit"
alt_covers_chest = TRUE
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/suit/black_really
@@ -61,6 +63,7 @@
icon_state = "really_black_suit_skirt"
inhand_icon_state = "really_black_suit_skirt"
body_parts_covered = CHEST|GROIN|ARMS
dying_key = DYE_REGISTRY_JUMPSKIRT
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/suit/black/female
code/modules/clothing/under/syndicate.dm
+2
View File
@@ -19,6 +19,7 @@
alt_covers_chest = TRUE
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
dying_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/syndicate/bloodred
name = "blood-red sneaksuit"
@@ -51,6 +52,7 @@
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
name = "Tactical turtleneck suit"