Merge remote-tracking branch 'upstream/master' into 20-10-30-admins

Resources/Maps/saltern.yml

@@ -1325,7 +1325,7 @@ entities:
   - deadThreshold: 100
     type: Destructible
 - uid: 156
-  type: AirlockMaintCargo
+  type: AirlockMaint
   components:
   - parent: 855
     pos: -24.5,-12.5
@@ -1676,8 +1676,7 @@ entities:
     pos: -17.5,-22.5
     rot: 3.141592653589793 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -1775,8 +1774,7 @@ entities:
     pos: -29.5,11.5
     rot: -1.5707963267948966 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -1900,8 +1898,7 @@ entities:
     pos: -5.5,17.5
     rot: -1.5707963267948966 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -1967,8 +1964,7 @@ entities:
     pos: 6.5,11.5
     rot: 3.141592653589793 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -2047,8 +2043,7 @@ entities:
     pos: 24.5,8.5
     rot: -1.5707963267948966 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -2221,8 +2216,7 @@ entities:
     pos: 34.5,-4.5
     rot: 3.141592653589793 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -2379,8 +2373,7 @@ entities:
     pos: 37.5,6.5
     rot: -1.5707963267948966 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -2798,8 +2791,7 @@ entities:
     pos: -2.5,29.5
     rot: 3.141592653589793 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -3111,8 +3103,7 @@ entities:
     pos: 11.5,-11.5
     rot: 3.141592653589793 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -3190,8 +3181,7 @@ entities:
     pos: 12.5,-2.5
     rot: 3.141592653589793 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -3608,8 +3598,7 @@ entities:
     pos: 0.5,1.5
     rot: -1.5707963267948966 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -3971,8 +3960,7 @@ entities:
     pos: -12.5,1.5
     rot: -1.5707963267948966 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -4103,8 +4091,7 @@ entities:
     pos: -22.5,6.5
     rot: 3.141592653589793 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -4469,8 +4456,7 @@ entities:
     pos: -27.5,-8.5
     rot: 1.5707963267948966 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -4523,8 +4509,7 @@ entities:
     pos: -10.5,-17.5
     rot: -1.5707963267948966 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -4532,7 +4517,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - uid: 407
-  type: AirlockMaintCommon
+  type: AirlockMaint
   components:
   - parent: 855
     pos: -24.5,-12.5
@@ -8298,8 +8283,7 @@ entities:
     pos: -5.5,-14.5
     rot: -1.5707963267948966 rad
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -21437,8 +21421,7 @@ entities:
   - parent: 855
     pos: 18.5,-0.5
     type: Transform
-  - entryDelay: 0
-    type: DisposalUnit
+  - type: DisposalUnit
   - deadThreshold: 100
     type: Destructible
   - containers:
@@ -46793,7 +46776,7 @@ entities:
     rot: -1.5707963267948966 rad
     type: Transform
 - uid: 4088
-  type: AirlockMaintCommon
+  type: AirlockMaint
   components:
   - parent: 855
     pos: -8.5,-6.5
@@ -46947,7 +46930,7 @@ entities:
     rot: -1.5707963267948966 rad
     type: Transform
 - uid: 4110
-  type: AirlockMaintCommon
+  type: AirlockMaint
   components:
   - parent: 855
     pos: -31.5,-7.5

Resources/Prototypes/Alerts/alerts.yml

