Merge branch 'master' into 2020-04-28-tool-component

Resources/Prototypes/BodySystem/BodyParts/humanoid_parts.yml

@@ -0,0 +1,102 @@
+- type: bodyPart
+  id: bodyPart.Torso.BasicHuman
+  name: "human torso"
+  plural: "human torsos"
+  rsiPath: Objects/BodySystem/BodyParts/basic_human.rsi
+  rsiState: "torso_m"
+  partType: Torso
+  durability: 100
+  destroyThreshold: -150
+  resistance: 4.0
+  size: 14
+  compatibility: Biological
+  surgeryDataType: BiologicalsurgeryDataType
+  mechanisms:
+    - mechanism.Heart.BasicHuman
+    - mechanism.Lungs.BasicHuman
+    - mechanism.Liver.BasicHuman
+    - mechanism.Kidneys.BasicHuman
+
+
+- type: bodyPart
+  id: bodyPart.Head.BasicHuman
+  name: "human head"
+  plural: "human heads"
+  rsiPath: Objects/BodySystem/BodyParts/basic_human.rsi
+  rsiState: head_m
+  partType: Head
+  durability: 50
+  destroyThreshold: -120
+  resistance: 7.0
+  size: 7
+  compatibility: Biological	
+  surgeryDataType: BiologicalsurgeryDataType
+  mechanisms:
+    - mechanism.Brain.BasicHuman
+    - mechanism.Eyes.BasicHuman
+
+
+
+- type: bodyPart
+  id: bodyPart.Arm.BasicHuman
+  name: "human arm"
+  plural: "human arms"
+  rsiPath: Objects/BodySystem/BodyParts/basic_human.rsi
+  rsiState: r_arm
+  partType: Arm
+  durability: 40
+  destroyThreshold: -80
+  resistance: 3.0
+  size: 5
+  compatibility: Biological	
+  surgeryDataType: BiologicalsurgeryDataType
+  properties:
+    - !type:ArmLength
+      length: 2.4
+  
+  
+  
+- type: bodyPart
+  id: bodyPart.Hand.BasicHuman
+  name: "human hand"
+  plural: "human hands"
+  rsiPath: Objects/BodySystem/BodyParts/basic_human.rsi
+  rsiState: r_hand
+  partType: Hand
+  durability: 30
+  destroyThreshold: -60
+  resistance: 2.0
+  size: 3
+  compatibility: Biological	
+  surgeryDataType: BiologicalsurgeryDataType
+       
+      
+- type: bodyPart
+  id: bodyPart.Leg.BasicHuman
+  name: "human leg"
+  plural: "human legs"
+  rsiPath: Objects/BodySystem/BodyParts/basic_human.rsi
+  rsiState: r_leg
+  partType: Leg
+  durability: 45
+  destroyThreshold: -90
+  resistance: 2.0
+  size: 6
+  compatibility: Biological	
+  surgeryDataType: BiologicalsurgeryDataType
+     
+     
+- type: bodyPart
+  id: bodyPart.Foot.BasicHuman
+  name: "human foot"
+  plural: "human feet"
+  rsiPath: Objects/BodySystem/BodyParts/basic_human.rsi
+  rsiState: r_foot
+  partType: Foot
+  durability: 30
+  destroyThreshold: -60
+  resistance: 3.0
+  size: 2
+  compatibility: Biological	
+  surgeryDataType: BiologicalsurgeryDataType
+      

Resources/Prototypes/BodySystem/BodyPresets/basic_human.yml

@@ -0,0 +1,15 @@
+- type: bodyPreset
+  name: "basic human"
+  id: bodyPreset.BasicHuman
+  partIDs:
+    head: bodyPart.Head.BasicHuman
+    torso: bodyPart.Torso.BasicHuman
+    right arm: bodyPart.Arm.BasicHuman
+    left arm: bodyPart.Arm.BasicHuman
+    right hand: bodyPart.Hand.BasicHuman
+    left hand: bodyPart.Hand.BasicHuman
+    right leg: bodyPart.Leg.BasicHuman
+    left leg: bodyPart.Leg.BasicHuman
+    right foot: bodyPart.Foot.BasicHuman
+    left foot: bodyPart.Foot.BasicHuman
+      

Resources/Prototypes/BodySystem/BodyTemplates/humanoid.yml

