Reorganizes Resources/Constructible (#4252)

Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs

@@ -19,7 +19,7 @@ namespace Content.Client.Atmos.Visualizers
     public class PipeConnectorVisualizer : AppearanceVisualizer, ISerializationHooks
     {
         [DataField("rsi")]
-        private string _rsi = "Constructible/Atmos/pipe.rsi";
+        private string _rsi = "Structures/Piping/Atmospherics/pipe.rsi";
 
         [DataField("baseState")]
         private string _baseState = "pipeConnector";

Content.Client/Botany/PlantHolderVisualizer.cs

@@ -22,7 +22,7 @@ namespace Content.Client.Botany
             sprite.LayerMapReserveBlank(PlantHolderLayers.AlertLight);
             sprite.LayerMapReserveBlank(PlantHolderLayers.HarvestLight);
 
-            var hydroTools = new ResourcePath("Constructible/Hydroponics/overlays.rsi");
+            var hydroTools = new ResourcePath("Structures/Hydroponics/overlays.rsi");
 
             sprite.LayerSetSprite(PlantHolderLayers.HealthLight,
                 new SpriteSpecifier.Rsi(hydroTools, "lowhealth3"));

Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs

@@ -465,7 +465,7 @@ namespace Content.Client.ParticleAccelerator.UI
             {
                 _menu = menu;
                 _baseState = name;
-                _rsi = cache.GetResource<RSIResource>($"/Textures/Constructible/Specific/Engines/PA/{name}.rsi").RSI;
+                _rsi = cache.GetResource<RSIResource>($"/Textures/Structures/Power/Generation/PA/{name}.rsi").RSI;
 
                 AddChild(_base = new TextureRect {Texture = _rsi[$"{state}"].Frame0});
                 AddChild(_unlit = new TextureRect());

Content.Client/Singularity/Visualizers/SingularityVisualizer.cs

@@ -33,7 +33,7 @@ namespace Content.Client.Singularity.Visualizers
                 return;
             }
 
-            sprite.LayerSetRSI(Layer, "Constructible/Power/Singularity/singularity_" + level + ".rsi");
+            sprite.LayerSetRSI(Layer, "Structures/Power/Generation/Singularity/singularity_" + level + ".rsi");
             sprite.LayerSetState(Layer, "singularity_" + level);
         }
     }

Content.Client/Window/WindowComponent.cs