@@ -0,0 +1,205 @@
+- type: alertOrder
+  # Defines ordering in alert tab, higher up = higher in tab.
+  # List below can contain alert type or category, if both are present the id will take precedence.
+  # If item is not in list it will go at the bottom (ties broken by alert type enum value)
+  order:
+    - category: Health
+    - alertType: Fire
+    - alertType: Handcuffed
+    - category: Buckled
+    - alertType: Pulling
+    - category: Piloting
+    - alertType: Stun
+    - category: Pressure
+    - category: Temperature
+    - category: Hunger
+    - category: Thirst
+
+
+
+- type: alert
+  alertType: LowPressure
+  category: Pressure
+  icon: /Textures/Interface/Alerts/Pressure/lowpressure.png
+  maxSeverity: 2
+  name: "[color=red]Low Pressure[/color]"
+  description: "The air around you is [color=red]hazardously thin[/color]. A [color=green]space suit[/color] would protect you."
+
+- type: alert
+  alertType: HighPressure
+  category: Pressure
+  icon: /Textures/Interface/Alerts/Pressure/highpressure.png
+  maxSeverity: 2
+  name: "[color=red]High Pressure[/color]"
+  description: "The air around you is [color=red]hazardously thick[/color]. A [color=green]fire suit[/color] would protect you."
+
+- type: alert
+  alertType: Fire
+  icon: /Textures/Interface/Alerts/Fire/fire.png
+  name: "[color=red]On Fire[/color]"
+  description: "You're [color=red]on fire[/color]. Click the alert to stop, drop and roll to put the fire out or move to a vacuum area."
+
+- type: alert
+  alertType: Cold
+  category: Temperature
+  icon: /Textures/Interface/Alerts/Temperature/cold.png
+  maxSeverity: 3
+  name: "[color=cyan]Too Cold[/color]"
+  description: "You're [color=cyan]freezing cold![/color] Get somewhere warmer and take off any insulating clothing like a space suit."
+
+- type: alert
+  alertType: Hot
+  category: Temperature
+  icon: /Textures/Interface/Alerts/Temperature/hot.png
+  maxSeverity: 3
+  name: "[color=red]Too Hot[/color]"
+  description: "It's [color=red]too hot![/color] Flee to space or at least away from the flames. Standing on weeds will heal you."
+
+- type: alert
+  alertType: Weightless
+  icon: /Textures/Interface/Alerts/Weightless/weightless.png
+  name: Weightless
+  description: >-
+    Gravity has ceased affecting you, and you're floating around aimlessly. You'll need something large and heavy, like a
+    wall or lattice, to push yourself off if you want to move. A jetpack would enable free range of motion. A pair of
+    magboots would let you walk around normally on the floor. Barring those, you can throw things, use a fire extinguisher,
+    or shoot a gun to move around via Newton's 3rd Law of Motion.
+
+- type: alert
+  alertType: Stun
+  icon: /Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png
+  name: "[color=yellow]Stunned[/color]"
+  description: "You're [color=yellow]stunned[/color]! Wait for it to wear off."
+
+- type: alert
+  alertType: Handcuffed
+  icon: /Textures/Interface/Alerts/Handcuffed/Handcuffed.png
+  name: "[color=yellow]Handcuffed[/color]"
+  description: "You're [color=yellow]handcuffed[/color] and can't act. If anyone drags you, you won't be able to move.."
+
+- type: alert
+  alertType: Buckled
+  category: Buckled
+  icon: /Textures/Interface/Alerts/Buckle/buckled.png
+  name: "[color=yellow]Buckled[/color]"
+  description: "You've been [color=yellow]buckled[/color] to something. Click the alert to unbuckle unless you're [color=yellow]handcuffed.[/color]"
+
+- type: alert
+  alertType: HumanCrit
+  category: Health
+  icon: /Textures/Interface/Alerts/Human/humancrit-0.png
+  name: "[color=red]Critical Condition[/color]"
+  description: "You're severely injured and unconscious."
+
+- type: alert
+  alertType: HumanDead
+  category: Health
+  icon: /Textures/Interface/Alerts/Human/humandead.png
+  name: Dead
+  description: You're dead.
+
+- type: alert
+  alertType: HumanHealth
+  category: Health
+  icon: /Textures/Interface/Alerts/Human/human.png
+  name: Health
+  description: "[color=green]Green[/color] good. [color=red]Red[/color] bad."
+  minSeverity: 0
+  maxSeverity: 6
+
+- type: alert
+  alertType: PilotingShuttle
+  category: Piloting
+  icon: /Textures/Interface/Alerts/Buckle/buckled.png
+  name: Piloting Shuttle
+  description: You are piloting a shuttle. Click the alert to stop.
+
+- type: alert
+  alertType: Overfed
+  category: Hunger
+  icon: /Textures/Interface/Alerts/Hunger/Overfed.png
+  name: "[color=yellow]Overfed[/color]"
+  description: You ate too much food, lardass. Run around the station and lose some weight.
+
+- type: alert
+  alertType: Peckish
+  category: Hunger
+  icon: /Textures/Interface/Alerts/Hunger/Peckish.png
+  name: "[color=yellow]Peckish[/color]"
+  description: Some food would be good right about now.
+
+- type: alert
+  alertType: Starving
+  category: Hunger
+  icon: /Textures/Interface/Alerts/Hunger/Starving.png
+  name: "[color=red]Starving[/color]"
+  description: You're severely malnourished. The hunger pains make moving around a chore.
+
+- type: alert
+  alertType: Overhydrated
+  category: Thirst
+  icon: /Textures/Interface/Alerts/Thirst/OverHydrated.png
+  name: "[color=yellow]Overhydrated[/color]"
+  description: You drank too much.
+
+- type: alert
+  alertType: Thirsty
+  category: Thirst
+  icon: /Textures/Interface/Alerts/Thirst/Thirsty.png
+  name: "[color=yellow]Thirsty[/color]"
+  description: Something to drink would be good right about now.
+
+- type: alert
+  alertType: Parched
+  category: Thirst
+  icon: /Textures/Interface/Alerts/Thirst/Parched.png
+  name: "[color=red]Parched[/color]"
+  description: You're severely thirsty. The thirst makes moving around a chore.
+
+- type: alert
+  alertType: Pulled
+  icon: /Textures/Interface/Alerts/Pull/pulled.png
+  name: Pulled
+  description: You're being pulled. Move to break free.
+
+- type: alert
+  alertType: Pulling
+  icon: /Textures/Interface/Alerts/Pull/pulling.png
+  name: Pulling
+  description: You're pulling something. Click the alert to stop.
+
+- type: alert
+  alertType: Debug1
+  icon: /Textures/Interface/Alerts/Human/human1.png
+  name: Debug
+  description: Debug
+
+- type: alert
+  alertType: Debug2
+  icon: /Textures/Interface/Alerts/Human/human2.png
+  name: Debug
+  description: Debug
+
+- type: alert
+  alertType: Debug3
+  icon: /Textures/Interface/Alerts/Human/human3.png
+  name: Debug
+  description: Debug
+
+- type: alert
+  alertType: Debug4
+  icon: /Textures/Interface/Alerts/Human/human4.png
+  name: Debug
+  description: Debug
+
+- type: alert
+  alertType: Debug5
+  icon: /Textures/Interface/Alerts/Human/human5.png
+  name: Debug
+  description: Debug
+
+- type: alert
+  alertType: Debug6
+  icon: /Textures/Interface/Alerts/Human/human6.png
+  name: Debug
+  description: Debug

Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml

@@ -11,7 +11,8 @@
     durability: 10
     size: 1
     compatibility: Biological
-  - type: Brain
+    behaviors:
+    - !type:BrainBehavior {}
 
 - type: entity
   id: EyesHuman
@@ -40,7 +41,8 @@
     durability: 10
     size: 1
     compatibility: Biological
-  - type: Heart
+    behaviors:
+    - !type:HeartBehavior {}
 
 - type: entity
   id: LungsHuman
@@ -55,7 +57,8 @@
     durability: 13
     size: 1
     compatibility: Biological
-  - type: Lung
+    behaviors:
+    - !type:LungBehavior {}
 
 - type: entity
   id: StomachHuman
@@ -70,7 +73,10 @@
     durability: 13
     size: 1
     compatibility: Biological
-  - type: Stomach
+    behaviors:
+    - !type:StomachBehavior
+      max_volume: 250
+      digestionDelay: 20
 
 - type: entity
   id: LiverHuman

Resources/Prototypes/Catalog/Fills/belt.yml

@@ -1,25 +0,0 @@
-- type: entity
-  id: UtilityBeltClothingFilled
-  parent: UtilityBeltClothing
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-      - name: Crowbar
-      - name: Wrench
-      - name: Screwdriver
-      - name: Wirecutter
-      - name: Welder
-      - name: Multitool
-      - name: ApcExtensionCableStack
-
-- type: entity
-  id: UtilityBeltClothingFilledEvent
-  parent: UtilityBeltClothing
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-      - name: Crowbar
-      - name: Screwdriver
-      - name: Multitool

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