@@ -0,0 +1,33 @@
+- type: bodyTemplate
+  id: bodyTemplate.Humanoid
+  name: "humanoid"
+  centerSlot: "torso"
+  slots: 
+    head: Head
+    torso: Torso
+    left arm: Arm
+    left hand: Hand
+    right arm: Arm
+    right hand: Hand
+    left leg: Leg
+    left foot: Foot
+    right leg: Leg
+    right foot: Foot
+  connections:
+    head:
+      - torso
+    torso:
+      - left arm
+      - right arm
+      - left leg
+      - right leg
+    left arm:
+      - left hand
+    right arm: 
+      - right hand
+    left leg: 
+      - left foot
+    right leg: 
+      - right foot
+      
+      

Resources/Prototypes/BodySystem/BodyTemplates/quadrupedal.yml

@@ -0,0 +1,33 @@
+- type: bodyTemplate
+  id: bodyTemplate.Quadrupedal
+  name: "Quadrupedal"
+  centerSlot: "torso"
+  slots: 
+    head: Head
+    torso: Torso
+    left front leg: Leg
+    left front paw: Foot
+    right front leg: Leg
+    right front paw: Foot
+    left hind leg: Leg
+    left hind paw: Foot
+    right hind leg: Leg  
+    right hind paw: Foot
+  connections:
+    head:
+      - torso
+    torso:
+      - left front leg
+      - right front leg
+      - left hind leg
+      - right hind paw
+    left front leg:
+      - left front paw
+    right front leg: 
+      - right front paw
+    left hind leg: 
+      - left hind paw
+    right hind leg: 
+      - right hind paw
+      
+      

Resources/Prototypes/BodySystem/Mechanisms/basic_human_organs.yml

@@ -0,0 +1,59 @@
+- type: mechanism
+  id: mechanism.Brain.BasicHuman
+  name: "Human Brain"
+  rsiPath: Objects/BodySystem/Organs/basic_human.rsi
+  rsiState: "brain_human"
+  description: "The source of incredible, unending intelligence. Honk."
+  durability: 10
+  size: 1
+  compatibility: Biological
+  
+- type: mechanism
+  id: mechanism.Eyes.BasicHuman
+  name: "Human Eyes"
+  rsiPath: Objects/BodySystem/Organs/basic_human.rsi
+  rsiState: "eyes_human"
+  description: "Ocular organ capable of turning light into a colorful visual."
+  durability: 10
+  size: 1
+  compatibility: Biological
+
+- type: mechanism
+  id: mechanism.Heart.BasicHuman
+  name: "Human Heart"
+  rsiPath: Objects/BodySystem/Organs/basic_human.rsi
+  rsiState: "heart_human"
+  description: "Pumps blood throughout a body. Essential for any entity with blood."
+  durability: 10
+  size: 1
+  compatibility: Biological
+
+- type: mechanism
+  id: mechanism.Lungs.BasicHuman
+  name: "Human Lungs"
+  rsiPath: Objects/BodySystem/Organs/basic_human.rsi
+  rsiState: "lungs_human"
+  description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
+  durability: 13
+  size: 1
+  compatibility: Biological
+
+- type: mechanism
+  id: mechanism.Liver.BasicHuman
+  name: "Human Liver"
+  rsiPath: Objects/BodySystem/Organs/basic_human.rsi
+  rsiState: "liver_human"
+  description: "Filters impurities out of a bloodstream and provides other important functionality to a human."
+  durability: 15
+  size: 1
+  compatibility: Biological
+
+- type: mechanism
+  id: mechanism.Kidneys.BasicHuman
+  name: "Human Kidneys"
+  rsiPath: Objects/BodySystem/Organs/basic_human.rsi
+  rsiState: "kidneys_human"
+  description: "Filters toxins out of a bloodstream."
+  durability: 20
+  size: 1
+  compatibility: Biological

Resources/Prototypes/BodySystem/Mechanisms/basic_tests.yml

@@ -0,0 +1,20 @@
+- type: mechanism
+  id: mechanism.EMPStriker
+  name: "EMP Striker"
+  description: "When activated, this arm implant will apply a small EMP on the target of a physical strike for 10 watts per use."
+  durability: 80
+  size: 4
+  compatibility: Universal
+  implantableParts: 
+    - Arm
+    - Hand
+  
+  
+- type: mechanism
+  id: mechanism.HonkModule
+  name: "HONK Module 3000"
+  description: "Mandatory implant for all clowns after the Genevo Convention of 2459."
+  durability: 50
+  size: 3
+  compatibility: Universal	  
+  

Resources/Prototypes/BodySystem/Surgery/surgery_tools.yml

