Merge branch 'master' into 2021-07-16/windoors

2021-07-25 18:25:59 -07:00
parent 1f7809772b e17fe6f008
commit ecad9fc32d
1350 changed files with 12393 additions and 11510 deletions
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -1,72 +1,167 @@
- 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
+# Belts that need/have visualizers

 - type: entity
  parent: ClothingBeltBase
-  id: ClothingBeltBandolier
-  name: bandolier
-  description: "A bandolier for holding shotgun ammunition."
+  id: ClothingBeltUtility
+  name: utility belt
+  description: Can hold various things.
  components:
  - type: Sprite
-    sprite: Clothing/Belt/bandolier.rsi
+    sprite: Clothing/Belt/utility.rsi
  - type: Clothing
-    sprite: Clothing/Belt/bandolier.rsi
+    sprite: Clothing/Belt/utility.rsi
  - type: Storage
    capacity: 40
+    # TODO: Fill this out more.
+    # whitelist:
+    #   tags:
+    #     - Wirecutter
+    #     - Crowbar
+    #     - CrowbarRed
+    #     - Screwdriver
+    #     - Flashlight
+    #     - Welder
+    #     - Wrench
+    #     - Painter
+    #     - GeigerCounter
+    #     - Flare
+    #     - Coilsofwire
+    #     -
+    #     -
+    #   components:
+    #     - SignalLinker
+  - type: ItemCounter
+    mapLayers:
+      cutters_red:
+        whitelist:
+          tags:
+          - Wirecutter
+      crowbar:
+        whitelist:
+          tags:
+          - Crowbar
+      crowbar_red:
+        whitelist:
+          tags:
+          - CrowbarRed
+      screwdriver_nuke:
+        whitelist:
+          tags:
+          - Screwdriver
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
+      multitool:
+        whitelist:
+          components:
+          - SignalLinker
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi

 - type: entity
  parent: ClothingBeltBase
  id: ClothingBeltChiefEngineer
-  name:  chief's toolbelt
-  description: "Holds tools, looks snazzy."
+  name: chief's toolbelt
+  description: Holds tools, looks snazzy.
  components:
  - type: Sprite
    sprite: Clothing/Belt/ce.rsi
  - type: Clothing
    sprite: Clothing/Belt/ce.rsi
  - type: Storage
+    # TODO: Fill this out more.
+    # whitelist:
+    #   tags:
+    #     - Wirecutter
+    #     - Crowbar
+    #     - CrowbarRed
+    #     - Screwdriver
+    #     - Flashlight
+    #     - Welder
+    #     - Wrench
+    #     - Painter
+    #     - GeigerCounter
+    #     - Flare
+    #     - Coilsofwire
+    #     -
+    #     -
+    #   components:
+    #     - SignalLinker
    capacity: 100
+  - type: ItemCounter
+    mapLayers:
+      drill:
+        whitelist:
+          tags:
+          - Powerdrill
+      cutters_red:
+        whitelist:
+          tags:
+          - Wirecutter
+      crowbar:
+        whitelist:
+          tags:
+          - Crowbar
+      crowbar_red:
+        whitelist:
+          tags:
+          - CrowbarRed
+      jaws:
+        whitelist:
+          tags:
+          - JawsOfLife
+      screwdriver_nuke:
+        whitelist:
+          tags:
+          - Screwdriver
+      multitool:
+        whitelist:
+          components:
+          - SignalLinker
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi

 - type: entity
  parent: ClothingBeltBase
-  id: ClothingBeltChampion
-  name:  championship belt
-  description: "Proves to the world that you are the strongest!"
+  id: ClothingBeltAssault
+  name: assault belt
+  description: A tactical assault belt.
  components:
  - type: Sprite
-    sprite: Clothing/Belt/champion.rsi
+    sprite: Clothing/Belt/assault.rsi
  - type: Clothing
-    sprite: Clothing/Belt/champion.rsi
-    QuickEquip: true
-
- 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
+    sprite: Clothing/Belt/assault.rsi
  - type: Storage
-    capacity: 20
+    capacity: 40
+  - type: ItemCounter
+    mapLayers:
+      flashbang:
+        whitelist:
+          components:
+          - FlashOnTrigger
+      stunbaton:
+        whitelist:
+          components:
+          - Stunbaton
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi

 - type: entity
  parent: ClothingBeltBase
  id: ClothingBeltJanitor
-  name:  janibelt
-  description: "A belt used to hold most janitorial supplies."
+  name: janibelt
+  description: A belt used to hold most janitorial supplies.
  components:
  - type: Sprite
    sprite: Clothing/Belt/janitor.rsi
@@ -74,12 +169,26 @@
    sprite: Clothing/Belt/janitor.rsi
  - type: Storage
    capacity: 40
+  - type: ItemCounter
+    mapLayers:
+      bottle:
+        whitelist:
+          tags:
+          - Bottle
+      bottle_spray:
+        whitelist:
+          tags:
+          - Spray
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi

 - type: entity
  parent: ClothingBeltBase
  id: ClothingBeltMedical
-  name:  medical belt
-  description: "Can hold various medical equipment."
+  name: medical belt
+  description: Can hold various medical equipment.
  components:
  - type: Sprite
    sprite: Clothing/Belt/medical.rsi
@@ -87,12 +196,99 @@
    sprite: Clothing/Belt/medical.rsi
  - type: Storage
    capacity: 40