@@ -1,30 +1,162 @@
+# BASE
 - type: entity
   parent: Clothing
-  id: BeltBase
+  id: ClothingBeltBase
   abstract: true
   components:
+  - type: Sprite
+    state: icon
   - type: Clothing
     Slots: [belt]
-
-- type: entity
-  parent: BeltBase
-  id: UtilityBeltClothing
-  name: utility belt
-  description: Belt for holding all your usual tools
-  components:
-  - type: Sprite
-    sprite: Clothing/Belt/belt_utility.rsi
-    state: utilitybelt
-  - type: Clothing
     size: 50
     QuickEquip: false
-    sprite: Clothing/Belt/belt_utility.rsi
+
+# CONTENT
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltAssault
+  name: assault belt
+  description: "A tactical assault belt."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/assault.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/assault.rsi
   - type: Storage
-    capacity: 40 # Full tool loadout is 35, plus an extra
+    capacity: 40
 
 - type: entity
-  parent: BeltBase
-  id: SuspendersClothing
+  parent: ClothingBeltBase
+  id: ClothingBeltBandolier
+  name: assault belt
+  description: "A bandolier for holding shotgun ammunition."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/bandolier.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/bandolier.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltChiefEngineer
+  name:  the Chief Engineer's toolbelt
+  description: "Holds tools, looks snazzy."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/ce.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/ce.rsi
+  - type: Storage
+    capacity: 60
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltChampion
+  name:  championship belt
+  description: "Proves to the world that you are the strongest!"
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/champion.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/champion.rsi
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltHolster
+  name:  shoulder holster
+  description: "A holster to carry a handgun and ammo. WARNING: Badasses only."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/holster.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/holster.rsi
+  - type: Storage
+    capacity: 20
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltJanitor
+  name:  janibelt
+  description: "A belt used to hold most janitorial supplies."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/janitor.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/janitor.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltMedical
+  name:  medical belt
+  description: "Can hold various medical equipment."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/medical.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/medical.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltSecurity
+  name:  security belt
+  description: "Can hold security gear like handcuffs and flashes."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/security.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/security.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltSecurityWebbing
+  name:  security webbing
+  description: "Unique and versatile chest rig, can hold security gear."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/securitywebbing.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/securitywebbing.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltMilitaryWebbing
+  name:  chest rig
+  description: "A set of tactical webbing worn by Syndicate boarding parties."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/militarywebbing.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/militarywebbing.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltSheath
+  name:  sabre sheath
+  description: "An ornate sheath designed to hold an officer's blade."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/sheath.rsi
+    state: sheath
+  - type: Clothing
+    sprite: Clothing/Belt/sheath.rsi
+  - type: Storage
+    capacity: 40
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltSuspenders
   name: suspenders
   description: For holding your pants up.
   components:
@@ -32,6 +164,17 @@
     sprite: Clothing/Belt/suspenders.rsi
     state: icon
   - type: Clothing
-    size: 50
-    QuickEquip: false
     sprite: Clothing/Belt/suspenders.rsi
+
+- type: entity
+  parent: ClothingBeltBase
+  id: UtilityBeltClothing #Change to ClothingBeltUtility
+  name: utility belt
+  description: "Can hold various things."
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/utility.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/utility.rsi
+  - type: Storage
+    capacity: 40 # Full tool loadout is 35, plus an extra

Resources/Prototypes/Entities/Clothing/Belt/filled_belts.yml