@@ -0,0 +1,128 @@
+- type: entity
+  name: Scalpel
+  parent: BaseItem
+  id: scalpel
+  desc: A surgical tool used to make incisions into flesh.
+  components:
+  - type: SurgeryTool
+    surgeryToolClass: Incision
+    baseOperateTime: 3
+    
+  - type: Sprite
+    sprite: Objects/Surgery/surgery_tools.rsi
+    state: scalpel
+  - type: Icon
+    sprite: Objects/Surgery/surgery_tools.rsi
+    state: scalpel
+
+  - type: ItemCooldown
+  - type: MeleeWeapon
+  
+  
+  
+- type: entity
+  name: Retractor
+  parent: BaseItem
+  id: retractor
+  desc: A surgical tool used to hold open incisions.
+  components:
+  - type: SurgeryTool
+    surgeryToolClass: Retraction
+    baseOperateTime: 3
+    
+  - type: Sprite
+    sprite: Objects/Surgery/surgery_tools.rsi
+    state: retractor
+  - type: Icon
+    sprite: Objects/Surgery/surgery_tools.rsi
+    state: retractor
+
+  - type: ItemCooldown
+  - type: MeleeWeapon
+  
+  
+  
+- type: entity
+  name: Cautery
+  parent: BaseItem
+  id: cautery
+  desc: A surgical tool used to cauterize open wounds.
+  components:
+  - type: SurgeryTool
+    surgeryToolClass: Cauterization
+    baseOperateTime: 3
+    
+  - type: Sprite
+    sprite: Objects/Surgery/surgery_tools.rsi
+    state: cautery
+  - type: Icon
+    sprite: Objects/Surgery/surgery_tools.rsi
+    state: cautery
+
+  - type: ItemCooldown
+  - type: MeleeWeapon
+  
+  
+  
+- type: entity
+  name: Drill
+  parent: BaseItem
+  id: drill
+  desc: A surgical drill for making holes into hard material.
+  components:
+  - type: SurgeryTool
+    surgeryToolClass: Drilling
+    baseOperateTime: 3
+    
+  - type: Sprite
+    sprite: Objects/Surgery/surgery_tools.rsi
+    state: drill
+  - type: Icon
+    sprite: Objects/Surgery/surgery_tools.rsi
+    state: drill
+
+  - type: ItemCooldown
+  - type: MeleeWeapon
+  
+  
+  
+- type: entity
+  name: Bone Saw
+  parent: BaseItem
+  id: bone_saw
+  desc: A surgical tool used to cauterize open wounds.
+  components:
+  - type: SurgeryTool
+    surgeryToolClass: BoneSawing
+    baseOperateTime: 3
+    
+  - type: Sprite
+    sprite: Objects/Surgery/surgery_tools.rsi
+    state: bone_saw
+  - type: Icon
+    sprite: Objects/Surgery/surgery_tools.rsi
+    state: bone_saw
+
+  - type: ItemCooldown
+  - type: MeleeWeapon
+  
+- type: entity
+  name: Hemostat
+  parent: BaseItem
+  id: hemostat
+  desc: A surgical tool used to compress blood vessels to prevent bleeding.
+  components:
+  - type: SurgeryTool
+    surgeryToolClass: VesselCompression
+    baseOperateTime: 3
+    
+  - type: Sprite
+    sprite: Objects/Surgery/surgery_tools.rsi
+    state: hemostat
+  - type: Icon
+    sprite: Objects/Surgery/surgery_tools.rsi
+    state: hemostat
+
+  - type: ItemCooldown
+  - type: MeleeWeapon
+  

Resources/Prototypes/BodySystem/body_system_dropped_items_default.yml

@@ -0,0 +1,19 @@
+- type: entity
+  name: "BaseDroppedBodyPart"
+  parent: BaseItem
+  id: BaseDroppedBodyPart
+  components:
+  - type: DroppedBodyPart
+  - type: Sprite
+    texture: Objects\BodySystem\Organs\eyes_grey.png
+  - type: Icon
+    
+- type: entity
+  name: "BaseDroppedMechanism"
+  parent: BaseItem
+  id: BaseDroppedMechanism
+  components:
+  - type: DroppedMechanism
+  - type: Sprite
+    texture: Objects\BodySystem\Organs\eyes_grey.png
+  - type: Icon

Resources/Prototypes/Entities/Buildings/computers.yml

@@ -165,7 +165,23 @@
     - type: ComputerVisualizer2D
       key: id_key
       screen: id
