Add entity prototype save test (#10274)

2022-08-17 12:47:58 +12:00
parent ad67a8508a
commit 93584f21db
104 changed files with 813 additions and 144 deletions
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ b/Resources/Prototypes/Body/Parts/animal.yml
@@ -10,6 +10,11 @@
  components:
  - type: Damageable
    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 # For primates mainly
 - type: entity
--- a/Resources/Prototypes/Body/Parts/human.yml
+++ b/Resources/Prototypes/Body/Parts/human.yml
@@ -8,6 +8,11 @@
  components:
  - type: Damageable
    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 - type: entity
  id: TorsoHuman
--- a/Resources/Prototypes/Body/Parts/reptilian.yml
+++ b/Resources/Prototypes/Body/Parts/reptilian.yml
@@ -8,6 +8,11 @@
  components:
  - type: Damageable
    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 - type: entity
  id: TorsoReptilian
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -6,6 +6,11 @@
  components:
  - type: Damageable
    damageContainer: Inorganic
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 - type: entity
  id: LeftArmBorg
--- a/Resources/Prototypes/Body/Parts/skeleton.yml
+++ b/Resources/Prototypes/Body/Parts/skeleton.yml
@@ -7,6 +7,11 @@
  components:
  - type: Damageable
    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 - type: entity
  id: TorsoSkeleton
--- a/Resources/Prototypes/Body/Parts/slime.yml
+++ b/Resources/Prototypes/Body/Parts/slime.yml
@@ -7,6 +7,11 @@
  components:
  - type: Damageable
    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 - type: entity
  id: TorsoSlime
--- a/Resources/Prototypes/Body/Parts/vox.yml
+++ b/Resources/Prototypes/Body/Parts/vox.yml
@@ -8,6 +8,11 @@
  components:
  - type: Damageable
    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 - type: entity
  id: TorsoVox
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -367,10 +367,22 @@
      - id: MagazineShotgunIncendiary
        amount: 6

+# base BallisticAmmoProvider boxes
+- type: entity
+  parent: BoxCardboard
+  id: BoxAmmoProvider
+  abstract: true
+  components:
+  - type: BallisticAmmoProvider
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+      storagebase: !type:Container
+
 # Shotgun Shells
 - type: entity
  name: box of shotgun beanbag cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxBeanbag
  description: A box full of beanbag shots, designed for riot shotguns.
  components:
@@ -384,7 +396,7 @@

 - type: entity
  name: box of shotgun lethal cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxLethalshot
  description: A box full of lethal pellet shots, designed for riot shotguns.
  components:
@@ -398,7 +410,7 @@

 - type: entity
  name: box of shotgun slug cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxShotgunSlug
  description: A box full of shotgun slugs, designed for riot shotguns.
  components:
@@ -412,7 +424,7 @@

 - type: entity
  name: box of shotgun flare cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxShotgunFlare
  description: A box full of shotgun flare cartridges, designed for riot shotguns.
  components:
@@ -426,7 +438,7 @@

 - type: entity
  name: box of shotgun incendiary cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxShotgunIncendiary
  description: A box full of shotgun incendiary cartridges, designed for riot shotguns.
  components:
@@ -440,7 +452,7 @@

 - type: entity
  name: box of shotgun practice cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxShotgunPractice
  description: A box full of shotgun practice cartridges, designed for riot shotguns.
  components:
@@ -454,7 +466,7 @@

 - type: entity
  name: box of tranquilizer cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxShellTranquilizer
  description: A box full of tranquilizer cartridges, designed for riot shotguns.
  components:
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -15,6 +15,10 @@
    - back
  - type: Storage
    capacity: 100
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
  - type: UserInterface
    interfaces:
    - key: enum.StorageUiKey.Key
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -15,6 +15,10 @@
    - back
  - type: Storage
    capacity: 120
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
  - type: ClothingSpeedModifier
    walkModifier: 1
    sprintModifier: 0.9
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -15,6 +15,10 @@
    - back
  - type: Storage
    capacity: 100
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
  - type: UserInterface
    interfaces:
    - key: enum.StorageUiKey.Key
--- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
@@ -20,6 +20,10 @@
    capacity: 40
    equipSound:
      path: /Audio/Items/belt_equip.ogg
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
  - type: UserInterface
    interfaces:
    - key: enum.StorageUiKey.Key
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -221,6 +221,10 @@
        Heat: 0.65
        Radiation: 1
  - type: IdentityBlocker
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot {}

 - type: entity
  parent: ClothingHeadLightBase
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -30,6 +30,10 @@
  components:
  - type: Storage
    capacity: 10
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
  - type: UserInterface
    interfaces:
    - key: enum.StorageUiKey.Key
@@ -62,6 +66,9 @@
  - type: DiseaseProtection
    protection: 0.05
  - type: ToggleableClothing
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -35,6 +35,9 @@
    coefficient: 0.5
  - type: ToggleableClothing
    clothingPrototype: ClothingHeadHelmetEVA
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}

 - type: entity
  parent: ClothingOuterBaseLarge
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -8,6 +8,8 @@
  - type: Sprite
    drawdepth: FloorObjects
  - type: SolutionContainerManager