@@ -38,7 +38,7 @@ namespace Content.Client.Window
             if (_sprite != null)
             {
                 var state0 = $"{_stateBase}0";
-                const string cracksRSIPath = "/Textures/Constructible/Structures/Windows/cracks.rsi";
+                const string cracksRSIPath = "/Textures/Structures/Windows/cracks.rsi";
                 _sprite.LayerMapSet(CornerLayers.SE, _sprite.AddLayerState(state0));
                 _sprite.LayerSetDirOffset(CornerLayers.SE, SpriteComponent.DirectionOffset.None);
                 _sprite.LayerMapSet(WindowDamageLayers.DamageSE, _sprite.AddLayerState("0_1", cracksRSIPath));

Content.Server/VendingMachines/VendingMachineComponent.cs

@@ -87,7 +87,7 @@ namespace Content.Server.VendingMachines
             if (!string.IsNullOrEmpty(_spriteName))
             {
                 var spriteComponent = Owner.GetComponent<SpriteComponent>();
-                const string vendingMachineRSIPath = "Constructible/Power/VendingMachines/{0}.rsi";
+                const string vendingMachineRSIPath = "Structures/Machines/VendingMachines/{0}.rsi";
                 spriteComponent.BaseRSIPath = string.Format(vendingMachineRSIPath, _spriteName);
             }
 

Content.Shared/Maps/ContentTileDefinition.cs

@@ -16,7 +16,7 @@ namespace Content.Shared.Maps
         [ViewVariables]
         string IPrototype.ID => Name;
 
-        public string Path => "/Textures/Constructible/Tiles/";
+        public string Path => "/Textures/Tiles/";
 
         [DataField("name", required: true)] public string Name { get; } = string.Empty;
 

Resources/Maps/saltern.yml

@@ -7246,7 +7246,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 760
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 5.5,-21.5
@@ -7268,7 +7268,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 762
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -23.5,11.5
@@ -7281,7 +7281,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 763
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 24.5,13.5
@@ -7314,7 +7314,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 766
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -2.5,30.5
@@ -7327,7 +7327,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 767
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 9.5,30.5
@@ -7362,7 +7362,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 770
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - pos: 0.5,14.5
     parent: 853
@@ -7392,7 +7392,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 773
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -37.5,-6.5
@@ -7405,7 +7405,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 774
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -11.5,-11.5
@@ -7424,7 +7424,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 776
-  type: LockerBombFilled
+  type: ClosetBombFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -12.5,21.5
@@ -7437,7 +7437,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 777
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 13.5,21.5
@@ -7450,7 +7450,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 778
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 12.5,21.5
@@ -7463,7 +7463,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 779
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 28.5,12.5
@@ -7476,7 +7476,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 780
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 43.5,9.5
@@ -7489,7 +7489,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 781
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 44.5,9.5
@@ -7502,7 +7502,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 782
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 23.5,0.5
@@ -7515,7 +7515,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 783
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 8.5,-18.5
@@ -7528,7 +7528,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 784
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 9.5,-18.5
@@ -7541,7 +7541,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 785
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -15.5,-17.5
@@ -7554,7 +7554,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 786
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -7.5,-25.5
@@ -7567,7 +7567,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 787
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 26.5,12.5
@@ -7580,7 +7580,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 788
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 23.5,1.5
@@ -7593,7 +7593,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 789
-  type: LockerFireFilled
+  type: ClosetFireFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -14.5,-17.5
@@ -7606,7 +7606,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 790
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -11.5,-10.5
@@ -7619,7 +7619,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 791
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -37.5,-7.5
@@ -7632,7 +7632,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 792
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -39.5,2.5
@@ -7645,7 +7645,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 793
-  type: LockerEmergencyFilledRandom
+  type: ClosetEmergencyFilledRandom
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -34.5,10.5
@@ -7712,7 +7712,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 800
-  type: LockerChefFilled
+  type: ClosetChefFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -14.5,1.5
@@ -7725,7 +7725,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 801
-  type: LockerJanitorFilled
+  type: ClosetJanitorFilled
   components:
   - pos: -19.5,10.5
     parent: 853
@@ -7807,7 +7807,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 808
-  type: LockerL3SecurityFilled
+  type: ClosetL3SecurityFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -11.5,21.5
@@ -7973,7 +7973,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 823
-  type: LockerGeneric
+  type: ClosetBase
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -11.5,-12.5
@@ -15340,7 +15340,7 @@ entities:
         ent: 3179
     type: ContainerContainer
 - uid: 1223
-  type: LockerToolFilled
+  type: ClosetToolFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 35.5,-0.5
@@ -15359,7 +15359,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 1225
-  type: LockerToolFilled
+  type: ClosetToolFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 35.5,0.5
@@ -15454,7 +15454,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 1233
-  type: LockerToolFilled
+  type: ClosetToolFilled
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -27.5,11.5
@@ -24369,7 +24369,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 2414
-  type: LockerGeneric
+  type: ClosetBase
   components:
   - pos: -8.5,-25.5
     parent: 853
@@ -42937,7 +42937,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4143
-  type: LockerGeneric
+  type: ClosetBase
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -3.5,8.5
@@ -42950,7 +42950,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 4144
-  type: LockerGeneric
+  type: ClosetBase
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -0.5,8.5

Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml

@@ -3,7 +3,7 @@
   id: AtmosphericsAir
   description: "Air canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: grey
   product: AirCanister
   cost: 1000
@@ -15,7 +15,7 @@
   id: AtmosphericsOxygen
   description: "Oxygen canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: blue
   product: OxygenCanister
   cost: 1000
@@ -27,7 +27,7 @@
   id: AtmosphericsNitrogen
   description: "Nitrogen canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: red
   product: NitrogenCanister
   cost: 1000
@@ -39,7 +39,7 @@
   id: AtmosphericsCarbonDioxide
   description: "Carbon dioxide canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: black
   product: CarbonDioxideCanister
   cost: 1000
@@ -51,7 +51,7 @@
   id: AtmosphericsWaterVapor
   description: "Water vapor canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: water_vapor
   product: WaterVaporCanister
   cost: 1000
@@ -63,7 +63,7 @@
   id: AtmosphericsPlasma
   description: "Plasma canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: orange
   product: PlasmaCanister
   cost: 2000
@@ -75,7 +75,7 @@
   id: AtmosphericsTritium
   description: "Tritium canister"
   icon:
-    sprite: Constructible/Atmos/canister.rsi
+    sprite: Structures/Storage/canister.rsi
     state: green
   product: TritiumCanister
   cost: 2000

Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml

@@ -39,7 +39,7 @@
   id: EmergencyRadiation
   description: "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a bottle of vodka and some glasses too, considering the life-expectancy of people who order this."
   icon:
-    sprite: Constructible/Misc/decals.rsi
+    sprite: Structures/Wallmounts/signs.rsi
     state: radiation
   product: CrateEmergencyRadiation
   cost: 1000

Resources/Prototypes/Catalog/Cargo/cargo_engines.yml

@@ -27,7 +27,7 @@
   id: EngineAmeControl
   description: "The control unit of an antimatter reactor."
   icon:
-    sprite: Constructible/Power/ame_controller.rsi
+    sprite: Structures/Power/Generation/ame.rsi
     state: control
   product: CrateEngineeringAMEControl
   cost: 500
@@ -39,7 +39,7 @@
   id: EngineSingularityGenerator
   description: "Contains a singularity generator. The mother of the beast."
   icon:
-    sprite: Constructible/Power/Singularity/generator.rsi
+    sprite: Structures/Power/Generation/Singularity/generator.rsi
     state: icon
   product: CrateEngineeringSingularityGenerator
   cost: 4000
@@ -51,7 +51,7 @@
   id: EngineSingularityContainment
   description: "Contains a singularity containment field generator."
   icon:
-    sprite: Constructible/Power/Singularity/containment.rsi
+    sprite: Structures/Power/Generation/Singularity/containment.rsi
     state: icon
   product: CrateEngineeringSingularityContainment
   cost: 1000
@@ -63,7 +63,7 @@
   id: EngineSingularityEmitter
   description: "Contains an emitter. Used only for dangerous applications."
   icon:
-    sprite: Constructible/Power/Singularity/emitter.rsi
+    sprite: Structures/Power/Generation/Singularity/emitter.rsi
     state: emitter2
   product: CrateEngineeringSingularityEmitter
   cost: 1000
@@ -75,7 +75,7 @@
   id: EngineSingularityCollector
   description: "Contains a radiation collector. Safety first!"
   icon:
-    sprite: Constructible/Power/Singularity/collector.rsi
+    sprite: Structures/Power/Generation/Singularity/collector.rsi
     state: ca_on
   product: CrateEngineeringSingularityCollector
   cost: 1000
@@ -87,7 +87,7 @@
   id: EngineParticleAccelerator
   description: "Contains all the boards needed to construct a Particle Accelerator."
   icon:
-    sprite: Constructible/Specific/Engines/PA/control_box.rsi
+    sprite: Structures/Power/Generation/PA/control_box.rsi
     state: boxc
   product: CrateEngineeringParticleAccelerator
   cost: 10000

Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml

@@ -0,0 +1,24 @@
+# - type: entity
+#   id: ClosetL3Filled
+#   suffix: Filled, Generic
+#  parent: ClosetL3
+
+ - type: entity
+   id: ClosetL3VirologyFilled
+   suffix: Filled, Virology
+   parent: ClosetL3Virology
+
+ - type: entity
+   id: ClosetL3SecurityFilled
+   suffix: Filled, Security
+   parent: ClosetL3Security
+
+ - type: entity
+   id: ClosetL3JanitorFilled
+   suffix: Filled, Janitor
+   parent: ClosetL3Janitor
+
+# - type: entity
+#   id: ClosetL3ScienceFilled
+#   suffix: Filled, Science
+#  parent: ClosetL3Virology

Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml

@@ -1,6 +1,6 @@
 - type: entity
-  id: LockerToolFilled
+  id: ClosetToolFilled
-  parent: LockerTool
+  parent: ClosetTool
   suffix: Filled
   components:
   - type: StorageFill
@@ -93,6 +93,6 @@
         prob: 0.15
 
 - type: entity
-  id: LockerRadiationSuitFilled
+  id: ClosetRadiationSuitFilled
-  parent: LockerRadiationSuit
+  parent: ClosetRadiationSuit
   suffix: Filled

Resources/Prototypes/Catalog/Fills/Lockers/l3.yml

@@ -1,24 +0,0 @@
-# - type: entity
-#   id: LockerL3Filled
-#   suffix: Filled, Generic
-#   parent: LockerL3
-
- - type: entity
-   id: LockerL3VirologyFilled
-   suffix: Filled, Virology
-   parent: LockerL3Virology
-
- - type: entity
-   id: LockerL3SecurityFilled
-   suffix: Filled, Security
-   parent: LockerL3Security
-
- - type: entity
-   id: LockerL3JanitorFilled
-   suffix: Filled, Janitor
-   parent: LockerL3Janitor
-
-# - type: entity
-#   id: LockerL3ScienceFilled
-#   suffix: Filled, Science
-#   parent: LockerL3Virology

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

@@ -4,8 +4,8 @@
 #   parent: LockerSyndicatePersonal
 
 - type: entity
-  id: LockerEmergencyFilledRandom
+  id: ClosetEmergencyFilledRandom
-  parent: LockerEmergency
+  parent: ClosetEmergency
   suffix: Filled, Random
   components:
   - type: StorageFill
@@ -22,8 +22,8 @@
         prob: 0.2
 
 - type: entity
-  id: LockerFireFilled
+  id: ClosetFireFilled
-  parent: LockerFire
+  parent: ClosetFire
   suffix: Filled
   components:
     - type: StorageFill

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -68,8 +68,8 @@
 
 
 - type: entity
-  id: LockerBombFilled
+  id: ClosetBombFilled
-  parent: LockerBomb
+  parent: ClosetBomb
   suffix: Filled
   components:
   - type: StorageFill

Resources/Prototypes/Catalog/Fills/Lockers/service.yml

@@ -24,9 +24,9 @@
 #  parent: LockerFormal
 
 - type: entity
-  id: LockerChefFilled
+  id: ClosetChefFilled
   suffix: Filled
-  parent: LockerChef
+  parent: ClosetChef
   components:
   - type: StorageFill
     contents:
@@ -36,9 +36,9 @@
       - id: ReagentContainerFlour
 
 - type: entity
-  id: LockerJanitorFilled
+  id: ClosetJanitorFilled
   suffix: Filled
-  parent: LockerJanitor
+  parent: ClosetJanitor
   components:
   - type: StorageFill
     contents:

Resources/Prototypes/Catalog/Research/technologies.yml

@@ -8,7 +8,7 @@
   id: BasicResearch
   description: Nanotrasen basic research technologies.
   icon:
-    sprite: Constructible/Power/server.rsi
+    sprite: Structures/Machines/server.rsi
     state: server-on
   requiredPoints: 2500
 
@@ -36,7 +36,7 @@
   id: BiologicalTechnology
   description: Investigations into the natural world.
   icon:
-    sprite: Constructible/Misc/potted_plants.rsi
+    sprite: Structures/Furniture/potted_plants.rsi
     state: applebush
   requiredPoints: 10000
   requiredTechnologies:
@@ -194,7 +194,7 @@
   id: IndustrialEngineering
   description: A refresher course on modern engineering technology.
   icon:
-    sprite: Constructible/Power/protolathe.rsi
+    sprite: Structures/Machines/protolathe.rsi
     state: icon
   requiredPoints: 10000
   requiredTechnologies:
@@ -227,7 +227,7 @@
   id: ElectromagneticTheory
   description: Try not to fry yourself.
   icon:
-    sprite: Constructible/Power/apc.rsi
+    sprite: Structures/Power/apc.rsi
     state: apcewires
   requiredPoints: 10000
   requiredTechnologies:

Resources/Prototypes/Entities/Constructible/Power/Engines/AME/shielding.yml

@@ -1,57 +0,0 @@
-- type: entity
-  id: AMEShielding
-  name: AME shielding
-  description: Keeps the antimatter in and the matter out.
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Sprite
-    drawdepth: Walls
-    sprite: Constructible/Power/ame_shielding.rsi
-    state: shield_0
-  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          SheetSteel1:
-            min: 1
-            max: 2
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: SnapGrid
-  - type: IconSmooth
-    mode: CardinalFlags
-    base: shield_
-    key: ame_shield
-  - type: AMEShield
-  - type: NodeContainer
-    nodes:
-      ame:
-        !type:AdjacentNode
-        nodeGroupID: AMEngine
-  - type: PointLight
-    enabled: false
-    radius: 5
-    energy: 0.5
-    color: "#00AAFF"
-  - type: Appearance
-    visuals:
-    - type: AMEVisualizer

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

@@ -1,81 +0,0 @@
-- type: entity
-  id: ComputerSupplyOrdering
-  parent: ComputerBase
-  name: Cargo ordering computer
-  description: Used to order supplies, approve requests, and control the shuttle.
-  components:
-  - type: Appearance
-    visuals:
-    - type: ComputerVisualizer
-      key: tech_key
-      screen: supply
-  - type: CargoConsole
-  - type: CargoOrderDatabase
-  - type: GalacticMarket
-    products:
-      - EmergencyExplosive
-      - EmergencyFire
-      - EmergencyInternals
-      - EmergencyRadiation
-      - ArmorySmg
-      - ArmoryShotgun
-      - SecurityArmor
-      - SecurityRiot
-      - SecurityLaser
-      - SecurityHelmet
-      - SecuritySupplies
-      - SecurityNonLethal
-      - HydroponicsTools
-      - HydroponicsSeeds
-      - HydroponicsSeedsExotic
-      - ServiceJanitorial
-      - ServiceLightsReplacement
-      - EngineeringCableLv
-      - EngineeringCableMv
-      - EngineeringCableHv
-      - EngineeringCableBulk
-      - EngineAmeShielding
-      - EngineAmeJar
-      - EngineAmeControl
-      - EngineSolar
-      - FunPlushies
-      - FunArtSupplies
-      - FunInstruments
-      - MaterialSteel
-      - MaterialGlass
-      - MaterialPlastic
-      - MaterialPlasteel
-      - EngineSingularityEmitter
-      - EngineSingularityCollector
-      - EngineSingularityGenerator
-      - EngineSingularityContainment
-      - EngineParticleAccelerator
-      - AtmosphericsAir
-      - AtmosphericsOxygen
-      - AtmosphericsNitrogen
-      - AtmosphericsCarbonDioxide
-#      - AtmosphericsWaterVapor
-#      - AtmosphericsPlasma
-#      - AtmosphericsTritium
-  - type: UserInterface
-    interfaces:
-    - key: enum.CargoConsoleUiKey.Key
-      type: CargoConsoleBoundUserInterface
-  - type: Computer
-    board: SupplyComputerCircuitboard
-
-- type: entity
-  id: ComputerSupplyRequest
-  parent: ComputerSupplyOrdering
-  name: cargo request computer
-  description: Used to request supplies from cargo.
-  components:
-  - type: Appearance
-    visuals:
-    - type: ComputerVisualizer
-      key: tech_key
-      screen: request
-  - type: CargoConsole
-    requestOnly: true
-  - type: Computer
-    board: SupplyRequestComputerCircuitboard

Resources/Prototypes/Entities/Constructible/Specific/Conveyor/twoWayLever.yml

@@ -1,21 +0,0 @@
-- type: entity
-  id: TwoWayLever
-  name: two way switch
-  description: A two way switch.
-  components:
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Sprite
-      netsync: false
-      sprite: Constructible/Power/conveyor.rsi
-      state: switch-off
-    - type: TwoWayLever
-    - type: Appearance
-      visuals:
-        - type: TwoWayLeverVisualizer
-          state_forward: switch-fwd
-          state_off: switch-off
-          state_reversed: switch-rev
-    - type: Construction
-      graph: leverGraph
-      node: lever

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml

@@ -1,12 +0,0 @@
-- type: entity
-  id: LockerBooze
-  parent: LockerSecureBase
-  name: "booze storage"
-  description: This is where the bartender keeps the booze.
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: cabinet
-  - type: AccessReader
-    access: [["Bar"]]

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml

@@ -1,11 +0,0 @@
-- type: entity
-  id: LockerQuarterMaster
-  parent: LockerSecureBase
-  name: "quartermaster's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: qm
-  - type: AccessReader
-    access: [["Cargo"]] # TODO access [["Quartermaster"]]

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml

@@ -1,23 +0,0 @@
-- type: entity
-  id: LockerCaptain
-  parent: LockerSecureBase
-  name: "captain's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: cap
-  - type: AccessReader
-    access: [["Captain"]]
-
-- type: entity
-  id: LockerHeadOfPersonnel
-  parent: LockerSecureBase
-  name: "head of personnel's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: hop
-  - type: AccessReader
-    access: [["HeadOfPersonnel"]]

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml

@@ -1,66 +0,0 @@
-# CE
-- type: entity
-  id: LockerChiefEngineer
-  parent: LockerSecureBase
-  name: "chief engineer's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: ce
-  - type: AccessReader
-    access: [ [ "Engineering", "Command" ] ]
-
-# Electrical supplies
-- type: entity
-  id: LockerElectricalSupplies
-  parent: LockerSecureBase
-  name: "electrical supplies locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: eng
-      state_closed: eng_elec_door
-  - type: AccessReader
-    access: [ [ "Engineering" ] ]
-
-# Welding supplies
-- type: entity
-  id: LockerWeldingSupplies
-  parent: LockerSecureBase
-  name: "welding supplies locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: eng
-      state_closed: eng_weld_door
-  - type: AccessReader
-    access: [ [ "Engineering" ] ]
-
-# Atmos tech
-- type: entity
-  id: LockerAtmospherics
-  parent: LockerSecureBase
-  name: "atmospheric technician's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: atmos
-  - type: AccessReader
-    access: [ [ "Engineering" ] ]
-
-# Engineer
-- type: entity
-  id: LockerEngineer
-  parent: LockerSecureBase
-  name: "engineer's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: eng_secure
-  - type: AccessReader
-    access: [ [ "Engineering" ] ]

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml

@@ -1,11 +0,0 @@
-- type: entity
-  id: LockerFreezer
-  parent: LockerSecureBase
-  name: "freezer"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: freezer
-  - type: AccessReader
-    access: [ [ "Service" ] ]

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml

@@ -1,11 +0,0 @@
-- type: entity
-  id: LockerBotanist
-  parent: LockerSecureBase
-  name: "botanist's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: hydro
-  - type: AccessReader
-    access: [ [ "Service" ] ]

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml

@@ -1,53 +0,0 @@
-# Medicine
-- type: entity
-  id: LockerMedicine
-  parent: LockerSecureBase
-  name: "medicine locker"
-  description: "Filled to the brim with medical junk."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: med
-  - type: AccessReader
-    access: [ [ "Medical" ] ]
-
-# Medical doctor
-- type: entity
-  id: LockerMedical
-  parent: LockerSecureBase
-  name: "medical doctor's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: med_secure
-  - type: AccessReader
-    access: [ [ "Medical" ] ]
-
-# Chemical
-- type: entity
-  id: LockerChemistry
-  parent: LockerSecureBase
-  name: "chemical closet"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: med
-      state_closed: chemical_door
-  - type: AccessReader
-    access: [ [ "Medical" ] ]
-
-# CMO
-- type: entity
-  id: LockerChiefMedicalOfficer
-  parent: LockerSecureBase
-  name: "chief medical officer's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: cmo
-  - type: AccessReader
-    access: [ [ "Medical", "Command" ] ]

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml

@@ -1,23 +0,0 @@
-- type: entity
-  id: LockerResearchDirector
-  parent: LockerSecureBase
-  name: "research director's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: rd
-  - type: AccessReader
-    access: [ [ "Research", "Command" ] ]
-
-- type: entity
-  id: LockerScientist
-  parent: LockerSecureBase
-  name: "scientist's locker"
-  components:
-    - type: Appearance
-      visuals:
-        - type: StorageVisualizer
-          state: science
-    - type: AccessReader
-      access: [ [ "Research" ] ]

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml

@@ -1,51 +0,0 @@
-# HoS
-- type: entity
-  id: LockerHeadOfSecurity
-  parent: LockerSecureBase
-  name: "head of security's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: hos
-  - type: AccessReader
-    access: [["Security", "Command"]]
-
-# Warden
-- type: entity
-  id: LockerWarden
-  parent: LockerSecureBase
-  name: "warden's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: warden
-  - type: AccessReader
-    access: [["Security"]] # TODO access [["Brig"]]
-
-# Security Officer
-- type: entity
-  id: LockerSecurity
-  parent: LockerSecureBase
-  name: "security officer's locker"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: sec
-  - type: AccessReader
-    access: [["Security"]]
-
-# Detective
-- type: entity
-  id: LockerDetective
-  parent: LockerSecureBase
-  name: "detective's cabinet"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: cabinet
-  - type: AccessReader
-    access: [["Service"]] # TODO access [["Detective"]]

Resources/Prototypes/Entities/Constructible/Storage/Closets/cursed.yml

@@ -1,8 +0,0 @@
-- type: entity
-  id: LockerCursed
-  parent: LockerGeneric
-  name: "closet"
-  suffix: "cursed"
-  description: "A standard-issue Nanotrasen storage unit."
-  components:
-  - type: CursedEntityStorage

Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml

@@ -1,30 +0,0 @@
-# Security wardrobe
-- type: entity
-  id: WardrobeSecurity
-  parent: WardrobeBase
-  name: "security wardrobe"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: red_door
-
-# Atmospherics wardrobe
-- type: entity
-  id: WardrobeAtmospherics
-  parent: WardrobeBase
-  name: "atmospherics wardrobe"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: atmos_wardrobe_door
-
-# Janitor locker (moved here from the Fills group because it was being misused)
-- type: entity
-  id: LockerJanitor
-  parent: WardrobeMixed
-  name: "custodial closet"
-  description: "It's a storage unit for janitorial clothes and gear."

Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml

@@ -1,41 +0,0 @@
-# Base level 3 bio hazard closet
-- type: entity
-  id: LockerL3
-  parent: LockerGeneric
-  name: "level 3 biohazard gear closet"
-  description: "It's a storage unit for level 3 biohazard gear."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: bio
-
-# Virology variant
-- type: entity
-  id: LockerL3Virology
-  parent: LockerL3
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: bio_viro
-
-# Security variant
-- type: entity
-  id: LockerL3Security
-  parent: LockerL3
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: bio_sec
-
-# Janitor variant
-- type: entity
-  id: LockerL3Janitor
-  parent: LockerL3
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: bio_jan

Resources/Prototypes/Entities/Constructible/Storage/Closets/name_variants.yml

@@ -1,73 +0,0 @@
-- type: entity
-  id: LockerFormal
-  parent: WardrobeBlack
-  name: "formal closet"
-  description: "It's a storage unit for formal clothing."
-
-- type: entity
-  id: LockerChef
-  parent: WardrobeBlack
-  name: "chef's closet"
-  description: "It's a storage unit for foodservice garments and mouse traps."
-
-- type: entity
-  id: WardrobeChapel
-  parent: WardrobeBlack
-  name: "chaplain's wardrobe"
-  description: "It's a storage unit for Nanotrasen-approved religious attire."
-
-- type: entity
-  id: LockerLegal
-  parent: WardrobeBlue
-  name: "legal closet"
-  description: "It's a storage unit for courtroom apparel and items."
-
-- type: entity
-  id: WardrobeCargo
-  parent: WardrobePrison
-  name: "cargo wardrobe"
-
-- type: entity
-  id: WardrobeEngineering
-  parent: WardrobeYellow
-  name: "engineering wardrobe"
-
-- type: entity
-  id: WardrobeMedicalDoctor
-  parent: WardrobeWhite
-  name: "medical doctor's wardrobe"
-
-- type: entity
-  id: WardrobeRobotics
-  parent: WardrobeBlack
-  name: "robotics wardrobe"
-
-- type: entity
-  id: WardrobeChemistry
-  parent: WardrobeWhite
-  name: "chemistry wardrobe"
-
-- type: entity
-  id: WardrobeGenetics
-  parent: WardrobeWhite
-  name: "genetics wardrobe"
-
-- type: entity
-  id: WardrobeVirology
-  parent: WardrobeWhite
-  name: "virology wardrobe"
-
-- type: entity
-  id: WardrobeScience
-  parent: WardrobeWhite
-  name: "science wardrobe"
-
-- type: entity
-  id: WardrobeBotanist
-  parent: WardrobeGreen
-  name: "botanist wardrobe"
-
-- type: entity
-  id: LockerSyndicatePersonal
-  parent: LockerSyndicateBase
-  description: "It's a personal storage unit for operative gear."

Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml

@@ -1,11 +0,0 @@
-# Base syndicate closet
-- type: entity
-  id: LockerSyndicateBase
-  name: armory closet
-  parent: LockerGeneric
-  abstract: true
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: syndicate

Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml

@@ -1,61 +0,0 @@
-# Tool closet
-- type: entity
-  id: LockerTool
-  name: tool closet
-  parent: LockerGeneric
-  description: "It's a storage unit for tools."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: eng
-      state_closed: eng_tool_door
-
-# Radiation suit closet
-- type: entity
-  id: LockerRadiationSuit
-  name: radiation suit closet
-  parent: LockerGeneric
-  description: "It's a storage unit for rad-protective suits."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: eng
-      state_closed: eng_rad_door
-
-# Emergency closet
-- type: entity
-  id: LockerEmergency
-  name: emergency closet
-  parent: LockerGeneric
-  description: "It's a storage unit for emergency breath masks and O2 tanks."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: emergency
-
-# Fire safety closet
-- type: entity
-  id: LockerFire
-  name: fire-safety closet
-  parent: LockerGeneric
-  description: "It's a storage unit for fire-fighting supplies."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: fire
-
-# EOD closet
-- type: entity
-  id: LockerBomb
-  name: EOD closet
-  parent: LockerGeneric
-  description: "It's a storage unit for explosion-protective suits."
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: bomb

Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml

@@ -1,113 +0,0 @@
-- type: entity
-  id: WardrobeBase
-  parent: LockerGeneric
-  abstract: true
-  description: "It's a storage unit for standard-issue Nanotrasen attire."
-
-# Blue wardrobe
-- type: entity
-  id: WardrobeBlue
-  parent: WardrobeBase
-  name: blue wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: blue_door
-
-# Pink wardrobe
-- type: entity
-  id: WardrobePink
-  parent: WardrobeBase
-  name: pink wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: pink_door
-
-# Black wardrobe
-- type: entity
-  id: WardrobeBlack
-  parent: WardrobeBase
-  name: black wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: black_door
-
-# Green wardrobe
-- type: entity
-  id: WardrobeGreen
-  parent: WardrobeBase
-  name: green wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: green_door
-
-# Prison wardrobe
-- type: entity
-  id: WardrobePrison
-  parent: WardrobeBase
-  name: prison wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: orange_door
-
-# Yellow wardrobe
-- type: entity
-  id: WardrobeYellow
-  parent: WardrobeBase
-  name: yellow wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: yellow_door
-
-# White wardrobe
-- type: entity
-  id: WardrobeWhite
-  parent: WardrobeBase
-  name: white wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: white_door
-
-# Grey wardrobe
-- type: entity
-  id: WardrobeGrey
-  parent: WardrobeBase
-  name: grey wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: grey_door
-
-# Mixed wardrobe
-- type: entity
-  id: WardrobeMixed
-  parent: WardrobeBase
-  name: mixed wardrobe
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: generic
-      state_closed: mixed_door

Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml

@@ -1,21 +0,0 @@
-- type: entity
-  id: WaterTank
-  parent: StorageTank
-  name: water tank
-  suffix: Empty
-  description: "A water tank. It is used to store high amounts of water."
-  components:
-  - type: Sprite
-    sprite: Constructible/Misc/tanks.rsi
-    state: watertank
-
-- type: entity
-  parent: WaterTank
-  id: WaterTankFull
-  suffix: Full
-  components:
-  - type: SolutionContainer
-    contents:
-      reagents:
-      - ReagentId: Water
-        Quantity: 1500

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

@@ -1,126 +0,0 @@
-- type: entity
-  id: Window
-  parent: BaseConstructible
-  name: window
-  description: Don't smudge up the glass down there.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Window
-  components:
-  - type: RCDDeconstructWhitelist
-  - type: Sprite
-    color: "#DDDDDD"
-    netsync: false
-    drawdepth: WallTops
-    sprite: Constructible/Structures/Windows/window.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Windows/window.rsi
-    state: full
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      layer:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
-      mask:
-      - VaultImpassable
-  - type: Damageable
-    resistances: glassResistances
-  - type: Repairable
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 15
-      behaviors:
-      - !type:PlaySoundCollectionBehavior
-        soundCollection: GlassBreak
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          ShardGlass:
-            min: 1
-            max: 2
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: Airtight
-  - type: Window
-    base: window
-  - type: Construction
-    graph: window
-    node: window
-  - type: Appearance
-    visuals:
-    - type: WindowVisualizer
-
-- type: entity
-  id: ReinforcedWindow
-  name: reinforced window
-  parent: Window
-  components:
-  - type: Sprite
-    drawdepth: WallTops
-    sprite: Constructible/Structures/Windows/reinforced_window.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Windows/reinforced_window.rsi
-  - type: Repairable
-    fuelCost: 10
-    doAfterDelay: 2
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
-      behaviors:
-      - !type:PlaySoundCollectionBehavior
-        soundCollection: GlassBreak
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          ShardGlassReinforced:
-            min: 1
-            max: 2
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: Window
-    base: rwindow
-  - type: Construction
-    graph: window
-    node: reinforcedWindow
-
-- type: entity
-  id: PlasmaWindow
-  name: plasma window
-  parent: Window
-  components:
-  - type: Sprite
-    drawdepth: WallTops
-    sprite: Constructible/Structures/Windows/plasma_window.rsi
-  - type: Icon
-    sprite: Constructible/Structures/Windows/plasma_window.rsi
-  - type: Damageable
-    resistances: glassResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-      - !type:PlaySoundCollectionBehavior
-        soundCollection: GlassBreak
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          ShardGlassPlasma:
-            min: 1
-            max: 2
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-    resistances: glassResistances
-  - type: Window
-    base: pwindow
-  - type: Construction
-    graph: window
-    node: plasmaWindow

Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml

@@ -6,7 +6,7 @@
     - type: Sprite
       layers:
         - state: blue
-        - texture: Objects/Misc/traitordm.rsi/redemption.png
+        - texture: Structures/Machines/traitordm.rsi/redemption.png
     - type: ConditionalSpawner
       prototypes:
         - TraitorDMRedemptionMachine

Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml

@@ -7,4 +7,4 @@
   - type: Sprite
     layers:
       - state: red
-      - texture: Constructible/Power/computers.rsi/arcade.png
+      - texture: Structures/Machines/computers.rsi/arcade.png

Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml

@@ -16,10 +16,10 @@
   - type: Hands
   - type: Sprite
     drawdepth: Mobs
-    sprite: Constructible/Power/VendingMachines/cola.rsi
+    sprite: Structures/Machines/VendingMachines/cola.rsi
     state: normal
   - type: Icon
-    sprite: Constructible/Power/VendingMachines/cola.rsi
+    sprite: Structures/Machines/VendingMachines/cola.rsi
     state: normal
   - type: Physics
     bodyType: Dynamic

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base.yml

@@ -7,5 +7,5 @@
   components:
     - type: MachineBoard
     - type: Sprite
-      sprite: Constructible/Misc/module.rsi
+      sprite: Objects/Misc/module.rsi
       state: id_mod

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

@@ -8,7 +8,7 @@
   components:
     - type: ComputerBoard
     - type: Sprite
-      sprite: Constructible/Misc/module.rsi
+      sprite: Objects/Misc/module.rsi
       state: id_mod
 
 - type: entity

Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml

@@ -5,5 +5,5 @@
   description: Circuit used in APC construction.
   components:
     - type: Sprite
-      sprite: Constructible/Misc/module.rsi
+      sprite: Objects/Misc/module.rsi
       state: charger_APC

Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml

@@ -7,6 +7,6 @@
       tags:
       - DoorElectronics
     - type: Sprite
-      sprite: Constructible/Misc/module.rsi
+      sprite: Objects/Misc/module.rsi
       state: door_electronics
     - type: AccessReader

Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml

@@ -8,5 +8,5 @@
       tags:
       - FirelockElectronics
     - type: Sprite
-      sprite: Constructible/Misc/module.rsi
+      sprite: Objects/Misc/module.rsi
       state: mainboard

Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml

@@ -5,5 +5,5 @@
   description: Advanced circuit board used to detect differences in pressure, temperature and gas concentrations between the two sides of the door.
   components:
     - type: Sprite
-      sprite: Constructible/Misc/module.rsi
+      sprite: Objects/Misc/module.rsi
       state: generic

Resources/Prototypes/Entities/Objects/Fun/instruments.yml

@@ -224,5 +224,5 @@
   - type: Instrument
     program: 13
   - type: Sprite
-    sprite: Objects/Fun/Instruments/otherinstruments.rsi
+    sprite: Structures/Furniture/instruments.rsi
     state: xylophone

Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml

@@ -7,7 +7,7 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Misc/stock_parts.rsi
+      sprite: Objects/Misc/stock_parts.rsi
     - type: MachinePart
       rating: 1
 

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -117,7 +117,7 @@
   components:
   - type: Sprite
     color: "#ffff33"
-    sprite: Constructible/Power/Singularity/emitter.rsi
+    sprite: Structures/Power/Generation/Singularity/emitter.rsi
     state: 'projectile'
   - type: Physics
     fixtures:

Resources/Prototypes/Entities/Structures/Dispensers/booze.yml

@@ -5,7 +5,7 @@
   parent: ReagentDispenserBase
   components:
   - type: Sprite
-    sprite: Constructible/Power/dispensers.rsi
+    sprite: Structures/dispensers.rsi
     state: booze_dispenser
   - type: ReagentDispenser
     pack: BoozeDispenserInventory

Resources/Prototypes/Entities/Structures/Dispensers/chem.yml

@@ -5,10 +5,10 @@
   description: An industrial grade chemical dispenser with a sizeable chemical supply.
   components:
   - type: Sprite
-    sprite: Constructible/Power/industrial_dispenser.rsi
+    sprite: Structures/dispensers.rsi
     state: industrial_dispenser
   - type: Icon
-    sprite: Constructible/Power/industrial_dispenser.rsi
+    sprite: Structures/dispensers.rsi
     state: industrial_dispenser
   - type: ReagentDispenser
     pack: ChemDispenserStandardInventory

Resources/Prototypes/Entities/Structures/Dispensers/soda.yml

@@ -5,7 +5,7 @@
   description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers.
   components:
   - type: Sprite
-    sprite: Constructible/Power/dispensers.rsi
+    sprite: Structures/dispensers.rsi
     state: soda_dispenser
   - type: ReagentDispenser
     pack: SodaDispenserInventory

Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml

@@ -1,30 +1,10 @@
-# Standard
-
-- type: entity
-  parent: Airlock
-  id: AirlockExternal
-  suffix: External
-  description: "It opens, it closes, it might crush you, and there might be only space behind it.\nHas to be manually activated."
-  components:
-  - type: Door
-    bumpOpen: false
-  - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/external.rsi
-  - type: Appearance
-    visuals:
-    - type: AirlockVisualizer
-      open_sound: /Audio/Machines/airlock_ext_open.ogg
-      close_sound: /Audio/Machines/airlock_ext_close.ogg
-      deny_sound: /Audio/Machines/airlock_deny.ogg
-    - type: WiresVisualizer
-
 - type: entity
   parent: Airlock
   id: AirlockFreezer
   suffix: Freezer
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/freezer.rsi
+    sprite: Structures/Doors/Airlocks/Standard/freezer.rsi
 
 - type: entity
   parent: Airlock
@@ -32,7 +12,7 @@
   suffix: Engineering
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/engineering.rsi
+    sprite: Structures/Doors/Airlocks/Standard/engineering.rsi
 
 - type: entity
   parent: Airlock
@@ -40,7 +20,7 @@
   suffix: Cargo
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/cargo.rsi
+    sprite: Structures/Doors/Airlocks/Standard/cargo.rsi
 
 - type: entity
   parent: Airlock
@@ -48,7 +28,7 @@
   suffix: Medical
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/medical.rsi
+    sprite: Structures/Doors/Airlocks/Standard/medical.rsi
 
 - type: entity
   parent: Airlock
@@ -56,7 +36,7 @@
   suffix: Science
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/science.rsi
+    sprite: Structures/Doors/Airlocks/Standard/science.rsi
 
 - type: entity
   parent: Airlock
@@ -64,7 +44,7 @@
   suffix: Command
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/command.rsi
+    sprite: Structures/Doors/Airlocks/Standard/command.rsi
 
 - type: entity
   parent: Airlock
@@ -72,7 +52,7 @@
   suffix: Security
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/security.rsi
+    sprite: Structures/Doors/Airlocks/Standard/security.rsi
 
 - type: entity
   parent: Airlock
@@ -80,7 +60,7 @@
   name: maintenance hatch
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/maint.rsi
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi
 
 # Glass
 
@@ -94,7 +74,7 @@
   - type: Occluder
     enabled: false
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/glass.rsi
+    sprite: Structures/Doors/Airlocks/Glass/glass.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -102,7 +82,7 @@
   suffix: Engineering
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/engineering.rsi
+    sprite: Structures/Doors/Airlocks/Glass/engineering.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -110,7 +90,7 @@
   suffix: Cargo
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/cargo.rsi
+    sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -118,7 +98,7 @@
   suffix: Medical
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/medical.rsi
+    sprite: Structures/Doors/Airlocks/Glass/medical.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -126,7 +106,7 @@
   suffix: Science
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/science.rsi
+    sprite: Structures/Doors/Airlocks/Glass/science.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -134,7 +114,7 @@
   suffix: Command
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/command.rsi
+    sprite: Structures/Doors/Airlocks/Glass/command.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -142,4 +122,4 @@
   suffix: Security
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Glass/security.rsi
+    sprite: Structures/Doors/Airlocks/Glass/security.rsi

Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml

@@ -0,0 +1,41 @@
+- type: entity
+  id: AirlockAssembly
+  name: airlock assembly
+  description: It opens, it closes, and maybe crushes you.
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    netsync: false
+    drawdepth: Mobs
+    sprite: Structures/Doors/Airlocks/Standard/basic.rsi
+    state: "assembly"
+  - type: Physics
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"
+      mass: 100
+      mask:
+      - MobImpassable
+      layer:
+      - MobImpassable
+      - VaultImpassable
+  - type: Anchorable
+  - type: Pullable
+  - type: SnapGrid
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: airlock
+    node: assembly
+  placement:
+    mode: SnapgridCenter

Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: Airlock
-  parent: BaseConstructible
+  parent: BaseStructure
   name: airlock
   description: It opens, it closes, and maybe crushes you.
   components:
@@ -8,7 +8,7 @@
   - type: Sprite
     netsync: false
     drawdepth: Mobs # They're on the same layer as mobs, perspective.
-    sprite: Constructible/Structures/Doors/Standard/basic.rsi
+    sprite: Structures/Doors/Airlocks/Standard/basic.rsi
     layers:
     - state: closed
       map: ["enum.DoorVisualLayers.Base"]
@@ -75,45 +75,3 @@
     mode: NoSprite
   placement:
     mode: SnapgridCenter
-
-- type: entity
-  id: AirlockAssembly
-  name: airlock assembly
-  description: It opens, it closes, and maybe crushes you.
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Sprite
-    netsync: false
-    drawdepth: Mobs
-    sprite: Constructible/Structures/Doors/Standard/basic.rsi
-    state: "assembly"
-  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49"
-      mass: 100
-      mask:
-      - MobImpassable
-      layer:
-      - MobImpassable
-      - VaultImpassable
-  - type: Anchorable
-  - type: Pullable
-  - type: SnapGrid
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 300
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: Construction
-    graph: airlock
-    node: assembly
-  placement:
-    mode: SnapgridCenter

Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml

@@ -0,0 +1,17 @@
+- type: entity
+  parent: Airlock
+  id: AirlockExternal
+  suffix: External
+  description: "It opens, it closes, it might crush you, and there might be only space behind it.\nHas to be manually activated."
+  components:
+  - type: Door
+    bumpOpen: false
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/external.rsi
+  - type: Appearance
+    visuals:
+    - type: AirlockVisualizer
+      open_sound: /Audio/Machines/airlock_ext_open.ogg
+      close_sound: /Audio/Machines/airlock_ext_close.ogg
+      deny_sound: /Audio/Machines/airlock_deny.ogg
+    - type: WiresVisualizer

Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: Firelock
-  parent: BaseConstructible
+  parent: BaseStructure
   name: firelock
   description: Apply crowbar.
   components:
@@ -18,7 +18,7 @@
     - type: Sprite
       netsync: false
       drawdepth: Mobs # They're on the same layer as mobs, perspective.
-      sprite: Constructible/Structures/Doors/Standard/firelock.rsi
+      sprite: Structures/Doors/Airlocks/Standard/firelock.rsi
       layers:
         - state: closed
           map: ["enum.DoorVisualLayers.Base"]
@@ -89,7 +89,7 @@
     - type: Occluder
       enabled: false
     - type: Sprite
-      sprite: Constructible/Structures/Doors/Glass/firelock.rsi
+      sprite: Structures/Doors/Airlocks/Glass/firelock.rsi
 
 - type: entity
   id: FirelockEdge
@@ -100,7 +100,7 @@
       occludes: false
       inhibitCrush: false
     - type: Sprite
-      sprite: Constructible/Structures/Doors/edge_door_hazard.rsi
+      sprite: Structures/Doors/edge_door_hazard.rsi
     - type: Airtight
       fixVacuum: true
       noAirWhenFullyAirBlocked: false

Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml

@@ -1,11 +1,11 @@
 - type: entity
   id: FirelockFrame
-  parent: BaseConstructibleDynamic
+  parent: BaseStructureDynamic
   name: Firelock Frame
   description: That is a firelock frame.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/Standard/firelock.rsi
+    sprite: Structures/Doors/Airlocks/Standard/firelock.rsi
     state: frame1
   - type: Construction
     graph: Firelock

Resources/Prototypes/Entities/Structures/Furniture/Tables/base.yml

@@ -0,0 +1,19 @@
+- type: entity
+  id: TableBase
+  parent: BaseStructure
+  name: table
+  description: A square piece of metal standing on four metal legs.
+  abstract: true
+  components:
+  - type: Damageable
+    resistances: metallicResistances
+  - type: PlaceableSurface
+  - type: Sprite
+    netsync: false
+    drawdepth: FloorTiles
+  - type: Icon
+    state: full
+  - type: IconSmooth
+    key: state
+    base: state_
+  - type: Climbable

Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml

@@ -1,33 +1,13 @@
 - type: entity
-  id: TableBase
-  parent: BaseConstructible
-  name: table
-  description: A square piece of metal standing on four metal legs.
-  abstract: true
-  components:
-  - type: Damageable
-    resistances: metallicResistances
-  - type: PlaceableSurface
-  - type: Sprite
-    netsync: false
-    drawdepth: FloorTiles
-  - type: Icon
-    state: full
-  - type: IconSmooth
-    key: state
-    base: state_
-  - type: Climbable
-
-- type: entity
   id: TableFrame
   parent: TableBase
   name: table frame
   description: Pieces of metal that make the frame of a table.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/frame.rsi
+    sprite: Structures/Furniture/Tables/frame.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/frame.rsi
+    sprite: Structures/Furniture/Tables/frame.rsi
   - type: Damageable
     resistances: metallicResistances
   - type: Destructible
@@ -56,9 +36,9 @@
   description: A square piece of metal standing on four metal legs.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/generic.rsi
+    sprite: Structures/Furniture/Tables/generic.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/generic.rsi
+    sprite: Structures/Furniture/Tables/generic.rsi
   - type: Damageable
     resistances: metallicResistances
   - type: Destructible
@@ -87,9 +67,9 @@
   description: Fancy table. Perfect for serving drinks.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/bar.rsi
+    sprite: Structures/Furniture/Tables/bar.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/bar.rsi
+    sprite: Structures/Furniture/Tables/bar.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -119,9 +99,9 @@
   description: Just a metal table.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/metal.rsi
+    sprite: Structures/Furniture/Tables/metal.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/metal.rsi
+    sprite: Structures/Furniture/Tables/metal.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -145,9 +125,9 @@
   description: A square piece of metal standing on four metal legs. Extra robust.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/reinforced.rsi
+    sprite: Structures/Furniture/Tables/reinforced.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/reinforced.rsi
+    sprite: Structures/Furniture/Tables/reinforced.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -174,9 +154,9 @@
   description: A square piece of glass, standing on four metal legs.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/glass.rsi
+    sprite: Structures/Furniture/Tables/glass.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/glass.rsi
+    sprite: Structures/Furniture/Tables/glass.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -203,9 +183,9 @@
   description: A square piece of glass, standing on four metal legs. Extra robust.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/r_glass.rsi
+    sprite: Structures/Furniture/Tables/r_glass.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/r_glass.rsi
+    sprite: Structures/Furniture/Tables/r_glass.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -235,9 +215,9 @@
   description: Do not apply fire to this. Rumour says it burns easily.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/wood.rsi
+    sprite: Structures/Furniture/Tables/wood.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/wood.rsi
+    sprite: Structures/Furniture/Tables/wood.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -264,9 +244,9 @@
   description: Play em' cowboy.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/carpet.rsi
+    sprite: Structures/Furniture/Tables/carpet.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/carpet.rsi
+    sprite: Structures/Furniture/Tables/carpet.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -296,9 +276,9 @@
   description: Literally the sturdiest thing you have ever seen.
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/stone.rsi
+    sprite: Structures/Furniture/Tables/stone.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/stone.rsi
+    sprite: Structures/Furniture/Tables/stone.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -318,9 +298,9 @@
   suffix: DEBUG
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Tables/debug.rsi
+    sprite: Structures/Furniture/Tables/debug.rsi
   - type: Icon
-    sprite: Constructible/Structures/Tables/debug.rsi
+    sprite: Structures/Furniture/Tables/debug.rsi
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Furniture/beds.yml

@@ -1,7 +1,7 @@
 - type: entity
   name: bed
   id: Bed
-  parent: BaseConstructible
+  parent: BaseStructure
   description: This is used to lie in, sleep in or strap on.
   components:
   # So that you can put bedsheets on beds again. Would be cool to have a tag
@@ -18,7 +18,7 @@
       mask:
       - SmallImpassable
   - type: Sprite
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
     state: bed
   - type: Strap
     position: Down

Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml

@@ -1,11 +1,11 @@
 - type: entity
   id: Bookshelf
-  parent: BaseConstructible
+  parent: BaseStructure
   name: "bookshelf"
   description: Mostly filled with erotica.
   components:
   - type: Sprite
-    sprite: Constructible/Misc/bookshelf.rsi
+    sprite: Structures/Furniture/bookshelf.rsi
     layers:
       - state: base
       - state: book-0

Resources/Prototypes/Entities/Structures/Furniture/carpets.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: CarpetBase
-  parent: BaseConstructible
+  parent: BaseStructure
   description: "Fancy walking surface."
   abstract: true
   components:
@@ -34,9 +34,9 @@
   name: "carpet"
   components:
   - type: Sprite
-    sprite: Constructible/Carpets/red_carpet.rsi
+    sprite: Structures/Furniture/Carpets/red_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/red_carpet.rsi
+    sprite: Structures/Furniture/Carpets/red_carpet.rsi
 
 - type: entity
   id: CarpetBlack
@@ -45,9 +45,9 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/black_carpet.rsi
+    sprite: Structures/Furniture/Carpets/black_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/black_carpet.rsi
+    sprite: Structures/Furniture/Carpets/black_carpet.rsi
 
 - type: entity
   id: CarpetGay
@@ -56,9 +56,9 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/gay_carpet.rsi
+    sprite: Structures/Furniture/Carpets/gay_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/gay_carpet.rsi
+    sprite: Structures/Furniture/Carpets/gay_carpet.rsi
 
 - type: entity
   id: CarpetBlue
@@ -67,9 +67,9 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/blue_carpet.rsi
+    sprite: Structures/Furniture/Carpets/blue_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/blue_carpet.rsi
+    sprite: Structures/Furniture/Carpets/blue_carpet.rsi
 
 - type: entity
   id: CarpetGreen
@@ -78,9 +78,9 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/green_carpet.rsi
+    sprite: Structures/Furniture/Carpets/green_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/green_carpet.rsi
+    sprite: Structures/Furniture/Carpets/green_carpet.rsi
 
 - type: entity
   id: CarpetOrange
@@ -89,9 +89,9 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/orange_carpet.rsi
+    sprite: Structures/Furniture/Carpets/orange_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/orange_carpet.rsi
+    sprite: Structures/Furniture/Carpets/orange_carpet.rsi
 
 - type: entity
   id: CarpetSBlue
@@ -100,9 +100,9 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/skyblue_carpet.rsi
+    sprite: Structures/Furniture/Carpets/skyblue_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/skyblue_carpet.rsi
+    sprite: Structures/Furniture/Carpets/skyblue_carpet.rsi
 
 - type: entity
   id: CarpetPurple
@@ -111,6 +111,6 @@
   components:
   - type: Clickable
   - type: Sprite
-    sprite: Constructible/Carpets/purple_carpet.rsi
+    sprite: Structures/Furniture/Carpets/purple_carpet.rsi
   - type: Icon
-    sprite: Constructible/Carpets/purple_carpet.rsi
+    sprite: Structures/Furniture/Carpets/purple_carpet.rsi

Resources/Prototypes/Entities/Structures/Furniture/instruments.yml

@@ -1,7 +1,7 @@
 - type: entity
   name: baseinstrument
   id: BasePlaceableInstrument
-  parent: BaseConstructibleDynamic
+  parent: BaseStructureDynamic
   abstract: true
   components:
   - type: Instrument
@@ -10,7 +10,7 @@
   - type: Rotatable
     rotateWhileAnchored: true
   - type: Sprite
-    sprite: Objects/Fun/Instruments/otherinstruments.rsi
+    sprite: Structures/Furniture/instruments.rsi
   - type: Damageable
     resistances: metallicResistances
   - type: Destructible
@@ -58,4 +58,4 @@
   - type: Instrument
     program: 20
   - type: Sprite
-    state: church_organ
+    state: church-organ

Resources/Prototypes/Entities/Structures/Furniture/pilot_chair.yml

@@ -1,11 +1,11 @@
 - type: entity
   id: PilotSeatChair
-  parent: BaseConstructible
+  parent: BaseStructure
   name: pilot seat
   description: The pilot seat of a prestigious battle cruiser.
   components:
   - type: Sprite
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
     state: shuttle_chair
   - type: Physics
     bodyType: Static

Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: PottedPlantBase
-  parent: BaseConstructibleDynamic
+  parent: BaseStructureDynamic
   abstract: true
   components:
   - type: InteractionOutline
@@ -19,7 +19,7 @@
         - SmallImpassable
         - VaultImpassable
   - type: Sprite
-    sprite: Constructible/Misc/potted_plants.rsi
+    sprite: Structures/Furniture/potted_plants.rsi
   - type: PottedPlantHide
   - type: SecretStash
     secretPartName: the plant

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

@@ -19,7 +19,7 @@
       - VaultImpassable
       - SmallImpassable
   - type: Sprite
-    sprite: Constructible/Misc/furniture.rsi
+    sprite: Structures/Furniture/furniture.rsi
   - type: Strap
     position: Stand
   - type: Pullable

Resources/Prototypes/Entities/Structures/Furniture/toilet.yml

@@ -7,7 +7,7 @@
   components:
   - type: Anchorable
   - type: Sprite
-    sprite: Constructible/Watercloset/toilet.rsi
+    sprite: Structures/Furniture/toilet.rsi
     state: closed_toilet_seat_up
     netsync: false
   - type: Toilet

Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml

@@ -7,7 +7,7 @@
   components:
   - type: ApcPowerReceiver
   - type: Sprite
-    sprite: Constructible/Power/computers.rsi
+    sprite: Structures/Machines/computers.rsi
     layers:
     - state: arcade
       map: ["enum.ComputerVisualizer+Layers.Body"]
@@ -15,7 +15,7 @@
       shader: unshaded
       map: ["enum.ComputerVisualizer+Layers.Screen"]
   - type: Icon
-    sprite: Constructible/Power/computers.rsi
+    sprite: Structures/Machines/computers.rsi
     state: arcade
   - type: Appearance
     visuals:

Resources/Prototypes/Entities/Structures/Machines/Computers/base.yml

@@ -0,0 +1,31 @@
+- type: entity
+  abstract: true
+  parent: ComputerFrame
+  id: ComputerBase
+  name: computer
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Construction
+    graph: computer
+    node: computer
+  - type: Computer
+  - type: ApcPowerReceiver
+  - type: Sprite
+    sprite: Structures/Machines/computers.rsi
+    layers:
+    - state: computer
+      map: ["enum.ComputerVisualizer+Layers.Body"]
+    - state: generic_key_off
+      map: ["enum.ComputerVisualizer+Layers.Keyboard"]
+    - state: generic
+      shader: unshaded
+      map: ["enum.ComputerVisualizer+Layers.Screen"]
+    - state: generic_key
+      shader: unshaded
+      map: ["enum.ComputerVisualizer+Layers.KeyboardOn"]
+  - type: Appearance
+    visuals:
+    - type: ComputerVisualizer
+      key: generic_key
+      screen: generic

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

@@ -1,108 +1,4 @@
 - type: entity
-  id: ComputerFrame
-  parent: BaseConstructible
-  name: computer frame
-  description: A computer under construction.
-  components:
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
-      mass: 25
-      mask:
-        - MobImpassable
-      layer:
-        - Opaque
-        - MobImpassable
-        - SmallImpassable
-        - VaultImpassable
-  - type: InteractionOutline
-  - type: Rotatable
-  - type: Anchorable
-  - type: Construction
-    graph: computer
-    node: frameUnsecured
-  - type: Sprite
-    sprite: "Constructible/Misc/stock_parts.rsi"
-    state: "0"
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:PlaySoundCollectionBehavior
-        soundCollection: GlassBreak
-      - !type:ChangeConstructionNodeBehavior
-        node: monitorBroken
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-
-- type: entity
-  parent: ComputerFrame
-  id: ComputerBroken
-  name: broken computer
-  description: This computer has seen better days.
-  components:
-  - type: Construction
-    graph: computer
-    node: monitorBroken
-  - type: Sprite
-    sprite: "Constructible/Power/computers.rsi"
-    state: "broken"
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound: /Audio/Effects/metalbreak.ogg
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          SheetSteel1:
-            min: 1
-            max: 1
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-
-- type: entity
-  abstract: true
-  parent: ComputerFrame
-  id: ComputerBase
-  name: computer
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Construction
-    graph: computer
-    node: computer
-  - type: Computer
-  - type: ApcPowerReceiver
-  - type: Sprite
-    sprite: Constructible/Power/computers.rsi
-    layers:
-    - state: computer
-      map: ["enum.ComputerVisualizer+Layers.Body"]
-    - state: generic_key_off
-      map: ["enum.ComputerVisualizer+Layers.Keyboard"]
-    - state: generic
-      shader: unshaded
-      map: ["enum.ComputerVisualizer+Layers.Screen"]
-    - state: generic_key
-      shader: unshaded
-      map: ["enum.ComputerVisualizer+Layers.KeyboardOn"]
-  - type: Appearance
-    visuals:
-    - type: ComputerVisualizer
-      key: generic_key
-      screen: generic
-
-- type: entity
   parent: ComputerBase
   id: ComputerAlert
   name: alerts computer
@@ -241,3 +137,85 @@
       type: SolarControlConsoleBoundUserInterface
   - type: Computer
     board: SolarControlComputerCircuitboard
+
+- type: entity
+  id: ComputerSupplyOrdering
+  parent: ComputerBase
+  name: Cargo ordering computer
+  description: Used to order supplies, approve requests, and control the shuttle.
+  components:
+  - type: Appearance
+    visuals:
+    - type: ComputerVisualizer
+      key: tech_key
+      screen: supply
+  - type: CargoConsole
+  - type: CargoOrderDatabase
+  - type: GalacticMarket
+    products:
+      - EmergencyExplosive
+      - EmergencyFire
+      - EmergencyInternals
+      - EmergencyRadiation
+      - ArmorySmg
+      - ArmoryShotgun
+      - SecurityArmor
+      - SecurityRiot
+      - SecurityLaser
+      - SecurityHelmet
+      - SecuritySupplies
+      - SecurityNonLethal
+      - HydroponicsTools
+      - HydroponicsSeeds
+      - HydroponicsSeedsExotic
+      - ServiceJanitorial
+      - ServiceLightsReplacement
+      - EngineeringCableLv
+      - EngineeringCableMv
+      - EngineeringCableHv
+      - EngineeringCableBulk
+      - EngineAmeShielding
+      - EngineAmeJar
+      - EngineAmeControl
+      - EngineSolar
+      - FunPlushies
+      - FunArtSupplies
+      - FunInstruments
+      - MaterialSteel
+      - MaterialGlass
+      - MaterialPlastic
+      - MaterialPlasteel
+      - EngineSingularityEmitter
+      - EngineSingularityCollector
+      - EngineSingularityGenerator
+      - EngineSingularityContainment
+      - EngineParticleAccelerator
+      - AtmosphericsAir
+      - AtmosphericsOxygen
+      - AtmosphericsNitrogen
+      - AtmosphericsCarbonDioxide
+#      - AtmosphericsWaterVapor
+#      - AtmosphericsPlasma
+#      - AtmosphericsTritium
+  - type: UserInterface
+    interfaces:
+    - key: enum.CargoConsoleUiKey.Key
+      type: CargoConsoleBoundUserInterface
+  - type: Computer
+    board: SupplyComputerCircuitboard
+
+- type: entity
+  id: ComputerSupplyRequest
+  parent: ComputerSupplyOrdering
+  name: cargo request computer
+  description: Used to request supplies from cargo.
+  components:
+  - type: Appearance
+    visuals:
+    - type: ComputerVisualizer
+      key: tech_key
+      screen: request
+  - type: CargoConsole
+    requestOnly: true
+  - type: Computer
+    board: SupplyRequestComputerCircuitboard

Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml

@@ -0,0 +1,71 @@
+- type: entity
+  id: ComputerFrame
+  parent: BaseStructure
+  name: computer frame
+  description: A computer under construction.
+  components:
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.25,0.5,0.25"
+      mass: 25
+      mask:
+        - MobImpassable
+      layer:
+        - Opaque
+        - MobImpassable
+        - SmallImpassable
+        - VaultImpassable
+  - type: InteractionOutline
+  - type: Rotatable
+  - type: Anchorable
+  - type: Construction
+    graph: computer
+    node: frameUnsecured
+  - type: Sprite
+    sprite: Structures/Machines/parts.rsi
+    state: 0
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundCollectionBehavior
+        soundCollection: GlassBreak
+      - !type:ChangeConstructionNodeBehavior
+        node: monitorBroken
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
+- type: entity
+  parent: ComputerFrame
+  id: ComputerBroken
+  name: broken computer
+  description: This computer has seen better days.
+  components:
+  - type: Construction
+    graph: computer
+    node: monitorBroken
+  - type: Sprite
+    sprite: Structures/Machines/computers.rsi
+    state: broken
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound: /Audio/Effects/metalbreak.ogg
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]