-
+      
+- type: entity
+  id: computerBodyScanner
+  parent: ComputerBase
+  name: Body Scanner Computer
+  components:
+  - type: BodyScanner
+  - type: UserInterface
+    interfaces:
+    - key: enum.BodyScannerUiKey.Key
+      type: BodyScannerBoundUserInterface
+  - type: Appearance
+    visuals:
+    - type: ComputerVisualizer2D
+      key: generic_key
+      screen: generic
+      
 - type: entity
   id: ComputerComms
   parent: ComputerBase

Resources/Prototypes/Entities/Buildings/instruments.yml

@@ -35,10 +35,10 @@
    - type: Instrument
      program: 1
    - type: Sprite
-     sprite: Objects/Instruments/musician.rsi
+     sprite: Objects/Instruments/otherinstruments.rsi
      state: piano
    - type: Icon
-     sprite: Objects/Instruments/musician.rsi
+     sprite: Objects/Instruments/otherinstruments.rsi
      state: piano
 
  - type: entity
@@ -49,10 +49,10 @@
    - type: Instrument
      program: 7
    - type: Sprite
-     sprite: Objects/Instruments/musician.rsi
+     sprite: Objects/Instruments/otherinstruments.rsi
      state: minimoog
    - type: Icon
-     sprite: Objects/Instruments/musician.rsi
+     sprite: Objects/Instruments/otherinstruments.rsi
      state: minimoog
 
  - type: entity
@@ -63,8 +63,8 @@
    - type: Instrument
      program: 13
    - type: Sprite
-     sprite: Objects/Instruments/musician.rsi
+     sprite: Objects/Instruments/otherinstruments.rsi
      state: xylophone
    - type: Icon
-     sprite: Objects/Instruments/musician.rsi
+     sprite: Objects/Instruments/otherinstruments.rsi
      state: xylophone

Resources/Prototypes/Entities/Buildings/table.yml

@@ -28,8 +28,9 @@
   - type: Damageable
   - type: Destructible
     thresholdvalue: 50
-    spawnondestroy: TableParts
+    spawnondestroy: SteelSheet1
 
+# TODO: drop wood instead of steel when destroyed when that's added
 - type: entity
   id: TableWood
   parent: Table
@@ -41,4 +42,4 @@
   - type: Damageable
   - type: Destructible
     thresholdvalue: 50
-    spawnondestroy: TableParts
+    spawnondestroy: SteelSheet1

Resources/Prototypes/Entities/Items/Clothing/belts.yml

@@ -6,7 +6,6 @@
   - type: Clothing
     Slots: [belt]
 
-
 - type: entity
   parent: BeltBase
   id: UtilityBeltClothing
@@ -14,15 +13,15 @@
   description: Belt for holding all your usual tools
   components:
   - type: Sprite
-    sprite: Clothing/belt_utility.rsi
+    sprite: Clothing/Belts/belt_utility.rsi
     state: utilitybelt
   - type: Icon
-    sprite: Clothing/belt_utility.rsi
+    sprite: Clothing/Belts/belt_utility.rsi
     state: utilitybelt
   - type: Clothing
     Size: 50
     QuickEquip: false
-    sprite: Clothing/belt_utility.rsi
+    sprite: Clothing/Belts/belt_utility.rsi
   - type: Storage
     Capacity: 40 # Full tool loadout is 35, plus an extra
 
@@ -31,4 +30,20 @@
   parent: UtilityBeltClothing
   components:
   - type: UtilityBeltClothingFill
-  
+
+- type: entity
+  parent: BeltBase
+  id: SuspendersClothing
+  name: Suspenders
+  description: For holding your pants up.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belts/suspenders.rsi
+    state: icon
+  - type: Icon
+    sprite: Clothing/Belts/suspenders.rsi
+    state: icon
+  - type: Clothing
+    Size: 50
+    QuickEquip: false
+    sprite: Clothing/Belts/suspenders.rsi

Resources/Prototypes/Entities/Items/Clothing/ears.yml

@@ -5,12 +5,12 @@
   description: The radio to keep up to date in real time with fun onboard station activities
   components:
   - type: Sprite
-    sprite: Clothing/headset.rsi
+    sprite: Clothing/Earpieces/headset.rsi
     state: headset
   - type: Icon
-    sprite: Clothing/headset.rsi
+    sprite: Clothing/Earpieces/headset.rsi
     state: headset
   - type: Clothing
     Slots:
     - ears
-    sprite: Clothing/headset.rsi
+    sprite: Clothing/Earpieces/headset.rsi