@@ -0,0 +1,65 @@
+- type: entity
+  id: UtilityBeltClothingFilled #Change to ClothingBeltUtilityFilled
+  parent: UtilityBeltClothing #Change to ClothingBeltUtility
+  description: "Holds tools."
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - name: Crowbar
+      - name: Wrench
+      - name: Screwdriver
+      - name: Wirecutter
+      - name: Welder
+      - name: Multitool
+
+- type: entity
+  id: UtilityBeltClothingFilledEvent
+  parent: UtilityBeltClothing
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - name: Crowbar
+      - name: Screwdriver
+      - name: Multitool
+
+- type: entity
+  id: ClothingBeltChiefEngineerFilled
+  parent: ClothingBeltChiefEngineer
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - name: PowerDrill
+      - name: JawsOfLife
+      - name: WelderExperimental
+      - name: Multitool
+      - name: ApcExtensionCableStack
+
+- type: entity
+  id: ClothingBeltSecurityFilled
+  parent: ClothingBeltSecurity
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - name: SecGlasses
+      - name: GrenadeFlashBang
+      - name: GrenadeFlashBang
+      - name: Stunbaton
+      - name: Handcuffs
+      - name: Handcuffs
+
+- type: entity
+  id: ClothingBeltJanitorFilled
+  parent: ClothingBeltJanitor
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - name: Soap #Make a soap group and pick between when i'm not lazy
+      - name: SprayBottleSpaceCleaner
+      - name: # GrenadeChem
+      - name: # GrenadeChem
+      - name: FlashlightLantern

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

@@ -460,3 +460,16 @@
     ClothingPrefix: maroon_skirt
     femaleMask: UniformTop
     HeldPrefix: maroon
+
+# Rainbow
+- type: entity
+  parent: UniformColorBase
+  id: UniformColorRainbow
+  name: rainbow jumpsuit
+  description: A multi-colored jumpsuit!
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/rainbow.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Uniforms/rainbow.rsi

Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml

@@ -154,7 +154,7 @@
     access: [["Maintenance"]]
 
 - type: entity
-  parent: AirlockMaintCargo
+  parent: AirlockMaint
   id: AirlockMaintCargoLocked
   suffix: Cargo, Locked
   components:
@@ -162,7 +162,7 @@
     access: [["Cargo"]]
 
 - type: entity
-  parent: AirlockMaintCommand
+  parent: AirlockMaint
   id: AirlockMaintCommandLocked
   suffix: Command, Locked
   components:
@@ -170,7 +170,7 @@
     access: [["Command"]]
 
 - type: entity
-  parent: AirlockMaintCommon
+  parent: AirlockMaint
   id: AirlockMaintCommonLocked
   suffix: Common, Locked
   components:
@@ -178,7 +178,7 @@
     access: [["Maintenance"]]
 
 - type: entity
-  parent: AirlockMaintEngi
+  parent: AirlockMaint
   id: AirlockMaintEngiLocked
   suffix: Engineering, Locked
   components:
@@ -186,7 +186,7 @@
     access: [["Engineering"]]
 
 - type: entity
-  parent: AirlockMaintInt
+  parent: AirlockMaint
   id: AirlockMaintIntLocked
   suffix: Interior, Locked
   components:
@@ -194,7 +194,7 @@
     access: [["Maintenance"]]
 
 - type: entity
-  parent: AirlockMaintMed
+  parent: AirlockMaint
   id: AirlockMaintMedLocked
   suffix: Medical, Locked
   components:
@@ -202,7 +202,7 @@
     access: [["Medical"]]
 
 - type: entity
-  parent: AirlockMaintRnD
+  parent: AirlockMaint
   id: AirlockMaintRnDLocked
   suffix: RnD, Locked
   components:
@@ -210,7 +210,7 @@
     access: [["Research"]]
 
 - type: entity
-  parent: AirlockMaintSec
+  parent: AirlockMaint
   id: AirlockMaintSecLocked
   suffix: Security, Locked
   components:

Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml

@@ -74,7 +74,6 @@
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_glass.rsi
 
-
 - type: entity
   parent: Airlock
   id: AirlockMaint

Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml

@@ -118,68 +118,3 @@
   components:
   - type: Sprite
     sprite: Constructible/Structures/Doors/airlock_security_glass.rsi
-
-# Maintenance Hatchs
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintCargo
-  suffix: Cargo
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_maint_cargo.rsi
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintCommand
-  suffix: Command
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_maint_command.rsi
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintCommon
-  suffix: Common
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_maint_common.rsi
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintEngi
-  suffix: Engineering
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_maint_engi.rsi
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintInt
-  suffix: Interior
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_maint_int.rsi
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintMed
-  suffix: Medical
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_maint_med.rsi
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintRnD
-  suffix: RnD
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_maint_rnd.rsi
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintSec
-  suffix: Security
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_maint_sec.rsi