Resources/Prototypes/Entities/Structures/Machines/base.yml

@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseConstructible
+  parent: BaseStructure
   id: BaseMachine
   components:
   - type: InteractionOutline

Resources/Prototypes/Entities/Structures/Machines/chem_master.yml

@@ -1,19 +1,19 @@
 - type: entity
   id: chem_master
-  parent: BaseConstructible
+  parent: BaseStructure
   name: ChemMaster 4000
   description: An industrial grade chemical manipulator with pill and bottle production included.
   placement:
     mode: SnapgridCenter
   components:
   - type: Sprite
-    sprite: Constructible/Power/mixer.rsi
+    sprite: Structures/Machines/mixer.rsi
     layers:
     - state: mixer_empty
     - state: mixer_screens
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Power/mixer.rsi
+    sprite: Structures/Machines/mixer.rsi
     state: mixer_loaded
   - type: ChemMaster
   - type: ApcPowerReceiver
@@ -52,20 +52,20 @@
 
 - type: entity
   id: chem_master_broken
-  parent: BaseConstructibleDynamic
+  parent: BaseStructureDynamic
   name: ChemMaster 4000
   description: "An industrial grade chemical manipulator with pill and bottle production included. It's broken."
   abstract: true
   suffix: Broken
   components:
   - type: Sprite
