[Feat] Тонкие спрайты снова в строю (#102)

* Revert "Hair Overhaul (#19298)"

This reverts commit 9491f322de.

# Conflicts:
#	Resources/Textures/Mobs/Customization/human_hair.rsi/a.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/afro.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/afro2.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/bigafro.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/cornrows2.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/emofringe.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/keanu.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/long.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/long2.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/long3.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
#	Resources/Textures/Mobs/Customization/human_hair.rsi/modern.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/quiff.png

* add: возврат системы тонкоспрайтов

* fix: небольшие фиксы после реверта причесок

* add: старые текстуры для slim бодитайпа

* fix: фикс причесок после апстрима

Resources/Locale/en-US/accessories/human-hair.ftl

@@ -37,15 +37,6 @@ marking-HumanHairBusiness3 = Business Hair 3
 marking-HumanHairBusiness4 = Business Hair 4
 marking-HumanHairBuzzcut = Buzzcut
 marking-HumanHairCia = CIA
-marking-HumanHairClassicAfro = Classic Afro
-marking-HumanHairClassicBigAfro = Classic Big Afro
-marking-HumanHairClassicBusiness = Classic Business Hair
-marking-HumanHairClassicCia = Classic CIA
-marking-HumanHairClassicCornrows2 = Classic Cornrows 2
-marking-HumanHairClassicFloorlengthBedhead = Classic Floorlength Bedhead
-marking-HumanHairClassicModern = Classic Modern
-marking-HumanHairClassicMulder = Classic Mulder
-marking-HumanHairClassicWisp = Classic Wisp
 marking-HumanHairCoffeehouse = Coffee House
 marking-HumanHairCombover = Combover
 marking-HumanHairCornrows = Cornrows

Resources/Prototypes/Body/Parts/human.yml

@@ -21,7 +21,7 @@
   components:
   - type: Sprite
     sprite: Mobs/Species/Human/parts.rsi
-    state: "torso_m"
+    state: "torso"
   - type: Extractable
     juiceSolution:
       reagents:
@@ -30,6 +30,14 @@
       - ReagentId: Blood
         Quantity: 20
 
+- type: entity
+  id: TorsoHumanSlim
+  name: "human torso"
+  parent: TorsoHuman
+  components:
+  - type: Sprite
+    state: "torso_slim"
+
 - type: entity
   id: HeadHuman
   name: "human head"
@@ -37,7 +45,7 @@
   components:
   - type: Sprite
     sprite: Mobs/Species/Human/parts.rsi
-    state: "head_m"
+    state: "head"
   - type: Extractable
     juiceSolution:
       reagents:
@@ -46,6 +54,13 @@
       - ReagentId: Blood
         Quantity: 10
 
+- type: entity
+  id: HeadHumanSlim
+  parent: HeadHuman
+  components:
+  - type: Sprite
+    state: "head_slim"
+
 - type: entity
   id: LeftArmHuman
   name: "left human arm"

Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

@@ -271,69 +271,6 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: cia
-- type: marking
-  id: HumanHairClassicAfro
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: classicafro
-- type: marking
-  id: HumanHairClassicBigAfro
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: classicbigafro
-- type: marking
-  id: HumanHairClassicBusiness
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: classicbusiness
-- type: marking
-  id: HumanHairClassicCia
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: classiccia
-- type: marking
-  id: HumanHairClassicCornrows2
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: classiccornrows2
-- type: marking
-  id: HumanHairClassicFloorlengthBedhead
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: classicfloorlength_bedhead
-- type: marking
-  id: HumanHairClassicModern
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: classicmodern
-- type: marking
-  id: HumanHairClassicMulder
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: classicmulder
-- type: marking
-  id: HumanHairClassicWisp
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: classicwisp
 - type: marking
   id: HumanHairCoffeehouse
   bodyPart: Hair

Resources/Prototypes/Species/arachnid.yml

@@ -3,7 +3,8 @@
   name: species-name-arachnid
   roundStart: true
   prototype: MobArachnid
-  sprites: MobArachnidSprites
+  bodyTypes:
+    - ArachnidNormal
   defaultSkinTone: "#385878"
   markingLimits: MobArachnidMarkingLimits
   dollPrototype: MobArachnidDummy
@@ -15,25 +16,6 @@
   sexes:
   - Unsexed
 
-- type: speciesBaseSprites
-  id: MobArachnidSprites
-  sprites:
-    Head: MobArachnidHead
-    Snout: MobHumanoidAnyMarking
-    Chest: MobArachnidTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobHumanoidAnyMarking
-    LArm: MobArachnidLArm
-    RArm: MobArachnidRArm
-    LHand: MobArachnidLHand
-    RHand: MobArachnidRHand
-    LLeg: MobArachnidLLeg
-    RLeg: MobArachnidRLeg
-    LFoot: MobArachnidLFoot
-    RFoot: MobArachnidRFoot
-
 - type: markingPoints
   id: MobArachnidMarkingLimits
   onlyWhitelisted: true

Resources/Prototypes/Species/diona.yml

@@ -3,7 +3,8 @@
   name: species-name-diona
   roundStart: true
   prototype: MobDiona
-  sprites: MobDionaSprites
+  bodyTypes:
+  - DionaNormal
   defaultSkinTone: "#cdb369"
   markingLimits: MobDionaMarkingLimits
   dollPrototype: MobDionaDummy
@@ -14,23 +15,6 @@
   femaleLastNames: DionaLast
   naming: TheFirstofLast
 
-- type: speciesBaseSprites
-  id: MobDionaSprites
-  sprites:
-    Head: MobDionaHead
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Chest: MobDionaTorso
-    Eyes: MobDionaEyes
-    LArm: MobDionaLArm
-    RArm: MobDionaRArm
-    LHand: MobDionaLHand
-    RHand: MobDionaRHand
-    LLeg: MobDionaLLeg
-    RLeg: MobDionaRLeg
-    LFoot: MobDionaLFoot
-    RFoot: MobDionaRFoot
-
 - type: markingPoints
   id: MobDionaMarkingLimits
   onlyWhitelisted: true

Resources/Prototypes/Species/dwarf.yml

@@ -3,7 +3,8 @@
   name: species-name-dwarf
   roundStart: true
   prototype: MobDwarf
-  sprites: MobHumanSprites
+  bodyTypes:
+  - HumanNormal
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobDwarfDummy
   skinColoration: HumanToned

Resources/Prototypes/Species/gingerbread.yml

@@ -3,29 +3,13 @@
   name: species-name-human
   roundStart: false
   prototype: MobGingerbread
-  sprites: MobGingerbreadSprites
+  bodyTypes:
+  - GingerbreadNormal
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobGingerbreadDummy
   skinColoration: HumanToned
   defaultSkinTone: "#9a7c5a"
 
-- type: speciesBaseSprites
-  id: MobGingerbreadSprites
-  sprites:
-    Head: MobGingerbreadHead
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Chest: MobGingerbreadTorso
-    Eyes: MobGingerbreadEyes
-    LArm: MobGingerbreadLArm
-    RArm: MobGingerbreadRArm
-    LHand: MobGingerbreadLHand
-    RHand: MobGingerbreadRHand
-    LLeg: MobGingerbreadLLeg
-    RLeg: MobGingerbreadRLeg
-    LFoot: MobGingerbreadLFoot
-    RFoot: MobGingerbreadRFoot
-
 - type: humanoidBaseSprite
   id: MobGingerbreadEyes
   baseSprite:

Resources/Prototypes/Species/human.yml

@@ -3,7 +3,9 @@
   name: species-name-human
   roundStart: true
   prototype: MobHuman
-  sprites: MobHumanSprites
+  bodyTypes:
+  - HumanNormal
+  - HumanSlim
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobHumanDummy
   skinColoration: HumanToned
@@ -14,24 +16,6 @@
 # be defined as a 'custom base layer'
 # in either the mob's starting marking prototype,
 # or it has to be added in C#.
-- type: speciesBaseSprites
-  id: MobHumanSprites
-  sprites:
-    Head: MobHumanHead
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Chest: MobHumanTorso
-    HeadTop: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobHumanoidEyes
-    LArm: MobHumanLArm
-    RArm: MobHumanRArm
-    LHand: MobHumanLHand
-    RHand: MobHumanRHand
-    LLeg: MobHumanLLeg
-    RLeg: MobHumanRLeg
-    LFoot: MobHumanLFoot
-    RFoot: MobHumanRFoot
 
 - type: markingPoints
   id: MobHumanMarkingLimits
@@ -71,17 +55,12 @@
   id: MobHumanoidMarkingMatchSkin
   markingsMatchSkin: true
 
+# Normal body type sprites
 - type: humanoidBaseSprite
   id: MobHumanHead
   baseSprite:
     sprite: Mobs/Species/Human/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobHumanHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: head_m
+    state: head
 
 - type: humanoidBaseSprite
   id: MobHumanHeadFemale
@@ -93,13 +72,7 @@
   id: MobHumanTorso
   baseSprite:
     sprite: Mobs/Species/Human/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobHumanTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: torso_m
+    state: torso
 
 - type: humanoidBaseSprite
   id: MobHumanTorsoFemale
@@ -154,3 +127,77 @@
   baseSprite:
     sprite: Mobs/Species/Human/parts.rsi
     state: r_foot
+
+# Slim types
+
+- type: humanoidBaseSprite
+  id: MobHumanSlimHead
+  baseSprite:
+    sprite: Mobs/Species/Human/parts.rsi
+    state: head_slim
+
+- type: humanoidBaseSprite
+  id: MobHumanSlimHeadFemale
+  baseSprite:
+    sprite: Mobs/Species/Human/parts.rsi
+    state: head_slim_f
+
+- type: humanoidBaseSprite
+  id: MobHumanSlimTorso
+  baseSprite:
+    sprite: Mobs/Species/Human/parts.rsi
+    state: torso_slim
+
+- type: humanoidBaseSprite
+  id: MobHumanSlimTorsoFemale
+  baseSprite:
+    sprite: Mobs/Species/Human/parts.rsi
+    state: torso_slim_f
+
+- type: humanoidBaseSprite
+  id: MobHumanSlimLLeg
+  baseSprite:
+    sprite: Mobs/Species/Human/parts.rsi
+    state: l_leg_slim
+
+- type: humanoidBaseSprite
+  id: MobHumanSlimLArm
+  baseSprite:
+    sprite: Mobs/Species/Human/parts.rsi
+    state: l_arm_slim
+
+- type: humanoidBaseSprite
+  id: MobHumanSlimLHand
+  baseSprite:
+    sprite: Mobs/Species/Human/parts.rsi
+    state: l_hand_slim
+
+- type: humanoidBaseSprite
+  id: MobHumanSlimLFoot
+  baseSprite:
+    sprite: Mobs/Species/Human/parts.rsi
+    state: l_foot_slim
+
+- type: humanoidBaseSprite
+  id: MobHumanSlimRLeg
+  baseSprite:
+    sprite: Mobs/Species/Human/parts.rsi
+    state: r_leg_slim
+
+- type: humanoidBaseSprite
+  id: MobHumanSlimRArm
+  baseSprite:
+    sprite: Mobs/Species/Human/parts.rsi
+    state: r_arm_slim
+
+- type: humanoidBaseSprite
+  id: MobHumanSlimRHand
+  baseSprite:
+    sprite: Mobs/Species/Human/parts.rsi
+    state: r_hand_slim
+
+- type: humanoidBaseSprite
+  id: MobHumanSlimRFoot
+  baseSprite:
+    sprite: Mobs/Species/Human/parts.rsi
+    state: r_foot_slim

Resources/Prototypes/Species/moth.yml

@@ -3,7 +3,8 @@
   name: species-name-moth
   roundStart: true
   prototype: MobMoth
-  sprites: MobMothSprites
+  bodyTypes:
+  - MothNormal
   defaultSkinTone: "#ffda93"
   markingLimits: MobMothMarkingLimits
   dollPrototype: MobMothDummy
@@ -12,25 +13,6 @@
   femaleFirstNames: names_moth_first_female
   lastNames: names_moth_last
 
-- type: speciesBaseSprites
-  id: MobMothSprites
-  sprites:
-    Head: MobMothHead
-    Snout: MobHumanoidAnyMarking
-    Chest: MobMothTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobMothEyes
-    LArm: MobMothLArm
-    RArm: MobMothRArm
-    LHand: MobMothLHand
-    RHand: MobMothRHand
-    LLeg: MobMothLLeg
-    RLeg: MobMothRLeg
-    LFoot: MobMothLFoot
-    RFoot: MobMothRFoot
-
 - type: humanoidBaseSprite
   id: MobMothEyes
   baseSprite:

Resources/Prototypes/Species/reptilian.yml

@@ -3,7 +3,8 @@
   name: species-name-reptilian
   roundStart: true
   prototype: MobReptilian
-  sprites: MobReptilianSprites
+  bodyTypes:
+  - ReptilianNormal
   defaultSkinTone: "#34a223"
   markingLimits: MobReptilianMarkingLimits
   dollPrototype: MobReptilianDummy
@@ -12,24 +13,6 @@
   femaleFirstNames: names_reptilian_female
   naming: FirstDashFirst
 
-- type: speciesBaseSprites
-  id: MobReptilianSprites
-  sprites:
-    Head: MobReptilianHead
-    Snout: MobHumanoidAnyMarking
-    Chest: MobReptilianTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobHumanoidEyes
-    LArm: MobReptilianLArm
-    RArm: MobReptilianRArm
-    LHand: MobReptilianLHand
-    RHand: MobReptilianRHand
-    LLeg: MobReptilianLLeg
-    RLeg: MobReptilianRLeg
-    LFoot: MobReptilianLFoot
-    RFoot: MobReptilianRFoot
 
 - type: markingPoints
   id: MobReptilianMarkingLimits

Resources/Prototypes/Species/skeleton.yml

@@ -3,7 +3,8 @@
   name: species-name-skeleton
   roundStart: false
   prototype: MobSkeletonPerson
-  sprites: MobSkeletonSprites
+  bodyTypes:
+  - SkeletonNormal
   defaultSkinTone: "#fff9e2"
   markingLimits: MobHumanMarkingLimits
   maleFirstNames: skeletonNamesFirst
@@ -11,20 +12,6 @@
   dollPrototype: MobSkeletonPersonDummy
   skinColoration: TintedHues
 
-- type: speciesBaseSprites
-  id: MobSkeletonSprites
-  sprites:
-    Head: MobSkeletonHead
-    Chest: MobSkeletonTorso
-    LArm: MobSkeletonLArm
-    RArm: MobSkeletonRArm
-    LHand: MobSkeletonLHand
-    RHand: MobSkeletonRHand
-    LLeg: MobSkeletonLLeg
-    RLeg: MobSkeletonRLeg
-    LFoot: MobSkeletonLFoot
-    RFoot: MobSkeletonRFoot
-
 - type: humanoidBaseSprite
   id: MobSkeletonHead
   baseSprite:

Resources/Prototypes/Species/slime.yml

@@ -3,29 +3,13 @@
   name: species-name-slime
   roundStart: true
   prototype: MobSlimePerson
-  sprites: MobSlimeSprites
+  bodyTypes:
+  - SlimeNormal
   defaultSkinTone: "#b8b8b8"
   markingLimits: MobSlimeMarkingLimits
   dollPrototype: MobSlimePersonDummy
   skinColoration: Hues
 
-- type: speciesBaseSprites
-  id: MobSlimeSprites
-  sprites:
-    Head: MobSlimeHead
-    Hair: MobSlimeMarkingFollowSkin
-    FacialHair: MobSlimeMarkingFollowSkin
-    Chest: MobSlimeTorso
-    Eyes: MobHumanoidEyes
-    LArm: MobSlimeLArm
-    RArm: MobSlimeRArm
-    LHand: MobSlimeLHand
-    RHand: MobSlimeRHand
-    LLeg: MobSlimeLLeg
-    RLeg: MobSlimeRLeg
-    LFoot: MobSlimeLFoot
-    RFoot: MobSlimeRFoot
-
 - type: markingPoints
   id: MobSlimeMarkingLimits
   points:

Resources/Prototypes/Species/terminator.yml

@@ -3,7 +3,8 @@
   name: Terminator
   roundStart: false
   prototype: MobTerminatorEndoskeleton
-  sprites: MobTerminatorSprites
+  bodyTypes:
+  - TerminatorNormal
   defaultSkinTone: "#fff9e2"
   markingLimits: MobHumanMarkingLimits
   maleFirstNames: skeletonNamesFirst
@@ -11,19 +12,6 @@
   dollPrototype: MobSkeletonPersonDummy
   skinColoration: TintedHues
 
-- type: speciesBaseSprites
-  id: MobTerminatorSprites
-  sprites:
-    Head: MobTerminatorHead
-    Chest: MobTerminatorTorso
-    LArm: MobTerminatorLArm
-    RArm: MobTerminatorRArm
-    LHand: MobTerminatorLHand
-    RHand: MobTerminatorRHand
-    LLeg: MobTerminatorLLeg
-    RLeg: MobTerminatorRLeg
-    LFoot: MobTerminatorLFoot
-    RFoot: MobTerminatorRFoot
 
 - type: humanoidBaseSprite
   id: MobTerminatorHead

Resources/Prototypes/Species/vox.yml

@@ -3,7 +3,8 @@
   name: species-name-vox
   roundStart: false # sad...
   prototype: MobVox
-  sprites: MobVoxSprites
+  bodyTypes:
+  - VoxNormal
   markingLimits: MobVoxMarkingLimits
   dollPrototype: MobVoxDummy
   skinColoration: Hues
@@ -14,23 +15,6 @@
     - Unsexed
 
 
-- type: speciesBaseSprites
-  id: MobVoxSprites
-  sprites:
-    Head: MobVoxHead
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Chest: MobVoxTorso
-    Eyes: MobVoxEyes
-    LArm: MobVoxLArm
-    RArm: MobVoxRArm
-    LHand: MobVoxLHand
-    RHand: MobVoxRHand
-    LLeg: MobVoxLLeg
-    RLeg: MobVoxRLeg
-    LFoot: MobVoxLFoot
-    RFoot: MobVoxRFoot
-
 - type: markingPoints
   id: MobVoxMarkingLimits
   onlyWhitelisted: true

Resources/Prototypes/_White/BodyTypes/normal.yml

@@ -0,0 +1,180 @@
+- type: bodyType
+  id: HumanNormal
+  name: body-normal
+  sprites:
+    Head: MobHumanHead
+    Hair: MobHumanoidAnyMarking
+    FacialHair: MobHumanoidAnyMarking
+    Chest: MobHumanTorso
+    HeadTop: MobHumanoidAnyMarking
+    Tail: MobHumanoidAnyMarking
+    Eyes: MobHumanoidEyes
+    LArm: MobHumanLArm
+    RArm: MobHumanRArm
+    LHand: MobHumanLHand
+    RHand: MobHumanRHand
+    LLeg: MobHumanLLeg
+    RLeg: MobHumanRLeg
+    LFoot: MobHumanLFoot
+    RFoot: MobHumanRFoot
+
+- type: bodyType
+  id: ReptilianNormal
+  name: body-normal
+  sprites:
+    Head: MobReptilianHead
+    Snout: MobHumanoidAnyMarking
+    Chest: MobReptilianTorso
+    HeadTop: MobHumanoidAnyMarking
+    HeadSide: MobHumanoidAnyMarking
+    Tail: MobHumanoidAnyMarking
+    Eyes: MobHumanoidEyes
+    LArm: MobReptilianLArm
+    RArm: MobReptilianRArm
+    LHand: MobReptilianLHand
+    RHand: MobReptilianRHand
+    LLeg: MobReptilianLLeg
+    RLeg: MobReptilianRLeg
+    LFoot: MobReptilianLFoot
+    RFoot: MobReptilianRFoot
+
+- type: bodyType
+  id: SkeletonNormal
+  name: body-normal
+  sprites:
+    Head: MobSkeletonHead
+    Chest: MobSkeletonTorso
+    LArm: MobSkeletonLArm
+    RArm: MobSkeletonRArm
+    LHand: MobSkeletonLHand
+    RHand: MobSkeletonRHand
+    LLeg: MobSkeletonLLeg
+    RLeg: MobSkeletonRLeg
+    LFoot: MobSkeletonLFoot
+    RFoot: MobSkeletonRFoot
+
+- type: bodyType
+  id: SlimeNormal
+  name: body-normal
+  sprites:
+    Head: MobSlimeHead
+    Hair: MobSlimeMarkingFollowSkin
+    FacialHair: MobSlimeMarkingFollowSkin
+    Chest: MobSlimeTorso
+    Eyes: MobHumanoidEyes
+    LArm: MobSlimeLArm
+    RArm: MobSlimeRArm
+    LHand: MobSlimeLHand
+    RHand: MobSlimeRHand
+    LLeg: MobSlimeLLeg
+    RLeg: MobSlimeRLeg
+    LFoot: MobSlimeLFoot
+    RFoot: MobSlimeRFoot
+
+- type: bodyType
+  id: VoxNormal
+  name: body-normal
+  sprites:
+    Head: MobVoxHead
+    Hair: MobHumanoidAnyMarking
+    FacialHair: MobHumanoidAnyMarking
+    Chest: MobVoxTorso
+    Eyes: MobVoxEyes
+    LArm: MobVoxLArm
+    RArm: MobVoxRArm
+    LHand: MobVoxLHand
+    RHand: MobVoxRHand
+    LLeg: MobVoxLLeg
+    RLeg: MobVoxRLeg
+    LFoot: MobVoxLFoot
+    RFoot: MobVoxRFoot
+
+- type: bodyType
+  id: DionaNormal
+  name: body-normal
+  sprites:
+    Head: MobDionaHead
+    HeadTop: MobHumanoidAnyMarking
+    HeadSide: MobHumanoidAnyMarking
+    Chest: MobDionaTorso
+    LArm: MobDionaLArm
+    RArm: MobDionaRArm
+    LHand: MobDionaLHand
+    RHand: MobDionaRHand
+    LLeg: MobDionaLLeg
+    RLeg: MobDionaRLeg
+    LFoot: MobDionaLFoot
+    RFoot: MobDionaRFoot
+
+- type: bodyType
+  id: ArachnidNormal
+  name: body-normal
+  sprites:
+    Head: MobArachnidHead
+    Snout: MobHumanoidAnyMarking
+    Chest: MobArachnidTorso
+    HeadTop: MobHumanoidAnyMarking
+    HeadSide: MobHumanoidAnyMarking
+    Tail: MobHumanoidAnyMarking
+    Eyes: MobArachnidEyes
+    LArm: MobArachnidLArm
+    RArm: MobArachnidRArm
+    LHand: MobArachnidLHand
+    RHand: MobArachnidRHand
+    LLeg: MobArachnidLLeg
+    RLeg: MobArachnidRLeg
+    LFoot: MobArachnidLFoot
+    RFoot: MobArachnidRFoot
+
+- type: bodyType
+  id: TerminatorNormal
+  name: body-normal
+  sprites:
+    Head: MobTerminatorHead
+    Chest: MobTerminatorTorso
+    LArm: MobTerminatorLArm
+    RArm: MobTerminatorRArm
+    LHand: MobTerminatorLHand
+    RHand: MobTerminatorRHand
+    LLeg: MobTerminatorLLeg
+    RLeg: MobTerminatorRLeg
+    LFoot: MobTerminatorLFoot
+    RFoot: MobTerminatorRFoot
+
+- type: bodyType
+  id: GingerbreadNormal
+  name: body-normal
+  sprites:
+    Head: MobGingerbreadHead
+    HeadTop: MobHumanoidAnyMarking
+    HeadSide: MobHumanoidAnyMarking
+    Chest: MobGingerbreadTorso
+    Eyes: MobGingerbreadEyes
+    LArm: MobGingerbreadLArm
+    RArm: MobGingerbreadRArm
+    LHand: MobGingerbreadLHand
+    RHand: MobGingerbreadRHand
+    LLeg: MobGingerbreadLLeg
+    RLeg: MobGingerbreadRLeg
+    LFoot: MobGingerbreadLFoot
+    RFoot: MobGingerbreadRFoot
+
+- type: bodyType
+  id: MothNormal
+  name: body-normal
+  sprites:
+    Head: MobMothHead
+    Snout: MobHumanoidAnyMarking
+    Chest: MobMothTorso
+    HeadTop: MobHumanoidAnyMarking
+    HeadSide: MobHumanoidAnyMarking
+    Tail: MobHumanoidAnyMarking
+    Eyes: MobMothEyes
+    LArm: MobMothLArm
+    RArm: MobMothRArm
+    LHand: MobMothLHand
+    RHand: MobMothRHand
+    LLeg: MobMothLLeg
+    RLeg: MobMothRLeg
+    LFoot: MobMothLFoot
+    RFoot: MobMothRFoot

Resources/Prototypes/_White/BodyTypes/slim.yml

@@ -0,0 +1,43 @@
+- type: bodyType
+  id: HumanSlim
+  name: body-slim
+  sexRestrictions:
+  - Male
+  sprites:
+    Head: MobHumanSlimHead
+    Hair: MobHumanoidAnyMarking
+    FacialHair: MobHumanoidAnyMarking
+    Chest: MobHumanSlimTorso
+    HeadTop: MobHumanoidAnyMarking
+    Tail: MobHumanoidAnyMarking
+    Eyes: MobHumanoidEyes
+    LArm: MobHumanSlimLArm
+    RArm: MobHumanSlimRArm
+    LHand: MobHumanSlimLHand
+    RHand: MobHumanSlimRHand
+    LLeg: MobHumanSlimLLeg
+    RLeg: MobHumanSlimRLeg
+    LFoot: MobHumanSlimLFoot
+    RFoot: MobHumanSlimRFoot
+
+# - type: bodyType
+#   id: ReptilianSlim
+#   name: body-slim
+#   sexRestrictions:
+#     - Male
+#   sprites:
+#     Head: MobReptilianSlimHead
+#     Snout: MobHumanoidAnyMarking
+#     Chest: MobReptilianSlimTorso
+#     HeadTop: MobHumanoidAnyMarking
+#     HeadSide: MobHumanoidAnyMarking
+#     Tail: MobHumanoidAnyMarking
+#     Eyes: MobHumanoidEyes
+#     LArm: MobReptilianSlimLArm
+#     RArm: MobReptilianSlimRArm
+#     LHand: MobReptilianSlimLHand
+#     RHand: MobReptilianSlimRHand
+#     LLeg: MobReptilianSlimLLeg
+#     RLeg: MobReptilianSlimRLeg
+#     LFoot: MobReptilianSlimLFoot
+#     RFoot: MobReptilianSlimRFoot

Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "equipped-HAND-kangaroo",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "equipped-HAND-kangaroo",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "equipped-HAND-kangaroo",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "equipped-HAND-kangaroo",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json

@@ -1 +1,35 @@
-{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": {"x": 32, "y": 32}, "states": [{"name": "icon"}, {"name": "equipped-HAND", "directions": 4}, {"name": "inhand-left", "directions": 4}, {"name": "inhand-right", "directions": 4}, {"name": "equipped-HAND-vox", "directions": 4}]}
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-HAND",
+        "directions": 4
+      },
+      {
+        "name": "equipped-HAND-body-slim",
+        "directions": 4
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      },
+      {
+        "name": "equipped-HAND-vox",
+        "directions": 4,
+        "delays": [[1.0], [1.0], [1.0], [1.0]]
+      }
+    ]
+  }

Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/meta.json

@@ -17,10 +17,18 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "on-equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "on-equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json

@@ -28,6 +28,18 @@
       "name": "green-equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-body-slim",
+      "directions": 4
+    },
+    {
+      "name": "red-equipped-HAND-body-slim",
+      "directions": 4
+    },
+    {
+      "name": "green-equipped-HAND-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json

@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-body-slim",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json

@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-body-slim",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json

@@ -14,6 +14,11 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
+
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json

@@ -14,6 +14,11 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
+
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json

@@ -14,6 +14,11 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
+
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json

@@ -14,6 +14,11 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
+
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json

@@ -14,6 +14,11 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-body-slim",
+      "directions": 4
+    },
+
     {
       "name": "inhand-left",
       "directions": 4