Jumpskirts and Beesocks ok baby be calling me hercules but this bitch here stand for hermes ok I done pop me a perkay cause I heard it helped with my pain but just help my backaches (#1444)

Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml

@@ -947,3 +947,29 @@
     sprite: Clothing/Shoes/yellow.rsi
   - type: Clothing
     sprite: Clothing/Shoes/yellow.rsi
+
+- type: entity
+  parent: ShoesBase
+  id: ShoesBee
+  name: bee socks
+  description: Make them loins buzz
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/beesocks.rsi
+  - type: Icon
+    sprite: Clothing/Shoes/beesocks.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/beesocks.rsi
+
+- type: entity
+  parent: ShoesBase
+  id: ShoesCoder
+  name: coder socks
+  description: It's time to code sisters!!!1
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/codersocks.rsi
+  - type: Icon
+    sprite: Clothing/Shoes/codersocks.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/codersocks.rsi

Resources/Prototypes/Entities/Clothing/Uniforms/bartender.yml

@@ -1,40 +0,0 @@
-- type: entity
-  parent: UniformBase
-  id: UniformBartender
-  name: bartender's uniform
-  description: It looks like it could use some more flair.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/bartender.rsi
-    state: barman
-  - type: Icon
-    sprite: Clothing/Uniforms/bartender.rsi
-    state: barman
-  - type: Clothing
-    sprite: Clothing/Uniforms/bartender.rsi
-
-- type: entity
-  parent: UniformBartender
-  id: UniformBartenderSkirt
-  name: bartender's skirt
-  components:
-  - type: Sprite
-    state: skirt
-  - type: Icon
-    state: skirt
-  - type: Clothing
-    ClothingPrefix: skirt
-    femaleMask: UniformTop
-
-
-- type: entity
-  parent: UniformBartender
-  id: UniformBartenderPurple
-  name: purple bartender's uniform
-  components:
-  - type: Sprite
-    state: purple
-  - type: Icon
-    state: purple
-  - type: Clothing
-    ClothingPrefix: purple

Resources/Prototypes/Entities/Clothing/Uniforms/color.yml

@@ -6,8 +6,10 @@
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/color.rsi
+
   - type: Icon
     sprite: Clothing/Uniforms/color.rsi
+
   - type: Clothing
     sprite: Clothing/Uniforms/color.rsi
 
@@ -38,6 +40,7 @@
   - type: Clothing
     ClothingPrefix: grey_skirt
     femaleMask: UniformTop
+    HeldPrefix: grey
 
 # Black
 - type: entity
@@ -64,6 +67,7 @@
   - type: Clothing
     ClothingPrefix: black_skirt
     femaleMask: UniformTop
+    HeldPrefix: black
 
 # Blue
 - type: entity
@@ -81,7 +85,7 @@
 - type: entity
   parent: UniformColorBlue
   id: UniformColorBlueSkirt
-  name: grey jumpskirt
+  name: blue jumpskirt
   components:
   - type: Sprite
     state: blue_skirt
@@ -90,6 +94,7 @@
   - type: Clothing
     ClothingPrefix: blue_skirt
     femaleMask: UniformTop
+    HeldPrefix: blue
 
 # Green
 - type: entity
@@ -116,6 +121,7 @@
   - type: Clothing
     ClothingPrefix: green_skirt
     femaleMask: UniformTop
+    HeldPrefix: green
 
 # Orange
 - type: entity
@@ -143,6 +149,7 @@
   - type: Clothing
     ClothingPrefix: orange_skirt
     femaleMask: UniformTop
+    HeldPrefix: orange
 
 # Pink
 - type: entity
@@ -157,7 +164,7 @@
     state: pink
   - type: Clothing
     ClothingPrefix: pink
-    HeldPrefix: purple
+    HeldPrefix: pink
 
 - type: entity
   parent: UniformColorPink
@@ -171,6 +178,19 @@
   - type: Clothing
     ClothingPrefix: pink_skirt
     femaleMask: UniformTop
+    HeldPrefix: pink
+
+- type: entity
+  parent: UniformColorBase
+  id: S
+  name: s
+  components:
+  - type: Sprite
+    state: s
+  - type: Icon
+    state: s
+  - type: Clothing
+    HeldPrefix: s
 
 # Red
 - type: entity
@@ -197,6 +217,7 @@
   - type: Clothing
     ClothingPrefix: red_skirt
     femaleMask: UniformTop
+    HeldPrefix: red
 
 # White
 - type: entity
@@ -223,6 +244,7 @@
   - type: Clothing
     ClothingPrefix: white_skirt
     femaleMask: UniformTop
+    HeldPrefix: white
 
 # Yellow
 - type: entity
@@ -249,6 +271,7 @@
   - type: Clothing
     ClothingPrefix: yellow_skirt
     femaleMask: UniformTop
+    HeldPrefix: yellow
 
 # Dark blue
 - type: entity
@@ -262,7 +285,7 @@
     state: darkblue
   - type: Clothing
     ClothingPrefix: darkblue
-    HeldPrefix: blue
+    HeldPrefix: darkblue
 
 - type: entity
   parent: UniformColorDarkBlue
@@ -276,6 +299,7 @@
   - type: Clothing
     ClothingPrefix: darkblue_skirt
     femaleMask: UniformTop
+    HeldPrefix: darkblue
 
 # Teal
 - type: entity
@@ -289,7 +313,7 @@
     state: teal
   - type: Clothing
     ClothingPrefix: teal
-    HeldPrefix: blue
+    HeldPrefix: teal
 
 - type: entity
   parent: UniformColorTeal
@@ -303,6 +327,7 @@
   - type: Clothing
     ClothingPrefix: teal_skirt
     femaleMask: UniformTop
+    HeldPrefix: teal
 
 # Purple
 - type: entity
@@ -316,7 +341,7 @@
     state: lightpurple
   - type: Clothing
     ClothingPrefix: lightpurple
-    HeldPrefix: purple
+    HeldPrefix: lightpurple
 
 - type: entity
   parent: UniformColorPurple
@@ -330,6 +355,7 @@
   - type: Clothing
     ClothingPrefix: lightpurple_skirt
     femaleMask: UniformTop
+    HeldPrefix: lightpurple
 
 # Dark Green
 - type: entity
@@ -357,6 +383,7 @@
   - type: Clothing
     ClothingPrefix: darkgreen_skirt
     femaleMask: UniformTop
+    HeldPrefix: green
 
 # Light Brown
 - type: entity
@@ -383,6 +410,7 @@
   - type: Clothing
     ClothingPrefix: lightbrown_skirt
     femaleMask: UniformTop
+    HeldPrefix: lightbrown
 
 # Brown
 - type: entity
@@ -423,7 +451,7 @@
     state: maroon
   - type: Clothing
     ClothingPrefix: maroon
-    HeldPrefix: red
+    HeldPrefix: maroon
 
 - type: entity
   parent: UniformColorMaroon
@@ -437,6 +465,7 @@
   - type: Clothing
     ClothingPrefix: maroon_skirt
     femaleMask: UniformTop
+    HeldPrefix: maroon
 
 # Rainbow
 - type: entity
@@ -464,3 +493,4 @@
   - type: Clothing
     ClothingPrefix: rainbow_skirt
     femaleMask: UniformTop
+    HeldPrefix: rainbow

Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml

@@ -8,19 +8,32 @@
 
 - type: entity
   parent: UniformBase
-  id: JanitorUniform
+  id: UniformJanitor
   name: janitor jumpsuit
   description: The jumpsuit for the poor sop with a mop
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_janitor.rsi
-    state: janitor
+    state: icon
   - type: Icon
     sprite: Clothing/Uniforms/uniform_janitor.rsi
-    state: janitor
+    state: icon
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_janitor.rsi
 
+- type: entity
+  parent: UniformJanitor
+  id: UniformJanitorSkirt
+  name: janitor jumpskirt
+  components:
+  - type: Sprite
+    state: jan_skirt
+  - type: Icon
+    state: jan_skirt
+  - type: Clothing
+    ClothingPrefix: jan_skirt
+    femaleMask: UniformTop
+
 - type: entity
   parent: UniformBase
   id: UniformEngineering
@@ -28,13 +41,26 @@
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_engineering.rsi
-    state: engine
+    state: icon
   - type: Icon
     sprite: Clothing/Uniforms/uniform_engineering.rsi
-    state: engine
+    state: icon
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_engineering.rsi
 
+- type: entity
+  parent: UniformEngineering
+  id: UniformEngineeringSkirt
+  name: engineering jumpskirt
+  components:
+  - type: Sprite
+    state: engine_skirt
+  - type: Icon
+    state: engine_skirt
+  - type: Clothing
+    ClothingPrefix: engine_skirt
+    femaleMask: UniformTop
+
 - type: entity
   parent: UniformBase
   id: UniformAssistant
@@ -49,6 +75,107 @@
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_assistant.rsi
 
+- type: entity
+  parent: UniformBase
+  id: UniformChemistry
+  name: chemistry jumpsuit
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    state: chemistry
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    state: chemistry
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    ClothingPrefix: chemistry
+
+- type: entity
+  parent: UniformChemistry
+  id: UniformChemistrySkirt
+  name: chemistry jumpskirt
+  components:
+  - type: Sprite
+    state: chemistry_skirt
+  - type: Icon
+    state: chemistry_skirt
+  - type: Clothing
+    ClothingPrefix: chemistry_skirt
+    femaleMask: UniformTop
+
+- type: entity
+  parent: UniformBase
+  id: UniformParamedic
+  name: paramedic jumpsuit
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    state: paramedic
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    state: paramedic
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    ClothingPrefix: paramedic
+
+- type: entity
+  parent: UniformParamedic
+  id: UniformParamedicSkirt
+  name: paramedic jumpskirt
+  components:
+  - type: Sprite
+    state: paramedic_skirt
+  - type: Icon
+    state: paramedic_skirt
+  - type: Clothing
+    ClothingPrefix: paramedic_skirt
+    femaleMask: UniformTop
+
+- type: entity
+  parent: UniformBase
+  id: UniformScrubsPurple
+  name: purple scrubs
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    state: scrubspurple
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    state: scrubspurple
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    ClothingPrefix: scrubspurple
+
+- type: entity
+  parent: UniformBase
+  id: UniformScrubsGreen
+  name: green scrubs
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    state: scrubsgreen
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    state: scrubsgreen
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    ClothingPrefix: scrubsgreen
+
+- type: entity
+  parent: UniformBase
+  id: UniformScrubsBlue
+  name: blue scrubs
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    state: scrubsblue
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    state: scrubsblue
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+    ClothingPrefix: scrubsblue
+
 - type: entity
   parent: UniformBase
   id: UniformClown
@@ -80,36 +207,104 @@
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_sec.rsi
 
+- type: entity
+  parent: UniformSec
+  id: UniformSecSkirt
+  name: security jumpskirt
+  description: A jumpskirt made of strong material, providing robust protection.
+  components:
+  - type: Sprite
+    state: sec_skirt
+  - type: Icon
+    state: sec_skirt
+  - type: Clothing
+    ClothingPrefix: sec_skirt
+    femaleMask: UniformTop
+
 - type: entity
   parent: UniformBase
   id: UniformCargoTech
-  name: cargo technician jumpsuit
+  name: cargo tech jumpsuit
-  description: Shooooorts! They're comfy and easy to wear!
+  description:
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_cargotech.rsi
-    state: cargotech
+    state: icon
   - type: Icon
     sprite: Clothing/Uniforms/uniform_cargotech.rsi
-    state: cargotech
+    state: icon
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_cargotech.rsi
 
+- type: entity
+  parent: UniformCargoTech
+  id: UniformCargoTechSkirt
+  name: cargo tech jumpskirt
+  components:
+  - type: Sprite
+    state: cargo_skirt
+  - type: Icon
+    state: cargo_skirt
+  - type: Clothing
+    ClothingPrefix: cargo_skirt
+    femaleMask: UniformTop
+
+- type: entity
+  parent: UniformBase
+  id: UniformQM
+  name: qm jumpsuit
+  description:
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_cargotech.rsi
+    state: qm
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_cargotech.rsi
+    state: qm
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_cargotech.rsi
+
+- type: entity
+  parent: UniformQM
+  id: UniformQMSkirt
+  name: qm jumpskirt
+  components:
+  - type: Sprite
+    state: qm_skirt
+  - type: Icon
+    state: qm_skirt
+  - type: Clothing
+    ClothingPrefix: qm_skirt
+    femaleMask: UniformTop
+
 - type: entity
   parent: UniformBase
   id: UniformChef
-  name: chef's uniform
+  name: chef uniform
   description: Can't cook without this.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_chef.rsi
-    state: chef
+    state: icon
   - type: Icon
     sprite: Clothing/Uniforms/uniform_chef.rsi
-    state: chef
+    state: icon
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_chef.rsi
 
+- type: entity
+  parent: UniformChef
+  id: UniformChefSkirt
+  name: chef skirt
+  components:
+  - type: Sprite
+    state: chef_skirt
+  - type: Icon
+    state: chef_skirt
+  - type: Clothing
+    ClothingPrefix: chef_skirt
+    femaleMask: UniformTop
+
 - type: entity
   parent: UniformBase
   id: UniformCaptain
@@ -125,51 +320,62 @@
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_captain.rsi
 
-- type: entity
-  parent: UniformBase
-  id: UniformHoP
-  name: head of personnel jumpsuit
-  description: It's a jumpsuit worn by someone who works in the position of Head of Personnel.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_hop.rsi
-    state: hop
-  - type: Icon
-    sprite: Clothing/Uniforms/uniform_hop.rsi
-    state: hop
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_hop.rsi
-
 - type: entity
   parent: UniformBase
   id: UniformChiefEngineer
-  name: chief engineer jumpsuit
+  name: ce jumpsuit
   description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_ce.rsi
-    state: ce
+    state: icon
   - type: Icon
     sprite: Clothing/Uniforms/uniform_ce.rsi
-    state: ce
+    state: icon
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_ce.rsi
 
+- type: entity
+  parent: UniformChiefEngineer
+  id: UniformChiefEngineerSkirt
+  name: ce jumpskirt
+  components:
+  - type: Sprite
+    state: chief_skirt
+  - type: Icon
+    state: chief_skirt
+  - type: Clothing
+    ClothingPrefix: chief_skirt
+    femaleMask: UniformTop
+
 - type: entity
   parent: UniformBase
   id: UniformCMO
-  name: chief medical officer jumpsuit
+  name: cmo jumpsuit
   description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_cmo.rsi
-    state: cmo
+    state: icon
   - type: Icon
     sprite: Clothing/Uniforms/uniform_cmo.rsi
-    state: cmo
+    state: icon
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_cmo.rsi
 
+- type: entity
+  parent: UniformCMO
+  id: UniformCMOSkirt
+  name: cmo jumpskirt
+  components:
+  - type: Sprite
+    state: cmo_skirt
+  - type: Icon
+    state: cmo_skirt
+  - type: Clothing
+    ClothingPrefix: cmo_skirt
+    femaleMask: UniformTop
+
 - type: entity
   parent: UniformBase
   id: UniformMedicalDoctor
@@ -177,13 +383,26 @@
   description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/uniform_md.rsi
+    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: md
+    state: icon
   - type: Icon
-    sprite: Clothing/Uniforms/uniform_md.rsi
+    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: md
+    state: icon
   - type: Clothing
-    sprite: Clothing/Uniforms/uniform_md.rsi
+    sprite: Clothing/Uniforms/uniform_medical.rsi
+
+- type: entity
+  parent: UniformMedicalDoctor
+  id: UniformMedicalDoctorSkirt
+  name: medical doctor jumpskirt
+  components:
+  - type: Sprite
+    state: medical_skirt
+  - type: Icon
+    state: medical_skirt
+  - type: Clothing
+    ClothingPrefix: medical_skirt
+    femaleMask: UniformTop
 
 - type: entity
   parent: UniformBase
@@ -193,32 +412,58 @@
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_scientist.rsi
-    state: scientist
+    state: icon
   - type: Icon
     sprite: Clothing/Uniforms/uniform_scientist.rsi
-    state: scientist
+    state: icon
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_scientist.rsi
 
+- type: entity
+  parent: UniformScientist
+  id: UniformScientistSkirt
+  name: scientist jumpskirt
+  components:
+  - type: Sprite
+    state: sci_skirt
+  - type: Icon
+    state: sci_skirt
+  - type: Clothing
+    ClothingPrefix: sci_skirt
+    femaleMask: UniformTop
+
 - type: entity
   parent: UniformBase
   id: UniformResearchDirector
-  name: research director vest suit
+  name: rd turtleneck
-  description: It's a suit worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
+  description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/uniform_rd.rsi
+    sprite: Clothing/Uniforms/uniform_rnd.rsi
-    state: rd
+    state: icon
   - type: Icon
-    sprite: Clothing/Uniforms/uniform_rd.rsi
+    sprite: Clothing/Uniforms/uniform_rnd.rsi
-    state: rd
+    state: icon
   - type: Clothing
-    sprite: Clothing/Uniforms/uniform_rd.rsi
+    sprite: Clothing/Uniforms/uniform_rnd.rsi
+
+- type: entity
+  parent: UniformResearchDirector
+  id: UniformResearchDirectorSkirt
+  name: rd skirtleneck
+  components:
+  - type: Sprite
+    state: rnd_skirt
+  - type: Icon
+    state: rnd_skirt
+  - type: Clothing
+    ClothingPrefix: rnd_skirt
+    femaleMask: UniformTop
 
 - type: entity
   parent: UniformBase
   id: UniformMime
-  name: mime's clothes
+  name: mime suit
   description: ...
   components:
   - type: Sprite
@@ -230,17 +475,199 @@
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_mime.rsi
 
+- type: entity
+  parent: UniformMime
+  id: UniformMimeSkirt
+  name: mime skirt
+  components:
+  - type: Sprite
+    state: mime_skirt
+  - type: Icon
+    state: mime_skirt
+  - type: Clothing
+    ClothingPrefix: mime_skirt
+    femaleMask: UniformTop
+
 - type: entity
   parent: UniformBase
-  id: UniformHoS
+  id: UniformHoSAlt
-  name: head of security jumpsuit
+  name: head of security turtleneck
-  description: A security jumpsuit decorated for those few with the dedication to achieve the position of Head of Security.
+  description:
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_hos.rsi
-    state: hos
+    state: hosalt
   - type: Icon
     sprite: Clothing/Uniforms/uniform_hos.rsi
-    state: hos
+    state: hosalt
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_hos.rsi
+    HeldPrefix: hosalt
+
+- type: entity
+  parent: UniformHoSAlt
+  id: UniformHoSAltSkirt
+  name: head of security skirtleneck
+  components:
+  - type: Sprite
+    state: hosalt_skirt
+  - type: Icon
+    state: hosalt_skirt
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_hos.rsi
+    ClothingPrefix: hosalt_skirt
+    femaleMask: UniformTop
+    HeldPrefix: hosalt
+
+- type: entity
+  parent: UniformBase
+  id: UniformHoS
+  name: head of security jumpsuit
+  description:
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_hos.rsi
+    state: icon
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_hos.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_hos.rsi
+
+- type: entity
+  parent: UniformHoS
+  id: UniformHoSSkirt
+  name: head of security jumpskirt
+  components:
+  - type: Sprite
+    state: hos_skirt
+  - type: Icon
+    state: hos_skirt
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_hos.rsi
+    ClothingPrefix: hos_skirt
+    femaleMask: UniformTop
+
+- type: entity
+  parent: UniformBase
+  id: UniformPrisoner
+  name: prisoner jumpsuit
+  description:
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_prisoner.rsi
+    state: icon
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_prisoner.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_prisoner.rsi
+
+- type: entity
+  parent: UniformPrisoner
+  id: UniformPrisonerSkirt
+  name: prisoner jumpskirt
+  components:
+  - type: Sprite
+    state: prisoner_skirt
+  - type: Icon
+    state: prisoner_skirt
+  - type: Clothing
+    ClothingPrefix: prisoner_skirt
+    femaleMask: UniformTop
+
+- type: entity
+  parent: UniformBase
+  id: UniformHop
+  name: hop jumpsuit
+  description:
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_hop.rsi
+    state: icon
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_hop.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_hop.rsi
+
+- type: entity
+  parent: UniformHop
+  id: UniformHopSkirt
+  name: hop jumpskirt
+  components:
+  - type: Sprite
+    state: hop_skirt
+  - type: Icon
+    state: hop_skirt
+  - type: Clothing
+    ClothingPrefix: hop_skirt
+    femaleMask: UniformTop
+
+- type: entity
+  parent: UniformBase
+  id: UniformHydroponics
+  name: hydroponics jumpsuit
+  description:
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_hydro.rsi
+    state: icon
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_hydro.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_hydro.rsi
+
+- type: entity
+  parent: UniformHydroponics
+  id: UniformHydroponicsSkirt
+  name: hydroponics jumpskirt
+  components:
+  - type: Sprite
+    state: hydro_skirt
+  - type: Icon
+    state: hydro_skirt
+  - type: Clothing
+    ClothingPrefix: hydro_skirt
+    femaleMask: UniformTop
+
+- type: entity
+  parent: UniformBase
+  id: UniformBartender
+  name: bartender's uniform
+  description: It looks like it could use some more flair.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/bartender.rsi
+    state: icon
+  - type: Icon
+    sprite: Clothing/Uniforms/bartender.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Uniforms/bartender.rsi
+
+- type: entity
+  parent: UniformBartender
+  id: UniformBartenderSkirt
+  name: bartender's skirt
+  components:
+  - type: Sprite
+    state: skirt
+  - type: Icon
+    state: skirt
+  - type: Clothing
+    ClothingPrefix: skirt
+    femaleMask: UniformTop
+
+- type: entity
+  parent: UniformBartender
+  id: UniformBartenderPurple
+  name: purple bartender's uniform
+  components:
+  - type: Sprite
+    state: purple
+  - type: Icon
+    state: purple
+  - type: Clothing
+    ClothingPrefix: purple

Resources/Textures/Clothing/Shoes/beesocks.rsi/meta.json

@@ -0,0 +1,24 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation",
+  "states": [
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/Shoes/codersocks.rsi/meta.json

@@ -0,0 +1,24 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation",
+  "states": [
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/bartender.rsi/meta.json

@@ -1 +1,144 @@
-{"version":1,"size":{"x":32,"y":32},"states":[{"name":"barman","directions":1,"delays":[[1.0]]},{"name":"barman_d","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"purple-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"purple","directions":1,"delays":[[1.0]]},{"name":"skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"skirt","directions":1,"delays":[[1.0]]}]}
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "barman_d",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "purple-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "purple",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "skirt-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "skirt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/meta.json

@@ -1 +1,155 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "cargotech", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation",
+  "states": [
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "cargo_skirt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "qm",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "qm_skirt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "cargo_skirt-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "qm-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "qm_skirt-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/meta.json

@@ -1 +1,101 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "ce", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation",
+  "states": [
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "chief_skirt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "chief_skirt-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/meta.json

@@ -5,23 +5,41 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "copyright": "https://github.com/tgstation/tgstation",
     "states": [
         {
             "name": "equipped-INNERCLOTHING",
             "directions": 4,
             "delays": [
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "chef_skirt-equipped-INNERCLOTHING",
+            "directions": 4,
+            "delays": [
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
                 ]
             ]
         },
@@ -30,16 +48,16 @@
             "directions": 4,
             "delays": [
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ]
             ]
         },
@@ -48,25 +66,34 @@
             "directions": 4,
             "delays": [
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ]
             ]
         },
         {
-            "name": "chef",
+            "name": "icon",
             "directions": 1,
             "delays": [
                 [
-                    1.0
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "chef_skirt",
+            "directions": 1,
+            "delays": [
+                [
+                    1
                 ]
             ]
         }

Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/meta.json

@@ -1 +1,101 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "cmo", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation",
+  "states": [
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "cmo_skirt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "cmo_skirt-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/meta.json

@@ -5,10 +5,19 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "copyright": "https://github.com/tgstation/tgstation",
     "states": [
         {
-            "name": "engine",
+            "name": "icon",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "engine_skirt",
             "directions": 1,
             "delays": [
                 [
@@ -34,6 +43,24 @@
                 ]
             ]
         },
+        {
+            "name": "engine_skirt-equipped-INNERCLOTHING",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
         {
             "name": "inhand-left",
             "directions": 4,

Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/meta.json

@@ -1 +1,101 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hop", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation",
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "hop_skirt",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "hop_skirt-equipped-INNERCLOTHING",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        }
+    ]
+}

Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/meta.json

@@ -1 +1,191 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hos", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet",
+  "states": [
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "hos_skirt-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "hosalt_skirt-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "hosalt-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "hosalt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "hosalt_skirt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "hos_skirt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "hosalt-inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "hosalt-inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/meta.json

@@ -0,0 +1,101 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation",
+  "states": [
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "hydro_skirt-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "hydro_skirt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/meta.json

@@ -5,23 +5,41 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "copyright": "https://github.com/tgstation/tgstation",
     "states": [
+        {
+            "name": "jan_skirt-equipped-INNERCLOTHING",
+            "directions": 4,
+            "delays": [
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "equipped-INNERCLOTHING",
             "directions": 4,
             "delays": [
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ]
             ]
         },
@@ -30,16 +48,16 @@
             "directions": 4,
             "delays": [
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ]
             ]
         },
@@ -48,25 +66,34 @@
             "directions": 4,
             "delays": [
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ],
                 [
-                    1.0
+                    1
                 ]
             ]
         },
         {
-            "name": "janitor",
+            "name": "icon",
             "directions": 1,
             "delays": [
                 [
-                    1.0
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "jan_skirt",
+            "directions": 1,
+            "delays": [
+                [
+                    1
                 ]
             ]
         }

Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/meta.json

@@ -0,0 +1,290 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation",
+  "states": [
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "chemistry-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "chemistry_skirt-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "medical_skirt-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "paramedic-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "paramedic_skirt-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "scrubsblue-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "scrubspurple-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "scrubsgreen-equipped-INNERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "medical_skirt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "paramedic",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "paramedic_skirt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "scrubsblue",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "scrubsgreen",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "scrubspurple",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "chemistry",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "chemistry_skirt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}