Resources/Prototypes/Entities/Items/Clothing/eyes.yml

@@ -17,10 +17,10 @@
     sprite: Clothing/meson_scanners.rsi
     state: meson
   - type: Icon
-    sprite: Clothing/meson_scanners.rsi
+    sprite: Clothing/Glasses/meson_scanners.rsi
     state: meson
   - type: Clothing
-    sprite: Clothing/meson_scanners.rsi
+    sprite: Clothing/Glasses/meson_scanners.rsi
 
 
 - type: entity
@@ -30,13 +30,13 @@
   description: Useful both for security and cargonia
   components:
   - type: Sprite
-    sprite: Clothing/sunglasses.rsi
+    sprite: Clothing/Glasses/sunglasses.rsi
     state: sunglasses
   - type: Icon
-    sprite: Clothing/sunglasses.rsi
+    sprite: Clothing/Glasses/sunglasses.rsi
     state: sunglasses
   - type: Clothing
-    sprite: Clothing/sunglasses.rsi
+    sprite: Clothing/Glasses/sunglasses.rsi
 
 - type: entity
   parent: GlassesBase
@@ -45,10 +45,10 @@
   description: Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes. Often worn by budget security officers.
   components:
   - type: Sprite
-    sprite: Clothing/sunglasses_sec.rsi
+    sprite: Clothing/Glasses/sunglasses_sec.rsi
     state: icon
   - type: Icon
-    sprite: Clothing/sunglasses_sec.rsi
+    sprite: Clothing/Glasses/sunglasses_sec.rsi
     state: icon
   - type: Clothing
-    sprite: Clothing/sunglasses_sec.rsi
+    sprite: Clothing/Glasses/sunglasses_sec.rsi

Resources/Prototypes/Entities/Items/Clothing/gloves.yml

@@ -766,6 +766,19 @@
   - type: Clothing
     sprite: Clothing/Gloves/s_ninjan.rsi
 
+- type: entity
+  parent: GlovesBase
+  id: GlovesWhite
+  name: White Gloves
+  description:
+  components:
+  - type: Sprite
+    sprite: Clothing/Gloves/white.rsi
+  - type: Icon
+    sprite: Clothing/Gloves/white.rsi
+  - type: Clothing
+    sprite: Clothing/Gloves/white.rsi
+
 - type: entity
   parent: GlovesBase
   id: GlovesYellow

Resources/Prototypes/Entities/Items/Clothing/masks.yml

@@ -6,6 +6,20 @@
   - type: Clothing
     Slots: [mask]
 
+- type: entity
+  parent: MasksBase
+  id: OldGasMaskClothing
+  name: Old Gas Mask
+  description: An old, dusty mask. Yet still dutifully functional.
+  components:
+  - type: Sprite
+    sprite: Clothing/Masks/mask_gasalt.rsi
+    state: icon
+  - type: Icon
+    sprite: Clothing/Masks/mask_gasalt.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Masks/mask_gasalt.rsi
 
 - type: entity
   parent: MasksBase
@@ -14,14 +28,13 @@
   description: Regulations require these to be stocked after the fourth coolant leak
   components:
   - type: Sprite
-    sprite: Clothing/gas_mask.rsi
-    state: gas_mask
+    sprite: Clothing/Masks/mask_gas.rsi
+    state: icon
   - type: Icon
-    sprite: Clothing/gas_mask.rsi
-    state: gas_mask
+    sprite: Clothing/Masks/mask_gas.rsi
+    state: icon
   - type: Clothing
-    sprite: Clothing/gas_mask.rsi
-
+    sprite: Clothing/Masks/mask_gas.rsi
 
 - type: entity
   parent: MasksBase
@@ -30,13 +43,13 @@
   description: Might as well keep this on 24/7
   components:
   - type: Sprite
-    sprite: Clothing/mask_breath.rsi
-    state: breath
+    sprite: Clothing/Masks/mask_breath.rsi
+    state: icon
   - type: Icon
-    sprite: Clothing/mask_breath.rsi
-    state: breath
+    sprite: Clothing/Masks/mask_breath.rsi
+    state: icon
   - type: Clothing
-    sprite: Clothing/mask_breath.rsi
+    sprite: Clothing/Masks/mask_breath.rsi
 
 - type: entity
   parent: MasksBase
@@ -45,10 +58,40 @@
   description: A true prankster's facial attire. A clown is incomplete without his wig and mask.
   components:
   - type: Sprite
-    sprite: Clothing/mask_clown.rsi
+    sprite: Clothing/Masks/mask_clown.rsi
     state: icon
   - type: Icon