+    solutions:
+      puddle: {}
  - type: Puddle
    spillSound:
      path: /Audio/Effects/Fluids/splat.ogg
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml
@@ -8,6 +8,7 @@
        - state: blue
        - texture: Mobs/Species/Human/parts.rsi/full.png
        - state: ai
+    - type: Timer
    - type: TimedSpawner
      prototypes:
        - MobSpirate
@@ -27,6 +28,7 @@
      - state: blue
      - texture: Mobs/Aliens/Xenos/burrower.rsi/crit.png
      - state: ai
+    - type: Timer
    - type: TimedSpawner
      prototypes:
      - MobXeno
@@ -45,6 +47,7 @@
        - state: blue
        - texture: Mobs/Animals/mouse.rsi/icon-2.png
        - state: timed
+    - type: Timer
    - type: TimedSpawner
      prototypes:
        - MobMouse
--- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
@@ -51,7 +51,7 @@
 - type: entity
  parent: BaseMobHuman
  suffix: Dead
-  save: true
+  save: false # mobs are currently not saveable.
  id: SalvageHumanCorpse
  name: unidentified human
  description: We barely knew ye.
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -4,6 +4,7 @@
  name: GuardianBase
  id: MobGuardianBase
  description: guardian
+  save: false
  components:
    - type: GhostTakeoverAvailable
      makeSentient: true
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -22,6 +22,8 @@
    solution: drink
  - type: RefillableSolution
    solution: drink
+  - type: DrainableSolution
+    solution: drink
  - type: UserInterface
    interfaces:
    - key: enum.TransferAmountUiKey.Key
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -27,6 +27,12 @@
      - state: icon
        map: ["enum.DrinkCanVisualLayers.Icon"]
    netsync: false
+  - type: FitsInDispenser
+    solution: drink
+  - type: DrawableSolution
+    solution: drink
+  - type: RefillableSolution
+    solution: drink
  - type: DrainableSolution
    solution: drink
  - type: Appearance
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -15,6 +15,8 @@
    solution: drink
  - type: RefillableSolution
    solution: drink
+  - type: DrainableSolution
+    solution: drink
  - type: SolutionTransfer
    canChangeTransferAmount: true
    maxTransferAmount: 10
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -16,6 +16,8 @@
    solution: drink
  - type: RefillableSolution
    solution: drink
+  - type: DrainableSolution
+    solution: drink
  - type: SolutionTransfer
    canChangeTransferAmount: true
  - type: Spillable
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
@@ -19,6 +19,14 @@
    isOpen: true
  - type: Spillable
    solution: drink
+  - type: FitsInDispenser
+    solution: drink
+  - type: DrawableSolution
+    solution: drink
+  - type: RefillableSolution
+    solution: drink
+  - type: DrainableSolution
+    solution: drink
  - type: UserInterface
    interfaces:
    - key: enum.TransferAmountUiKey.Key
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -11,6 +11,7 @@
  components:
  - type: Drink
    solution: food
+    refillable: false
    openSounds:
      collection: packetOpenSounds
  - type: DrawableSolution
@@ -19,7 +20,9 @@
    solution: food
  - type: DrainableSolution
    solution: food
-    # Note NOT refillable
+    # Note NOT refillable. 
+    # It be a shame if it turned out ALL drinks were ALWAYS refillable.... ffs.
+    # Well its fixed now, but I want to share my pain.
  - type: SolutionContainerManager
    solutions:
      food:
@@ -331,6 +334,10 @@
    solution: food
    openSounds:
      collection: pop
+  - type: RefillableSolution
+    solution: food
+  - type: DrainableSolution
+    solution: food
  - type: SolutionContainerManager
    solutions:
      food:
@@ -478,6 +485,10 @@
    solution: food
    openSounds:
      collection: pop
+  - type: RefillableSolution
+    solution: food
+  - type: DrainableSolution
+    solution: food
  - type: SolutionContainerManager
    solutions:
      food:
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -8,6 +8,10 @@
  - type: ItemCooldown
  - type: UseDelay
    delay: 1.0
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot {}
  - type: PowerCellSlot
    cellSlot:
      startingItem: PowerCellMedium