+  - type: ItemCounter
+    mapLayers:
+      bottle:
+        whitelist:
+          tags:
+          - Bottle
+      hypo:
+        whitelist:
+          components:
+          - Hypospray
+      pill:
+        whitelist:
+          components:
+          - Pill
+      bottle_spray:
+        whitelist:
+          tags:
+          - Spray
+      # spray_med:
+      #   whitelist:
+      #     tags:
+      #     - SprayMedical
+      # wrench_medical:
+      #   whitelist:
+      #     tags:
+      #     - WrenchMedical
+      wrench:
+        whitelist:
+          tags:
+          - Wrench
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltPlant
+  name: botanical belt
+  description: A belt used to hold most hydroponics supplies. Suprisingly, not green.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/plant.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/plant.rsi
+  - type: Storage
+    # whitelist:
+    #   tags:
+    #     - BotanyHoe
+    #     - PlantAnalyzer
+    #     - BotanyHoe
+    #     - BotanyShovel
+    #     - PlantBGone
+    #     - Bottle
+    #   components:
+    #     - Seed
+    capacity: 40
+  - type: ItemCounter
+    mapLayers:
+      hatchet:
+        whitelist:
+          tags:
+          - BotanyHatchet
+      hydro:
+        whitelist:
+          tags:
+          - PlantAnalyzer # Dunno what to put here, should be aight.
+      hoe:
+        whitelist:
+          tags:
+          - BotanyHoe
+      secateurs: # We don't have secateurs and this looks similar enough.
+        whitelist:
+          tags:
+          - BotanyShovel
+      plantbgone:
+        whitelist:
+          tags:
+          - PlantBGone
+      bottle:
+        whitelist:
+          tags:
+          - Bottle
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi

 - type: entity
  parent: ClothingBeltBase
  id: ClothingBeltSecurity
-  name:  security belt
-  description: "Can hold security gear like handcuffs and flashes."
+  name: security belt
+  description: Can hold security gear like handcuffs and flashes.
  components:
  - type: Sprite
    sprite: Clothing/Belt/security.rsi
@@ -100,38 +296,26 @@
    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: ItemCounter
+    mapLayers:
+      flashbang:
+        whitelist:
+          components:
+          - FlashOnTrigger
+      stunbaton:
+        whitelist:
+          components:
+          - Stunbaton
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+      sprite: Clothing/Belt/belt_overlay.rsi

 - type: entity
  parent: ClothingBeltBase
  id: ClothingBeltSheath
-  name:  sabre sheath
-  description: "An ornate sheath designed to hold an officer's blade."
+  name: sabre sheath
+  description: An ornate sheath designed to hold an officer's blade.
  components:
  - type: Sprite
    sprite: Clothing/Belt/sheath.rsi
@@ -143,12 +327,87 @@
  - type: StorageFill
    contents:
      - id: CaptainSabre
+  - type: ItemCounter
+    mapLayers:
+      sheath-sabre:
+        whitelist:
+          tags:
+          - CaptainSabre
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+
+# Belts without visualizers
+
+- type: entity
+  parent: ClothingBeltBase
+  id: ClothingBeltBandolier
+  name: bandolier
+  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: 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
+    QuickEquip: true
+
+- 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: 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: ClothingBeltSuspenders
  name: suspenders
-  description: "For holding your pants up."
+  description: For holding your pants up.
  components:
  - type: Sprite
    sprite: Clothing/Belt/suspenders.rsi
@@ -156,16 +415,3 @@
  - type: Clothing
    sprite: Clothing/Belt/suspenders.rsi
    QuickEquip: true
-
- type: entity
-  parent: ClothingBeltBase
-  id: 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
--- a/Resources/Prototypes/Entities/Clothing/clothing_base.yml
+++ b/Resources/Prototypes/Entities/Clothing/clothing_base.yml
@@ -3,5 +3,7 @@
  parent: BaseItem
  id: Clothing
  components:
+  - type: Sprite
+    netsync: false
  - type: Clothing
    size: 5
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -4,9 +4,6 @@
  id: SimpleMobBase
  suffix: AI
  components:
-  - type: Tag
-    tags:
-    - Teleportable
  - type: Reactive
    reactions:
      - !type:ExtinguishReaction
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -8,7 +8,7 @@
  components:
  - type: Tag
    tags:
-    - Teleportable
+    - CanPilot
    - FootstepSound
  - type: Reactive
    reactions:
@@ -151,7 +151,6 @@
      - SmallImpassable
      layer:
      - Opaque
-      - MobImpassable
  - type: AtmosExposed
  - type: Flammable
    fireSpread: true
@@ -254,6 +253,7 @@
    - type: Sprite
      netsync: false
      drawdepth: Mobs
+      noRot: true
      # TODO BODY Turn these into individual body parts?
      layers:
      - map: ["enum.HumanoidVisualLayers.Chest"]
@@ -340,7 +340,7 @@
        - VaultImpassable
        - SmallImpassable
        layer:
-        - MobImpassable
+        - Opaque
    - type: HumanoidAppearance
    - type: Body
      template: HumanoidTemplate
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -1,8 +1,5 @@
 # Base

- type: Tag
-  id: Donut
-
 - type: entity
  parent: BaseItem
  id: FoodDonutBase
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -18,6 +18,9 @@
        Quantity: 15
  - type: SliceableFood
    count: 4
+  - type: Tag
+    tags:
+    - NoSpinOnThrow

 - type: entity
  parent: FoodPieBase
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -21,6 +21,9 @@
    count: 8
  - type: Item
    size: 8
+  - type: Tag
+    tags:
+    - Pizza

 - type: entity
  parent: FoodPizzaBase
@@ -37,6 +40,9 @@
        Quantity: 5
  - type: Item
    size: 1
+  - type: Tag
+    tags:
+    - Pizza

 # Pizza

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -8,7 +8,7 @@
 - type: entity
  parent: BaseItem
  id: FoodBoxDonut
-  name: donutbox
+  name: donut box
  description: Mmm, Donuts.
  components:
  - type: Sprite
@@ -17,6 +17,9 @@
    state: box
  - type: Storage
    capacity: 6
+    whitelist:
+      tags:
+      - Donut
  - type: Item
    sprite: Objects/Consumable/Food/Baked/donut.rsi
    size: 6
@@ -48,7 +51,7 @@
 - type: entity
  parent: BaseItem
  id: FoodContainerEgg
-  name: eggbox
+  name: egg carton
  description: Don't drop 'em!
  components:
  - type: Sprite