-    sprite: Constructible/Power/mixer.rsi
+    sprite: Structures/Machines/mixer.rsi
     layers:
     - state: mixer_empty
     - state: mixer_screen_broken
       shader: unshaded
   - type: Icon
-    sprite: Constructible/Power/mixer.rsi
+    sprite: Structures/Machines/mixer.rsi
     state: mixer_broken
   - type: InteractionOutline
   - type: Physics

Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml

@@ -7,7 +7,7 @@
   - type: CloningPod
   - type: Sprite
     netsync: false
-    sprite: Constructible/Specific/Medical/cloning.rsi
+    sprite: Structures/Machines/cloning.rsi
     layers:
       - state: pod_0
         map: ["enum.CloningPodVisualLayers.Machine"]

Resources/Prototypes/Entities/Structures/Machines/frame.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: UnfinishedMachineFrame
   name: machine frame
-  description: "A machine under construction. Needs more parts."
+  description: A machine under construction. Needs more parts.
   suffix: Unfinished
   placement:
     mode: SnapgridCenter
@@ -43,8 +43,8 @@
         - !type:DoActsBehavior
           acts: ["Destruction"]
     - type: Sprite
-      sprite: "Constructible/Misc/stock_parts.rsi"
+      sprite: Structures/Machines/parts.rsi
-      state: "box_0"
+      state: box_0
 
 - type: entity
   id: MachineFrame
@@ -92,8 +92,8 @@
     - type: MachineFrame
     - type: Sprite
       netsync: false
-      sprite: "Constructible/Misc/stock_parts.rsi"
+      sprite: Structures/Machines/parts.rsi
-      state: "box_1"
+      state: box_1
     - type: Appearance
       visuals:
       - type: MachineFrameVisualizer

Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml

@@ -1,15 +1,18 @@
 - type: entity
   id: GravityGenerator
+  parent: BaseMachinePowered
   name: gravity generator
   description: It's what keeps you to the floor.
+  placement:
+    mode: AlignTileAny
   components:
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/gravity_generator.rsi
+    sprite: Structures/Machines/gravity_generator.rsi
     layers:
       - state: on
         map: ["enum.GravityGeneratorVisualLayers.Base"]
-      - sprite: Constructible/Power/gravity_generator_core.rsi
+      - sprite: Structures/Machines/gravity_generator_core.rsi
         state: activated
         shader: unshaded
         map: ["enum.GravityGeneratorVisualLayers.Core"]
@@ -17,6 +20,7 @@
   - type: ApcPowerReceiver
     powerLoad: 500
   - type: Physics
+    bodyType: Static
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -26,10 +30,6 @@
       - Impassable
       - MobImpassable
       - VaultImpassable
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Damageable
-    resistances: metallicResistances
   - type: Repairable
     fuelCost: 10
     doAfterDelay: 5
@@ -54,6 +54,3 @@
         unpowered: "off"
         off: "off"
         on: "on"
-
-  placement:
-    mode: AlignTileAny

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -1,12 +1,21 @@
-- type: entity
+- type: entity
-  id: BaseLathe
+  parent: BaseMachinePowered
-  name: "lathe"
+  id: Autolathe
-  abstract: true
+  name: autolathe
-  placement:
+  description: It produces items using metal and glass.
-    mode: SnapgridCenter
   components:
-  - type: Clickable
+  - type: Sprite
-  - type: InteractionOutline
+    sprite: Structures/Machines/autolathe.rsi
+    layers:
+    - state: icon
+      map: ["enum.AutolatheVisualLayers.Base"]
+    - state: unlit
+      shader: unshaded
+      map: ["enum.AutolatheVisualLayers.BaseUnlit"]
+    - state: icon
+      map: ["enum.AutolatheVisualLayers.AnimationLayer"]
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Physics
     bodyType: Static
     fixtures:
@@ -21,40 +30,9 @@
       layer:
       - Opaque
       - MobImpassable
-  - type: SnapGrid
-  - type: Lathe
-  - type: MaterialStorage
-  - type: Anchorable
-  - type: Pullable
-  - type: UserInterface
-    interfaces:
-    - key: enum.LatheUiKey.Key
-      type: LatheBoundUserInterface
-  - type: ApcPowerReceiver
-
-- type: entity
-  parent: BaseLathe
-  id: Autolathe
-  name: "autolathe"
-  description: It produces items using metal and glass.
-  components:
-  - type: Sprite
-    sprite: Constructible/Power/autolathe.rsi
-    layers:
-    - state: icon
-      map: ["enum.AutolatheVisualLayers.Base"]
-    - state: unlit
-      shader: unshaded
-      map: ["enum.AutolatheVisualLayers.BaseUnlit"]
-    - state: icon
-      map: ["enum.AutolatheVisualLayers.AnimationLayer"]
-    - state: panel
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Construction
     graph: machine
     node: machine
-  - type: Damageable
-    resistances: metallicResistances
   - type: Destructible
     thresholds:
     - trigger:
@@ -67,6 +45,7 @@
         acts: ["Destruction"]
   - type: Machine
     board: AutolatheMachineCircuitboard
+  - type: MaterialStorage
   - type: Wires
     BoardName: "Autolathe"
     LayoutId: Autolathe
@@ -88,15 +67,22 @@
     visuals:
     - type: AutolatheVisualizer
     - type: WiresVisualizer
+  - type: UserInterface
+    interfaces:
+    - key: enum.LatheUiKey.Key
+      type: LatheBoundUserInterface
+  - type: SnapGrid
+  - type: Pullable
+  - type: Lathe
 
 - type: entity
-  parent: BaseLathe
+  parent: BaseMachinePowered
   id: Protolathe
-  name: "protolathe"
+  name: protolathe
   description: Converts raw materials into useful objects.
   components:
   - type: Sprite
-    sprite: Constructible/Power/protolathe.rsi
+    sprite: Structures/Machines/protolathe.rsi
     layers:
     - state: icon
       map: ["enum.ProtolatheVisualLayers.Base"]
@@ -107,12 +93,24 @@
       map: ["enum.ProtolatheVisualLayers.AnimationLayer"]
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Physics
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+      mass: 25
+      mask:
+      - Impassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
   - type: ResearchClient
   - type: Construction
     graph: machine
     node: machine
-  - type: Damageable
-    resistances: metallicResistances
   - type: Destructible
     thresholds:
     - trigger:
@@ -129,6 +127,7 @@
     BoardName: "Protolathe"
     LayoutId: Protolathe
   - type: TechnologyDatabase
+  - type: MaterialStorage
   - type: ProtolatheDatabase
     protolatherecipes:
       - LightTube
@@ -174,7 +173,6 @@
       - KitchenKnife
       - ButchCleaver
       - FlashlightLantern
-
   - type: UserInterface
     interfaces:
     - key: enum.LatheUiKey.Key
@@ -185,3 +183,6 @@
     visuals:
     - type: ProtolatheVisualizer
     - type: WiresVisualizer
+  - type: SnapGrid
+  - type: Pullable
+  - type: Lathe

Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml

@@ -8,7 +8,7 @@
   - type: Sprite
     netsync: false
     noRot: true
-    sprite: Constructible/Specific/Medical/scanner.rsi
+    sprite: Structures/Machines/scanner.rsi
     layers:
     - state: open
       map: ["enum.MedicalScannerVisualLayers.Machine"]

Resources/Prototypes/Entities/Structures/Machines/microwave.yml

@@ -1,14 +1,10 @@
 - type: entity
   id: KitchenMicrowave
+  parent: BaseMachinePowered
   name: microwave
   description: It's magic.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: SnapGrid
   - type: Microwave
-  - type: Clickable
-  - type: InteractionOutline
   - type: SolutionContainer
     maxVol: 100
     caps: Refillable
@@ -25,13 +21,15 @@
     - shape:
         !type:PhysShapeAabb
           bounds: "-0.16,-0.3,0.16,0.3"
+      mass: 25
       layer:
-      - SmallImpassable
+      - MobMask
+      - Opaque
       mask:
-      - VaultImpassable
+      - MobMask
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/microwave.rsi
+    sprite: Structures/Machines/microwave.rsi
     drawdepth: WallMountedItems
     layers:
     - state: mw0
@@ -39,9 +37,6 @@
     - state: mw_unlit
       shader: unshaded
       map: ["enum.MicrowaveVisualizerLayers.BaseUnlit"]
-  - type: ApcPowerReceiver
-  - type: Damageable
-    resistances: metallicResistances
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml

@@ -1,10 +1,9 @@
 - type: entity
   id: KitchenReagentGrinder
+  parent: BaseMachinePowered
   name: reagent grinder
-  description: "From BlenderTech. Will It Blend? Let's find out!"
+  description: From BlenderTech. Will It Blend? Let's find out!
   suffix: grinder/juicer
-  placement:
-    mode: SnapgridCenter
   components:
   - type: SnapGrid
   - type: ReagentGrinder
@@ -15,9 +14,6 @@
   - type: Appearance
     visuals:
     - type: ReagentGrinderVisualizer
-  - type: Clickable
-  - type: InteractionOutline
-  - type: ApcPowerReceiver
   - type: LoopingSound
   - type: Physics
     fixtures:
@@ -30,18 +26,6 @@
       - VaultImpassable
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/juicer.rsi
+    sprite: Structures/Machines/juicer.rsi
     state: juicer0
     drawdepth: Items
-  - type: Damageable
-    resistances: metallicResistances
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:PlaySoundBehavior
-        sound: /Audio/Effects/metalbreak.ogg

Resources/Prototypes/Entities/Structures/Machines/recycler.yml

@@ -1,12 +1,9 @@
 - type: entity
   id: Recycler
+  parent: BaseMachinePowered
   name: recycler
   description: A large crushing machine used to recycle small items inefficiently. There are lights on the side.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
   - type: Physics
     fixtures:
     - shape:
@@ -21,15 +18,13 @@
   - type: SnapGrid
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/recycling.rsi
+    sprite: Structures/Machines/recycling.rsi
     layers:
     - state: grinder-o1
       map: ["enum.RecyclerVisualLayers.Bloody"]
-
   - type: Appearance
     visuals:
     - type: RecyclerVisualizer
       state_clean: grinder-o1
       state_bloody: grinder-o1bld
   - type: Recycler
-  - type: ApcPowerReceiver

Resources/Prototypes/Entities/Structures/Machines/research.yml

@@ -1,31 +1,17 @@
 - type: entity
   id: ResearchAndDevelopmentServer
-  parent: BaseConstructibleDynamic
+  parent: BaseMachinePowered
-  name: "R&D server"
+  name: R&D server
-  description: 'Thats a R&D server.'
+  description: Contains the collective knowledge of the station's scientists. Destroying it would send them back to the stone age. You don't want that do you?
   components:
   - type: Sprite
-    sprite: Constructible/Power/server.rsi
+    sprite: Structures/Machines/server.rsi
     state: server
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 25
-      mask:
-        - SmallImpassable
-      layer:
-        - Opaque
-        - MobImpassable
   - type: ResearchServer
   - type: TechnologyDatabase
   - type: ApcPowerReceiver
     powerLoad: 200
     priority: Low
-  - type: Damageable
-    resistances: metallicResistances
   - type: Destructible
     thresholds:
     - trigger:
@@ -44,29 +30,17 @@
 
 - type: entity
   id: BaseResearchAndDevelopmentPointSource
-  parent: BaseConstructibleDynamic
+  parent: BaseMachinePowered
   name: "base R&D point source"
   # We should make this abstract once there are actual point sources.
   components:
   - type: Sprite
-    sprite: Constructible/Power/rndpointsource.rsi
+    sprite: Structures/Machines/rndpointsource.rsi
     layers:
     - state: rndpointsource-off
     - state: rndpointsource
       shader: unshaded
       map: ["enum.PowerDeviceVisualLayers.Powered"]
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      mass: 25
-      mask:
-        - SmallImpassable
-      layer:
-        - Opaque
-        - MobImpassable
   - type: ResearchPointSource
     pointspersecond: 100
     active: true
@@ -77,7 +51,6 @@
   - type: Appearance
     visuals:
     - type: PowerDeviceVisualizer
-  - type: ApcPowerReceiver
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml

@@ -5,7 +5,7 @@
   description: Extracts seeds from produce.
   components:
   - type: Sprite
-    sprite: Constructible/Hydroponics/machines.rsi
+    sprite: Structures/Machines/seed_extractor.rsi
     layers:
     - state: seedextractor-off
     - state: seedextractor-unlit

Resources/Prototypes/Entities/Structures/Machines/traitordm.yml

@@ -1,17 +1,16 @@
 - type: entity
   id: TraitorDMRedemptionMachine
+  parent: BaseMachinePowered
   name: traitor deathmatch pda redemption machine
   description: Put someone else's PDA into this to get telecrystals.
   components:
   - type: Sprite
     layers:
-      - sprite: Objects/Misc/traitordm.rsi
+      - sprite: Structures/Machines/traitordm.rsi
         state: redemption
-      - sprite: Objects/Misc/traitordm.rsi
+      - sprite: Structures/Machines/traitordm.rsi
         state: redemption-unshaded
         shader: unshaded
-  - type: Clickable
-  - type: InteractionOutline
   - type: Physics
     bodyType: Static
     fixtures:

Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml

@@ -1,13 +1,12 @@
 # Vending machine descriptions are stored in vendingMachineInventory YAML files.
 - type: entity
   id: VendingMachine
-  parent: BaseConstructible
+  parent: BaseMachinePowered
-  name: Vending machine
+  name: vending machine
   abstract: true
   components:
-  - type: InteractionOutline
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/empty.rsi
+    sprite: Structures/Machines/VendingMachines/empty.rsi
     netsync: false
   - type: Physics
     bodyType: Static
@@ -22,13 +21,12 @@
       layer:
       - Opaque
       - MobImpassable
-  - type: Damageable
+      mass: 100
-    resistances: metallicResistances
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 50
+        damage: 100
       behaviors:
       - !type:DoActsBehavior
         acts: ["Breakage"]
@@ -38,7 +36,6 @@
       type: VendingMachineBoundUserInterface
     - key: enum.WiresUiKey.Key
       type: WiresBoundUserInterface
-  - type: ApcPowerReceiver
   - type: Wires
     BoardName: "Vending Machine"
     LayoutId: Vending
@@ -56,7 +53,7 @@
     pack: AmmoVendAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/ammo.rsi
+    sprite: Structures/Machines/VendingMachines/ammo.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -84,7 +81,7 @@
     pack: BoozeOMatAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/boozeomat.rsi
+    sprite: Structures/Machines/VendingMachines/boozeomat.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -113,7 +110,7 @@
   - type: Advertise
     pack: BarDrobeAds
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/bardrobe.rsi
+    sprite: Structures/Machines/VendingMachines/bardrobe.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -140,7 +137,7 @@
   - type: VendingMachine
     pack: PTechInventory
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/cart.rsi
+    sprite: Structures/Machines/VendingMachines/cart.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -170,7 +167,7 @@
     pack: CigaretteMachineAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/cigs.rsi
+    sprite: Structures/Machines/VendingMachines/cigs.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -200,7 +197,7 @@
     pack: ClothesMateAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/clothing.rsi
+    sprite: Structures/Machines/VendingMachines/clothing.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -229,7 +226,7 @@
     pack: HotDrinksMachineAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/coffee.rsi
+    sprite: Structures/Machines/VendingMachines/coffee.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -239,7 +236,7 @@
     - state: "screen"
       map: ["enum.VendingMachineVisualLayers.Screen"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -263,7 +260,7 @@
     pack: RobustSoftdrinksAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/cola.rsi
+    sprite: Structures/Machines/VendingMachines/cola.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -292,14 +289,14 @@
   - type: Advertise
     pack: DinnerwareAds
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/dinnerware.rsi
+    sprite: Structures/Machines/VendingMachines/dinnerware.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -322,14 +319,14 @@
     pack: DiscountDansAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/discount.rsi
+    sprite: Structures/Machines/VendingMachines/discount.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -347,7 +344,7 @@
   - type: VendingMachine
     pack: EngiVendInventory
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/engivend.rsi
+    sprite: Structures/Machines/VendingMachines/engivend.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -378,7 +375,7 @@
   - type: Advertise
     pack: NanoMedAds
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/medical.rsi
+    sprite: Structures/Machines/VendingMachines/medical.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -409,14 +406,14 @@
   - type: Advertise
     pack: NutriMaxAds
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/nutri.rsi
+    sprite: Structures/Machines/VendingMachines/nutri.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -439,7 +436,7 @@
   - type: Advertise
     pack: SecTechAds
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/sec.rsi
+    sprite: Structures/Machines/VendingMachines/sec.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -468,14 +465,14 @@
   - type: Advertise
     pack: MegaSeedAds
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/seeds.rsi
+    sprite: Structures/Machines/VendingMachines/seeds.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -498,14 +495,14 @@
     pack: SmartFridgeAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/smartfridge.rsi
+    sprite: Structures/Machines/VendingMachines/smartfridge.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -525,7 +522,7 @@
     pack: GetmoreChocolateCorpAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/snack.rsi
+    sprite: Structures/Machines/VendingMachines/snack.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -554,7 +551,7 @@
     pack: BodaAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/sovietsoda.rsi
+    sprite: Structures/Machines/VendingMachines/sovietsoda.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -583,7 +580,7 @@
     pack: AutoDrobeAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/theater.rsi
+    sprite: Structures/Machines/VendingMachines/theater.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -616,7 +613,7 @@
     pack: VendomatAds
   - type: Speech
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/vendomat.rsi
+    sprite: Structures/Machines/VendingMachines/vendomat.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
@@ -643,14 +640,14 @@
   - type: VendingMachine
     pack: NanoMedInventory
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/wallmed.rsi
+    sprite: Structures/Machines/VendingMachines/wallmed.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
       shader: unshaded
-    - texture: Constructible/Power/VendingMachines/maintenance_panel.png
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Appearance
     visuals:
@@ -670,7 +667,7 @@
   - type: VendingMachine
     pack: YouToolInventory
   - type: Sprite
-    sprite: Constructible/Power/VendingMachines/youtool.rsi
+    sprite: Structures/Machines/VendingMachines/youtool.rsi
     layers:
     - state: "off"
       map: ["enum.VendingMachineVisualLayers.Unlit"]

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml

@@ -27,9 +27,9 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Constructible/Atmos/pump.rsi
+    sprite: Structures/Piping/Atmospherics/pump.rsi
     layers:
-    - sprite: Constructible/Atmos/pipe.rsi
+    - sprite: Structures/Piping/Atmospherics/pipe.rsi
       state: pipeStraight
       map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
     - state: pumpPressure
@@ -51,9 +51,9 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/pump.rsi
+      sprite: Structures/Piping/Atmospherics/pump.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeStraight
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: pumpVolume
@@ -69,9 +69,9 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/pump.rsi
+      sprite: Structures/Piping/Atmospherics/pump.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeStraight
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: pumpPassiveGate
@@ -88,9 +88,9 @@
     # TODO ATMOS: Give unique sprite.
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/pump.rsi
+      sprite: Structures/Piping/Atmospherics/pump.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeStraight
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: pumpPassiveGate
@@ -112,9 +112,9 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/gascanisterport.rsi
+      sprite: Structures/Piping/Atmospherics/gascanisterport.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeHalf
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: gasCanisterPort
@@ -136,9 +136,9 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/vent.rsi
+      sprite: Structures/Piping/Atmospherics/vent.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeStraight
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: vent_off

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml

@@ -21,7 +21,7 @@
               acts: ["Destruction"]
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/miners.rsi
+      sprite: Structures/Piping/Atmospherics/miners.rsi
       state: miner
     - type: AtmosDevice
     - type: GasMiner

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml

@@ -23,7 +23,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Sprite
-    sprite: Constructible/Atmos/pipe.rsi
+    sprite: Structures/Piping/Atmospherics/pipe.rsi
     drawdepth: BelowFloor
     netsync: false
   - type: Appearance

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml

@@ -32,9 +32,9 @@
     # TODO ATMOS Improve this sprite and appearance...
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/gasfilter.rsi
+      sprite: Structures/Piping/Atmospherics/gasfilter.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeTJunction
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: gasFilter
@@ -51,9 +51,9 @@
     # TODO ATMOS Give this its actual sprite...
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/gasfilter.rsi
+      sprite: Structures/Piping/Atmospherics/gasfilter.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeTJunction
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: gasFilter

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml

@@ -23,9 +23,9 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/vent.rsi
+      sprite: Structures/Piping/Atmospherics/vent.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeHalf
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: vent_off
@@ -48,9 +48,9 @@
     # TODO ATMOS: Find sprite for this.
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/vent.rsi
+      sprite: Structures/Piping/Atmospherics/vent.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeHalf
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: vent_off
@@ -70,9 +70,9 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/scrubber.rsi
+      sprite: Structures/Piping/Atmospherics/scrubber.rsi
       layers:
-        - sprite: Constructible/Atmos/pipe.rsi
+        - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeHalf
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
         - state: scrub_off
@@ -99,7 +99,7 @@
       netsync: false
       layers:
         - state: pipeHalf
-          sprite: Constructible/Atmos/pipe.rsi
+          sprite: Structures/Piping/Atmospherics/pipe.rsi
           map: [ "enum.PipeColorVisualizer+Layers.Pipe" ]
 
 - type: entity
@@ -113,7 +113,7 @@
   components:
     - type: Sprite
       netsync: false
-      sprite: Constructible/Atmos/thermomachine.rsi
+      sprite: Structures/Piping/Atmospherics/thermomachine.rsi
     - type: Appearance
       visuals:
         - type: PipeConnectorVisualizer
@@ -158,4 +158,3 @@
     - type: GasThermoMachine
       mode: Heater
       maxTemperature: 573.15 # This is changed when parts are refreshed.
-

Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml

@@ -44,7 +44,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-s
   - type: DisposalTransit
   - type: Appearance
@@ -68,7 +68,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-tagger
   - type: DisposalTagger
   - type: Appearance
@@ -96,7 +96,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-t
   - type: DisposalEntry
   - type: Appearance
@@ -120,7 +120,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-j1s
   - type: DisposalRouter
     degrees:
@@ -153,7 +153,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-j2s
   - type: DisposalRouter
     degrees:
@@ -183,7 +183,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-j1
   - type: DisposalJunction
     degrees:
@@ -212,7 +212,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-j2
   - type: DisposalJunction
     degrees:
@@ -242,7 +242,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-y
   - type: DisposalJunction
     degrees:
@@ -270,7 +270,7 @@
   components:
   - type: Sprite
     drawdepth: BelowFloor
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     state: conpipe-c
   - type: DisposalBend
   - type: Appearance

Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml

@@ -10,7 +10,7 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Constructible/Power/disposal.rsi
+    sprite: Structures/Piping/disposal.rsi
     layers:
     - state: condisposal
       map: ["enum.DisposalUnitVisualLayers.Base"]

Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml

@@ -5,7 +5,7 @@
   description: This controls the density of the particles.
   components:
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/control_box.rsi
+      sprite: Structures/Power/Generation/PA/control_box.rsi
       layers:
         - state: boxc
           map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
@@ -44,7 +44,7 @@
     - type: Physics
       bodyType: Dynamic
     - type: Sprite
-      sprite: Constructible/Specific/Engines/PA/control_box.rsi
+      sprite: Structures/Power/Generation/PA/control_box.rsi
       state: box
     - type: Construction
       graph: particleAcceleratorControlBox