-    sprite: Clothing/mask_clown.rsi
+    sprite: Clothing/Masks/mask_clown.rsi
     state: icon
   - type: Clothing
-    sprite: Clothing/mask_clown.rsi
+    sprite: Clothing/Masks/mask_clown.rsi
+
+- type: entity
+  parent: MasksBase
+  id: MaskJoy
+  name: Joy Mask
+  description:
+  components:
+  - type: Sprite
+    sprite: Clothing/Masks/mask_joy.rsi
+    state: icon
+  - type: Icon
+    sprite: Clothing/Masks/mask_joy.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Masks/mask_joy.rsi
+
+- type: entity
+  parent: MasksBase
+  id: MaskMime
+  name: Mime Mask
+  description:
+  components:
+  - type: Sprite
+    sprite: Clothing/Masks/mask_mime.rsi
+    state: icon
+  - type: Icon
+    sprite: Clothing/Masks/mask_mime.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Masks/mask_mime.rsi

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

@@ -245,6 +245,23 @@
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_rd.rsi
 
+- type: entity
+  parent: UniformBase
+  id: UniformMime
+  name: Mime's Clothes
+  description: ...
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_mime.rsi
+    state: icon
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_mime.rsi
+    state: icon
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_mime.rsi
+
 - type: entity
   parent: UniformBase
   id: UniformHoS

Resources/Prototypes/Entities/Items/Instruments.yml

@@ -19,9 +19,15 @@
   - type: Instrument
     program: 2
   - type: Sprite
-    texture: Objects/Instruments/musician.rsi/h_synthesizer.png
+    sprite: Objects/Instruments/h_synthesizer.rsi
+    state: icon
   - type: Icon
-    texture: Objects/Instruments/musician.rsi/h_synthesizer.png
+    sprite: Objects/Instruments/h_synthesizer.rsi
+    state: icon
+  - type: Item
+    Size: 24
+    sprite: Objects/Instruments/h_synthesizer.rsi
+
 
 - type: entity
   name: Acoustic Guitar
@@ -31,9 +37,14 @@
   - type: Instrument
     program: 25
   - type: Sprite
-    texture: Objects/Instruments/musician.rsi/guitar.png
+    sprite: Objects/Instruments/guitar.rsi
+    state: icon
   - type: Icon
-    texture: Objects/Instruments/musician.rsi/guitar.png
+    sprite: Objects/Instruments/guitar.rsi
+    state: icon
+  - type: Item
+    Size: 24
+    sprite: Objects/Instruments/guitar.rsi
 
 - type: entity
   name: Violin
@@ -43,9 +54,14 @@
   - type: Instrument
     program: 40
   - type: Sprite
-    texture: Objects/Instruments/musician.rsi/violin.png
+    sprite: Objects/Instruments/violin.rsi
+    state: icon
   - type: Icon
-    texture: Objects/Instruments/musician.rsi/violin.png
+    sprite: Objects/Instruments/violin.rsi
+    state: icon
+  - type: Item
+    Size: 24
+    sprite: Objects/Instruments/violin.rsi
 
 - type: entity
   name: Trumpet
@@ -55,9 +71,9 @@
   - type: Instrument
     program: 56
   - type: Sprite
-    texture: Objects/Instruments/musician.rsi/trumpet.png
+    texture: Objects/Instruments/otherinstruments.rsi/trumpet.png
   - type: Icon
-    texture: Objects/Instruments/musician.rsi/trumpet.png
+    texture: Objects/Instruments/otherinstruments.rsi/trumpet.png
 
 - type: entity
   name: Electric Guitar
@@ -67,9 +83,14 @@
   - type: Instrument
     program: 27
   - type: Sprite
-    texture: Objects/Instruments/musician.rsi/eguitar.png
+    sprite: Objects/Instruments/eguitar.rsi
+    state: icon
   - type: Icon
-    texture: Objects/Instruments/musician.rsi/eguitar.png
+    sprite: Objects/Instruments/eguitar.rsi
+    state: icon
+  - type: Item
+    Size: 24
+    sprite: Objects/Instruments/eguitar.rsi
 
 - type: entity
   name: Accordion
@@ -79,9 +100,14 @@
   - type: Instrument
     program: 21
   - type: Sprite
-    texture: Objects/Instruments/musician.rsi/accordion.png
+    sprite: Objects/Instruments/accordion.rsi
+    state: icon
   - type: Icon