@@ -57,6 +60,9 @@
    state: box-closed
  - type: Storage
    capacity: 12
+    whitelist:
+      tags:
+      - Egg
  - type: Item
    sprite: Objects/Consumable/Food/egg.rsi
    size: 12
@@ -114,6 +120,7 @@
 - type: entity
  parent: FoodContainerEgg
  id: EggBoxBroken
+  suffix: Broken
  components:
  - type: StorageFill
    contents:
@@ -261,6 +268,9 @@
    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
    state: box
  - type: Storage
+    whitelist:
+      tags:
+      - DonkPocket
    capacity: 6
  - type: Item
    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -14,7 +14,7 @@
  - type: SolutionContainer
    maxVol: 10
  - type: SolutionTransfer
-    transferAmount: 5
+    maxTransferAmount: 10
  - type: Sprite
    netsync: false
    sprite: Objects/Consumable/Food/condiments.rsi
@@ -313,7 +313,7 @@
  - type: SolutionContainer
    maxVol: 30
  - type: SolutionTransfer
-    transferAmount: 5
+    maxTransferAmount: 30
  - type: Sprite
    netsync: false
    sprite: Objects/Consumable/Food/condiments.rsi
@@ -448,7 +448,7 @@
  - type: SolutionContainer
    maxVol: 15
  - type: SolutionTransfer
-    transferAmount: 5
+    maxTransferAmount: 15
  - type: Sprite
    netsync: false
    sprite: Objects/Consumable/Food/condiments.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -1,8 +1,5 @@
 # Base

- type: Tag
-  id: Egg
-
 - type: entity
  parent: BaseItem
  id: FoodEggBase
@@ -66,7 +63,7 @@
  - type: Puddle
    variants: 4
    state: egg
-    
+
 - type: entity
  name: eggshells
  parent: BaseItem
@@ -86,6 +83,9 @@
      reagents:
      - ReagentId: Egg
        Quantity: 1
+  - type: Tag
+    tags:
+    - Egg

 # Egg

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -27,7 +27,6 @@
  - type: SolutionContainer
    maxVol: 50
  - type: SolutionTransfer
-    transferAmount: 5
  - type: Drink
    openSounds: packetOpenSounds
    useSound: /Audio/Items/eating_1.ogg
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
@@ -4,10 +4,15 @@
  id: PackPaperRolling
  description: "A pack of thin pieces of paper used to make fine smokeables."
  components:
-    # I know but it just works.
-  - type: FoodContainer
-    prototypes:
-      PaperRolling: 100
+  - type: Storage
+    whitelist:
+      tags:
+      - RollingPaper
+    capacity: 16
+  - type: StorageFill
+    contents:
+      - id: PaperRolling
+        amount: 8
  - type: Sprite
    sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
    state: cigpapers
@@ -29,6 +34,10 @@
      state: cigpaper
    - type: Item
      sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
+      size: 2
+    - type: Tag
+      tags:
+      - RollingPaper

 - type: entity
  id: CigaretteFilter
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
@@ -9,11 +9,15 @@
  - type: SolutionContainer
    maxVol: 50
  - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
  - type: Drink
  - type: Sprite
    state: icon
  - type: Spillable
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface

 - type: entity
  parent: DrinkBase
@@ -56,8 +60,12 @@
  - type: SolutionContainer
    maxVol: 50
  - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
  - type: TransformableContainer
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface

 - type: entity
  parent: DrinkGlassBase
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
@@ -8,7 +8,11 @@
  - type: SolutionContainer
    maxVol: 100
  - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Sprite
    state: icon
  - type: DamageOnLand
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
@@ -14,7 +14,12 @@
      - ReagentId: Cola
        Quantity: 20
  - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
+    maxTransferAmount: 10
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Sprite
    state: icon

--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
@@ -8,7 +8,12 @@
  - type: SolutionContainer
    maxVol: 20
  - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
+    maxTransferAmount: 10
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Drink
    isOpen: true
  - type: Sprite
--- a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
@@ -9,14 +9,19 @@
  - type: LoopingSound
  - type: Sprite
    state: icon
-
  - type: SolutionContainer
    maxVol: 10
  - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
+    maxTransferAmount: 5
  - type: Drink
    isOpen: true
  - type: Spillable
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
+


 # Containers
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -14,7 +14,8 @@
    QuickEquip: false
  - type: ItemCooldown
  - type: EmitSoundOnUse
-    soundCollection: BikeHorn
+    sound: 
+      collection: BikeHorn
    semitoneVariation: 6
  - type: UseDelay
    delay: 0.5
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -1,6 +1,3 @@
- type: Tag
-  id: Crayon
-
 - type: entity
  abstract: true
  parent: BaseItem
@@ -30,6 +27,9 @@
  - type: Crayon
    color: white
    capacity: 5
+  - type: Tag
+    tags:
+    - CrayonWhite

 - type: entity
  parent: Crayon
@@ -42,6 +42,9 @@
  - type: Crayon
    color: white
    capacity: 5
+  - type: Tag
+    tags:
+    - CrayonWhite

 - type: entity
  parent: Crayon
@@ -54,6 +57,9 @@
  - type: Crayon
    color: black
    capacity: 5
+  - type: Tag
+    tags:
+    - CrayonBlack

 - type: entity
  parent: Crayon
@@ -66,6 +72,9 @@
  - type: Crayon
    color: red
    capacity: 5
+  - type: Tag
+    tags:
+    - CrayonRed

 - type: entity
  parent: Crayon
@@ -78,6 +87,9 @@
  - type: Crayon
    color: orange
    capacity: 5
+  - type: Tag
+    tags:
+    - CrayonOrange

 - type: entity
  parent: Crayon
@@ -90,6 +102,9 @@
  - type: Crayon
    color: yellow
    capacity: 5
+  - type: Tag
+    tags:
+    - CrayonYellow

 - type: entity
  parent: Crayon
@@ -102,6 +117,9 @@
  - type: Crayon
    color: green
    capacity: 5