--- a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
@@ -48,6 +48,10 @@
  - type: StaticPrice
    price: 50000 # YOU STOLE A NUCLEAR FISSION EXPLOSIVE?!
  - type: CargoSellBlacklist
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      Nuke: !type:ContainerSlot

 - type: entity
  parent: NuclearBomb
--- a/Resources/Prototypes/Entities/Objects/Devices/payload.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/payload.yml
@@ -76,6 +76,11 @@
        enum.ChemicalPayloadFilledSlots.Left: payload-chemical-left
        enum.ChemicalPayloadFilledSlots.Right: payload-chemical-right
        enum.ChemicalPayloadFilledSlots.Both: payload-chemical-armed
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      BeakerSlotA: !type:ContainerSlot
+      BeakerSlotB: !type:ContainerSlot

 - type: entity
  name: flash payload
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -17,6 +17,11 @@
    state: pda
  - type: Item
    size: 10
+  - type: ContainerContainer
+    containers:
+      PDA-id: !type:ContainerSlot {}
+      PDA-pen: !type:ContainerSlot {}
+  - type: ItemSlots
  - type: Clothing
    quickEquip: false
    slots:
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
@@ -147,7 +147,7 @@
    state: toms

 - type: entity
-  parent: BasePlaceableInstrument
+  parent: [ BasePlaceableInstrument, ConstructibleMachine]
  id: DawInstrument
  name: digital audio workstation
  description: Cutting edge music technology, straight from the 90s.
@@ -161,9 +161,6 @@
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: Appearance
  - type: WiresVisuals
-  - type: Construction
-    graph: Machine
-    node: machine
  - type: Wires
    BoardName: "DawInstrument"
    LayoutId: DawInstrument
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -491,6 +491,10 @@
    capacity: 1
    soundInsert:
      path: /Audio/Weapons/drawbow2.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  parent: BaseItem
@@ -530,6 +534,10 @@
    autoCycle: true
    soundInsert:
      path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  parent: BaseItem
--- a/Resources/Prototypes/Entities/Objects/Misc/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml
@@ -12,3 +12,6 @@
  - type: Storage
    capacity: 30
    size: 10
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -7,6 +7,7 @@
  - type: HandheldLight
    addPrefix: true
  - type: PowerCellSlot
+  - type: ItemSlots
  - type: ContainerContainer
    containers:
      cell_slot: !type:ContainerSlot
@@ -16,6 +17,7 @@
  - type: Item
    sprite: Objects/Misc/Lights/lights.rsi
    size: 20
+    heldPrefix: off
  - type: PointLight
    netsync: false
    enabled: false
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -67,6 +67,11 @@
          False: {visible: false}
  - type: Pullable
  - type: AntiRottingContainer
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+      paper_label: !type:ContainerSlot

 - type: entity
  id: BodyBag_Folded
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
@@ -67,3 +67,8 @@
        - type: StorageVisualizer
          state_open: artifact_container_open
          state_closed: artifact_container_door
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+        paper_label: !type:ContainerSlot
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -31,6 +31,7 @@
  - type: ContainerContainer
    containers:
      cell_slot: !type:ContainerSlot
+  - type: ItemSlots
  - type: Sprite
    sprite: Objects/Tools/flashlight.rsi
    netsync: false
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -30,6 +30,10 @@
    - type: PowerCellSlot
      cellSlot:
        startingItem: PowerCellMedium
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot {}

 - type: entity
  name: extra-bright lantern
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimaterial.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimaterial.yml
@@ -19,3 +19,7 @@
    steps: 2
    zeroVisible: false
  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
@@ -11,6 +11,10 @@
    capacity: 30
  - type: Sprite
    netsync: false
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 # Boxes
 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -11,6 +11,10 @@
    capacity: 6
  - type: Sprite
    netsync: false
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  id: SpeedLoaderMagnum
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
@@ -12,6 +12,10 @@
  - type: Sprite
    netsync: false
    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  id: SpeedLoaderPistol
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
@@ -22,3 +22,7 @@
    steps: 6
    zeroVisible: false
  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
@@ -21,6 +21,10 @@
    steps: 7
    zeroVisible: false
  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  id: SpeedLoaderCap
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -44,3 +44,7 @@
    steps: 4
    zeroVisible: true
  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -37,14 +37,24 @@
    angularDamping: 0
  - type: Fixtures
    fixtures:
-    - shape:
+    - id: projectile
+      shape:
        !type:PhysShapeAabb
        bounds: "-0.1,-0.1,0.1,0.1"
      hard: false