-    texture: Objects/Instruments/musician.rsi/accordion.png
+    sprite: Objects/Instruments/accordion.rsi
+    state: icon
+  - type: Item
+    Size: 24
+    sprite: Objects/Instruments/accordion.rsi
 
 - type: entity
   name: Harmonica
@@ -91,9 +117,14 @@
   - type: Instrument
     program: 22
   - type: Sprite
-    texture: Objects/Instruments/musician.rsi/harmonica.png
+    sprite: Objects/Instruments/harmonica.rsi
+    state: icon
   - type: Icon
-    texture: Objects/Instruments/musician.rsi/harmonica.png
+    sprite: Objects/Instruments/harmonica.rsi
+    state: icon
+  - type: Item
+    Size: 24
+    sprite: Objects/Instruments/harmonica.rsi
 
 - type: entity
   name: Recorder
@@ -103,9 +134,14 @@
   - type: Instrument
     program: 74
   - type: Sprite
-    texture: Objects/Instruments/musician.rsi/recorder.png
+    sprite: Objects/Instruments/recorder.rsi
+    state: icon
   - type: Icon
-    texture: Objects/Instruments/musician.rsi/recorder.png
+    sprite: Objects/Instruments/recorder.rsi
+    state: icon
+  - type: Item
+    Size: 24
+    sprite: Objects/Instruments/recorder.rsi
 
 - type: entity
   name: Trombone
@@ -115,9 +151,14 @@
   - type: Instrument
     program: 57
   - type: Sprite
-    texture: Objects/Instruments/musician.rsi/trombone.png
+    sprite: Objects/Instruments/trombone.rsi
+    state: icon
   - type: Icon
-    texture: Objects/Instruments/musician.rsi/trombone.png
+    sprite: Objects/Instruments/trombone.rsi
+    state: icon
+  - type: Item
+    Size: 24
+    sprite: Objects/Instruments/trombone.rsi
 
 - type: entity
   name: Saxophone
@@ -127,9 +168,14 @@
   - type: Instrument
     program: 67
   - type: Sprite
-    texture: Objects/Instruments/musician.rsi/saxophone.png
+    sprite: Objects/Instruments/saxophone.rsi
+    state: icon
   - type: Icon
-    texture: Objects/Instruments/musician.rsi/saxophone.png
+    sprite: Objects/Instruments/saxophone.rsi
+    state: icon
+  - type: Item
+    Size: 24
+    sprite: Objects/Instruments/saxophone.rsi
 
 - type: entity
   name: Glockenspiel
@@ -139,6 +185,11 @@
   - type: Instrument
     program: 9
   - type: Sprite
-    texture: Objects/Instruments/musician.rsi/glockenspiel.png
+    sprite: Objects/Instruments/glockenspiel.rsi
+    state: icon
   - type: Icon
-    texture: Objects/Instruments/musician.rsi/glockenspiel.png
+    sprite: Objects/Instruments/glockenspiel.rsi
+    state: icon
+  - type: Item
+    Size: 24
+    sprite: Objects/Instruments/glockenspiel.rsi

Resources/Prototypes/Entities/Items/Weapons/spear.yml

@@ -13,7 +13,7 @@
 
   - type: MeleeWeapon
     range: 1.5
-    arcwidth: 10
+    arcwidth: 0
     arc: spear
 
   - type: Item

Resources/Prototypes/Entities/Items/table_parts.yml

@@ -1,17 +0,0 @@
-- type: entity
-  name: Table Parts
-  parent: BaseItem
-  id: TableParts
-  description: Parts of a table.
-  components:
-  - type: Sprite
-    sprite: Objects/Parts/table_parts.rsi
-    state: icon
-
-  - type: Icon
-    sprite: Objects/Parts/table_parts.rsi
-    state: icon
-
-  - type: Item
-    Size: 25
-    sprite: Objects/Parts/table_parts.rsi

Resources/Prototypes/Entities/Mobs/human.yml

@@ -110,6 +110,10 @@
   - type: Species
     Template: Human
     HeatResistance: 323
+  - type: BodyManager
+    BaseTemplate: bodyTemplate.Humanoid
+    BasePreset: bodyPreset.BasicHuman
+    
   - type: StatusEffectsUI
   - type: OverlayEffectsUI
   - type: HeatResistance
@@ -235,3 +239,4 @@
         - type: SpeciesVisualizer2D
 
     - type: HumanoidAppearance
+    

Resources/Textures/Clothing/Belts/suspenders.rsi/meta.json

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

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