Resources/Prototypes/Entities/Constructible/Doors/firelock.yml

@@ -24,6 +24,7 @@
           map: ["enum.WiresVisualLayers.MaintenancePanel"]
 
     - type: Physics
+      on: false
       shapes:
         - !type:PhysShapeAabb
           bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
@@ -54,6 +55,7 @@
     - type: Airtight
       fixVacuum: true
     - type: Occluder
+      enabled: false
     - type: SnapGrid
       offset: Center
   placement:
@@ -80,8 +82,6 @@
     - type: Firelock
       occludes: false
       canCrush: false
-    - type: Occluder
-      enabled: false
     - type: Sprite
       sprite: Constructible/Structures/Doors/edge_door_hazard.rsi
     - type: Airtight

Resources/Prototypes/Entities/Constructible/Furniture/seats.yml

@@ -83,6 +83,7 @@
   parent: SeatBase
   components:
   - type: Rotatable
+    rotateWhileAnchored: true
   - type: Sprite
     state: officechair_white
   - type: Physics

Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml

@@ -68,6 +68,8 @@
       normalUnshaded: true
       broken: true
     - type: WiresVisualizer
+  - type: AccessReader
+    access: [["Bar"]]
 
 - type: entity
   parent: VendingMachine
@@ -227,6 +229,8 @@
       ejectUnshaded: true
       broken: true
     - type: WiresVisualizer
+  - type: AccessReader
+    access: [["Kitchen"]]
 
 - type: entity
   parent: VendingMachine
@@ -277,6 +281,8 @@
       denyUnshaded: true
       broken: true
     - type: WiresVisualizer
+  - type: AccessReader
+    access: [["Engineering"]]
 
 - type: entity
   parent: VendingMachine
@@ -352,6 +358,8 @@
       denyUnshaded: true
       broken: true
     - type: WiresVisualizer
+  - type: AccessReader
+    access: [["Medical"]]
 
 - type: entity
   parent: VendingMachine
@@ -403,6 +411,8 @@
       denyUnshaded: true
       broken: true
     - type: WiresVisualizer
+  - type: AccessReader
+    access: [["Hydroponics"]]
 
 - type: entity
   parent: VendingMachine
@@ -428,6 +438,8 @@
       denyUnshaded: true
       broken: true
     - type: WiresVisualizer
+  - type: AccessReader
+    access: [["Research"]]
 
 - type: entity
   parent: VendingMachine
@@ -479,6 +491,8 @@
       denyUnshaded: true
       broken: true
     - type: WiresVisualizer
+  - type: AccessReader
+    access: [["Security"]]
 
 - type: entity
   parent: VendingMachine
@@ -505,6 +519,8 @@
       ejectUnshaded: true
       broken: true
     - type: WiresVisualizer
+  - type: AccessReader
+    access: [["Hydroponics"]]
 
 - type: entity
   parent: VendingMachine
@@ -749,6 +765,8 @@
       denyUnshaded: true
       broken: true
     - type: WiresVisualizer
+  - type: AccessReader
+    access: [["Medical"]]
 
 - type: entity
   parent: VendingMachine

Resources/Prototypes/Entities/Constructible/Walls/linking.yml

@@ -6,9 +6,10 @@
   - type: InteractionOutline
   - type: Physics
   - type: Sprite
-    sprite: Constructible/Linking/switch.rsi
+    sprite: Constructible/Power/switch.rsi
     state: on
   - type: SignalSwitch
+  - type: Rotatable
   - type: SignalTransmitter
   placement:
     snap:
@@ -22,9 +23,10 @@
   - type: InteractionOutline
   - type: Physics
   - type: Sprite
-    sprite: Constructible/Linking/switch.rsi
+    sprite: Constructible/Power/switch.rsi
     state: dead
   - type: SignalButton
+  - type: Rotatable
   - type: SignalTransmitter
   placement:
     snap:

Resources/Prototypes/Entities/Mobs/Player/human.yml

@@ -10,7 +10,7 @@
     show_examine_info: true
   - type: Input
     context: "human"
-  - type: StatusEffectsUI
+  - type: AlertsUI
   - type: OverlayEffectsUI
   - type: Eye
     zoom: 0.5, 0.5

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -23,9 +23,6 @@
     caps: AddTo, RemoveFrom, NoExamine
   - type: Bloodstream
     max_volume: 100