-      id: projectile
      mask:
      - Impassable
      - BulletImpassable
+    - &flybyfixture
+      id: fly-by
+      shape: !type:PhysShapeCircle
+        radius: 1.5
+      layer:
+      - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      hard: False
  - type: Projectile
    impactEffect: BulletImpactEffect
    damage:
@@ -76,6 +86,7 @@
      mask:
      - Impassable
      - BulletImpassable
+    - *flybyfixture

 - type: entity
  id: BaseBulletHighVelocity
@@ -142,6 +153,7 @@
      mask:
      - Impassable
      - BulletImpassable
+    - *flybyfixture
  - type: Ammo
  - type: StaminaDamageOnCollide
    damage: 30
@@ -178,6 +190,7 @@
      mask:
      - Impassable
      - Opaque
+    - *flybyfixture
  - type: Projectile
 #   soundHit:  Waiting on serv3
    damage:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -17,12 +17,17 @@
    - SemiAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
+  - type: ContainerContainer
+    containers:
+      revolver-ammo: !type:Container
  - type: RevolverAmmoProvider
    whitelist:
      tags:
        - CartridgeMagnum
    proto: CartridgeMagnum
    capacity: 7
+    chambers: [ True, True, True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null, null, null ]
    soundEject:
      path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg
    soundInsert:
@@ -46,6 +51,8 @@
    sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
  - type: RevolverAmmoProvider
    capacity: 5
+    chambers: [ True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null ]
  - type: MagazineVisuals
    magState: mag
    steps: 4
@@ -64,6 +71,8 @@
    sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
  - type: RevolverAmmoProvider
    capacity: 6
+    chambers: [ True, True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null, null ]

 - type: entity
  name: Mateba
@@ -75,8 +84,6 @@
    sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
  - type: Item
    sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
-  - type: RevolverAmmoProvider
-    capacity: 7
  - type: Gun
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
@@ -104,5 +111,10 @@
    sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
  - type: Gun
    fireRate: 1
+  - type: ContainerContainer
+    containers:
+      revolver-ammo: !type:Container
  - type: RevolverAmmoProvider
    capacity: 5
+    chambers: [ True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null ]
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -31,6 +31,10 @@
    proto: ShellShotgun
    soundInsert:
      path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  name: Bulldog
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -27,6 +27,10 @@
    whitelist:
      tags:
      - CartridgeLightRifle
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  name: Kardashev-Mosin
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
@@ -27,3 +27,7 @@
    capacity: 1
    soundInsert:
      path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
--- a/Resources/Prototypes/Entities/Objects/base_item.yml
+++ b/Resources/Prototypes/Entities/Objects/base_item.yml
@@ -22,6 +22,7 @@
  - type: Physics
    bodyType: Dynamic
    fixedRotation: false
+    canCollide: false # most entities start asleep.
  - type: Fixtures
    fixtures:
    - shape:
@@ -48,4 +49,8 @@
    interfaces:
    - key: enum.StorageUiKey.Key
      type: StorageBoundUserInterface
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []

--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -1,6 +1,7 @@
 - type: entity
  abstract: true
  id: ReagentDispenserBase
+  parent: ConstructibleMachine
  placement:
    mode: SnapgridCenter
  components:
@@ -52,3 +53,9 @@
      whitelist:
        components:
        - FitsInDispenser
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      machine_board: !type:Container
+      machine_parts: !type:Container
+      ReagentDispenser-beaker: !type:ContainerSlot
--- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
@@ -12,9 +12,6 @@
    emagPack: ChemDispenserEmaggedInventory
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
-  - type: Construction
-    graph: Machine
-    node: machine
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -85,10 +85,14 @@
      interfaces:
        - key: enum.WiresUiKey.Key
          type: WiresBoundUserInterface
+    - type: Physics
+      canCollide: false
    - type: Airtight
      fixVacuum: true
+      airBlocked: false
      noAirWhenFullyAirBlocked: true
    - type: Occluder
+      enabled: false
    - type: Construction
      graph: Firelock
      node: Firelock
@@ -126,6 +130,7 @@
      sprite: Structures/Doors/edge_door_hazard.rsi
    - type: Airtight
      fixVacuum: true
+      airBlocked: false
      noAirWhenFullyAirBlocked: false
      airBlockedDirection:
        - South
@@ -143,3 +148,5 @@
      enabled: false
    - type: Door
      occludes: false
+    - type: Physics
+      canCollide: false
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
@@ -33,3 +33,9 @@
  components:
  - type: Door
    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Physics