+  - type: Tag
+    tags:
+    - CrayonGreen

 - type: entity
  parent: Crayon
@@ -114,6 +132,9 @@
  - type: Crayon
    color: lightblue
    capacity: 5
+  - type: Tag
+    tags:
+    - CrayonBlue

 - type: entity
  parent: Crayon
@@ -126,6 +147,9 @@
  - type: Crayon
    color: purple
    capacity: 5
+  - type: Tag
+    tags:
+    - CrayonPurple

 - type: entity
  parent: BaseItem
@@ -152,15 +176,37 @@
    - id: CrayonBlue
    - id: CrayonPurple
    - id: CrayonBlack
+  - type: ItemCounter
+    mapLayers:
+      black_box:
+        whitelist:
+          tags:
+          - CrayonBlack
+      blue_box:
+        whitelist:
+          tags:
+          - CrayonBlue
+      green_box:
+        whitelist:
+          tags:
+          - CrayonGreen
+      orange_box:
+        whitelist:
+          tags:
+          - CrayonOrange
+      purple_box:
+        whitelist:
+          tags:
+          - CrayonPurple
+      red_box:
+        whitelist:
+          tags:
+          - CrayonRed
+      yellow_box:
+        whitelist:
+          tags:
+          - CrayonYellow
+
  - type: Appearance
    visuals:
-    - type: StackVisualizer
-      composite: true
-      stackLayers:
-      - red_box
-      - orange_box
-      - yellow_box
-      - green_box
-      - blue_box
-      - purple_box
-      - black_box
+    - type: MappedItemVisualizer
--- a/Resources/Prototypes/Entities/Objects/Fun/skub.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
@@ -12,6 +12,7 @@
  - type: ItemCooldown
  - type: LoopingSound
  - type: EmitSoundOnUse
-    sound: /Audio/Items/skub.ogg
+    sound:
+      path: /Audio/Items/skub.ogg
  - type: UseDelay
    delay: 2.0
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -5,11 +5,14 @@
  id: BasePlushie
  components:
  - type: EmitSoundOnUse
-    soundCollection: ToySqueak
+    sound: 
+      collection: ToySqueak
  - type: EmitSoundOnLand
-    soundCollection: ToySqueak
+    sound:
+      collection: ToySqueak
  - type: EmitSoundOnActivate
-    soundCollection: ToySqueak
+    sound:
+      collection: ToySqueak
  - type: LoopingSound
  - type: ItemCooldown
  - type: UseDelay
@@ -90,7 +93,8 @@
  - type: ItemCooldown
  - type: LoopingSound
  - type: EmitSoundOnUse
-    sound: /Audio/Items/Toys/rattle.ogg
+    sound:
+      path: /Audio/Items/Toys/rattle.ogg
  - type: UseDelay
    delay: 1.0

@@ -106,7 +110,8 @@
  - type: ItemCooldown
  - type: LoopingSound
  - type: EmitSoundOnUse
-    sound: /Audio/Items/Toys/mousesqueek.ogg
+    sound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
  - type: UseDelay
    delay: 1.0

@@ -122,7 +127,8 @@
  - type: ItemCooldown
  - type: LoopingSound
  - type: EmitSoundOnUse
-    sound: /Audio/Voice/Vox/shriek1.ogg
+    sound:
+      path: /Audio/Voice/Vox/shriek1.ogg
  - type: UseDelay
    delay: 1.0

@@ -142,11 +148,13 @@
  - type: Item
    sprite: Objects/Misc/carvings.rsi
  - type: EmitSoundOnThrow
-    sound: /Audio/Items/Toys/helpme.ogg
+    sound:
+      path: /Audio/Items/Toys/helpme.ogg
  - type: ItemCooldown
  - type: LoopingSound
  - type: EmitSoundOnUse
-    sound: /Audio/Items/Toys/helpme.ogg
+    sound:
+      path: /Audio/Items/Toys/helpme.ogg
  - type: UseDelay
    delay: 1.0

@@ -162,11 +170,13 @@
  - type: Item
    sprite: Objects/Misc/carvings.rsi
  - type: EmitSoundOnThrow
-    sound: /Audio/Items/Toys/hellothere.ogg
+    sound: 
+      path: /Audio/Items/Toys/hellothere.ogg
  - type: ItemCooldown
  - type: LoopingSound
  - type: EmitSoundOnUse
-    sound: /Audio/Items/Toys/hellothere.ogg
+    sound: 
+      path: /Audio/Items/Toys/hellothere.ogg
  - type: UseDelay
    delay: 1.0

@@ -182,11 +192,13 @@
  - type: Item
    sprite: Objects/Misc/carvings.rsi
  - type: EmitSoundOnThrow
-    sound: /Audio/Items/Toys/thankyou.ogg
+    sound:
+      path: /Audio/Items/Toys/thankyou.ogg
  - type: ItemCooldown
  - type: LoopingSound
  - type: EmitSoundOnUse
-    sound: /Audio/Items/Toys/thankyou.ogg
+    sound: 
+      path: /Audio/Items/Toys/thankyou.ogg
  - type: UseDelay
    delay: 1.0

@@ -202,11 +214,13 @@
  - type: Item
    sprite: Objects/Misc/carvings.rsi
  - type: EmitSoundOnThrow
-    sound: /Audio/Items/Toys/verygood.ogg
+    sound: 
+      path: /Audio/Items/Toys/verygood.ogg
  - type: ItemCooldown
  - type: LoopingSound
  - type: EmitSoundOnUse
-    sound: /Audio/Items/Toys/verygood.ogg
+    sound: 
+      path: /Audio/Items/Toys/verygood.ogg
  - type: UseDelay
    delay: 1.0

@@ -222,11 +236,13 @@
  - type: Item
    sprite: Objects/Misc/carvings.rsi
  - type: EmitSoundOnThrow