@@ -0,0 +1,60 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi",
+  "states": [
+    {
+      "name": "equipped-HAND",
+      "directions": 4
+    },
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/Masks/mask_breath.rsi/meta.json

@@ -0,0 +1,38 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+  "states": [
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/Masks/mask_gas.rsi/meta.json

@@ -8,7 +8,7 @@
     "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9f4bd6e0d5e457b6a36f3c505a8194116a666d6f",
     "states": [
         {
-            "name": "gas_mask",
+            "name": "icon",
             "directions": 1,
             "delays": [ [ 1.0 ] ]
         },

Resources/Textures/Clothing/Masks/mask_gasalt.rsi/meta.json

@@ -0,0 +1,46 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation",
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1,
+            "delays": [ [ 1.0 ] ]
+        },
+        {
+            "name": "equipped-MASK",
+            "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/Masks/mask_joy.rsi/meta.json

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

Resources/Textures/Clothing/Masks/mask_mime.rsi/meta.json

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

Resources/Textures/Clothing/OuterClothing/bio.rsi/meta.json

@@ -1 +1,74 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi",
+  "states": [
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          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_mime.rsi/meta.json

@@ -0,0 +1,74 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/",
+  "states": [
+    {
+      "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": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/mask_breath.rsi/meta.json

@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "breath", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-MASK", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}

Resources/Textures/Objects/BodySystem/BodyParts/basic_human.rsi/meta.json

@@ -0,0 +1,81 @@
+{
+	"version": 1,
+	"size": {
+		"x": 32,
+		"y": 32
+	}, 
+	"license": "CC-BY-SA-3.0", 
+	"copyright": "Taken from https://github.com/vgstation-coders/vgstation13", 
+	"states": [
+		{
+			"name": "head_m",
+			"directions": 4,
+			"delays": [
+				[1.0], [1.0], [1.0], [1.0]
+			]
+		},
+				{
+			"name": "torso_m",
+			"directions": 4,
+			"delays": [
+				[1.0], [1.0], [1.0], [1.0]
+			]
+		},
+		{
+			"name": "l_arm",
+			"directions": 4,
+			"delays": [
+				[1.0], [1.0], [1.0], [1.0]
+			]
+		},
+		{
+			"name": "r_arm",
+			"directions": 4,
+			"delays": [
+				[1.0], [1.0], [1.0], [1.0]
+			]
+		},
+		{
+			"name": "l_hand",
+			"directions": 4,
+			"delays": [
+				[1.0], [1.0], [1.0], [1.0]
+			]
+		},
+		{
+			"name": "r_hand",
+			"directions": 4,
+			"delays": [
+				[1.0], [1.0], [1.0], [1.0]
+			]
+		},
+		{
+			"name": "l_leg",
+			"directions": 4,
+			"delays": [
+				[1.0], [1.0], [1.0], [1.0]
+			]
+		},
+				{
+			"name": "r_leg",
+			"directions": 4,
+			"delays": [
+				[1.0], [1.0], [1.0], [1.0]
+			]
+		},
+		{
+			"name": "l_foot",
+			"directions": 4,
+			"delays": [
+				[1.0], [1.0], [1.0], [1.0]
+			]
+		},
+				{
+			"name": "r_foot",
+			"directions": 4,
+			"delays": [
+				[1.0], [1.0], [1.0], [1.0]
+			]
+		}
+	]
+}

Resources/Textures/Objects/BodySystem/Organs/basic_human.rsi/meta.json

@@ -0,0 +1,53 @@
+{
+	"version": 1,
+	"size": {
+		"x": 32,
+		"y": 32
+	}, 
+	"license": "CC-BY-SA-3.0", 
+	"copyright": "Taken from https://github.com/vgstation-coders/vgstation13", 
+	"states": [
+		{
+			"name": "brain_human",
+			"directions": 1,
+			"delays": [
+				[1.0]
+			]
+		},
+		{
+			"name": "eyes_human",
+			"directions": 1,
+			"delays": [
+				[1.0]
+			]
+		},
+		{
+			"name": "heart_human",
+			"directions": 1,
+			"delays": [
+				[1.0]
+			]
+		},
+		{
+			"name": "kidneys_human",
+			"directions": 1,
+			"delays": [
+				[1.0]
+			]
+		},
+		{
+			"name": "liver_human",
+			"directions": 1,
+			"delays": [
+				[1.0]
+			]
+		},
+		{
+			"name": "lungs_human",
+			"directions": 1,
+			"delays": [
+				[1.0]
+			]
+		},
+	]
+}