+    canCollide: false
+  - type: Airtight
+    airBlocked: false
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -66,6 +66,11 @@
    key: walls
    mode: NoSprite
  - type: DoorSignalControl
+  - type: SignalReceiver
+    inputs:
+      Open: []
+      Close: []
+      Toggle: []
  - type: InteractionPopup
    interactSuccessString: comp-window-knock
    messagePerceivedByOthers: comp-window-knock
@@ -127,6 +132,12 @@
  - type: Construction
    graph: Shutters
    node: ShuttersRadiation
+  - type: Occluder
+    enabled: false
+  - type: Physics
+    canCollide: false
+  - type: Airtight
+    airBlocked: false

 - type: entity
  id: ShuttersWindow
@@ -154,6 +165,10 @@
  - type: Construction
    graph: Shutters
    node: ShuttersWindow
+  - type: Physics
+    canCollide: false
+  - type: Airtight
+    airBlocked: false

 # Frame for construction
 - type: entity
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -25,6 +25,9 @@
  - type: PottedPlantHide
  - type: SecretStash
    secretPartName: the plant
+  - type: ContainerContainer
+    containers:
+      stash: !type:ContainerSlot {}
  - type: Pullable
  - type: Damageable
    damageContainer: Inorganic # The pot. Not the plant. Or is it plastic?
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -18,6 +18,9 @@
  - type: Toilet
  - type: SecretStash
    secretPartName: the toilet cistern
+  - type: ContainerContainer
+    containers:
+      stash: !type:ContainerSlot {}
  - type: SolutionContainerManager
    solutions:
      toilet:
@@ -28,6 +31,7 @@
    graph: Toilet
    node: toilet
  - type: Appearance
+
 - type: entity
  id: ToiletDirtyWater
  parent: ToiletEmpty
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
@@ -49,3 +49,7 @@
  - type: EmitSoundOnUIOpen
    sound:
      collection: Keyboard
+  - type: ContainerContainer
+    containers:
+      board: !type:Container
+        ents: []
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -382,6 +382,12 @@
  - type: Tag
    tags:
    - EmagImmune
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      board: !type:Container
+      IdCardConsole-privilegedId: !type:ContainerSlot
+      IdCardConsole-targetId: !type:ContainerSlot

 - type: entity
  parent: BaseComputer
--- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
@@ -43,3 +43,19 @@
  - type: ApcPowerReceiver
    powerLoad: 1000
  - type: ExtensionCableReceiver
+
+- type: entity
+  abstract: true
+  id: ConstructibleMachine
+  components:
+  - type: Machine
+  - type: ContainerContainer
+    containers:
+      machine_board: !type:Container
+      machine_parts: !type:Container
+  - type: Construction
+    graph: Machine
+    node: machine
+    containers:
+    - machine_parts
+    - machine_board
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: chem_master
-  parent: BaseMachinePowered
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
  name: ChemMaster 4000
  description: An industrial grade chemical manipulator with pill and bottle production included.
  placement:
@@ -60,7 +60,12 @@
  - type: Machine
    board: ChemMasterMachineCircuitboard
  - type: MaterialStorage
-  - type: Construction
-    graph: Machine
-    node: machine
-
+  - type: ContainerContainer
+    containers:
+      machine_board: !type:Container
+      machine_parts: !type:Container
+      ChemMaster-beaker: !type:ContainerSlot
+  - type: ItemSlots
+  - type: SolutionContainerManager
+    solutions:
+      buffer: {}
--- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: CloningPod
-  parent: BaseMachinePowered
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
  name: cloning pod
  description: A Cloning Pod. 50% reliable.
  components:
@@ -25,9 +25,6 @@
      - MachineMask
      layer:
      - MachineLayer
-  - type: Construction
-    graph: Machine
-    node: machine
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseMachinePowered
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
  id: Autolathe
  name: autolathe
  description: It produces items using metal and glass.
@@ -34,9 +34,6 @@
      - MachineMask
      layer:
      - MachineLayer
-  - type: Construction
-    graph: Machine
-    node: machine
  - type: Destructible
    thresholds:
    - trigger:
@@ -86,7 +83,7 @@
        - Ingot

 - type: entity
-  parent: BaseMachinePowered
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
  id: Protolathe
  name: protolathe
  description: Converts raw materials into useful objects.
@@ -122,9 +119,6 @@
      layer:
      - MachineLayer
  - type: ResearchClient
-  - type: Construction
-    graph: Machine
-    node: machine
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: MedicalScanner
-  parent: BaseMachinePowered
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
  name: medical scanner
  description: A bulky medical scanner.
  components:
@@ -28,9 +28,6 @@
      - MachineMask
      layer:
      - MachineLayer
-  - type: Construction
-    graph: Machine
-    node: machine
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -42,3 +42,8 @@
    drawdepth: SmallObjects
  - type: ApcPowerReceiver
    powerLoad: 300
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      ReagentGrinder-reagentContainerContainer: !type:ContainerSlot
+      ReagentGrinder-entityContainerContainer: !type:Container
--- a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
@@ -1,6 +1,6 @@
 - type: entity
  abstract: true
-  parent: BaseMachinePowered
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
  id: SurveillanceCameraRouterBase
  name: camera router
  description: A surveillance camera router. It routes. Perhaps.
@@ -14,9 +14,6 @@
      interfaces:
        - key: enum.SurveillanceCameraSetupUiKey.Router
          type: SurveillanceCameraSetupBoundUi
-    - type: Construction
-      graph: Machine
-      node: machine
    - type: Machine
      board: SurveillanceCameraRouterCircuitboard
    - type: Sprite
@@ -105,7 +102,7 @@
      subnetFrequency: SurveillanceCameraGeneral

 - type: entity
-  parent: BaseMachinePowered
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
  id: SurveillanceCameraWirelessRouterBase
  name: wireless camera router
  description: A wireless surveillance camera router. It routes. Perhaps.
@@ -120,9 +117,6 @@
      interfaces:
        - key: enum.SurveillanceCameraSetupUiKey.Router
          type: SurveillanceCameraSetupBoundUi
-    - type: Construction
-      graph: Machine
-      node: machine
    - type: Machine
      board: SurveillanceCameraWirelessRouterCircuitboard
    - type: Sprite
--- a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
@@ -1,13 +1,10 @@
 - type: entity
  abstract: true
-  parent: BaseStructureDynamic
+  parent: [ BaseStructureDynamic, ConstructibleMachine ]
  id: SurveillanceWirelessCameraBase
  name: wireless camera
  description: A camera. It's watching you. Kinda.
  components:
-    - type: Construction
-      graph: Machine
-      node: machine
    - type: InteractionOutline
    - type: Eye
    - type: WirelessNetworkConnection
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
@@ -9,6 +9,7 @@
    - type: Clickable
    - type: InteractionOutline
    - type: Physics
+    - type: Fixtures
    - type: Transform
      anchored: true
    - type: Damageable
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -15,6 +15,7 @@
    damageContainer: Inorganic
    damageModifierSet: Metallic
  - type: SubFloorHide
+  - type: CollideOnAnchor
  - type: PipeAppearance
  - type: Anchorable
  - type: Rotatable
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -15,6 +15,7 @@
          !type:PipeNode
          nodeGroupID: Pipe
          pipeDirection: South
+    - type: CollideOnAnchor

 - type: entity
  parent: GasUnaryBase
@@ -184,7 +185,7 @@
      - enum.LightLayers.Unshaded

 - type: entity
-  parent: BaseMachinePowered
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
  id: BaseGasThermoMachine
  name: thermomachine
  abstract: true
@@ -207,9 +208,6 @@
    - type: ActivatableUI
      inHandsOnly: false
      key: enum.ThermomachineUiKey.Key
-    - type: Construction
-      graph: Machine
-      node: machine
    - type: Wires
      BoardName: "Thermomachine"
      LayoutId: Thermomachine
@@ -244,10 +242,6 @@
      mode: Freezer
    - type: Machine
      board: ThermomachineFreezerMachineCircuitBoard
-    - type: ContainerContainer
-      containers:
-        machine_parts: !type:Container
-        machine_board: !type:Container

 - type: entity
  parent: BaseGasThermoMachine
@@ -273,7 +267,3 @@
      mode: Heater
    - type: Machine
      board: ThermomachineHeaterMachineCircuitBoard
-    - type: ContainerContainer
-      containers:
-        machine_parts: !type:Container
-        machine_board: !type:Container
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -49,6 +49,11 @@
        node: broken
  - type: Rotatable
  - type: Pullable
+  - type: CollideOnAnchor
+  - type: ContainerContainer
+    containers:
+      disposal-tube: !type:Container
+        ents: []

 - type: entity
  id: DisposalHolder
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -70,6 +70,10 @@
    interfaces:
    - key: enum.DisposalUnitUiKey.Key
      type: DisposalUnitBoundUserInterface
+  - type: ContainerContainer
+    containers:
+      disposal-unit: !type:Container
+        ents: []

 - type: entity
  id: DisposalUnit
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -1,6 +1,7 @@
 - type: entity
  id: Emitter
  name: emitter