-  - type: Stomach
-    max_volume: 250
-    digestionDelay: 20
   # StatusEffects
   - type: Stunnable
   # Other

Resources/Prototypes/Entities/Objects/Consumable/botany.yml

@@ -20,8 +20,11 @@
     - type: SolutionContainer
       caps: NoExamine
       contents:
-        chem.Nutrient: 5
-        chem.Flour: 5
+        reagents:
+          - ReagentId: chem.Nutriment
+            Quantity: 5
+          - ReagentId: chem.Flour
+            Quantity: 5
     - type: Produce
       seed: wheat
 
@@ -36,8 +39,11 @@
     - type: SolutionContainer
       caps: NoExamine
       contents:
-        chem.Nutrient: 5
-        chem.Flour: 5
+        reagents:
+          - ReagentId: chem.Nutriment
+            Quantity: 5
+          - ReagentId: chem.Glucose
+            Quantity: 5
     - type: Produce
       seed: sugarcane
 

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -61,40 +61,6 @@
       cyan: "#18a2d5"
       yellow: "#ffa500"
 
-- type: entity
-  name: welding tool
-  parent: BaseItem
-  id: Welder
-  description: 'Melts anything as long as it''s fueled, don''t forget your eye protection!'
-  components:
-  - type: Sprite
-    sprite: Objects/Tools/welder.rsi
-    layers:
-    - state: welder
-    - state: welder_flame
-      shader: unshaded
-      visible: false
-  - type: Item
-    size: 10
-    sprite: Objects/Tools/welder.rsi
-    HeldPrefix: off
-  - type: ItemCooldown
-  - type: MeleeWeapon
-  - type: ItemStatus
-  - type: SolutionContainer
-    maxVol: 100
-    caps: AddTo, NoExamine
-    contents:
-      reagents:
-        - ReagentId: chem.WeldingFuel
-          Quantity: 100
-  - type: Welder
-    weldSoundCollection: Welder
-  - type: PointLight
-    enabled: false
-    radius: 1.5
-    color: orange
-
 - type: entity
   name: wrench
   parent: BaseItem

Resources/Prototypes/Entities/Objects/Tools/welders.yml

@@ -0,0 +1,77 @@
+- type: entity
+  name: welding tool
+  parent: BaseItem
+  id: Welder
+  description: "Melts anything as long as it's fueled, don't forget your eye protection!"
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/welder.rsi
+    layers:
+    - state: icon
+    - state: welder_flame
+      shader: unshaded
+      visible: false
+  - type: Item
+    size: 10
+    sprite: Objects/Tools/welder.rsi
+    HeldPrefix: off
+  - type: ItemCooldown
+  - type: MeleeWeapon
+  - type: ItemStatus
+  - type: SolutionContainer
+    maxVol: 100
+    caps: AddTo, NoExamine
+    contents:
+      reagents:
+        - ReagentId: chem.WeldingFuel
+          Quantity: 100
+  - type: Welder
+    weldSoundCollection: Welder
+  - type: PointLight
+    enabled: false
+    radius: 1.5
+    color: orange
+
+- type: entity
+  name: experimental welding tool
+  parent: Welder
+  id: WelderExperimental
+  description: "An experimental welder capable of self-fuel generation and less harmful to the eyes."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/welder_experimental.rsi
+  - type: Item
+    sprite: Objects/Tools/welder_experimental.rsi
+  - type: SolutionContainer
+    maxVol: 1000
+    caps: AddTo, NoExamine
+    contents:
+      reagents:
+        - ReagentId: chem.WeldingFuel
+          Quantity: 1000
+  - type: PointLight
+    enabled: false
+    radius: 1.5
+    color: lightblue
+
+- type: entity
+  name: emergency welding tool
+  parent: Welder
+  id: WelderMini
+  description: "A miniature welder used during emergencies."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/welder_mini.rsi
+  - type: Item
+    sprite: Objects/Tools/welder_mini.rsi
+  - type: SolutionContainer
+    maxVol: 25
+    caps: AddTo, NoExamine
+    contents:
+      reagents:
+        - ReagentId: chem.WeldingFuel
+          Quantity: 25
+  - type: PointLight
+    enabled: false
+    radius: 1.0
+    color: orange

Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml

@@ -19,3 +19,4 @@
     head: HatPurplesoft
     idcard: JanitorPDA
     ears: HeadsetService
+    belt: ClothingBeltJanitorFilled

Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml

@@ -23,5 +23,5 @@
     backpack: BackpackEngineeringFilled
     shoes: ShoesBrown
     idcard: CEPDA
-    belt: UtilityBeltClothingFilled
     ears: HeadsetEngineering
+    belt: ClothingBeltChiefEngineerFilled

Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml

@@ -25,3 +25,4 @@
     outerclothing: OuterclothingLabcoatcmo
     idcard: CMOPDA
     ears: HeadsetMedicalAlt
+    belt: ClothingBeltMedical

Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml

@@ -20,3 +20,4 @@
     outerclothing: OuterclothingLabcoatmedspecopen
     idcard: MedicalPDA
     ears: HeadsetMedical
+    belt: ClothingBeltMedical

Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml

@@ -28,3 +28,4 @@
     head: HatBeretHoS
     idcard: HoSPDA
     ears: HeadsetSecurityAlt
+    belt: ClothingBeltSecurityFilled

Resources/Prototypes/Roles/Jobs/Security/security_officer.yml

@@ -22,3 +22,4 @@
     outerclothing: OuterclothingArmorVest
     idcard: SecurityPDA
     ears: HeadsetSecurity
+    belt: ClothingBeltSecurityFilled

Resources/Prototypes/Roles/Jobs/Security/warden.yml

@@ -23,3 +23,4 @@
     outerclothing: OuterclothingArmorVest
     idcard: WardenPDA
     ears: HeadsetSecurity
+    belt: ClothingBeltSecurityFilled

Resources/Textures/Clothing/Belt/assault.rsi/meta.json

@@ -0,0 +1,74 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "states": [
+    {
+      "name": "equipped-BELT",
+      "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/Belt/bandolier.rsi/meta.json

@@ -0,0 +1,74 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "states": [
+    {
+      "name": "equipped-BELT",
+      "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/Belt/belt_icon_overlay.rsi/meta.json

@@ -0,0 +1,236 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dc89ef0239830774bd3d9d7d6c8da2856da2b869",
+  "states": [
+    {
+      "name": "crowbar",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "crowbar_brass",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "crowbar_large",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "crowbar_red",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "cutters_brass",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "cutters_red",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "cutters_yellow",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "drill_bolt",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "drill_screw",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "flashbang",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "jaws_cutter",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "jaws_pry",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "multitool",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "multitool_red",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "multitool_yellow",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "screwdriver",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "screwdriver_brass",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "screwdriver_head",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "screwdriver_nuke",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "stunbaton",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "stunbaton_active",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "stunbaton_nocell",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "wrench",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "wrench_brass",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "wrench_medical",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json

@@ -0,0 +1,101 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dc89ef0239830774bd3d9d7d6c8da2856da2b869",
+  "states": [
+    {
+      "name": "baton",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "gun",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "handcuff",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "injector",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "tank",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Clothing/Belt/belt_utility.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": "equipped-BELT", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "utilitybelt", "directions": 1, "delays": [[1.0]]}]}

Resources/Textures/Clothing/Belt/ce.rsi/meta.json

@@ -0,0 +1,74 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "states": [
+    {
+      "name": "equipped-BELT",
+      "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/Belt/champion.rsi/meta.json

@@ -0,0 +1,74 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "states": [
+    {
+      "name": "equipped-BELT",
+      "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/Belt/holster.rsi/meta.json

@@ -0,0 +1,74 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "states": [
+    {
+      "name": "equipped-BELT",
+      "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/Belt/janitor.rsi/meta.json

@@ -0,0 +1,74 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "states": [
+    {
+      "name": "equipped-BELT",
+      "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/Belt/medical.rsi/meta.json

@@ -0,0 +1,74 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "states": [
+    {
+      "name": "equipped-BELT",
+      "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/Belt/militarywebbing.rsi/meta.json

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