-    sound: /Audio/Items/Toys/imsorry.ogg
+    sound:
+      path: /Audio/Items/Toys/imsorry.ogg
  - type: ItemCooldown
  - type: LoopingSound
  - type: EmitSoundOnUse
-    sound: /Audio/Items/Toys/imsorry.ogg
+    sound:
+      path: /Audio/Items/Toys/imsorry.ogg
  - type: UseDelay
    delay: 1.0

@@ -297,7 +313,8 @@
  - type: ItemCooldown
  - type: LoopingSound
  - type: EmitSoundOnUse
-    sound: /Audio/Items/Toys/ian.ogg
+    sound:
+      path: /Audio/Items/Toys/ian.ogg
  - type: UseDelay
    delay: 1.0

--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -42,6 +42,9 @@
    startUncuffSound: /Audio/Items/Handcuffs/rope_start.ogg
    endUncuffSound: /Audio/Items/Handcuffs/rope_breakout.ogg
    startBreakoutSound: /Audio/Items/Handcuffs/rope_takeoff.ogg
+  - type: Construction
+    graph: makeshifthandcuffs
+    node: cuffscable

  - type: Sprite
    sprite: Objects/Misc/cablecuffs.rsi
--- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
@@ -4,9 +4,15 @@
  id: MonkeyCubeBox
  description: Drymate brand monkey cubes. Just add water!
  components:
-  - type: FoodContainer
-    prototypes:
-      MonkeyCubeWrapper: 100
+  - type: Storage
+    whitelist:
+      tags:
+      - MonkeyCube
+    capacity: 30
+  - type: StorageFill
+    contents:
+      - id: MonkeyCubeWrapped
+        amount: 6
  - type: Sprite
    sprite: Objects/Misc/monkeycube.rsi
    state: box
@@ -14,13 +20,18 @@
 - type: entity
  parent: BaseItem
  name: monkey cube
-  id: MonkeyCubeWrapper
+  suffix: Wrapped
+  id: MonkeyCubeWrapped
  description: Unwrap this to get a monkey cube.
  components:
-  - type: FoodContainer
-    capacity: 1
-    prototypes:
-      MonkeyCube: 100
+  - type: SpawnItemsOnUse
+    items:
+      - id: MonkeyCube
+    sound:
+      path: /Audio/Effects/unwrap.ogg
  - type: Sprite
    sprite: Objects/Misc/monkeycube.rsi
    state: wrapper
+  - type: Tag
+    tags:
+    - MonkeyCube
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
@@ -5,6 +5,9 @@
  description: Kills those pesky weeds!
  suffix: "Filled"
  components:
+  - type: Tag
+    tags:
+    - PlantBGone
  - type: Sprite
    sprite: Objects/Tools/Hydroponics/sprays.rsi
    state: plantbgone
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -7,6 +7,7 @@
  - type: Tag
    tags:
    - Hoe
+    - BotanyHoe
  - type: Sprite
    sprite: Objects/Tools/Hydroponics/hoe.rsi
    state: icon
@@ -40,6 +41,7 @@
  components:
  - type: Tag
    tags:
+    - BotanyHatchet
    - BotanySharp
  - type: Sprite
    sprite: Objects/Tools/Hydroponics/hatchet.rsi
@@ -58,6 +60,7 @@
  - type: Tag
    tags:
    - Shovel
+    - BotanyShovel
  - type: Sprite
    sprite: Objects/Tools/Hydroponics/spade.rsi
    state: icon
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -5,6 +5,9 @@
  suffix: Empty
  description: A spray bottle with an unscrewable top.
  components:
+  - type: Tag
+    tags:
+    - Spray
  - type: Sprite
    netsync: false
    sprite: Objects/Specific/Janitorial/janitorial.rsi
@@ -15,7 +18,6 @@
    maxVol: 100
    caps: Refillable, Drainable
  - type: SolutionTransfer
-    transferAmount: 5.0
  - type: Spillable
  - type: ItemCooldown
  - type: Spray
@@ -29,12 +31,12 @@
  suffix: Filled
  parent: SprayBottle
  components:
-    - type: SolutionContainer
-      maxVol: 100
-      contents:
-        reagents:
-          - ReagentId: Water
-            Quantity: 100
+  - type: SolutionContainer
+    maxVol: 100
+    contents:
+      reagents:
+        - ReagentId: Water
+          Quantity: 100

 - type: entity
  name: space cleaner
@@ -43,12 +45,12 @@
  parent: SprayBottle
  suffix: ""
  components:
-    - type: SolutionContainer
-      maxVol: 100
-      contents:
-        reagents:
-          - ReagentId: SpaceCleaner
-            Quantity: 100
+  - type: SolutionContainer
+    maxVol: 100
+    contents:
+      reagents:
+        - ReagentId: SpaceCleaner
+          Quantity: 100

 # Vapor

--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -4,12 +4,12 @@
  description: A sterile injector for rapid administration of drugs to patients.
  id: Hypospray
  components:
-    - type: Sprite
-      sprite: Objects/Specific/Medical/hypospray.rsi
-      state: hypo
-    - type: Item
-      sprite: Objects/Specific/Medical/hypospray.rsi
-    - type: SolutionContainer
-      maxVol: 30
-      caps: Refillable, CanExamine
-    - type: Hypospray
+  - type: Sprite
+    sprite: Objects/Specific/Medical/hypospray.rsi
+    state: hypo
+  - type: Item
+    sprite: Objects/Specific/Medical/hypospray.rsi
+  - type: SolutionContainer
+    maxVol: 30
+    caps: Refillable, CanExamine
+  - type: Hypospray
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -5,6 +5,9 @@
  abstract: true
  description: A small bottle.
  components:
+  - type: Tag
+    tags:
+    - Bottle
  - type: Sprite
    sprite: Objects/Specific/Chemistry/bottle.rsi
    netsync: false
@@ -15,7 +18,12 @@
    maxVol: 30
    caps: OpenContainer
  - type: SolutionTransfer
-    transferAmount: 5
+    maxTransferAmount: 30
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Item
    sprite: Objects/Specific/Chemistry/beaker.rsi
  - type: Spillable
@@ -29,7 +37,7 @@
    sprite: Objects/Specific/Chemistry/bottle.rsi
    layers:
      - state: bottle-1
-      - state: bottle-1-1  
+      - state: bottle-1-1
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
  - type: Appearance
@@ -47,7 +55,7 @@
    sprite: Objects/Specific/Chemistry/bottle.rsi
    layers:
      - state: bottle-2
-      - state: bottle-2-1  
+      - state: bottle-2-1
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
  - type: Appearance
@@ -65,7 +73,7 @@
    sprite: Objects/Specific/Chemistry/bottle.rsi
    layers:
      - state: bottle-3
-      - state: bottle-3-1  
+      - state: bottle-3-1
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
  - type: Appearance
@@ -83,7 +91,7 @@
    sprite: Objects/Specific/Chemistry/bottle.rsi
    layers:
      - state: bottle-4
-      - state: bottle-4-1  
+      - state: bottle-4-1
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
  - type: Appearance
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -12,7 +12,7 @@
    netsync: false
    layers:
      - state: beaker
-      - state: beaker1  
+      - state: beaker1
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
  - type: Item
@@ -21,7 +21,11 @@
    maxVol: 50
    caps: OpenContainer, FitsInDispenser # can add and remove solutions and fits in the chemmaster.
  - type: SolutionTransfer
-    transferAmount: 5.0
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Spillable
  - type: Drink
    isOpen: true
@@ -62,7 +66,7 @@
    sprite: Objects/Specific/Chemistry/beaker_large.rsi
    layers:
      - state: beakerlarge
-      - state: beakerlarge1  
+      - state: beakerlarge1
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
  - type: Item
@@ -120,7 +124,14 @@
    caps: OpenContainer
    maxVol: 5
  - type: SolutionTransfer
-    transferAmount: 5.0
+    minTransferAmount: 1
+    transferAmount: 1
+    maxTransferAmount: 5
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Spillable
  - type: Item
    sprite: Objects/Specific/Chemistry/dropper.rsi
@@ -140,7 +151,7 @@
    sprite: Objects/Specific/Chemistry/syringe.rsi
    netsync: false
    layers:
-      - state: syringe1  
+      - state: syringe1
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
      - state: syringe_base0
@@ -155,7 +166,7 @@
  - type: Appearance
    visuals:
      # this visualizer used for reagent inside
-    - type: SolutionContainerVisualizer 
+    - type: SolutionContainerVisualizer
      maxFillLevels: 4
      fillBaseName: syringe
      # this one for syrigine itself (plunger)
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -20,6 +20,13 @@
    maxVol: 500
  - type: SolutionTransfer
    transferAmount: 50
+    maxTransferAmount: 100
+    minTransferAmount: 10
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Physics
    bodyType: Dynamic
    fixtures:
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -4,30 +4,33 @@
  id: JawsOfLife
  description: A set of jaws of life, compressed through the magic of science.
  components:
-    - type: Sprite
-      sprite: Objects/Tools/jaws_of_life.rsi
-      state: jaws_pry
-    - type: Clothing
-      sprite: Objects/Tools/jaws_of_life.rsi
-      size: 50
-      QuickEquip: false
-      Slots:
-        - Belt
-    - type: TilePrying
-    - type: Tool
-      qualities:
-        - Prying
-      statusShowBehavior: true
-    - type: MultiTool
-      tools:
-        - behavior: Prying
-          state: jaws_pry
-          useSound: /Audio/Items/jaws_pry.ogg
-          changeSound: /Audio/Items/change_jaws.ogg
-        - behavior: Cutting
-          state: jaws_cutter
-          useSound: /Audio/Items/jaws_cut.ogg
-          changeSound: /Audio/Items/change_jaws.ogg
+  - type: Tag
+    tags:
+    - JawsOfLife
+  - type: Sprite
+    sprite: Objects/Tools/jaws_of_life.rsi
+    state: jaws_pry
+  - type: Clothing
+    sprite: Objects/Tools/jaws_of_life.rsi
+    size: 50
+    QuickEquip: false
+    Slots:
+      - Belt
+  - type: TilePrying
+  - type: Tool
+    qualities:
+      - Prying
+    statusShowBehavior: true
+  - type: MultiTool
+    tools:
+      - behavior: Prying
+        state: jaws_pry
+        useSound: /Audio/Items/jaws_pry.ogg
+        changeSound: /Audio/Items/change_jaws.ogg
+      - behavior: Cutting
+        state: jaws_cutter
+        useSound: /Audio/Items/jaws_cut.ogg
+        changeSound: /Audio/Items/change_jaws.ogg

 - type: entity
  name: syndicate jaws of life
@@ -35,11 +38,11 @@
  id: SyndicateJawsOfLife
  description: Useful for entering the station or its departments.
  components:
-    - type: Sprite
-      state: syn_jaws_pry
-    - type: MultiTool
-      tools:
-        - behavior: Prying
-          state: syn_jaws_pry
-        - behavior: Cutting
-          state: syn_jaws_cutter
+  - type: Sprite
+    state: syn_jaws_pry
+  - type: MultiTool
+    tools:
+      - behavior: Prying
+        state: syn_jaws_pry
+      - behavior: Cutting
+        state: syn_jaws_cutter
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  name: wirecutter
  parent: BaseItem
  id: Wirecutter
@@ -7,6 +7,7 @@
  - type: Tag
    tags:
    - PlantSampleTaker
+    - Wirecutter
  - type: Sprite
    sprite: Objects/Tools/wirecutters.rsi
    layers:
@@ -37,6 +38,9 @@
  id: Screwdriver
  description: Industrial grade torque in a small screwdriving package.
  components:
+  - type: Tag
+    tags:
+    - Screwdriver
  - type: Sprite
    sprite: Objects/Tools/screwdriver.rsi
    layers:
@@ -67,6 +71,9 @@
  id: Wrench
  description: A common tool for assembly and disassembly, righty tighty lefty loosey.
  components:
+  - type: Tag
+    tags:
+    - Wrench
  - type: Sprite
    sprite: Objects/Tools/wrench.rsi
    state: icon
@@ -74,6 +81,7 @@
    sprite: Objects/Tools/wrench.rsi
  - type: ItemCooldown
  - type: MeleeWeapon
+    damage: 7
  - type: Tool
    qualities:
      - Anchoring
@@ -85,6 +93,9 @@
  id: Crowbar
  description: A multipurpose tool to pry open doors and fight interdimensional invaders.
  components:
+  - type: Tag
+    tags:
+    - Crowbar
  - type: Sprite
    sprite: Objects/Tools/crowbar.rsi
    state: icon
@@ -93,6 +104,7 @@
    size: 10
  - type: ItemCooldown
  - type: MeleeWeapon
+    damage: 7
  - type: Tool
    qualities:
      - Prying
@@ -105,6 +117,9 @@
  id: CrowbarRed
  description: A multipurpose tool to pry open doors and fight interdimensional invaders.
  components:
+  - type: Tag
+    tags:
+    - CrowbarRed
  - type: Sprite
    sprite: Objects/Tools/crowbar_red.rsi
    state: icon
@@ -113,6 +128,7 @@
    size: 5
  - type: ItemCooldown
  - type: MeleeWeapon
+    damage: 7
  - type: Tool
    qualities:
      - Prying
@@ -148,26 +164,29 @@
  id: PowerDrill
  description: A simple powered hand drill.
  components:
-    - type: Sprite
-      sprite: Objects/Tools/drill.rsi
-      state: drill_screw
-    - type: Item
-      sprite: Objects/Tools/drill.rsi
-      size: 20
-    - type: Tool
-      qualities:
-        - Screwing
-      statusShowBehavior: true
-    - type: MultiTool
-      tools:
-        - behavior: Screwing
-          state: drill_screw
-          useSound: /Audio/Items/drill_use.ogg
-          changeSound: /Audio/Items/change_drill.ogg
-        - behavior: Anchoring
-          state: drill_bolt
-          useSound: /Audio/Items/drill_use.ogg
-          changeSound: /Audio/Items/change_drill.ogg
+  - type: Tag
+    tags:
+    - Powerdrill
+  - type: Sprite
+    sprite: Objects/Tools/drill.rsi
+    state: drill_screw
+  - type: Item
+    sprite: Objects/Tools/drill.rsi
+    size: 20
+  - type: Tool
+    qualities:
+      - Screwing
+    statusShowBehavior: true
+  - type: MultiTool
+    tools:
+      - behavior: Screwing
+        state: drill_screw
+        useSound: /Audio/Items/drill_use.ogg
+        changeSound: /Audio/Items/change_drill.ogg
+      - behavior: Anchoring
+        state: drill_bolt
+        useSound: /Audio/Items/drill_use.ogg
+        changeSound: /Audio/Items/change_drill.ogg

 - type: entity
  name: RCD
@@ -205,13 +224,13 @@
  id: Shovel
  description: A large tool for digging and moving dirt.
  components:
-    - type: Tag
-      tags:
-      - Shovel
-    - type: Sprite
-      sprite: Objects/Tools/shovel.rsi
-      state: icon
-    - type: ItemCooldown
-    - type: MeleeWeapon
-    - type: Item
-      sprite: Objects/Tools/shovel.rsi
+  - type: Tag
+    tags:
+    - Shovel
+  - type: Sprite
+    sprite: Objects/Tools/shovel.rsi
+    state: icon
+  - type: ItemCooldown
+  - type: MeleeWeapon
+  - type: Item
+    sprite: Objects/Tools/shovel.rsi
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -101,3 +101,4 @@
    maxVol: 15
    caps: Refillable, Drainable
  - type: SolutionTransfer
+    maxTransferAmount: 15
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -23,7 +23,7 @@
  - type: Projectile
    damages:
      Blunt: 10
-  - type: StunnableProjectile
+  - type: StunOnCollide

 - type: entity
  id: PelletShotgun
@@ -92,5 +92,5 @@
  - type: SolutionContainer
    maxVol: 15
    caps: Refillable, Drainable
-  - type: ChemicalInjectionProjectile
+  - type: SolutionInjectOnCollide
    transferAmount: 15
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
@@ -22,6 +22,7 @@
    heavyImpactRange: 2
    lightImpactRange: 4
    flashRange: 7
+  - type: ExplodeOnTrigger
  - type: Damageable
  - type: Destructible
    thresholds:
@@ -55,7 +56,12 @@
    - Belt
  - type: OnUseTimerTrigger
    delay: 3.5
-  - type: FlashExplosive
+  - type: FlashOnTrigger
+    range: 7
+  - type: SoundOnTrigger
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
+  - type: DeleteOnTrigger
  - type: Damageable
  - type: Destructible
    thresholds:
@@ -90,6 +96,7 @@
    heavyImpactRange: 3
    lightImpactRange: 5
    flashRange: 10
+  - type: ExplodeOnTrigger
  - type: Damageable
  - type: Destructible
    thresholds:
@@ -123,6 +130,7 @@
    devastationRange: 25
    heavyImpactRange: 25
    flashRange: 50
+  - type: ExplodeOnTrigger
  - type: Damageable
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -20,6 +20,7 @@
      hard: false
      mask:
      - Impassable
+      layer:
      - MobImpassable
    linearDamping: 0
    angularDamping: 0
@@ -38,8 +39,13 @@
    soundHit: /Audio/Weapons/Guns/Hits/snap.ogg
    damages:
      Piercing: 10
-  - type: FlashProjectile
+  - type: FlashOnTrigger
    range: 1
+  - type: SoundOnTrigger
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
+  - type: TriggerOnCollide
+  - type: DeleteOnTrigger

 - type: entity
  id: BulletBaseHV
@@ -71,8 +77,9 @@
    soundHit: /Audio/Weapons/Guns/Hits/snap.ogg
    damages:
      Blunt: 3
-  - type: StunnableProjectile
-    paralyzeAmount: 2
+  - type: StunOnCollide
+    stunAmount: 2
+    knockdownAmount: 2

 # Energy projectiles
 - type: entity
@@ -105,7 +112,7 @@
    soundHitSpecies: "/Audio/Weapons/Guns/Hits/taser_hit.ogg"
    damages:
      Heat: 5
-  - type: StunnableProjectile
+  - type: StunOnCollide
    stunAmount: 5
    knockdownAmount: 5

@@ -149,7 +156,9 @@
    netsync: false
    sprite: Objects/Weapons/Guns/Projectiles/rocket.rsi
    state: frag
-  - type: ExplosiveProjectile
+  - type: ExplodeOnTrigger
+  - type: DeleteOnTrigger
+  - type: TriggerOnCollide
  - type: Projectile
    deleteOnCollide: false
  - type: Explosive
@@ -175,8 +184,9 @@
  - type: Projectile
    deleteOnCollide: false
    soundHit: /Audio/Effects/gen_hit.ogg
-  - type: StunnableProjectile
-    paralyzeAmount: 8
+  - type: StunOnCollide
+    stunAmount: 8
+    knockdownAmount: 8

 - type: entity
  id: BulletGrenadeBlast
@@ -188,7 +198,9 @@
    netsync: false
    sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi
    state: grenade
-  - type: ExplosiveProjectile
+  - type: ExplodeOnTrigger
+  - type: DeleteOnTrigger
+  - type: TriggerOnCollide
  - type: Projectile
    deleteOnCollide: false
  - type: Explosive
@@ -210,8 +222,13 @@
  - type: Projectile
    deleteOnCollide: false
    soundHit: /Audio/Effects/flash_bang.ogg
-  - type: FlashProjectile
+  - type: FlashOnTrigger
    range: 7
+  - type: SoundOnTrigger
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
+  - type: TriggerOnCollide
+  - type: DeleteOnTrigger

 # This is supposed to spawn shrapnel and stuff so uhh... TODO?
 - type: entity
@@ -224,7 +241,9 @@
    netsync: false
    sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi
    state: grenade
-  - type: ExplosiveProjectile
+  - type: ExplodeOnTrigger
+  - type: DeleteOnTrigger
+  - type: TriggerOnCollide
  - type: Projectile
    deleteOnCollide: false
  - type: Explosive
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -8,8 +8,11 @@
    sprite: Objects/Weapons/Melee/baseball_bat.rsi
    state: icon
  - type: MeleeWeapon
-    damage: 20
+    damage: 15
  - type: Item
    size: 24
    sprite: Objects/Weapons/Melee/baseball_bat.rsi
    prefix: inhand
+  - type: Construction
+    graph: WoodenBat
+    node: bat
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -27,6 +27,7 @@
    caps: Refillable
    maxVol: 5
  - type: SolutionTransfer
+    maxTransferAmount: 5

 - type: MeleeWeaponAnimation
  id: spear
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -13,6 +13,9 @@
    size: 15
    sprite: Objects/Weapons/Melee/captain_sabre.rsi
    prefix: inhand
+  - type: Tag
+    tags:
+    - CaptainSabre

 - type: entity
  name: katana
--- a/Resources/Prototypes/Entities/Structures/Furniture/pilot_chair.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/pilot_chair.yml
@@ -1,33 +0,0 @@
- type: entity
-  id: PilotSeatChair
-  parent: BaseStructure
-  name: pilot seat
-  description: The pilot seat of a prestigious battle cruiser.
-  components:
-  - type: Sprite
-    sprite: Structures/Furniture/furniture.rsi
-    state: shuttle_chair
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
-      mask:
-      - Impassable
-      - VaultImpassable
-      - SmallImpassable
-  - type: InteractionOutline
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: ShuttleController
-  - type: Strap
-    position: Stand
--- a/Resources/Prototypes/Entities/Structures/Furniture/seats.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/seats.yml
@@ -199,3 +199,26 @@
          MaterialWoodPlank:
            min: 1
            max: 1
+
+- type: entity
+  name: pilot seat
+  id: ChairPilotSeat
+  parent: SeatBase
+  description: The pilot seat of a prestigious ship.
+  components:
+  - type: Anchorable
+  - type: Rotatable
+  - type: Sprite
+    sprite: Structures/Furniture/furniture.rsi
+    state: shuttle_chair
+    netsync: false
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45, -0.45, 0.05, 0.45"
+      mask:
+      - Impassable
+      - VaultImpassable
+      - SmallImpassable
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -12,6 +12,17 @@

 - type: entity
  parent: ComputerBase
+  id: ComputerShuttleBase
+  name: shuttle console
+  description: Used to pilot a shuttle.
+  abstract: true
+  components:
+  - type: ShuttleConsole
+  - type: ApcPowerReceiver
+    powerLoad: 200
+
+- type: entity
+  parent: ComputerShuttleBase
  id: ComputerShuttle
  name: shuttle console
  description: Used to pilot a shuttle.
@@ -23,7 +34,7 @@
      screen: shuttle

 - type: entity
-  parent: ComputerBase
+  parent: ComputerShuttleBase
  id: ComputerShuttleSyndie
  name: syndicate shuttle console
  description: Used to pilot a syndicate shuttle.
@@ -79,7 +90,7 @@
    - key: enum.ResearchClientUiKey.Key
      type: ResearchClientBoundUserInterface
  - type: ApcPowerReceiver
-    load: 200
+    powerLoad: 200
    priority: Low
  - type: Computer
    board: ResearchComputerCircuitboard
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml
@@ -8,6 +8,7 @@
  - type: Sprite
    netsync: false
    sprite: Structures/Storage/closet.rsi
+    noRot: true
    layers:
    - state: generic
    - state: generic_door