+  parent: ConstructibleMachine
  description: A heavy duty industrial laser. Shoots non-stop when turned on.
  placement:
    mode: SnapgridCenter
@@ -70,8 +71,5 @@
    locked: false
  - type: AccessReader
    access: [[ "Engineering" ]]
-  - type: Construction
-    graph: Machine
-    node: machine
  - type: Machine
    board: EmitterCircuitboard
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -151,7 +151,7 @@
    supplyRate: 3000

 - type: entity
-  parent: BaseGenerator
+  parent: [ BaseGenerator, ConstructibleMachine ]
  id: GeneratorPlasma
  suffix: Plasma, 5kW
  components:
@@ -160,21 +160,14 @@
  - type: Sprite
    sprite: Structures/Power/Generation/portable_generator.rsi
    state: portgen0_1
-  - type: Construction
-    graph: Machine
-    node: machine
  - type: Wires
    BoardName: "GeneratorPlasma"
    LayoutId: GeneratorPlasma
  - type: Machine
    board: GeneratorPlasmaMachineCircuitboard
-  - type: ContainerContainer
-    containers:
-      machine_parts: !type:Container
-      machine_board: !type:Container

 - type: entity
-  parent: BaseGenerator
+  parent: [ BaseGenerator, ConstructibleMachine ]
  id: GeneratorUranium
  suffix: Uranium, 15kW
  components:
@@ -183,18 +176,11 @@
  - type: Sprite
    sprite: Structures/Power/Generation/portable_generator.rsi
    state: portgen1_1
-  - type: Construction
-    graph: Machine
-    node: machine
  - type: Wires
    BoardName: "GeneratorUranium"
    LayoutId: GeneratorUranium
  - type: Machine
    board: GeneratorUraniumMachineCircuitboard
-  - type: ContainerContainer
-    containers:
-      machine_parts: !type:Container
-      machine_board: !type:Container

 - type: entity
  parent: BaseGeneratorWallmount
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -26,6 +26,7 @@
      - !type:DoActsBehavior
        acts: ["Destruction"]
  - type: SubFloorHide
+  - type: CollideOnAnchor
  - type: AmbientSound
    enabled: false  # Leaving as false because 90% of them are set to this.
  - type: Appearance
--- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -38,6 +38,10 @@
        - MachineMask
      layer:
        - HighImpassable
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      charger-slot: !type:ContainerSlot

 - type: entity
  name: recharger
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -2,7 +2,7 @@
 - type: entity
  abstract: true
  id: BaseSMES
-  parent: BaseMachine
+  parent: [ BaseMachine, ConstructibleMachine ]
  name: SMES
  description: A high-capacity superconducting magnetic energy storage (SMES) unit.
  placement:
@@ -51,18 +51,11 @@
      energy: 1.6
      color: "#c9c042"
      castShadows: false
-    - type: Construction
-      graph: Machine
-      node: machine
    - type: Wires
      BoardName: "SMES"
      LayoutId: SMES
    - type: Machine
      board: SMESMachineCircuitboard
-    - type: ContainerContainer
-      containers:
-        machine_parts: !type:Container
-        machine_board: !type:Container
    - type: StationInfiniteBatteryTarget

 # SMES' in use
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -2,7 +2,7 @@
 - type: entity
  abstract: true
  id: BaseSubstation
-  parent: BaseMachine
+  parent: [ BaseMachine, ConstructibleMachine ]
  name: substation
  description: Reduces the voltage of electricity put into it.
  placement:
@@ -43,9 +43,6 @@
    maxChargeRate: 5000
    supplyRampTolerance: 5000
    supplyRampRate: 1000
-  - type: Construction
-    graph: Machine
-    node: machine
  - type: Destructible
    thresholds:
    - trigger:
@@ -73,10 +70,6 @@
    LayoutId: Substation
  - type: Machine
    board: SubstationMachineCircuitboard
-  - type: ContainerContainer
-    containers:
-      machine_parts: !type:Container
-      machine_board: !type:Container
  - type: StationInfiniteBatteryTarget

 # Compact Wall Substation Base
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -34,6 +34,7 @@
    capacity: 500
  - type: Weldable
  - type: PlaceableSurface
+    isPlaceable: false # defaults to closed.
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Metallic
@@ -61,6 +62,7 @@
    containers:
      entity_storage: !type:Container
      paper_label: !type:ContainerSlot
+  - type: ItemSlots

 - type: entity
  id: CrateBaseSecure
@@ -97,6 +99,7 @@
    capacity: 500
  - type: Weldable
  - type: PlaceableSurface
+    isPlaceable: false # defaults to closed.
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: StrongMetallic
@@ -123,3 +126,10 @@
  - type: Construction
    graph: CrateSecure
    node: cratesecure
+    containers:
+    - entity_storage
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+      paper_label: !type:ContainerSlot
+  - type: ItemSlots
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -23,7 +23,8 @@
  - type: Construction
    graph: CrateGenericSteel
    node: crategenericsteel
-
+    containers:
+    - entity_storage

 - type: entity
  id: CratePlastic
@@ -50,6 +51,8 @@
  - type: Construction
    graph: CratePlastic
    node: crateplastic
+    containers:
+    - entity_storage

 - type: entity
  id: CrateFreezer
@@ -76,6 +79,8 @@
  - type: Construction
    graph: CrateGenericSteel
    node: crategenericsteel
+    containers:
+    - entity_storage
  - type: AntiRottingContainer

 - type: entity
@@ -103,6 +108,8 @@
  - type: Construction
    graph: CrateGenericSteel
    node: crategenericsteel
+    containers:
+    - entity_storage

 - type: entity
  id: CrateMedical
@@ -129,6 +136,8 @@
  - type: Construction
    graph: CrateGenericSteel
    node: crategenericsteel
+    containers:
+    - entity_storage

 - type: entity
  id: CrateRadiation
@@ -156,6 +165,8 @@
  - type: Construction
    graph: CrateGenericSteel
    node: crategenericsteel
+    containers:
+    - entity_storage

 - type: entity
  id: CrateInternals
@@ -182,6 +193,8 @@
  - type: Construction
    graph: CrateGenericSteel
    node: crategenericsteel
+    containers:
+    - entity_storage

 - type: entity
  id: CrateElectrical
@@ -208,6 +221,8 @@
  - type: Construction
    graph: CrateGenericSteel
    node: crategenericsteel
+    containers:
+    - entity_storage

 - type: entity
  id: CrateEngineering
@@ -234,6 +249,8 @@
  - type: Construction
    graph: CrateGenericSteel
    node: crategenericsteel
+    containers:
+    - entity_storage

 - type: entity
  id: CrateScience
@@ -260,6 +277,8 @@
  - type: Construction
    graph: CrateGenericSteel
    node: crategenericsteel
+    containers:
+    - entity_storage

 - type: entity
  id: CrateSurgery
@@ -286,6 +305,8 @@
  - type: Construction
    graph: CrateGenericSteel
    node: crategenericsteel
+    containers:
+    - entity_storage

 # Secure Crates

@@ -629,4 +650,6 @@
  - type: Construction
    graph: CrateLivestock
    node: cratelivestock
+    containers:
+    - entity_storage

--- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
@@ -31,6 +31,10 @@
    - type: ItemCabinetVisuals
      openState: open
      closedState: closed
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        ItemCabinet: !type:ContainerSlot
  placement:
    mode: SnapgridCenter

--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
@@ -35,6 +35,10 @@
      closedState: glass
    - type: AccessReader
      access: [["Atmospherics"]]
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        ItemCabinet: !type:ContainerSlot
  placement:
    mode: SnapgridCenter

--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -22,6 +22,11 @@
  - type: Construction
    graph: SignalSwitchGraph
    node: SignalSwitchNode
+  - type: Fixtures
+  - type: SignalTransmitter
+    outputs:
+      On: []
+      Off: []

 - type: entity
  id: SignalButton
@@ -49,6 +54,10 @@
  - type: Construction
    graph: SignalButtonGraph
    node: SignalButtonNode
+  - type: Fixtures
+  - type: SignalTransmitter
+    outputs:
+      Pressed: []

 - type: entity
  id: ApcNetSwitch
@@ -79,6 +88,7 @@
    - type: Construction
      graph: LightSwitchGraph
      node: LightSwitchNode
+    - type: Fixtures

 - type: entity
  id: TwoWayLever
@@ -120,3 +130,9 @@
    - type: Construction
      graph: LeverGraph
      node: LeverNode
+    - type: Fixtures
+    - type: SignalTransmitter
+      outputs:
+        Left: []
+        Right: []
+        Middle: []
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -1,6 +1,6 @@
 - type: entity
  name: hydroponics tray
-  parent: hydroponicsSoil
+  parent: [ hydroponicsSoil, ConstructibleMachine]
  id: hydroponicsTray
  description: An interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds.
  components:
@@ -66,9 +66,6 @@
          False: { visible: false }
  - type: PlantHolder
    drawWarnings: true
-  - type: Construction
-    graph: Machine
-    node: machine
  - type: Destructible
    thresholds:
    - trigger: