diff --git a/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs index 5a068b2f0b..1e6d3c05a7 100644 --- a/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs +++ b/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"; diff --git a/Content.Client/Botany/PlantHolderVisualizer.cs b/Content.Client/Botany/PlantHolderVisualizer.cs index 485d225ed2..2cd216d7d2 100644 --- a/Content.Client/Botany/PlantHolderVisualizer.cs +++ b/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")); diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs index d6da1a6434..b37cf86384 100644 --- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs +++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs @@ -465,7 +465,7 @@ namespace Content.Client.ParticleAccelerator.UI { _menu = menu; _baseState = name; - _rsi = cache.GetResource($"/Textures/Constructible/Specific/Engines/PA/{name}.rsi").RSI; + _rsi = cache.GetResource($"/Textures/Structures/Power/Generation/PA/{name}.rsi").RSI; AddChild(_base = new TextureRect {Texture = _rsi[$"{state}"].Frame0}); AddChild(_unlit = new TextureRect()); diff --git a/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs b/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs index c7ac7d2f8f..cf5acade56 100644 --- a/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs +++ b/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); } } diff --git a/Content.Client/Window/WindowComponent.cs b/Content.Client/Window/WindowComponent.cs index b88b6ebe13..135e94dba0 100644 --- a/Content.Client/Window/WindowComponent.cs +++ b/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)); diff --git a/Content.Server/VendingMachines/VendingMachineComponent.cs b/Content.Server/VendingMachines/VendingMachineComponent.cs index 4b4bd3bca6..1634dd9bac 100644 --- a/Content.Server/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/VendingMachines/VendingMachineComponent.cs @@ -87,7 +87,7 @@ namespace Content.Server.VendingMachines if (!string.IsNullOrEmpty(_spriteName)) { var spriteComponent = Owner.GetComponent(); - const string vendingMachineRSIPath = "Constructible/Power/VendingMachines/{0}.rsi"; + const string vendingMachineRSIPath = "Structures/Machines/VendingMachines/{0}.rsi"; spriteComponent.BaseRSIPath = string.Format(vendingMachineRSIPath, _spriteName); } diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index 4949818a15..7d5281a1e0 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/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; diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 69c4448469..cd8bb69256 100644 --- a/Resources/Maps/saltern.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml index c34b5fefc8..1c33d1da13 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml index 994e7b648f..957e91a4ab 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml index 301095d32e..4e7e91e85f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml b/Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml new file mode 100644 index 0000000000..b9a6ce5322 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index c44efffef7..ed6ab1f72e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -1,6 +1,6 @@ - type: entity - id: LockerToolFilled - parent: LockerTool + id: ClosetToolFilled + parent: ClosetTool suffix: Filled components: - type: StorageFill @@ -93,6 +93,6 @@ prob: 0.15 - type: entity - id: LockerRadiationSuitFilled - parent: LockerRadiationSuit + id: ClosetRadiationSuitFilled + parent: ClosetRadiationSuit suffix: Filled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/l3.yml b/Resources/Prototypes/Catalog/Fills/Lockers/l3.yml deleted file mode 100644 index fdb7259d21..0000000000 --- a/Resources/Prototypes/Catalog/Fills/Lockers/l3.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index cc188f472d..78cb14b62b 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -4,8 +4,8 @@ # parent: LockerSyndicatePersonal - type: entity - id: LockerEmergencyFilledRandom - parent: LockerEmergency + id: ClosetEmergencyFilledRandom + parent: ClosetEmergency suffix: Filled, Random components: - type: StorageFill @@ -22,8 +22,8 @@ prob: 0.2 - type: entity - id: LockerFireFilled - parent: LockerFire + id: ClosetFireFilled + parent: ClosetFire suffix: Filled components: - type: StorageFill diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 469c3113f8..28bbc7effa 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -68,8 +68,8 @@ - type: entity - id: LockerBombFilled - parent: LockerBomb + id: ClosetBombFilled + parent: ClosetBomb suffix: Filled components: - type: StorageFill diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index 7029d639f5..b753048f50 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/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: diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 2978056ac6..8a648128c1 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/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: diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/shielding.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/shielding.yml deleted file mode 100644 index c0bcc8e5e4..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/shielding.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml b/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml deleted file mode 100644 index fbbd73a9e1..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/twoWayLever.yml b/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/twoWayLever.yml deleted file mode 100644 index 9486116d8a..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/twoWayLever.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml deleted file mode 100644 index 9eb47b1d76..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml +++ /dev/null @@ -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"]] diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml deleted file mode 100644 index 17ca50c7dc..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml +++ /dev/null @@ -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"]] diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml deleted file mode 100644 index 8f0d58f3ff..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml +++ /dev/null @@ -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"]] diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml deleted file mode 100644 index dfa5745b63..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml +++ /dev/null @@ -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" ] ] diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml deleted file mode 100644 index 743fc560d7..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: entity - id: LockerFreezer - parent: LockerSecureBase - name: "freezer" - components: - - type: Appearance - visuals: - - type: StorageVisualizer - state: freezer - - type: AccessReader - access: [ [ "Service" ] ] diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml deleted file mode 100644 index 24e5a50fc7..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml +++ /dev/null @@ -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" ] ] diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml deleted file mode 100644 index da1b9081a1..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml +++ /dev/null @@ -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" ] ] diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml deleted file mode 100644 index 1130a31566..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml +++ /dev/null @@ -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" ] ] diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml deleted file mode 100644 index 902066a865..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml +++ /dev/null @@ -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"]] diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/cursed.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/cursed.yml deleted file mode 100644 index b82c8d68df..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/cursed.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: entity - id: LockerCursed - parent: LockerGeneric - name: "closet" - suffix: "cursed" - description: "A standard-issue Nanotrasen storage unit." - components: - - type: CursedEntityStorage diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml deleted file mode 100644 index 9d6e2c76eb..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml +++ /dev/null @@ -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." diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml deleted file mode 100644 index 728f993bd5..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/name_variants.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/name_variants.yml deleted file mode 100644 index a0aef85851..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/name_variants.yml +++ /dev/null @@ -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." diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml deleted file mode 100644 index c1cedf590b..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml deleted file mode 100644 index 26d56a871e..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml deleted file mode 100644 index 9a11101a42..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml deleted file mode 100644 index 2ee3b28b2d..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml deleted file mode 100644 index fcaf1401dc..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml +++ /dev/null @@ -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 diff --git a/Resources/Prototypes/Entities/Constructible/Ground/crayondecals.yml b/Resources/Prototypes/Entities/Effects/crayondecals.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/Ground/crayondecals.yml rename to Resources/Prototypes/Entities/Effects/crayondecals.yml diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml index 3a4b4236ad..331c5502a9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml index 83786369a0..67c09fb22c 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml index 060107e51e..a48d0baef1 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base.yml index de5b8c089e..64fadf1ffe 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index 1547c75528..b1fcbf8a44 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml index 69383d00ac..0c0ae550b3 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml index e44eca397b..dc0867488b 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml index 9916f3a5e0..cd44d0d755 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml index eed1097922..792c69e4ed 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml index 07567eaef8..8cc456fa0d 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Specific/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml similarity index 99% rename from Resources/Prototypes/Entities/Constructible/Specific/machine_parts.yml rename to Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml index 1aa44d6e3c..65c1e85fbb 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/machine_parts.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 8237a11655..5f9b898de7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/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: diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml rename to Resources/Prototypes/Entities/Structures/Dispensers/base.yml diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml similarity index 86% rename from Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml rename to Resources/Prototypes/Entities/Structures/Dispensers/booze.yml index b238843e9c..e1c4d24682 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml similarity index 77% rename from Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml rename to Resources/Prototypes/Entities/Structures/Dispensers/chem.yml index 84ae79f823..ea409f1bd2 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml similarity index 87% rename from Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml rename to Resources/Prototypes/Entities/Structures/Dispensers/soda.yml index 9b70240a9e..bf981ba7e7 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml rename to Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml similarity index 52% rename from Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml rename to Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index cec0c0d245..b7d264d589 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml new file mode 100644 index 0000000000..4b62f40ffe --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml similarity index 65% rename from Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml rename to Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml index 523a1e4c62..7b88ff7002 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml new file mode 100644 index 0000000000..b33fa434c7 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml similarity index 93% rename from Resources/Prototypes/Entities/Constructible/Doors/firelock.yml rename to Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml index c52a2f0505..40fad456b0 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml similarity index 87% rename from Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml rename to Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml index 825a9a96f9..dd73940b31 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base.yml new file mode 100644 index 0000000000..8fdc6370cd --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml similarity index 80% rename from Resources/Prototypes/Entities/Constructible/Furniture/tables.yml rename to Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index 4a05fdb46e..e9c2fc3f2a 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml +++ b/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: diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml similarity index 93% rename from Resources/Prototypes/Entities/Constructible/Furniture/beds.yml rename to Resources/Prototypes/Entities/Structures/Furniture/beds.yml index 49778bb69b..a9ba42a0b7 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml rename to Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml index 728aa67d1d..4e4cf4e074 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml similarity index 64% rename from Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml rename to Resources/Prototypes/Entities/Structures/Furniture/carpets.yml index 117a2a12e7..17ac1a5ab4 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml b/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml rename to Resources/Prototypes/Entities/Structures/Furniture/instruments.yml index d4ecbf7ba4..f3a1f66670 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml b/Resources/Prototypes/Entities/Structures/Furniture/pilot_chair.yml similarity index 90% rename from Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml rename to Resources/Prototypes/Entities/Structures/Furniture/pilot_chair.yml index 448f0889cf..798d2ae902 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml similarity index 96% rename from Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml rename to Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml index e6d8dc2e04..07a2513d2a 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml b/Resources/Prototypes/Entities/Structures/Furniture/seats.yml similarity index 98% rename from Resources/Prototypes/Entities/Constructible/Furniture/seats.yml rename to Resources/Prototypes/Entities/Structures/Furniture/seats.yml index 617447f05f..defc331e58 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Watercloset/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml similarity index 94% rename from Resources/Prototypes/Entities/Constructible/Watercloset/toilet.yml rename to Resources/Prototypes/Entities/Structures/Furniture/toilet.yml index 0de11e1e9f..c5a9cc88d0 100644 --- a/Resources/Prototypes/Entities/Constructible/Watercloset/toilet.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml similarity index 94% rename from Resources/Prototypes/Entities/Constructible/Power/arcade.yml rename to Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index f0db5e326a..eb167c146e 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml +++ b/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: diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base.yml new file mode 100644 index 0000000000..43fd08eba7 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Power/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml similarity index 61% rename from Resources/Prototypes/Entities/Constructible/Power/computers.yml rename to Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index d19ec4cb9e..00232a36e5 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/computers.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml new file mode 100644 index 0000000000..77cba8a15c --- /dev/null +++ b/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" ] diff --git a/Resources/Prototypes/Entities/Constructible/base_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/base.yml similarity index 96% rename from Resources/Prototypes/Entities/Constructible/base_machine.yml rename to Resources/Prototypes/Entities/Structures/Machines/base.yml index b19a2a4167..9f7d7faad1 100644 --- a/Resources/Prototypes/Entities/Constructible/base_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/base.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseConstructible + parent: BaseStructure id: BaseMachine components: - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml similarity index 90% rename from Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml rename to Resources/Prototypes/Entities/Structures/Machines/chem_master.yml index 08526a09de..0deb23f6d4 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml similarity index 92% rename from Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml rename to Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml index c0365ff0f7..95154b771d 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml +++ b/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"] diff --git a/Resources/Prototypes/Entities/Constructible/Power/machine_frame.yml b/Resources/Prototypes/Entities/Structures/Machines/frame.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/Power/machine_frame.yml rename to Resources/Prototypes/Entities/Structures/Machines/frame.yml index a973737234..a96523dd78 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/machine_frame.yml +++ b/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" - state: "box_0" + sprite: Structures/Machines/parts.rsi + state: box_0 - type: entity id: MachineFrame @@ -92,8 +92,8 @@ - type: MachineFrame - type: Sprite netsync: false - sprite: "Constructible/Misc/stock_parts.rsi" - state: "box_1" + sprite: Structures/Machines/parts.rsi + state: box_1 - type: Appearance visuals: - type: MachineFrameVisualizer diff --git a/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml similarity index 84% rename from Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml rename to Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml index 527bcade39..bfbeb05fb5 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml similarity index 87% rename from Resources/Prototypes/Entities/Constructible/Power/lathe.yml rename to Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7202bd93f7..c43572e7f4 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1,12 +1,21 @@ -- type: entity - id: BaseLathe - name: "lathe" - abstract: true - placement: - mode: SnapgridCenter +- type: entity + parent: BaseMachinePowered + id: Autolathe + name: autolathe + description: It produces items using metal and glass. components: - - type: Clickable - - type: InteractionOutline + - type: Sprite + 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 diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml rename to Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml index 9e31fd109a..f83802bdba 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml +++ b/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"] diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml similarity index 76% rename from Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml rename to Resources/Prototypes/Entities/Structures/Machines/microwave.yml index 38c3bae6c9..aa9093711a 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml +++ b/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: diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml similarity index 54% rename from Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml rename to Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml index 1261dcbebb..4a9a89d5a2 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml similarity index 81% rename from Resources/Prototypes/Entities/Constructible/Specific/recycler.yml rename to Resources/Prototypes/Entities/Structures/Machines/recycler.yml index 683b59074d..92cd7d374e 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml similarity index 66% rename from Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml rename to Resources/Prototypes/Entities/Structures/Machines/research.yml index 68ce5a5646..2ac286ab18 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml @@ -1,31 +1,17 @@ - type: entity id: ResearchAndDevelopmentServer - parent: BaseConstructibleDynamic - name: "R&D server" - description: 'Thats a R&D server.' + parent: BaseMachinePowered + name: 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: diff --git a/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml rename to Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml index ea36f6c59c..2fd55b34f7 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Specific/traitordm.yml b/Resources/Prototypes/Entities/Structures/Machines/traitordm.yml similarity index 81% rename from Resources/Prototypes/Entities/Constructible/Specific/traitordm.yml rename to Resources/Prototypes/Entities/Structures/Machines/traitordm.yml index 003f29a4b0..4127d3f695 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/traitordm.yml +++ b/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: diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml similarity index 89% rename from Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml rename to Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 5b11907247..a768916885 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml +++ b/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 - name: Vending machine + parent: BaseMachinePowered + 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 - resistances: metallicResistances + mass: 100 - 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"] diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml similarity index 83% rename from Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/binary.yml rename to Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml index d9d2f6a82b..f7d23a40a4 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/binary.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml similarity index 96% rename from Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/miners.yml rename to Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml index c72bc79341..4261cb48ce 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/miners.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml similarity index 97% rename from Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/pipes.yml rename to Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml index 75ff476a9d..df3534b3d3 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/pipes.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml similarity index 85% rename from Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/trinary.yml rename to Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml index 6671265f2f..916ba7302e 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/trinary.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml similarity index 88% rename from Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/unary.yml rename to Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index 936fefc386..14be2b9c3a 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/unary.yml +++ b/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. - diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml similarity index 93% rename from Resources/Prototypes/Entities/Constructible/Piping/Disposal/pipes.yml rename to Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml index 638301f040..f7d51bf2c7 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/Disposal/pipes.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml similarity index 98% rename from Resources/Prototypes/Entities/Constructible/Piping/Disposal/units.yml rename to Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml index 77543a62e5..d8cb9c3f48 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/Disposal/units.yml +++ b/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"] diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/base.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/base.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/control_box.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml similarity index 92% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/control_box.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml index 14494511f7..4b003dd5f4 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/control_box.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml similarity index 90% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/emitter.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml index 83b24de757..930fa0a1f4 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/emitter.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml @@ -5,7 +5,7 @@ description: This launchs the Alpha particles, might not want to stand near this end. components: - type: Sprite - sprite: Constructible/Specific/Engines/PA/emitter_left.rsi + sprite: Structures/Power/Generation/PA/emitter_left.rsi layers: - state: leftc map: [ "enum.ParticleAcceleratorVisualLayers.Base" ] @@ -30,7 +30,7 @@ description: This launchs the Alpha particles, might not want to stand near this end. components: - type: Sprite - sprite: Constructible/Specific/Engines/PA/emitter_center.rsi + sprite: Structures/Power/Generation/PA/emitter_center.rsi layers: - state: centerc map: [ "enum.ParticleAcceleratorVisualLayers.Base" ] @@ -55,7 +55,7 @@ description: This launchs the Alpha particles, might not want to stand near this end. components: - type: Sprite - sprite: Constructible/Specific/Engines/PA/emitter_right.rsi + sprite: Structures/Power/Generation/PA/emitter_right.rsi layers: - state: rightc map: [ "enum.ParticleAcceleratorVisualLayers.Base" ] @@ -85,7 +85,7 @@ - type: Physics bodyType: Dynamic - type: Sprite - sprite: Constructible/Specific/Engines/PA/emitter_left.rsi + sprite: Structures/Power/Generation/PA/emitter_left.rsi state: left - type: Construction graph: particleAcceleratorEmitterLeft @@ -102,7 +102,7 @@ - type: Physics bodyType: Dynamic - type: Sprite - sprite: Constructible/Specific/Engines/PA/emitter_center.rsi + sprite: Structures/Power/Generation/PA/emitter_center.rsi state: center - type: Construction graph: particleAcceleratorEmitterCenter @@ -119,7 +119,7 @@ - type: Physics bodyType: Dynamic - type: Sprite - sprite: Constructible/Specific/Engines/PA/emitter_right.rsi + sprite: Structures/Power/Generation/PA/emitter_right.rsi state: right - type: Construction graph: particleAcceleratorEmitterRight diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/end_cap.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml similarity index 88% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/end_cap.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml index fd97a8b0ac..76b5967d7b 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/end_cap.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml @@ -5,7 +5,7 @@ description: Formally known as the Alpha Particle Generation Array. This is where Alpha particles are generated from [REDACTED]. components: - type: Sprite - sprite: Constructible/Specific/Engines/PA/end_cap.rsi + sprite: Structures/Power/Generation/PA/end_cap.rsi state: capc - type: ParticleAcceleratorEndCap - type: Construction @@ -24,7 +24,7 @@ - type: Physics bodyType: Dynamic - type: Sprite - sprite: Constructible/Specific/Engines/PA/end_cap.rsi + sprite: Structures/Power/Generation/PA/end_cap.rsi state: cap - type: Construction graph: particleAcceleratorEndCap diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/fuel_chamber.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml similarity index 90% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/fuel_chamber.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml index 760ec86d34..160feea36f 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/fuel_chamber.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml @@ -5,7 +5,7 @@ description: Formally known as the EM Acceleration Chamber. This is where the Alpha particles are accelerated to radical speeds. components: - type: Sprite - sprite: Constructible/Specific/Engines/PA/fuel_chamber.rsi + sprite: Structures/Power/Generation/PA/fuel_chamber.rsi layers: - state: chamberc map: [ "enum.ParticleAcceleratorVisualLayers.Base" ] @@ -34,7 +34,7 @@ - type: Physics bodyType: Dynamic - type: Sprite - sprite: Constructible/Specific/Engines/PA/fuel_chamber.rsi + sprite: Structures/Power/Generation/PA/fuel_chamber.rsi state: chamber - type: Construction graph: particleAcceleratorFuelChamber diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/particles.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml similarity index 92% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/particles.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml index 7e653b1d84..146ba2fa58 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/particles.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml @@ -6,7 +6,7 @@ components: - type: Sprite layers: - - sprite: Constructible/Specific/Engines/PA/particle.rsi + - sprite: Structures/Power/Generation/PA/particle.rsi state: particle0 shader: unshaded - type: Projectile @@ -28,4 +28,3 @@ - type: ParticleProjectile - type: SinguloFood # Energy is setup by the PA particle fire function. - diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/power_box.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/PA/power_box.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml index b9b24c7d43..ccb9ae55e2 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/power_box.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml @@ -5,7 +5,7 @@ description: Formally known as the Particle Focusing EM Lens. This uses electromagnetic waves to focus the Alpha-Particles. components: - type: Sprite - sprite: Constructible/Specific/Engines/PA/power_box.rsi + sprite: Structures/Power/Generation/PA/power_box.rsi layers: - state: boxc map: [ "enum.ParticleAcceleratorVisualLayers.Base" ] @@ -40,7 +40,7 @@ - type: Physics bodyType: Dynamic - type: Sprite - sprite: Constructible/Specific/Engines/PA/power_box.rsi + sprite: Structures/Power/Generation/PA/power_box.rsi state: box - type: Construction graph: particleAcceleratorPowerBox diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml similarity index 95% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml index b5e8c6ea33..b7ba19a4f5 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml @@ -25,7 +25,7 @@ - VaultImpassable - type: SnapGrid - type: Sprite - sprite: Constructible/Power/Singularity/collector.rsi + sprite: Structures/Power/Generation/Singularity/collector.rsi layers: - state: ca_on map: ["enum.RadiationCollectorVisualLayers.Main"] @@ -53,4 +53,3 @@ - type: PowerNetworkBattery maxSupply: 1000000000 supplyRampTolerance: 1000000000 - diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/containment.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml similarity index 84% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/containment.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml index 4488cbb3bf..d0654ead03 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/containment.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml @@ -25,10 +25,10 @@ - VaultImpassable - type: SnapGrid - type: Sprite - sprite: Constructible/Power/Singularity/containment.rsi + sprite: Structures/Power/Generation/Singularity/containment.rsi state: icon - type: Icon - sprite: Constructible/Power/Singularity/containment.rsi + sprite: Structures/Power/Generation/Singularity/containment.rsi state: icon - type: ContainmentFieldGenerator - type: Anchorable @@ -66,9 +66,9 @@ - VaultImpassable - type: SnapGrid - type: Sprite - sprite: Constructible/Power/Singularity/containment_field.rsi + sprite: Structures/Power/Generation/Singularity/containment_field.rsi state: field - type: Icon - sprite: Constructible/Power/Singularity/containment_field.rsi + sprite: Structures/Power/Generation/Singularity/containment_field.rsi state: field - type: ContainmentField diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml similarity index 96% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml index c8ba2e3832..ba39a44907 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml @@ -25,7 +25,7 @@ - VaultImpassable - type: SnapGrid - type: Sprite - sprite: Constructible/Power/Singularity/emitter.rsi + sprite: Structures/Power/Generation/Singularity/emitter.rsi layers: - state: emitter2 - state: beam diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/generator.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml index 82d64806be..1953e5d8ab 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/generator.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml @@ -6,7 +6,7 @@ mode: SnapgridCenter components: - type: Sprite - sprite: Constructible/Power/Singularity/generator.rsi + sprite: Structures/Power/Generation/Singularity/generator.rsi state: icon - type: SingularityGenerator - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/singularity.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml similarity index 84% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/singularity.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml index 36fec026c9..3f6629d99f 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/singularity.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml @@ -23,10 +23,10 @@ range: 15 decay: false - type: Sprite - sprite: Constructible/Power/Singularity/singularity_1.rsi + sprite: Structures/Power/Generation/Singularity/singularity_1.rsi state: singularity_1 - type: Icon - sprite: Constructible/Power/Singularity/singularity_1.rsi + sprite: Structures/Power/Generation/Singularity/singularity_1.rsi state: singularity_1 drawdepth: Items - type: Appearance diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml similarity index 59% rename from Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml index c34c0821b9..92c68b637f 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml @@ -8,7 +8,7 @@ - type: Clickable - type: InteractionOutline - type: Sprite - sprite: Constructible/Power/ame_controller.rsi + sprite: Structures/Power/Generation/ame.rsi state: control - type: Physics fixtures: @@ -84,3 +84,61 @@ - Opaque - MobImpassable - SmallImpassable + +- 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: Structures/Power/Generation/ame.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 diff --git a/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml similarity index 95% rename from Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml index 6772432f48..1c73587d4c 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml @@ -27,7 +27,7 @@ - SmallImpassable - type: SnapGrid - type: Sprite - sprite: Constructible/Power/power.rsi + sprite: Structures/Power/power.rsi state: generator - type: NodeContainer examinable: true diff --git a/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml similarity index 94% rename from Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml rename to Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml index 0daea56341..bc3a7ec9b6 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml @@ -23,7 +23,7 @@ - VaultImpassable - SmallImpassable - type: Sprite - sprite: Constructible/Power/solar_panel.rsi + sprite: Structures/Power/Generation/solar_panel.rsi state: normal - type: NodeContainer examinable: true @@ -73,7 +73,7 @@ layer: - VaultImpassable - type: Sprite - sprite: Constructible/Power/solar_panel.rsi + sprite: Structures/Power/Generation/solar_panel.rsi state: solar_assembly - type: SnapGrid - type: Damageable @@ -117,7 +117,7 @@ - VaultImpassable - SmallImpassable - type: Sprite - sprite: Constructible/Power/solar_panel.rsi + sprite: Structures/Power/Generation/solar_panel.rsi state: solar_tracker - type: SnapGrid - type: Damageable diff --git a/Resources/Prototypes/Entities/Constructible/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml similarity index 93% rename from Resources/Prototypes/Entities/Constructible/Power/cable_terminal.yml rename to Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml index ef3c90a1cb..b3b6e042bb 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/cable_terminal.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml @@ -1,11 +1,11 @@ -- type: entity +- type: entity id: CableTerminal name: cable terminal placement: mode: SnapgridCenter components: - type: Sprite - sprite: Constructible/Power/wire_terminal.rsi + sprite: Structures/Power/cable_terminal.rsi state: term netsync: false drawdepth: BelowFloor diff --git a/Resources/Prototypes/Entities/Constructible/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml similarity index 90% rename from Resources/Prototypes/Entities/Constructible/Power/cables.yml rename to Resources/Prototypes/Entities/Structures/Power/cables.yml index 4970d246cb..774af10e32 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/cables.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml @@ -38,10 +38,10 @@ description: An orange high voltage power cable. components: - type: Sprite - sprite: Constructible/Power/Wires/hv_cable.rsi + sprite: Structures/Power/Cables/hv_cable.rsi state: hvcable_0 - type: Icon - sprite: Constructible/Power/Wires/hv_cable.rsi + sprite: Structures/Power/Cables/hv_cable.rsi state: hvcable_4 - type: NodeContainer nodes: @@ -80,11 +80,11 @@ components: - type: Sprite color: Yellow - sprite: Constructible/Power/Wires/mv_cable.rsi + sprite: Structures/Power/Cables/mv_cable.rsi state: mvcable_0 - type: Icon color: Yellow - sprite: Constructible/Power/Wires/mv_cable.rsi + sprite: Structures/Power/Cables/mv_cable.rsi state: mvcable_4 - type: NodeContainer nodes: @@ -119,15 +119,15 @@ parent: CableBase id: CableApcExtension name: LV power cable - description: A cable used to connect machines to an APC. #ACPs aren't area defined anymore so need this cable to connect things to the APC. This description should be dynamic in future. + description: A cable used to connect machines to an APC. #APCs aren't area defined anymore so need this cable to connect things to the APC. This description should be dynamic in future. components: - type: Sprite color: Green - sprite: Constructible/Power/Wires/lv_cable.rsi + sprite: Structures/Power/Cables/lv_cable.rsi state: lvcable_0 - type: Icon color: Green - sprite: Constructible/Power/Wires/lv_cable.rsi + sprite: Structures/Power/Cables/lv_cable.rsi state: lvcable_4 - type: NodeContainer nodes: diff --git a/Resources/Prototypes/Entities/Constructible/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml similarity index 79% rename from Resources/Prototypes/Entities/Constructible/Power/chargers.yml rename to Resources/Prototypes/Entities/Structures/Power/chargers.yml index 017ebeeac9..bc02c847fa 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/chargers.yml +++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml @@ -4,10 +4,10 @@ components: - type: Sprite netsync: false - sprite: Constructible/Power/cell_recharger.rsi + sprite: Structures/Power/cell_recharger.rsi drawdepth: Items - type: Icon - sprite: Constructible/Power/cell_recharger.rsi + sprite: Structures/Power/cell_recharger.rsi state: empty - type: PowerCellCharger transfer_efficiency: 0.85 @@ -25,10 +25,10 @@ components: - type: Sprite netsync: false - sprite: Constructible/Power/recharger.rsi + sprite: Structures/Power/recharger.rsi drawdepth: Items - type: Icon - sprite: Constructible/Power/recharger.rsi + sprite: Structures/Power/recharger.rsi state: empty - type: WeaponCapacitorCharger transfer_efficiency: 0.85 @@ -46,10 +46,10 @@ components: - type: Sprite netsync: false - sprite: Constructible/Power/wall_recharger.rsi + sprite: Structures/Power/wall_recharger.rsi drawdepth: Items - type: Icon - sprite: Constructible/Power/wall_recharger.rsi + sprite: Structures/Power/wall_recharger.rsi state: empty - type: WeaponCapacitorCharger transfer_efficiency: 0.95 diff --git a/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml similarity index 93% rename from Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml rename to Resources/Prototypes/Entities/Structures/Power/debug_power.yml index 24f55dfcfa..e07aff409c 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml +++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml @@ -20,7 +20,7 @@ layer: [MobMask, Opaque] - type: SnapGrid - type: Sprite - sprite: Constructible/Power/power.rsi + sprite: Structures/Power/power.rsi state: wiredmachine - type: NodeContainer nodes: @@ -58,7 +58,7 @@ layer: [MobMask, Opaque] - type: SnapGrid - type: Sprite - sprite: Constructible/Power/power.rsi + sprite: Structures/Power/power.rsi state: provider - type: Battery - type: NodeContainer @@ -85,7 +85,7 @@ layer: [MobMask, Opaque] - type: SnapGrid - type: Sprite - sprite: Constructible/Power/power.rsi + sprite: Structures/Power/power.rsi state: provider - type: Battery - type: NodeContainer @@ -128,7 +128,7 @@ layer: [MobMask, Opaque] - type: SnapGrid - type: Sprite - sprite: Constructible/Power/power.rsi + sprite: Structures/Power/power.rsi state: wirelessmachine - type: ApcPowerReceiver - type: Anchorable diff --git a/Resources/Prototypes/Entities/Constructible/Power/parts.yml b/Resources/Prototypes/Entities/Structures/Power/parts.yml similarity index 96% rename from Resources/Prototypes/Entities/Constructible/Power/parts.yml rename to Resources/Prototypes/Entities/Structures/Power/parts.yml index f80f119e3d..2905bb612e 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/parts.yml +++ b/Resources/Prototypes/Entities/Structures/Power/parts.yml @@ -8,7 +8,7 @@ mode: SnapgridCenter components: - type: Sprite - sprite: Constructible/Power/substation.rsi + sprite: Structures/Power/substation.rsi layers: - state: substation - state: screen @@ -37,6 +37,7 @@ maxChargeRate: 5000 supplyRampTolerance: 5000 supplyRampRate: 1000 + - type: entity abstract: true id: BaseApc @@ -59,7 +60,7 @@ - type: Sprite drawdepth: WallMountedItems netsync: false - sprite: "Constructible/Power/apc.rsi" + sprite: Structures/Power/apc.rsi state: apc0 - type: Appearance visuals: @@ -95,4 +96,3 @@ maxChargeRate: 5000 supplyRampTolerance: 1000 supplyRampRate: 500 - diff --git a/Resources/Prototypes/Entities/Constructible/Power/Specific/saltern_power.yml b/Resources/Prototypes/Entities/Structures/Power/saltern_power.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/Power/Specific/saltern_power.yml rename to Resources/Prototypes/Entities/Structures/Power/saltern_power.yml diff --git a/Resources/Prototypes/Entities/Constructible/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml similarity index 94% rename from Resources/Prototypes/Entities/Constructible/Power/smes.yml rename to Resources/Prototypes/Entities/Structures/Power/smes.yml index cce3cbebf2..6c3796f1ef 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/smes.yml +++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity abstract: true id: BaseSmes parent: BaseMachine @@ -9,7 +9,7 @@ components: - type: Sprite netsync: false - sprite: Constructible/Power/smes.rsi + sprite: Structures/Power/smes.rsi layers: - state: smes - state: smes-display @@ -34,11 +34,9 @@ - type: BatteryCharger voltage: High node: output - - type: BatteryDischarger voltage: High node: input - - type: PowerNetworkBattery maxSupply: 150000 maxChargeRate: 5000 diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml new file mode 100644 index 0000000000..2be102cc95 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/base.yml @@ -0,0 +1,72 @@ +- type: entity + abstract: true + id: GasCanister + name: gas canister + description: A canister that can contain any type of gas. It can be attached to connector ports using a wrench. + parent: BaseStructureDynamic + components: + - type: InteractionOutline + - type: Sprite + netsync: false + sprite: Structures/Storage/canister.rsi + state: grey + - type: Appearance + visuals: + - type: GasPortableVisualizer + stateConnected: can-connector + - type: GasCanisterVisualizer + insertedTankState: can-open + pressureStates: + - can-o0 + - can-o1 + - can-o2 + - can-o3 + - type: UserInterface + interfaces: + - key: enum.GasCanisterUiKey.Key + type: GasCanisterBoundUserInterface + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:PlaySoundBehavior + sound: /Audio/Effects/metalbreak.ogg + - !type:SpawnEntitiesBehavior + spawn: + GasCanisterBrokenBase: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Damageable + resistances: metallicResistances + - type: Physics + bodyType: Dynamic + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + mass: 25 + mask: + - MobImpassable + layer: + - Opaque + - MobImpassable + - SmallImpassable + - VaultImpassable + - type: AtmosDevice + requireAnchored: false + - type: ContainerContainer + containers: + GasCanisterTankHolder: !type:ContainerSlot {} + - type: NodeContainer + nodes: + port: + !type:PortablePipeNode + nodeGroupID: Pipe + rotationsEnabled: false + volume: 1 + - type: GasPortable + - type: GasCanister diff --git a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml similarity index 81% rename from Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/gas_canisters.yml rename to Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index 574f9e9ea8..7144edd6f1 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/Atmospherics/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -1,76 +1,3 @@ -- type: entity - abstract: true - id: GasCanister - name: gas canister - description: A canister that can contain any type of gas. It can be attached to connector ports using a wrench. - parent: BaseConstructibleDynamic - components: - - type: InteractionOutline - - type: Sprite - netsync: false - sprite: Constructible/Atmos/canister.rsi - state: grey - - type: Appearance - visuals: - - type: GasPortableVisualizer - stateConnected: can-connector - - type: GasCanisterVisualizer - insertedTankState: can-open - pressureStates: - - can-o0 - - can-o1 - - can-o2 - - can-o3 - - type: UserInterface - interfaces: - - key: enum.GasCanisterUiKey.Key - type: GasCanisterBoundUserInterface - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 300 - behaviors: - - !type:PlaySoundBehavior - sound: /Audio/Effects/metalbreak.ogg - - !type:SpawnEntitiesBehavior - spawn: - GasCanisterBrokenBase: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Damageable - resistances: metallicResistances - - type: Physics - bodyType: Dynamic - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.25,-0.25,0.25,0.25" - mass: 25 - mask: - - MobImpassable - layer: - - Opaque - - MobImpassable - - SmallImpassable - - VaultImpassable - - type: AtmosDevice - requireAnchored: false - - type: ContainerContainer - containers: - GasCanisterTankHolder: !type:ContainerSlot {} - - type: NodeContainer - nodes: - port: - !type:PortablePipeNode - nodeGroupID: Pipe - rotationsEnabled: false - volume: 1 - - type: GasPortable - - type: GasCanister - - type: entity parent: GasCanister id: StorageCanister @@ -329,7 +256,7 @@ # Broke Entities - type: entity - parent: BaseConstructible + parent: BaseStructure id: GasCanisterBrokenBase name: broken gas canister description: A broken gas canister. Not useless yet, as it can be salvaged for high quality materials. @@ -354,7 +281,7 @@ resistances: metallicResistances - type: InteractionOutline - type: Sprite - sprite: Constructible/Atmos/canister.rsi + sprite: Structures/Storage/canister.rsi state: grey-1 - type: Physics bodyType: Dynamic diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet_secure.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml similarity index 89% rename from Resources/Prototypes/Entities/Constructible/Storage/Closets/closet_secure.yml rename to Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml index 5655c8c250..671ca7cb34 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet_secure.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml @@ -1,13 +1,13 @@ - type: entity - id: LockerSecureBase - parent: LockerGeneric + id: LockerBase + parent: ClosetBase abstract: true components: - type: AccessReader - type: SecureEntityStorage - type: Sprite netsync: false - sprite: Constructible/Structures/closet.rsi + sprite: Structures/Storage/closet.rsi layers: - state: generic - state: generic_door diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml new file mode 100644 index 0000000000..7d497e0535 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -0,0 +1,288 @@ +- type: entity + id: LockerBooze + parent: LockerBase + name: booze storage + description: This is where the bartender keeps the booze. + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: cabinet + - type: AccessReader + access: [["Bar"]] + +# Cargo +- type: entity + id: LockerQuarterMaster + parent: LockerBase + name: quartermaster's locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: qm + - type: AccessReader + access: [["Cargo"]] # TODO access [["Quartermaster"]] + +# Command +- type: entity + id: LockerCaptain + parent: LockerBase + name: captain's locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: cap + - type: AccessReader + access: [["Captain"]] + +- type: entity + id: LockerHeadOfPersonnel + parent: LockerBase + name: head of personnel's locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: hop + - type: AccessReader + access: [["HeadOfPersonnel"]] + +# CE +- type: entity + id: LockerChiefEngineer + parent: LockerBase + 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: LockerBase + 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: LockerBase + 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: LockerBase + name: atmospheric technician's locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: atmos + - type: AccessReader + access: [ [ "Engineering" ] ] + +# Engineer +- type: entity + id: LockerEngineer + parent: LockerBase + name: engineer's locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: eng_secure + - type: AccessReader + access: [ [ "Engineering" ] ] + +# Freezer +- type: entity + id: LockerFreezer + parent: LockerBase + name: freezer + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: freezer + - type: AccessReader + access: [ [ "Service" ] ] + +# Botanist +- type: entity + id: LockerBotanist + parent: LockerBase + name: botanist's locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: hydro + - type: AccessReader + access: [ [ "Service" ] ] + +# Medicine +- type: entity + id: LockerMedicine + parent: LockerBase + 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: LockerBase + name: medical doctor's locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: med_secure + - type: AccessReader + access: [ [ "Medical" ] ] + +# Chemical +- type: entity + id: LockerChemistry + parent: LockerBase + name: chemical locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: med + state_closed: chemical_door + - type: AccessReader + access: [ [ "Medical" ] ] + +# CMO +- type: entity + id: LockerChiefMedicalOfficer + parent: LockerBase + name: chief medical officer's locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: cmo + - type: AccessReader + access: [ [ "Medical", "Command" ] ] + +# Science + +- type: entity + id: LockerResearchDirector + parent: LockerBase + name: research director's locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: rd + - type: AccessReader + access: [ [ "Research", "Command" ] ] + +- type: entity + id: LockerScientist + parent: LockerBase + name: scientist's locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: science + - type: AccessReader + access: [ [ "Research" ] ] + +# HoS +- type: entity + id: LockerHeadOfSecurity + parent: LockerBase + 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: LockerBase + 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: LockerBase + name: security officer's locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: sec + - type: AccessReader + access: [["Security"]] + +# Detective +- type: entity + id: LockerDetective + parent: LockerBase + name: detective's cabinet + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: cabinet + - type: AccessReader + access: [["Service"]] # TODO access [["Detective"]] + +# Syndicate + +- type: entity + id: LockerSyndicatePersonal + name: armory closet + parent: LockerBase + description: It's a personal storage unit for operative gear. + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: syndicate diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml rename to Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml index 66f9fc8910..7c387a93d4 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml @@ -1,12 +1,12 @@ -- type: entity - id: LockerGeneric - parent: BaseConstructibleDynamic +- type: entity + id: ClosetBase + parent: BaseStructureDynamic name: closet description: A standard-issue Nanotrasen storage unit. components: - type: Sprite netsync: false - sprite: Constructible/Structures/closet.rsi + sprite: Structures/Storage/closet.rsi layers: - state: generic - state: generic_door diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml new file mode 100644 index 0000000000..ad7a284db0 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml @@ -0,0 +1,105 @@ +# Tool closet +- type: entity + id: ClosetTool + name: tool closet + parent: ClosetBase + 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: ClosetRadiationSuit + name: radiation suit closet + parent: ClosetBase + 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: ClosetEmergency + name: emergency closet + parent: ClosetBase + 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: ClosetFire + name: fire-safety closet + parent: ClosetBase + description: It's a storage unit for fire-fighting supplies. + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: fire + +# EOD closet +- type: entity + id: ClosetBomb + name: EOD closet + parent: ClosetBase + description: It's a storage unit for explosion-protective suits. + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: bomb + +# Biohazard + +# Base level 3 bio hazard closet +- type: entity + id: ClosetL3 + parent: ClosetBase + 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: ClosetL3Virology + parent: ClosetL3 + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: bio_viro + +# Security variant +- type: entity + id: ClosetL3Security + parent: ClosetL3 + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: bio_sec + +# Janitor variant +- type: entity + id: ClosetL3Janitor + parent: ClosetL3 + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: bio_jan diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/cursed.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/cursed.yml new file mode 100644 index 0000000000..573c593fc2 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/cursed.yml @@ -0,0 +1,8 @@ +- type: entity + id: ClosetCursed + parent: ClosetBase + name: closet + suffix: cursed + description: A standard-issue Nanotrasen storage unit. + components: + - type: CursedEntityStorage diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml new file mode 100644 index 0000000000..c288d5641a --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml @@ -0,0 +1,215 @@ +# Base +- type: entity + id: WardrobeBase + parent: ClosetBase + abstract: true + description: It's a storage unit for standard-issue Nanotrasen attire. + +# Colored + +# 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 + +# Jobs + +- type: entity + id: WardrobeSecurity + parent: WardrobeBase + name: security wardrobe + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: generic + state_closed: red_door + +- type: entity + id: WardrobeAtmospherics + parent: WardrobeBase + name: atmospherics wardrobe + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: generic + state_closed: atmos_wardrobe_door + +- type: entity + id: ClosetJanitor + parent: WardrobeMixed + name: custodial closet + description: It's a storage unit for janitorial clothes and gear. + +- type: entity + id: WardrobeFormal + parent: WardrobeBlack + name: formal closet + description: It's a storage unit for formal clothing. + +- type: entity + id: ClosetChef + 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: ClosetLegal + 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 diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml similarity index 92% rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml rename to Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml index 954d529693..eec102958c 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml @@ -1,13 +1,13 @@ - type: entity id: CrateGeneric - parent: BaseConstructibleDynamic + parent: BaseStructureDynamic abstract: true name: crate description: A large container for items. components: - type: Sprite netsync: false - sprite: Constructible/Storage/Crates/generic.rsi + sprite: Structures/Storage/Crates/generic.rsi layers: - state: crate - state: crate_door diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml similarity index 84% rename from Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml rename to Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 56a7239462..dae7bc4c1c 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -4,7 +4,7 @@ parent: CrateGeneric components: - type: Sprite - sprite: Constructible/Storage/Crates/generic.rsi + sprite: Structures/Storage/Crates/generic.rsi layers: - state: crate - state: crate_door @@ -13,7 +13,7 @@ visible: false map: ["enum.StorageVisualLayers.Welded"] - type: Icon - sprite: Constructible/Storage/Crates/generic.rsi + sprite: Structures/Storage/Crates/generic.rsi state: crate_icon - type: Appearance visuals: @@ -27,7 +27,7 @@ parent: CrateGeneric components: - type: Sprite - sprite: Constructible/Storage/Crates/plastic.rsi + sprite: Structures/Storage/Crates/plastic.rsi layers: - state: plasticcrate - state: plasticcrate_door @@ -36,7 +36,7 @@ visible: false map: ["enum.StorageVisualLayers.Welded"] - type: Icon - sprite: Constructible/Storage/Crates/plastic.rsi + sprite: Structures/Storage/Crates/plastic.rsi state: plasticcrate_icon - type: Appearance visuals: @@ -50,7 +50,7 @@ parent: CrateGeneric components: - type: Sprite - sprite: Constructible/Storage/Crates/freezer.rsi + sprite: Structures/Storage/Crates/freezer.rsi layers: - state: freezer - state: freezer_door @@ -59,7 +59,7 @@ visible: false map: ["enum.StorageVisualLayers.Welded"] - type: Icon - sprite: Constructible/Storage/Crates/freezer.rsi + sprite: Structures/Storage/Crates/freezer.rsi state: freezer_icon - type: Appearance visuals: @@ -73,7 +73,7 @@ parent: CrateGeneric components: - type: Sprite - sprite: Constructible/Storage/Crates/hydro.rsi + sprite: Structures/Storage/Crates/hydro.rsi layers: - state: hydrocrate - state: hydrocrate_door @@ -82,7 +82,7 @@ visible: false map: ["enum.StorageVisualLayers.Welded"] - type: Icon - sprite: Constructible/Storage/Crates/hydro.rsi + sprite: Structures/Storage/Crates/hydro.rsi state: hydrocrate_icon - type: Appearance visuals: @@ -96,7 +96,7 @@ parent: CrateGeneric components: - type: Sprite - sprite: Constructible/Storage/Crates/medical.rsi + sprite: Structures/Storage/Crates/medical.rsi layers: - state: medicalcrate - state: medicalcrate_door @@ -105,7 +105,7 @@ visible: false map: ["enum.StorageVisualLayers.Welded"] - type: Icon - sprite: Constructible/Storage/Crates/medical.rsi + sprite: Structures/Storage/Crates/medical.rsi state: medicalcrate_icon - type: Appearance visuals: @@ -120,7 +120,7 @@ parent: CrateGeneric components: - type: Sprite - sprite: Constructible/Storage/Crates/radiation.rsi + sprite: Structures/Storage/Crates/radiation.rsi layers: - state: radiationcrate - state: radiationcrate_door @@ -129,7 +129,7 @@ visible: false map: ["enum.StorageVisualLayers.Welded"] - type: Icon - sprite: Constructible/Storage/Crates/radiation.rsi + sprite: Structures/Storage/Crates/radiation.rsi state: radiationcrate_icon - type: Appearance visuals: @@ -143,7 +143,7 @@ parent: CrateGeneric components: - type: Sprite - sprite: Constructible/Storage/Crates/o2.rsi + sprite: Structures/Storage/Crates/o2.rsi layers: - state: o2crate - state: o2crate_door @@ -152,7 +152,7 @@ visible: false map: ["enum.StorageVisualLayers.Welded"] - type: Icon - sprite: Constructible/Storage/Crates/o2.rsi + sprite: Structures/Storage/Crates/o2.rsi state: o2crate_icon - type: Appearance visuals: @@ -166,7 +166,7 @@ parent: CrateGeneric components: - type: Sprite - sprite: Constructible/Storage/Crates/electricalcrate.rsi + sprite: Structures/Storage/Crates/electricalcrate.rsi layers: - state: electricalcrate - state: electricalcrate_door @@ -175,7 +175,7 @@ visible: false map: ["enum.StorageVisualLayers.Welded"] - type: Icon - sprite: Constructible/Storage/Crates/electricalcrate.rsi + sprite: Structures/Storage/Crates/electricalcrate.rsi state: electricalcrate_icon - type: Appearance visuals: @@ -189,7 +189,7 @@ parent: CrateGeneric components: - type: Sprite - sprite: Constructible/Storage/Crates/engicrate.rsi + sprite: Structures/Storage/Crates/engicrate.rsi layers: - state: engicrate - state: engicrate_door @@ -198,7 +198,7 @@ visible: false map: ["enum.StorageVisualLayers.Welded"] - type: Icon - sprite: Constructible/Storage/Crates/engicrate.rsi + sprite: Structures/Storage/Crates/engicrate.rsi state: engicrate_icon - type: Appearance visuals: @@ -212,7 +212,7 @@ parent: CrateGeneric components: - type: Sprite - sprite: Constructible/Storage/Crates/scicrate.rsi + sprite: Structures/Storage/Crates/scicrate.rsi layers: - state: scicrate - state: scicrate_door @@ -221,7 +221,7 @@ visible: false map: ["enum.StorageVisualLayers.Welded"] - type: Icon - sprite: Constructible/Storage/Crates/scicrate.rsi + sprite: Structures/Storage/Crates/scicrate.rsi state: scicrate_icon - type: Appearance visuals: @@ -235,7 +235,7 @@ parent: CrateGeneric components: - type: Sprite - sprite: Constructible/Storage/Crates/surgerycrate.rsi + sprite: Structures/Storage/Crates/surgerycrate.rsi layers: - state: surgerycrate - state: surgerycrate_door @@ -244,7 +244,7 @@ visible: false map: ["enum.StorageVisualLayers.Welded"] - type: Icon - sprite: Constructible/Storage/Crates/surgerycrate.rsi + sprite: Structures/Storage/Crates/surgerycrate.rsi state: surgerycrate_icon - type: Appearance visuals: @@ -263,7 +263,7 @@ access: [["Security"]] - type: SecureEntityStorage - type: Sprite - sprite: Constructible/Storage/Crates/sec_gear.rsi + sprite: Structures/Storage/Crates/sec_gear.rsi layers: - state: secgearcrate - state: secgearcrate_door @@ -275,7 +275,7 @@ map: ["enum.StorageVisualLayers.Lock"] shader: unshaded - type: Icon - sprite: Constructible/Storage/Crates/sec_gear.rsi + sprite: Structures/Storage/Crates/sec_gear.rsi state: secgearcrate_icon - type: Appearance visuals: @@ -292,7 +292,7 @@ access: [["Engineering"]] - type: SecureEntityStorage - type: Sprite - sprite: Constructible/Storage/Crates/engicrate_secure.rsi + sprite: Structures/Storage/Crates/engicrate_secure.rsi layers: - state: engicratesecure - state: engicratesecure_door @@ -304,7 +304,7 @@ map: ["enum.StorageVisualLayers.Lock"] shader: unshaded - type: Icon - sprite: Constructible/Storage/Crates/engicrate_secure.rsi + sprite: Structures/Storage/Crates/engicrate_secure.rsi state: engicratesecure_icon - type: Appearance visuals: @@ -321,7 +321,7 @@ access: [["Medical"]] - type: SecureEntityStorage - type: Sprite - sprite: Constructible/Storage/Crates/medicalcrate_secure.rsi + sprite: Structures/Storage/Crates/medicalcrate_secure.rsi layers: - state: medicalcratesecure - state: medicalcratesecure_door @@ -333,7 +333,7 @@ map: ["enum.StorageVisualLayers.Lock"] shader: unshaded - type: Icon - sprite: Constructible/Storage/Crates/medicalcrate_secure.rsi + sprite: Structures/Storage/Crates/medicalcrate_secure.rsi state: medicalcratesecure_icon - type: Appearance visuals: @@ -349,7 +349,7 @@ - type: AccessReader - type: SecureEntityStorage - type: Sprite - sprite: Constructible/Storage/Crates/privatecrate_secure.rsi + sprite: Structures/Storage/Crates/privatecrate_secure.rsi layers: - state: privatecrate - state: privatecrate_door @@ -361,7 +361,7 @@ map: ["enum.StorageVisualLayers.Lock"] shader: unshaded - type: Icon - sprite: Constructible/Storage/Crates/privatecrate_secure.rsi + sprite: Structures/Storage/Crates/privatecrate_secure.rsi state: privatecrate_icon - type: Appearance visuals: @@ -378,7 +378,7 @@ access: [["Research"]] - type: SecureEntityStorage - type: Sprite - sprite: Constructible/Storage/Crates/scicrate_secure.rsi + sprite: Structures/Storage/Crates/scicrate_secure.rsi layers: - state: scicratesecure - state: scicratesecure_door @@ -390,7 +390,7 @@ map: ["enum.StorageVisualLayers.Lock"] shader: unshaded - type: Icon - sprite: Constructible/Storage/Crates/scicrate_secure.rsi + sprite: Structures/Storage/Crates/scicrate_secure.rsi state: scicratesecure_icon - type: Appearance visuals: @@ -407,7 +407,7 @@ access: [["Engineering"]] - type: SecureEntityStorage - type: Sprite - sprite: Constructible/Storage/Crates/plasma.rsi + sprite: Structures/Storage/Crates/plasma.rsi layers: - state: plasmacrate - state: plasmacrate_door @@ -419,7 +419,7 @@ map: ["enum.StorageVisualLayers.Lock"] shader: unshaded - type: Icon - sprite: Constructible/Storage/Crates/plasma.rsi + sprite: Structures/Storage/Crates/plasma.rsi state: plasmacrate_icon - type: Appearance visuals: @@ -435,7 +435,7 @@ - type: AccessReader - type: SecureEntityStorage - type: Sprite - sprite: Constructible/Storage/Crates/secure.rsi + sprite: Structures/Storage/Crates/secure.rsi layers: - state: securecrate - state: securecrate_door @@ -447,7 +447,7 @@ map: ["enum.StorageVisualLayers.Lock"] shader: unshaded - type: Icon - sprite: Constructible/Storage/Crates/secure.rsi + sprite: Structures/Storage/Crates/secure.rsi state: securecrate_icon - type: Appearance visuals: @@ -464,7 +464,7 @@ access: [["Service"]] - type: SecureEntityStorage - type: Sprite - sprite: Constructible/Storage/Crates/hydro_secure.rsi + sprite: Structures/Storage/Crates/hydro_secure.rsi layers: - state: hydrocratesecure - state: hydrocratesecure_door @@ -476,7 +476,7 @@ map: ["enum.StorageVisualLayers.Lock"] shader: unshaded - type: Icon - sprite: Constructible/Storage/Crates/hydro_secure.rsi + sprite: Structures/Storage/Crates/hydro_secure.rsi state: hydrocratesecure_icon - type: Appearance visuals: @@ -493,7 +493,7 @@ access: [["Security"]] - type: SecureEntityStorage - type: Sprite - sprite: Constructible/Storage/Crates/weapon.rsi + sprite: Structures/Storage/Crates/weapon.rsi layers: - state: weaponcrate - state: weaponcrate_door @@ -502,7 +502,7 @@ map: ["enum.StorageVisualLayers.Lock"] shader: unshaded - type: Icon - sprite: Constructible/Storage/Crates/weapon.rsi + sprite: Structures/Storage/Crates/weapon.rsi state: weaponcrate_icon - type: Appearance visuals: @@ -516,13 +516,13 @@ parent: CrateGeneric components: - type: Sprite - sprite: Constructible/Storage/Crates/livestock.rsi + sprite: Structures/Storage/Crates/livestock.rsi layers: - state: livestockcrate - state: livestockcrate_door map: ["enum.StorageVisualLayers.Door"] - type: Icon - sprite: Constructible/Storage/Crates/livestock.rsi + sprite: Structures/Storage/Crates/livestock.rsi state: livestockcrate - type: Appearance visuals: diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml similarity index 95% rename from Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml rename to Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml index 45dc455272..536a020c93 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml @@ -1,6 +1,6 @@ - type: entity id: StorageTank - parent: BaseConstructibleDynamic + parent: BaseStructureDynamic name: storage tank description: "A liquids storage tank." abstract: true diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml similarity index 55% rename from Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml rename to Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml index 92b306a59d..ef0c53bfd0 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml @@ -1,3 +1,5 @@ +# Welding + - type: entity id: WeldingFuelTank parent: StorageTank @@ -6,7 +8,7 @@ description: A fuel tank. It is used to store high amounts of fuel. components: - type: Sprite - sprite: Constructible/Misc/tanks.rsi + sprite: Structures/Storage/tanks.rsi state: fueltank - type: ReagentTank tankType: Fuel @@ -27,3 +29,27 @@ reagents: - ReagentId: WeldingFuel Quantity: 1500 + +# Water + +- 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: Structures/Storage/tanks.rsi + state: watertank + +- type: entity + parent: WaterTank + id: WaterTankFull + suffix: Full + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Water + Quantity: 1500 diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml similarity index 93% rename from Resources/Prototypes/Entities/Constructible/Specific/Medical/morgue.yml rename to Resources/Prototypes/Entities/Structures/Storage/morgue.yml index af4fa47dae..a4dab64e39 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml @@ -5,7 +5,7 @@ components: - type: Sprite netsync: false - sprite: Objects/Specific/Medical/Morgue/morgue.rsi + sprite: Structures/Storage/morgue.rsi layers: - state: morgue_closed map: ["enum.MorgueVisualLayers.Base"] @@ -56,7 +56,7 @@ components: - type: Sprite netsync: false - sprite: Objects/Specific/Medical/Morgue/morgue.rsi + sprite: Structures/Storage/morgue.rsi state: morgue_tray - type: Clickable - type: InteractionOutline @@ -70,7 +70,7 @@ components: - type: Sprite netsync: false - sprite: Objects/Specific/Medical/Morgue/morgue.rsi + sprite: Structures/Storage/morgue.rsi layers: - state: crema_closed map: ["enum.CrematoriumVisualLayers.Base"] @@ -122,5 +122,5 @@ components: - type: Sprite netsync: false - sprite: Objects/Specific/Medical/Morgue/morgue.rsi + sprite: Structures/Storage/morgue.rsi state: crema_tray diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml similarity index 95% rename from Resources/Prototypes/Entities/Constructible/Furniture/storage.yml rename to Resources/Prototypes/Entities/Structures/Storage/storage.yml index 9bf1bace6c..c2704fb71d 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml @@ -9,7 +9,7 @@ - type: InteractionOutline - type: PlaceableSurface - type: Sprite - sprite: Constructible/Misc/furniture.rsi + sprite: Structures/Furniture/furniture.rsi state: rack drawdepth: FloorObjects - type: Physics diff --git a/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml similarity index 100% rename from Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml rename to Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml diff --git a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml similarity index 88% rename from Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml rename to Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml index 9cf0b64ab5..cb47972448 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml @@ -1,6 +1,6 @@ - type: entity id: BarSign - parent: BaseConstructible + parent: BaseStructure name: bar sign components: - type: Physics @@ -12,7 +12,7 @@ - Passable - type: Sprite drawdepth: WallTops - sprite: Constructible/Misc/barsign.rsi + sprite: Structures/Wallmounts/barsign.rsi state: empty - type: ApcPowerReceiver - type: BarSign @@ -35,7 +35,7 @@ - type: Physics - type: Sprite drawdepth: WallTops - sprite: Constructible/Misc/sylphs.rsi + sprite: Structures/Wallmounts/sylphs.rsi state: sylph - type: ApcPowerReceiver - type: BarSign diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml new file mode 100644 index 0000000000..ec988ce0cc --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml @@ -0,0 +1,26 @@ +- type: entity + id: BaseSign + name: base sign + abstract: true + components: + - type: Clickable + - type: InteractionOutline + - type: Physics + bodyType: Static + canCollide: false + fixtures: + - shape: + !type:PhysShapeAabb {} + - type: Damageable + resistances: metallicResistances + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Sprite + drawdepth: WallTops + sprite: Structures/Wallmounts/signs.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml similarity index 96% rename from Resources/Prototypes/Entities/Constructible/Walls/signs.yml rename to Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 1b2960f6a2..436fe4d48c 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -1,30 +1,3 @@ -- type: entity - id: BaseSign - name: base sign - abstract: true - components: - - type: Clickable - - type: InteractionOutline - - type: Physics - bodyType: Static - canCollide: false - fixtures: - - shape: - !type:PhysShapeAabb {} - - type: Damageable - resistances: metallicResistances - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 5 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - type: Sprite - drawdepth: WallTops - sprite: Constructible/Misc/decals.rsi - # These signs would not have collision otherwise, they simply # need collision in order for them to be destructible. Once the # SmallImpassable etc. stuff actually gets implemented in this diff --git a/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/emergency_light.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml rename to Resources/Prototypes/Entities/Structures/Wallmounts/emergency_light.yml index f4e6bb0181..c72b60f25e 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/emergency_light.yml @@ -17,13 +17,12 @@ startingCharge: 0 - type: EmergencyLight - type: Sprite - sprite: Constructible/Lighting/emergency_light.rsi + sprite: Structures/Wallmounts/Lighting/emergency_light.rsi layers: - state: emergency_light_off - type: Appearance visuals: - type: EmergencyLightVisualizer - placement: snap: - Wallmount diff --git a/Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml similarity index 94% rename from Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml rename to Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml index d4b64963df..0f9a6a2fd0 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml @@ -6,7 +6,7 @@ - type: Clickable - type: InteractionOutline - type: Sprite - sprite: Constructible/Storage/Cabinets/extinguisher_cabinet.rsi + sprite: Structures/Wallmounts/extinguisher_cabinet.rsi netsync: false state: extinguisher_closed - type: ItemCabinet diff --git a/Resources/Prototypes/Entities/Constructible/Walls/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml similarity index 94% rename from Resources/Prototypes/Entities/Constructible/Walls/fireaxe_cabinet.yml rename to Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml index 1d5e811f09..d994153abf 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/fireaxe_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml @@ -6,7 +6,7 @@ - type: Clickable - type: InteractionOutline - type: Sprite - sprite: Constructible/Storage/Cabinets/fireaxe_cabinet.rsi + sprite: Structures/Wallmounts/fireaxe_cabinet.rsi netsync: false state: cabinet-filled-closed - type: ItemCabinet diff --git a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml similarity index 93% rename from Resources/Prototypes/Entities/Constructible/Walls/lighting.yml rename to Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml index 3a1c355533..620f13a43d 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml @@ -18,7 +18,7 @@ layer: [ Passable ] - type: LoopingSound - type: Sprite - sprite: Constructible/Lighting/light_tube.rsi + sprite: Structures/Wallmounts/Lighting/light_tube.rsi layers: - state: on map: ["enum.PoweredLightLayers.Base"] @@ -57,7 +57,7 @@ parent: WallLight components: - type: Sprite - sprite: Constructible/Lighting/light_tube.rsi + sprite: Structures/Wallmounts/Lighting/light_tube.rsi state: off - type: PointLight enabled: false @@ -88,7 +88,7 @@ parent: WallLight components: - type: Sprite - sprite: Constructible/Lighting/light_small.rsi + sprite: Structures/Wallmounts/Lighting/light_small.rsi state: on - type: PointLight energy: 1.0 @@ -122,7 +122,7 @@ parent: SmallLight components: - type: Sprite - sprite: Constructible/Lighting/light_small.rsi + sprite: Structures/Wallmounts/Lighting/light_small.rsi state: off - type: PointLight enabled: false diff --git a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml similarity index 83% rename from Resources/Prototypes/Entities/Constructible/Walls/mirror.yml rename to Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml index 6730a0c73d..82dd590bae 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml @@ -1,11 +1,11 @@ - type: entity id: Mirror - parent: BaseConstructible + parent: BaseStructure name: mirror description: 'Mirror mirror on the wall , who''s the most robust of them all?' components: - type: Sprite - sprite: Constructible/Misc/mirror.rsi + sprite: Structures/Wallmounts/mirror.rsi state: mirror - type: InteractionOutline - type: MagicMirror diff --git a/Resources/Prototypes/Entities/Constructible/Walls/linking.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml similarity index 88% rename from Resources/Prototypes/Entities/Constructible/Walls/linking.yml rename to Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml index 6fd8acb01d..66abc219af 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/linking.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml @@ -7,7 +7,7 @@ - type: InteractionOutline - type: Physics - type: Sprite - sprite: Constructible/Power/switch.rsi + sprite: Structures/Wallmounts/switch.rsi state: on - type: SignalSwitch - type: Rotatable @@ -25,7 +25,7 @@ - type: InteractionOutline - type: Physics - type: Sprite - sprite: Constructible/Power/switch.rsi + sprite: Structures/Wallmounts/switch.rsi state: dead - type: SignalButton - type: Rotatable diff --git a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml similarity index 83% rename from Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml rename to Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index 981b10fe84..da2a7bf71d 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -1,13 +1,13 @@ -- type: entity +- type: entity id: AsteroidRock - parent: BaseConstructible + parent: BaseStructure name: asteroid rock description: That's an asteroid components: - type: AsteroidRock - type: InteractionOutline - type: Sprite - sprite: Constructible/Structures/Walls/asteroid_rock.rsi + sprite: Structures/Walls/asteroid_rock.rsi state: 0 - type: Damageable resistances: metallicResistances diff --git a/Resources/Prototypes/Entities/Constructible/Specific/barricades.yml b/Resources/Prototypes/Entities/Structures/Walls/barricades.yml similarity index 94% rename from Resources/Prototypes/Entities/Constructible/Specific/barricades.yml rename to Resources/Prototypes/Entities/Structures/Walls/barricades.yml index 3ae0b467e9..e79c7dfeac 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/barricades.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/barricades.yml @@ -1,6 +1,6 @@ - type: entity id: Barricade - parent: BaseConstructible + parent: BaseStructure name: barricade components: - type: InteractionOutline @@ -8,7 +8,7 @@ graph: barricade node: barricadewooden - type: Sprite - sprite: Constructible/Structures/barricades.rsi + sprite: Structures/Walls/barricades.rsi state: barricadewooden - type: Physics fixtures: diff --git a/Resources/Prototypes/Entities/Structures/Walls/base.yml b/Resources/Prototypes/Entities/Structures/Walls/base.yml new file mode 100644 index 0000000000..d78e81c5fe --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Walls/base.yml @@ -0,0 +1,40 @@ +- type: entity + abstract: true + parent: BaseStructure + id: WallBase + name: basewall + description: Keeps the air in and the greytide out. + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: Tag + tags: + - Wall + - type: Sprite + netsync: false + drawdepth: Walls + - type: Icon + state: full + - type: Damageable + resistances: metallicResistances + - type: Physics + bodyType: Static + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.5, -0.5, 0.5, 0.5" + layer: + - Opaque + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + - type: Occluder + sizeX: 32 + sizeY: 32 + - type: Airtight + - type: IconSmooth + key: walls + base: solid diff --git a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml b/Resources/Prototypes/Entities/Structures/Walls/girder.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/Walls/girder.yml rename to Resources/Prototypes/Entities/Structures/Walls/girder.yml index b4d2401e14..6e357f0f9f 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/girder.yml @@ -1,6 +1,6 @@ - type: entity id: Girder - parent: BaseConstructibleDynamic + parent: BaseStructureDynamic name: girder description: A large structural assembly made out of metal; It requires a layer of metal before it can be considered a wall. components: @@ -22,7 +22,7 @@ graph: girder node: girder - type: Sprite - sprite: Constructible/Structures/Walls/solid.rsi + sprite: Structures/Walls/solid.rsi state: wall_girder - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml b/Resources/Prototypes/Entities/Structures/Walls/low.yml similarity index 81% rename from Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml rename to Resources/Prototypes/Entities/Structures/Walls/low.yml index b1c0d9546b..453b1a3d60 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/low.yml @@ -1,6 +1,6 @@ - type: entity id: LowWall - parent: BaseConstructible + parent: BaseStructure name: low wall description: Goes up to about your waist. components: @@ -10,9 +10,9 @@ netsync: false color: "#889192" drawdepth: Walls - sprite: Constructible/Structures/Walls/low_wall.rsi + sprite: Structures/Walls/low_wall.rsi - type: Icon - sprite: Constructible/Structures/Walls/low_wall.rsi + sprite: Structures/Walls/low_wall.rsi state: metal - type: Damageable resistances: metallicResistances @@ -42,4 +42,4 @@ - type: Sprite color: "#889192" drawdepth: WallMountedItems - sprite: Constructible/Structures/Walls/low_wall.rsi + sprite: Structures/Walls/low_wall.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml similarity index 77% rename from Resources/Prototypes/Entities/Constructible/Walls/walls.yml rename to Resources/Prototypes/Entities/Structures/Walls/walls.yml index 83ef87ce68..365ecd9b81 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -1,44 +1,3 @@ -- type: entity - abstract: true - parent: BaseConstructible - id: WallBase - name: basewall - description: Keeps the air in and the greytide out. - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: Tag - tags: - - Wall - - type: Sprite - netsync: false - drawdepth: Walls - - type: Icon - state: full - - type: Damageable - resistances: metallicResistances - - type: Physics - bodyType: Static - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.5, -0.5, 0.5, 0.5" - layer: - - Opaque - - Impassable - - MobImpassable - - VaultImpassable - - SmallImpassable - - type: Occluder - sizeX: 32 - sizeY: 32 - - type: Airtight - - type: IconSmooth - key: walls - base: solid - - type: entity parent: WallBase id: WallBrick @@ -46,9 +5,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/brick.rsi + sprite: Structures/Walls/brick.rsi - type: Icon - sprite: Constructible/Structures/Walls/brick.rsi + sprite: Structures/Walls/brick.rsi - type: Destructible thresholds: - trigger: @@ -73,9 +32,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/clock.rsi + sprite: Structures/Walls/clock.rsi - type: Icon - sprite: Constructible/Structures/Walls/clock.rsi + sprite: Structures/Walls/clock.rsi - type: Destructible thresholds: - trigger: @@ -100,9 +59,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/clown.rsi + sprite: Structures/Walls/clown.rsi - type: Icon - sprite: Constructible/Structures/Walls/clown.rsi + sprite: Structures/Walls/clown.rsi - type: Destructible thresholds: - trigger: @@ -128,9 +87,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/cult.rsi + sprite: Structures/Walls/cult.rsi - type: Icon - sprite: Constructible/Structures/Walls/cult.rsi + sprite: Structures/Walls/cult.rsi - type: Destructible thresholds: - trigger: @@ -155,9 +114,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/debug.rsi + sprite: Structures/Walls/debug.rsi - type: Icon - sprite: Constructible/Structures/Walls/debug.rsi + sprite: Structures/Walls/debug.rsi - type: Destructible thresholds: - trigger: @@ -182,9 +141,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/diamond.rsi + sprite: Structures/Walls/diamond.rsi - type: Icon - sprite: Constructible/Structures/Walls/diamond.rsi + sprite: Structures/Walls/diamond.rsi - type: Destructible thresholds: - trigger: @@ -209,9 +168,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/gold.rsi + sprite: Structures/Walls/gold.rsi - type: Icon - sprite: Constructible/Structures/Walls/gold.rsi + sprite: Structures/Walls/gold.rsi - type: Destructible thresholds: - trigger: @@ -236,9 +195,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/ice.rsi + sprite: Structures/Walls/ice.rsi - type: Icon - sprite: Constructible/Structures/Walls/ice.rsi + sprite: Structures/Walls/ice.rsi - type: Destructible thresholds: - trigger: @@ -263,9 +222,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/metal.rsi + sprite: Structures/Walls/metal.rsi - type: Icon - sprite: Constructible/Structures/Walls/metal.rsi + sprite: Structures/Walls/metal.rsi - type: Destructible thresholds: - trigger: @@ -290,9 +249,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/plasma.rsi + sprite: Structures/Walls/plasma.rsi - type: Icon - sprite: Constructible/Structures/Walls/plasma.rsi + sprite: Structures/Walls/plasma.rsi - type: Destructible thresholds: - trigger: @@ -317,9 +276,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/plastic.rsi + sprite: Structures/Walls/plastic.rsi - type: Icon - sprite: Constructible/Structures/Walls/plastic.rsi + sprite: Structures/Walls/plastic.rsi - type: Destructible thresholds: - trigger: @@ -344,9 +303,9 @@ components: - type: Sprite color: "#889192" - sprite: Constructible/Structures/Walls/solid.rsi + sprite: Structures/Walls/solid.rsi - type: Icon - sprite: Constructible/Structures/Walls/solid.rsi + sprite: Structures/Walls/solid.rsi state: rgeneric - type: Construction graph: girder @@ -377,9 +336,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/riveted.rsi + sprite: Structures/Walls/riveted.rsi - type: Icon - sprite: Constructible/Structures/Walls/riveted.rsi + sprite: Structures/Walls/riveted.rsi - type: Destructible thresholds: - trigger: @@ -404,9 +363,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/sandstone.rsi + sprite: Structures/Walls/sandstone.rsi - type: Icon - sprite: Constructible/Structures/Walls/sandstone.rsi + sprite: Structures/Walls/sandstone.rsi - type: Destructible thresholds: - trigger: @@ -431,9 +390,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/silver.rsi + sprite: Structures/Walls/silver.rsi - type: Icon - sprite: Constructible/Structures/Walls/silver.rsi + sprite: Structures/Walls/silver.rsi - type: Destructible thresholds: - trigger: @@ -459,12 +418,12 @@ - type: RCDDeconstructWhitelist - type: Sprite color: "#889192" - sprite: Constructible/Structures/Walls/solid.rsi + sprite: Structures/Walls/solid.rsi - type: Construction graph: girder node: wall - type: Icon - sprite: Constructible/Structures/Walls/solid.rsi + sprite: Structures/Walls/solid.rsi - type: Destructible thresholds: - trigger: @@ -488,9 +447,9 @@ name: uranium wall components: - type: Sprite - sprite: Constructible/Structures/Walls/uranium.rsi + sprite: Structures/Walls/uranium.rsi - type: Icon - sprite: Constructible/Structures/Walls/uranium.rsi + sprite: Structures/Walls/uranium.rsi - type: Destructible thresholds: - trigger: @@ -515,9 +474,9 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - sprite: Constructible/Structures/Walls/wood.rsi + sprite: Structures/Walls/wood.rsi - type: Icon - sprite: Constructible/Structures/Walls/wood.rsi + sprite: Structures/Walls/wood.rsi - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml new file mode 100644 index 0000000000..1672f3ac9a --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml @@ -0,0 +1,33 @@ +- type: entity + id: PlasmaWindow + name: plasma window + parent: Window + components: + - type: Sprite + drawdepth: WallTops + sprite: Structures/Windows/plasma_window.rsi + - type: Icon + sprite: 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 diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml new file mode 100644 index 0000000000..2b34fc4eee --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml @@ -0,0 +1,33 @@ +- type: entity + id: ReinforcedWindow + name: reinforced window + parent: Window + components: + - type: Sprite + drawdepth: WallTops + sprite: Structures/Windows/reinforced_window.rsi + - type: Icon + sprite: 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 diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml new file mode 100644 index 0000000000..49aff00bc0 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -0,0 +1,58 @@ +- type: entity + id: Window + parent: BaseStructure + 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: Structures/Windows/window.rsi + - type: Icon + sprite: 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 diff --git a/Resources/Prototypes/Entities/Constructible/base.yml b/Resources/Prototypes/Entities/Structures/base.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/base.yml rename to Resources/Prototypes/Entities/Structures/base.yml index 2df3e4b3e8..d34140b087 100644 --- a/Resources/Prototypes/Entities/Constructible/base.yml +++ b/Resources/Prototypes/Entities/Structures/base.yml @@ -1,5 +1,5 @@ - type: entity - id: BaseConstructible + id: BaseStructure abstract: true placement: mode: SnapgridCenter @@ -22,8 +22,8 @@ - type: entity # This means that it's not anchored on spawn. - id: BaseConstructibleDynamic - parent: BaseConstructible + id: BaseStructureDynamic + parent: BaseStructure abstract: true components: # These might/might not be a good idea diff --git a/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml similarity index 81% rename from Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml rename to Resources/Prototypes/Entities/Structures/cargo_telepad.yml index aefaaff479..e33853fe32 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml +++ b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml @@ -1,8 +1,8 @@ - type: entity id: cargoTelepad - parent: BaseConstructibleDynamic + parent: BaseStructureDynamic name: cargo telepad - description: "Temporary cargo delivery for developing Nanotrasen stations! Warning: destroying this while goods are in transit will lose them forever!" + description: 'Temporary cargo delivery for developing Nanotrasen stations! Warning: destroying this while goods are in transit will lose them forever!' components: - type: InteractionOutline - type: Physics @@ -15,7 +15,7 @@ layer: - Passable - type: Sprite - sprite: Constructible/Specific/Cargo/teleporter.rsi + sprite: Structures/cargo_telepad.rsi state: offline drawdepth: FloorObjects - type: Damageable diff --git a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml similarity index 88% rename from Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml rename to Resources/Prototypes/Entities/Structures/catwalk.yml index 3c57331279..fcb1cfc7e6 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml +++ b/Resources/Prototypes/Entities/Structures/catwalk.yml @@ -15,10 +15,10 @@ layer: [ Passable ] - type: Sprite netsync: false - sprite: Constructible/Tiles/catwalk.rsi + sprite: Structures/catwalk.rsi drawdepth: FloorTiles - type: Icon - sprite: Constructible/Tiles/catwalk.rsi + sprite: Structures/catwalk.rsi state: catwalk_preview - type: SnapGrid - type: IconSmooth diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml similarity index 69% rename from Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml rename to Resources/Prototypes/Entities/Structures/conveyor.yml index 0aa313a130..1dc2a9088f 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml +++ b/Resources/Prototypes/Entities/Structures/conveyor.yml @@ -22,7 +22,7 @@ - type: SnapGrid - type: Sprite netsync: false - sprite: Constructible/Power/conveyor.rsi + sprite: Structures/conveyor.rsi state: conveyor_started_cw drawdepth: FloorObjects - type: SignalReceiver @@ -51,8 +51,30 @@ - ConveyorAssembly - type: Sprite netsync: false - sprite: Constructible/Power/conveyor.rsi + sprite: Structures/conveyor.rsi state: conveyor_loose - type: Construction graph: ConveyorGraph node: item + +- type: entity + id: TwoWayLever + name: two way lever + description: A two way lever. + components: + - type: Clickable + - type: InteractionOutline + - type: Sprite + netsync: false + sprite: Structures/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 diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml new file mode 100644 index 0000000000..35972093ed --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml @@ -0,0 +1,22 @@ +- type: entity + name: hydroponics tray + parent: hydroponicsSoil + id: hydroponicsTray + description: An interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds. + components: + - type: Physics + fixtures: + - shape: + !type:PhysShapeAabb {} + mass: 25 + hard: true + mask: + - Impassable + - type: Anchorable + - type: Pullable + - type: Sprite + sprite: Structures/Hydroponics/containers.rsi + state: hydrotray3 + drawdepth: FloorObjects + - type: PlantHolder + drawWarnings: true diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/Specific/Kitchen/meat_spike.yml rename to Resources/Prototypes/Entities/Structures/meat_spike.yml index 5b9aee0f82..c5ac6e35f1 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/meat_spike.yml +++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml @@ -1,6 +1,6 @@ - type: entity id: KitchenSpike - parent: BaseConstructible + parent: BaseStructure name: meat spike description: A spike for collecting meat from animals. components: @@ -8,7 +8,7 @@ - type: Sprite netsync: false # temp to make clickmask work - sprite: Constructible/Misc/kitchen.rsi + sprite: Structures/meat_spike.rsi state: spike - type: Damageable resistances: metallicResistances diff --git a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml b/Resources/Prototypes/Entities/Structures/soil.yml similarity index 62% rename from Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml rename to Resources/Prototypes/Entities/Structures/soil.yml index 906b1bfe06..3090d7c0e8 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml +++ b/Resources/Prototypes/Entities/Structures/soil.yml @@ -35,7 +35,7 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: Sprite - sprite: Constructible/Hydroponics/misc.rsi + sprite: Structures/Hydroponics/misc.rsi state: soil drawdepth: FloorObjects - type: PlantHolder @@ -50,26 +50,3 @@ - type: Appearance visuals: - type: PlantHolderVisualizer - -- type: entity - name: hydroponics tray - parent: hydroponicsSoil - id: hydroponicsTray - description: An interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds. - components: - - type: Physics - fixtures: - - shape: - !type:PhysShapeAabb {} - mass: 25 - hard: true - mask: - - Impassable - - type: Anchorable - - type: Pullable - - type: Sprite - sprite: Constructible/Hydroponics/containers.rsi - state: hydrotray3 - drawdepth: FloorObjects - - type: PlantHolder - drawWarnings: true diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml index 32c5c8c337..9642326a0e 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml @@ -52,7 +52,7 @@ store: board name: "door electronics circuit board" icon: - sprite: "Constructible/Misc/module.rsi" + sprite: "Objects/Misc/module.rsi" state: "door_electronics" doAfter: 1 - to: assembly diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml b/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml index 3de0a915fd..1a19bcb024 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml @@ -26,7 +26,7 @@ store: board name: any computer circuit board icon: - sprite: "Constructible/Misc/module.rsi" + sprite: "Objects/Misc/module.rsi" state: "id_mod" - to: start diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml index f39bdaad21..bb3c343a40 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml @@ -8,7 +8,7 @@ steps: - tag: ConveyorAssembly icon: - sprite: Constructible/Power/conveyor.rsi + sprite: Structures/conveyor.rsi state: conveyor_loose name: conveyor belt assembly doAfter: 2 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml index 000dfdda8c..c3f8973d94 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml @@ -53,7 +53,7 @@ - tag: FirelockElectronics name: Firelock Electronics icon: - sprite: "Constructible/Misc/module.rsi" + sprite: "Objects/Misc/module.rsi" state: "mainboard" - to: frame1 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml index ffffa99ef6..aced558d85 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml @@ -18,7 +18,7 @@ actions: - !type:SpriteChange specifier: - sprite: /Textures/Constructible/Structures/Walls/solid.rsi + sprite: /Textures/Structures/Walls/solid.rsi state: wall_girder edges: - to: start @@ -70,7 +70,7 @@ actions: - !type:SpriteChange specifier: - sprite: /Textures/Constructible/Structures/Walls/solid.rsi + sprite: /Textures/Structures/Walls/solid.rsi state: reinforced_wall_girder edges: - to: reinforcedWall diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/solarpanel.yml index 29d61a6358..f33bd8444c 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/solarpanel.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/solarpanel.yml @@ -44,7 +44,7 @@ - prototype: SolarTrackerElectronics name: Solar Tracker Electronics icon: - sprite: Constructible/Misc/module.rsi + sprite: Objects/Misc/module.rsi state: id_mod doAfter: 1 - material: Glass diff --git a/Resources/Prototypes/Recipes/Construction/conveyor.yml b/Resources/Prototypes/Recipes/Construction/conveyor.yml index 30abd3ca51..314745146e 100644 --- a/Resources/Prototypes/Recipes/Construction/conveyor.yml +++ b/Resources/Prototypes/Recipes/Construction/conveyor.yml @@ -10,7 +10,7 @@ placementMode: SnapgridCenter canBuildInImpassable: false icon: - sprite: Constructible/Power/conveyor.rsi + sprite: Structures/conveyor.rsi state: conveyor_stopped_cw conditions: - !type:TileNotBlocked {} @@ -26,7 +26,7 @@ objectType: Structure canBuildInImpassable: false icon: - sprite: Constructible/Power/conveyor.rsi + sprite: Structures/conveyor.rsi state: switch-off conditions: - !type:TileNotBlocked {} diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index 7b2e6f5419..a3c6ef90ff 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -7,7 +7,7 @@ category: Furniture description: You sit in this. Either by will or force. icon: - sprite: Constructible/Misc/furniture.rsi + sprite: Structures/Furniture/furniture.rsi state: chair objectType: Structure placementMode: SnapgridCenter @@ -24,7 +24,7 @@ category: Furniture description: You sit in this. Either by will or force. icon: - sprite: Constructible/Misc/furniture.rsi + sprite: Structures/Furniture/furniture.rsi state: stool_base objectType: Structure placementMode: SnapgridCenter @@ -41,7 +41,7 @@ category: Furniture description: You sit in this. Either by will or force. icon: - sprite: Constructible/Misc/furniture.rsi + sprite: Structures/Furniture/furniture.rsi state: bar_stool objectType: Structure placementMode: SnapgridCenter @@ -58,7 +58,7 @@ category: Furniture description: You sit in this. Either by will or force. icon: - sprite: Constructible/Misc/furniture.rsi + sprite: Structures/Furniture/furniture.rsi state: officechair_white objectType: Structure placementMode: SnapgridCenter @@ -75,7 +75,7 @@ category: Furniture description: You sit in this. Either by will or force. icon: - sprite: Constructible/Misc/furniture.rsi + sprite: Structures/Furniture/furniture.rsi state: officechair_dark objectType: Structure placementMode: SnapgridCenter @@ -92,7 +92,7 @@ category: Furniture description: It looks comfy. icon: - sprite: Constructible/Misc/furniture.rsi + sprite: Structures/Furniture/furniture.rsi state: comfychair_preview objectType: Structure placementMode: SnapgridCenter @@ -109,7 +109,7 @@ category: Furniture description: You sit in this. Either by will or force. icon: - sprite: Constructible/Misc/furniture.rsi + sprite: Structures/Furniture/furniture.rsi state: wooden_chair objectType: Structure placementMode: SnapgridCenter diff --git a/Resources/Prototypes/Recipes/Construction/lighting.yml b/Resources/Prototypes/Recipes/Construction/lighting.yml index 6fc5ddc8b2..adf9d8cbff 100644 --- a/Resources/Prototypes/Recipes/Construction/lighting.yml +++ b/Resources/Prototypes/Recipes/Construction/lighting.yml @@ -7,7 +7,7 @@ category: Structures description: A wall light fixture. Use light tubes. icon: - sprite: Constructible/Lighting/light_tube.rsi + sprite: Structures/Wallmounts/Lighting/light_tube.rsi state: off objectType: Structure placementMode: WallmountLight @@ -25,7 +25,7 @@ category: Structures description: A wall light fixture. Use light bulbs. icon: - sprite: Constructible/Lighting/light_small.rsi + sprite: Structures/Wallmounts/Lighting/light_small.rsi state: off objectType: Structure placementMode: WallmountLight diff --git a/Resources/Prototypes/Recipes/Construction/machines.yml b/Resources/Prototypes/Recipes/Construction/machines.yml index 29af78de42..5853767457 100644 --- a/Resources/Prototypes/Recipes/Construction/machines.yml +++ b/Resources/Prototypes/Recipes/Construction/machines.yml @@ -8,7 +8,7 @@ placementMode: SnapgridCenter canBuildInImpassable: false icon: - sprite: Constructible/Misc/stock_parts.rsi + sprite: Structures/Machines/parts.rsi state: 4 - type: construction @@ -21,5 +21,5 @@ placementMode: SnapgridCenter canBuildInImpassable: false icon: - sprite: Constructible/Misc/stock_parts.rsi + sprite: Structures/Machines/parts.rsi state: "box_0" diff --git a/Resources/Prototypes/Recipes/Construction/power.yml b/Resources/Prototypes/Recipes/Construction/power.yml index 4375e042be..c048be0aa4 100644 --- a/Resources/Prototypes/Recipes/Construction/power.yml +++ b/Resources/Prototypes/Recipes/Construction/power.yml @@ -7,7 +7,7 @@ category: Utility description: "Area Power Controller (APC). Controls power. In an area." icon: - sprite: Constructible/Power/apc.rsi + sprite: Structures/Power/apc.rsi state: apc0 objectType: Structure placementMode: AlignWallProper @@ -22,7 +22,7 @@ category: Utility description: "Can be turned into a solar panel or solar tracker." icon: - sprite: Constructible/Power/solar_panel.rsi + sprite: Structures/Power/Generation/solar_panel.rsi state: solar_assembly objectType: Structure placementMode: SnapgridCenter diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index 99a47ea608..2e52a35875 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -7,7 +7,7 @@ category: Structures description: A large structural assembly made out of metal. icon: - sprite: /Textures/Constructible/Structures/Walls/solid.rsi + sprite: /Textures/Structures/Walls/solid.rsi state: wall_girder objectType: Structure placementMode: SnapgridCenter @@ -25,7 +25,7 @@ category: Structures description: Keeps the air in and the greytide out. icon: - sprite: Constructible/Structures/Walls/solid.rsi + sprite: Structures/Walls/solid.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -43,7 +43,7 @@ category: Structures description: Keeps the air in and the greytide out. icon: - sprite: Constructible/Structures/Walls/solid.rsi + sprite: Structures/Walls/solid.rsi state: rgeneric objectType: Structure placementMode: SnapgridCenter @@ -64,7 +64,7 @@ - !type:NoWindowsInTile {} - !type:TileNotBlocked {} icon: - sprite: Constructible/Structures/Walls/low_wall.rsi + sprite: Structures/Walls/low_wall.rsi state: metal objectType: Structure placementMode: SnapgridCenter @@ -82,7 +82,7 @@ - !type:LowWallInTile {} - !type:NoWindowsInTile {} icon: - sprite: Constructible/Structures/Windows/window.rsi + sprite: Structures/Windows/window.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -100,7 +100,7 @@ - !type:LowWallInTile {} - !type:NoWindowsInTile {} icon: - sprite: Constructible/Structures/Windows/reinforced_window.rsi + sprite: Structures/Windows/reinforced_window.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -118,7 +118,7 @@ - !type:LowWallInTile {} - !type:NoWindowsInTile {} icon: - sprite: Constructible/Structures/Windows/plasma_window.rsi + sprite: Structures/Windows/plasma_window.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -133,7 +133,7 @@ category: Structures description: This is a firelock - it locks an area when a fire alarm in the area is triggered. Don't get squished! icon: - sprite: Constructible/Structures/Doors/Standard/firelock.rsi + sprite: Structures/Doors/Airlocks/Standard/firelock.rsi state: closed objectType: Structure placementMode: SnapgridCenter @@ -157,7 +157,7 @@ - plating - underplating icon: - sprite: Constructible/Tiles/catwalk.rsi + sprite: Structures/catwalk.rsi state: catwalk_preview objectType: Structure placementMode: SnapgridCenter @@ -172,7 +172,7 @@ category: Structures description: An improvised barricade made out of wooden planks. icon: - sprite: Constructible/Structures/barricades.rsi + sprite: Structures/Walls/barricades.rsi state: barricadewooden objectType: Structure placementMode: SnapgridCenter @@ -189,7 +189,7 @@ category: Structures description: It opens, it closes, and maybe crushes you. icon: - sprite: Constructible/Structures/Doors/Standard/basic.rsi + sprite: Structures/Doors/Airlocks/Standard/basic.rsi state: assembly objectType: Structure placementMode: SnapgridCenter diff --git a/Resources/Prototypes/Recipes/Construction/tables.yml b/Resources/Prototypes/Recipes/Construction/tables.yml index 20099df80d..9c1f1afeeb 100644 --- a/Resources/Prototypes/Recipes/Construction/tables.yml +++ b/Resources/Prototypes/Recipes/Construction/tables.yml @@ -7,7 +7,7 @@ category: Structures description: A square piece of metal standing on four metal legs. icon: - sprite: Constructible/Structures/Tables/carpet.rsi + sprite: Structures/Furniture/Tables/carpet.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -24,7 +24,7 @@ category: Structures description: A fancy table. Perfect for serving drinks. icon: - sprite: Constructible/Structures/Tables/bar.rsi + sprite: Structures/Furniture/Tables/bar.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -41,7 +41,7 @@ category: Structures description: A square piece of metal standing on four metal legs. Extra robust. icon: - sprite: Constructible/Structures/Tables/reinforced.rsi + sprite: Structures/Furniture/Tables/reinforced.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -58,7 +58,7 @@ category: Structures description: A square piece of glass, standing on four metal legs. icon: - sprite: Constructible/Structures/Tables/glass.rsi + sprite: Structures/Furniture/Tables/glass.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -75,7 +75,7 @@ category: Structures description: A square piece of glass, standing on four metal legs. Extra robust. icon: - sprite: Constructible/Structures/Tables/r_glass.rsi + sprite: Structures/Furniture/Tables/r_glass.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -92,7 +92,7 @@ category: Structures description: Do not apply fire to this. Rumour says it burns easily. icon: - sprite: Constructible/Structures/Tables/wood.rsi + sprite: Structures/Furniture/Tables/wood.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -109,7 +109,7 @@ category: Structures description: A square piece of wood standing on four legs covered by a cloth. (What did you expect?) icon: - sprite: Constructible/Structures/Tables/carpet.rsi + sprite: Structures/Furniture/Tables/carpet.rsi state: full objectType: Structure placementMode: SnapgridCenter diff --git a/Resources/Prototypes/Recipes/Crafting/crates.yml b/Resources/Prototypes/Recipes/Crafting/crates.yml index 79a4d02bfc..51ca15e03c 100644 --- a/Resources/Prototypes/Recipes/Crafting/crates.yml +++ b/Resources/Prototypes/Recipes/Crafting/crates.yml @@ -6,6 +6,6 @@ targetNode: cratelivestock category: Storage description: "A wooden crate for holding livestock" - icon: Constructible/Storage/Crates/livestock.rsi/livestockcrate.png + icon: Structures/Storage/Crates/livestock.rsi/livestockcrate.png objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Lathes/cargo.yml b/Resources/Prototypes/Recipes/Lathes/cargo.yml index 8a31b89198..b312b807c2 100644 --- a/Resources/Prototypes/Recipes/Lathes/cargo.yml +++ b/Resources/Prototypes/Recipes/Lathes/cargo.yml @@ -1,7 +1,7 @@ - type: latheRecipe id: ConveyorAssembly icon: - sprite: Constructible/Power/conveyor.rsi + sprite: Structures/conveyor.rsi state: conveyor_loose result: ConveyorBeltAssembly completetime: 1000 diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index d5a2361a11..69b7503055 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -1,6 +1,6 @@ - type: latheRecipe id: FirelockElectronics - icon: Constructible/Misc/module.rsi/mainboard.png + icon: Objects/Misc/module.rsi/mainboard.png result: FirelockElectronics completetime: 500 materials: @@ -9,7 +9,7 @@ - type: latheRecipe id: DoorElectronics - icon: Constructible/Misc/module.rsi/door_electronics.png + icon: Objects/Misc/module.rsi/door_electronics.png result: DoorElectronics completetime: 500 materials: @@ -18,7 +18,7 @@ - type: latheRecipe id: APCElectronics - icon: Constructible/Misc/module.rsi/charger_APC.png + icon: Objects/Misc/module.rsi/charger_APC.png result: APCElectronics completetime: 500 materials: diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/meta.json b/Resources/Textures/Constructible/Misc/stock_parts.rsi/meta.json deleted file mode 100644 index 364722dfa7..0000000000 --- a/Resources/Textures/Constructible/Misc/stock_parts.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0", "states": [{"name": "0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "adv_capacitor", "delays": [[1.0]]}, {"name": "adv_electrolite", "delays": [[0.13, 0.13]]}, {"name": "adv_scan_module", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "advanced_matter_bin", "delays": [[1.0]]}, {"name": "ansible_crystal", "delays": [[1.0]]}, {"name": "bluespace_electrolite", "delays": [[0.1, 0.1]]}, {"name": "bluespace_matter_bin", "delays": [[0.1, 0.1]]}, {"name": "box_0", "delays": [[1.0]]}, {"name": "box_1", "delays": [[1.0]]}, {"name": "box_2", "delays": [[1.0]]}, {"name": "capacitor", "delays": [[1.0]]}, {"name": "card_reader", "delays": [[1.0]]}, {"name": "datadisk0", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk1", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk2", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk3", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk4", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk5", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk6", "delays": [[0.1, 0.1, 0.1]]}, {"name": "electrolite", "delays": [[0.16, 0.16]]}, {"name": "femto_mani", "delays": [[0.1, 0.1]]}, {"name": "hdd1", "delays": [[1.0]]}, {"name": "hdd2", "delays": [[1.0]]}, {"name": "high_micro_laser", "delays": [[1.0]]}, {"name": "hyperwave_filter", "delays": [[1.0]]}, {"name": "matter_bin", "delays": [[1.0]]}, {"name": "micro_laser", "delays": [[1.0]]}, {"name": "micro_mani", "delays": [[1.0]]}, {"name": "nano_mani", "delays": [[1.0]]}, {"name": "pico_mani", "delays": [[1.0]]}, {"name": "quadratic_capacitor", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "quadultra_micro_laser", "delays": [[0.1, 0.1]]}, {"name": "rom1", "delays": [[1.0]]}, {"name": "rom2", "delays": [[1.0]]}, {"name": "romos1", "delays": [[1.0]]}, {"name": "romos2", "delays": [[1.0]]}, {"name": "scan_module", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "subspace_amplifier", "delays": [[0.2, 0.4, 0.2, 0.4]]}, {"name": "subspace_ansible", "delays": [[1.0]]}, {"name": "subspace_transmitter", "delays": [[1.0]]}, {"name": "super_capacitor", "delays": [[1.0]]}, {"name": "super_electrolite", "delays": [[0.1, 0.1]]}, {"name": "super_matter_bin", "delays": [[1.0]]}, {"name": "super_scan_module", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "treatment_disk", "delays": [[1.0]]}, {"name": "triphasic_scan_module", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ultra_high_micro_laser", "delays": [[1.0]]}, {"name": "vbox_0", "delays": [[1.0]]}, {"name": "vbox_1", "delays": [[1.0]]}, {"name": "vbox_2", "delays": [[1.0]]}, {"name": "vbox_3", "delays": [[1.0]]}, {"name": "wavelength_analyzer", "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Constructible/Power/ame_controller.rsi/meta.json b/Resources/Textures/Constructible/Power/ame_controller.rsi/meta.json deleted file mode 100644 index 92dbb97139..0000000000 --- a/Resources/Textures/Constructible/Power/ame_controller.rsi/meta.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/machines/new_ame.dmi at 1b7952787c06c21ef1623e494dcfe7cb1f46e041", - "states": [ - { - "name": "control", - - }, - { - "name": "control_critical", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "control_fuck", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "control_on", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/meta.json b/Resources/Textures/Constructible/Power/ame_shielding.rsi/meta.json deleted file mode 100644 index 93fb103cdd..0000000000 --- a/Resources/Textures/Constructible/Power/ame_shielding.rsi/meta.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/machines/new_ame.dmi at 1b7952787c06c21ef1623e494dcfe7cb1f46e041", - "states": [ - { - "name": "shield_0", - - }, - { - "name": "shield_1", - - }, - { - "name": "shield_10", - - }, - { - "name": "shield_11", - - }, - { - "name": "shield_12", - - }, - { - "name": "shield_13", - - }, - { - "name": "shield_14", - - }, - { - "name": "shield_15", - - }, - { - "name": "shield_2", - - }, - { - "name": "shield_3", - - }, - { - "name": "shield_4", - - }, - { - "name": "shield_5", - - }, - { - "name": "shield_6", - - }, - { - "name": "shield_7", - - }, - { - "name": "shield_8", - - }, - { - "name": "core", - - }, - { - "name": "shield_9", - - }, - { - "name": "core_weak", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "core_strong", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter.png b/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter.png deleted file mode 100644 index c147a0743a..0000000000 Binary files a/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_ani.png b/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_ani.png deleted file mode 100644 index c598e271b2..0000000000 Binary files a/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_ani.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_t.png b/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_t.png deleted file mode 100644 index 9177717715..0000000000 Binary files a/Resources/Textures/Constructible/Power/circuit_printer.rsi/circuit_imprinter_t.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/circuit_printer.rsi/meta.json b/Resources/Textures/Constructible/Power/circuit_printer.rsi/meta.json deleted file mode 100644 index 1515c2951b..0000000000 --- a/Resources/Textures/Constructible/Power/circuit_printer.rsi/meta.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/machines/excelsior/autolathe.dmi at 40b254106b46981b8ad95ccd5589deb8fa56e765", - "states": [ - { - "name": "circuit_imprinter", - - }, - { - "name": "circuit_imprinter_ani", - "delays": [ - [ - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08 - ] - ] - }, - { - "name": "circuit_imprinter_t", - - } - ] -} diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer.png deleted file mode 100644 index 54fbf13c18..0000000000 Binary files a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_l.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_l.png deleted file mode 100644 index 86c82e87df..0000000000 Binary files a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_l.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_la.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_la.png deleted file mode 100644 index 54342922f8..0000000000 Binary files a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_la.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_process.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_process.png deleted file mode 100644 index c18ad48f9a..0000000000 Binary files a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_process.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_t.png b/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_t.png deleted file mode 100644 index 27179ba0f7..0000000000 Binary files a/Resources/Textures/Constructible/Power/d_analyzer.rsi/d_analyzer_t.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/d_analyzer.rsi/meta.json b/Resources/Textures/Constructible/Power/d_analyzer.rsi/meta.json deleted file mode 100644 index d8e78fe6d3..0000000000 --- a/Resources/Textures/Constructible/Power/d_analyzer.rsi/meta.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/machines/excelsior/autolathe.dmi at 40b254106b46981b8ad95ccd5589deb8fa56e765", - "states": [ - { - "name": "d_analyzer", - - }, - { - "name": "d_analyzer_l", - - }, - { - "name": "d_analyzer_la", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "d_analyzer_process", - "delays": [ - [ - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09, - 0.09 - ] - ] - }, - { - "name": "d_analyzer_t", - - } - ] -} diff --git a/Resources/Textures/Constructible/Power/industrial_dispenser.rsi/meta.json b/Resources/Textures/Constructible/Power/industrial_dispenser.rsi/meta.json deleted file mode 100644 index 34a7df8d8e..0000000000 --- a/Resources/Textures/Constructible/Power/industrial_dispenser.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"industrial_dispenser","directions":1,"delays":[[1.0]]}]} diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/0.png b/Resources/Textures/Effects/crayondecals.rsi/0.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/0.png rename to Resources/Textures/Effects/crayondecals.rsi/0.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/1.png b/Resources/Textures/Effects/crayondecals.rsi/1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/1.png rename to Resources/Textures/Effects/crayondecals.rsi/1.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/2.png b/Resources/Textures/Effects/crayondecals.rsi/2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/2.png rename to Resources/Textures/Effects/crayondecals.rsi/2.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/3.png b/Resources/Textures/Effects/crayondecals.rsi/3.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/3.png rename to Resources/Textures/Effects/crayondecals.rsi/3.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/4.png b/Resources/Textures/Effects/crayondecals.rsi/4.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/4.png rename to Resources/Textures/Effects/crayondecals.rsi/4.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/5.png b/Resources/Textures/Effects/crayondecals.rsi/5.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/5.png rename to Resources/Textures/Effects/crayondecals.rsi/5.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/6.png b/Resources/Textures/Effects/crayondecals.rsi/6.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/6.png rename to Resources/Textures/Effects/crayondecals.rsi/6.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/7.png b/Resources/Textures/Effects/crayondecals.rsi/7.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/7.png rename to Resources/Textures/Effects/crayondecals.rsi/7.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/8.png b/Resources/Textures/Effects/crayondecals.rsi/8.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/8.png rename to Resources/Textures/Effects/crayondecals.rsi/8.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/9.png b/Resources/Textures/Effects/crayondecals.rsi/9.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/9.png rename to Resources/Textures/Effects/crayondecals.rsi/9.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Blasto.png b/Resources/Textures/Effects/crayondecals.rsi/Blasto.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Blasto.png rename to Resources/Textures/Effects/crayondecals.rsi/Blasto.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Clandestine.png b/Resources/Textures/Effects/crayondecals.rsi/Clandestine.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Clandestine.png rename to Resources/Textures/Effects/crayondecals.rsi/Clandestine.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Cyber.png b/Resources/Textures/Effects/crayondecals.rsi/Cyber.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Cyber.png rename to Resources/Textures/Effects/crayondecals.rsi/Cyber.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Diablo.png b/Resources/Textures/Effects/crayondecals.rsi/Diablo.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Diablo.png rename to Resources/Textures/Effects/crayondecals.rsi/Diablo.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Donk.png b/Resources/Textures/Effects/crayondecals.rsi/Donk.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Donk.png rename to Resources/Textures/Effects/crayondecals.rsi/Donk.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Gene.png b/Resources/Textures/Effects/crayondecals.rsi/Gene.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Gene.png rename to Resources/Textures/Effects/crayondecals.rsi/Gene.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Gib.png b/Resources/Textures/Effects/crayondecals.rsi/Gib.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Gib.png rename to Resources/Textures/Effects/crayondecals.rsi/Gib.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Max.png b/Resources/Textures/Effects/crayondecals.rsi/Max.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Max.png rename to Resources/Textures/Effects/crayondecals.rsi/Max.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Newton.png b/Resources/Textures/Effects/crayondecals.rsi/Newton.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Newton.png rename to Resources/Textures/Effects/crayondecals.rsi/Newton.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/North.png b/Resources/Textures/Effects/crayondecals.rsi/North.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/North.png rename to Resources/Textures/Effects/crayondecals.rsi/North.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Omni.png b/Resources/Textures/Effects/crayondecals.rsi/Omni.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Omni.png rename to Resources/Textures/Effects/crayondecals.rsi/Omni.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Osiron.png b/Resources/Textures/Effects/crayondecals.rsi/Osiron.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Osiron.png rename to Resources/Textures/Effects/crayondecals.rsi/Osiron.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Prima.png b/Resources/Textures/Effects/crayondecals.rsi/Prima.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Prima.png rename to Resources/Textures/Effects/crayondecals.rsi/Prima.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Psyke.png b/Resources/Textures/Effects/crayondecals.rsi/Psyke.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Psyke.png rename to Resources/Textures/Effects/crayondecals.rsi/Psyke.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Sirius.png b/Resources/Textures/Effects/crayondecals.rsi/Sirius.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Sirius.png rename to Resources/Textures/Effects/crayondecals.rsi/Sirius.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Sleeping Carp.png b/Resources/Textures/Effects/crayondecals.rsi/Sleeping Carp.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Sleeping Carp.png rename to Resources/Textures/Effects/crayondecals.rsi/Sleeping Carp.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Tunnel.png b/Resources/Textures/Effects/crayondecals.rsi/Tunnel.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Tunnel.png rename to Resources/Textures/Effects/crayondecals.rsi/Tunnel.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Waffle.png b/Resources/Textures/Effects/crayondecals.rsi/Waffle.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Waffle.png rename to Resources/Textures/Effects/crayondecals.rsi/Waffle.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/Zero-G.png b/Resources/Textures/Effects/crayondecals.rsi/Zero-G.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/Zero-G.png rename to Resources/Textures/Effects/crayondecals.rsi/Zero-G.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/a.png b/Resources/Textures/Effects/crayondecals.rsi/a.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/a.png rename to Resources/Textures/Effects/crayondecals.rsi/a.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/ampersand.png b/Resources/Textures/Effects/crayondecals.rsi/ampersand.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/ampersand.png rename to Resources/Textures/Effects/crayondecals.rsi/ampersand.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/amyjon.png b/Resources/Textures/Effects/crayondecals.rsi/amyjon.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/amyjon.png rename to Resources/Textures/Effects/crayondecals.rsi/amyjon.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/antilizard.png b/Resources/Textures/Effects/crayondecals.rsi/antilizard.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/antilizard.png rename to Resources/Textures/Effects/crayondecals.rsi/antilizard.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/arrow.png b/Resources/Textures/Effects/crayondecals.rsi/arrow.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/arrow.png rename to Resources/Textures/Effects/crayondecals.rsi/arrow.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/b.png b/Resources/Textures/Effects/crayondecals.rsi/b.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/b.png rename to Resources/Textures/Effects/crayondecals.rsi/b.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/beepsky.png b/Resources/Textures/Effects/crayondecals.rsi/beepsky.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/beepsky.png rename to Resources/Textures/Effects/crayondecals.rsi/beepsky.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/biohazard.png b/Resources/Textures/Effects/crayondecals.rsi/biohazard.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/biohazard.png rename to Resources/Textures/Effects/crayondecals.rsi/biohazard.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/blueprint.png b/Resources/Textures/Effects/crayondecals.rsi/blueprint.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/blueprint.png rename to Resources/Textures/Effects/crayondecals.rsi/blueprint.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/body.png b/Resources/Textures/Effects/crayondecals.rsi/body.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/body.png rename to Resources/Textures/Effects/crayondecals.rsi/body.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/bottle.png b/Resources/Textures/Effects/crayondecals.rsi/bottle.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/bottle.png rename to Resources/Textures/Effects/crayondecals.rsi/bottle.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/brush.png b/Resources/Textures/Effects/crayondecals.rsi/brush.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/brush.png rename to Resources/Textures/Effects/crayondecals.rsi/brush.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/c.png b/Resources/Textures/Effects/crayondecals.rsi/c.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/c.png rename to Resources/Textures/Effects/crayondecals.rsi/c.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/carp.png b/Resources/Textures/Effects/crayondecals.rsi/carp.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/carp.png rename to Resources/Textures/Effects/crayondecals.rsi/carp.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/cat.png b/Resources/Textures/Effects/crayondecals.rsi/cat.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/cat.png rename to Resources/Textures/Effects/crayondecals.rsi/cat.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/chevron.png b/Resources/Textures/Effects/crayondecals.rsi/chevron.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/chevron.png rename to Resources/Textures/Effects/crayondecals.rsi/chevron.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/clawprint.png b/Resources/Textures/Effects/crayondecals.rsi/clawprint.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/clawprint.png rename to Resources/Textures/Effects/crayondecals.rsi/clawprint.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/clown.png b/Resources/Textures/Effects/crayondecals.rsi/clown.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/clown.png rename to Resources/Textures/Effects/crayondecals.rsi/clown.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/comma.png b/Resources/Textures/Effects/crayondecals.rsi/comma.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/comma.png rename to Resources/Textures/Effects/crayondecals.rsi/comma.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/corgi.png b/Resources/Textures/Effects/crayondecals.rsi/corgi.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/corgi.png rename to Resources/Textures/Effects/crayondecals.rsi/corgi.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/credit.png b/Resources/Textures/Effects/crayondecals.rsi/credit.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/credit.png rename to Resources/Textures/Effects/crayondecals.rsi/credit.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/cyka.png b/Resources/Textures/Effects/crayondecals.rsi/cyka.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/cyka.png rename to Resources/Textures/Effects/crayondecals.rsi/cyka.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/d.png b/Resources/Textures/Effects/crayondecals.rsi/d.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/d.png rename to Resources/Textures/Effects/crayondecals.rsi/d.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/danger.png b/Resources/Textures/Effects/crayondecals.rsi/danger.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/danger.png rename to Resources/Textures/Effects/crayondecals.rsi/danger.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/disk.png b/Resources/Textures/Effects/crayondecals.rsi/disk.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/disk.png rename to Resources/Textures/Effects/crayondecals.rsi/disk.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/dot.png b/Resources/Textures/Effects/crayondecals.rsi/dot.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/dot.png rename to Resources/Textures/Effects/crayondecals.rsi/dot.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/dwarf.png b/Resources/Textures/Effects/crayondecals.rsi/dwarf.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/dwarf.png rename to Resources/Textures/Effects/crayondecals.rsi/dwarf.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/e.png b/Resources/Textures/Effects/crayondecals.rsi/e.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/e.png rename to Resources/Textures/Effects/crayondecals.rsi/e.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/electricdanger.png b/Resources/Textures/Effects/crayondecals.rsi/electricdanger.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/electricdanger.png rename to Resources/Textures/Effects/crayondecals.rsi/electricdanger.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/end.png b/Resources/Textures/Effects/crayondecals.rsi/end.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/end.png rename to Resources/Textures/Effects/crayondecals.rsi/end.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/engie.png b/Resources/Textures/Effects/crayondecals.rsi/engie.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/engie.png rename to Resources/Textures/Effects/crayondecals.rsi/engie.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/equals.png b/Resources/Textures/Effects/crayondecals.rsi/equals.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/equals.png rename to Resources/Textures/Effects/crayondecals.rsi/equals.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/evac.png b/Resources/Textures/Effects/crayondecals.rsi/evac.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/evac.png rename to Resources/Textures/Effects/crayondecals.rsi/evac.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/exclamationmark.png b/Resources/Textures/Effects/crayondecals.rsi/exclamationmark.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/exclamationmark.png rename to Resources/Textures/Effects/crayondecals.rsi/exclamationmark.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/f.png b/Resources/Textures/Effects/crayondecals.rsi/f.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/f.png rename to Resources/Textures/Effects/crayondecals.rsi/f.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/face.png b/Resources/Textures/Effects/crayondecals.rsi/face.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/face.png rename to Resources/Textures/Effects/crayondecals.rsi/face.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/fireaxe.png b/Resources/Textures/Effects/crayondecals.rsi/fireaxe.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/fireaxe.png rename to Resources/Textures/Effects/crayondecals.rsi/fireaxe.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/firedanger.png b/Resources/Textures/Effects/crayondecals.rsi/firedanger.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/firedanger.png rename to Resources/Textures/Effects/crayondecals.rsi/firedanger.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/food.png b/Resources/Textures/Effects/crayondecals.rsi/food.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/food.png rename to Resources/Textures/Effects/crayondecals.rsi/food.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/footprint.png b/Resources/Textures/Effects/crayondecals.rsi/footprint.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/footprint.png rename to Resources/Textures/Effects/crayondecals.rsi/footprint.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/g.png b/Resources/Textures/Effects/crayondecals.rsi/g.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/g.png rename to Resources/Textures/Effects/crayondecals.rsi/g.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/ghost.png b/Resources/Textures/Effects/crayondecals.rsi/ghost.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/ghost.png rename to Resources/Textures/Effects/crayondecals.rsi/ghost.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/guy.png b/Resources/Textures/Effects/crayondecals.rsi/guy.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/guy.png rename to Resources/Textures/Effects/crayondecals.rsi/guy.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/h.png b/Resources/Textures/Effects/crayondecals.rsi/h.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/h.png rename to Resources/Textures/Effects/crayondecals.rsi/h.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/heart.png b/Resources/Textures/Effects/crayondecals.rsi/heart.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/heart.png rename to Resources/Textures/Effects/crayondecals.rsi/heart.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/i.png b/Resources/Textures/Effects/crayondecals.rsi/i.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/i.png rename to Resources/Textures/Effects/crayondecals.rsi/i.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/j.png b/Resources/Textures/Effects/crayondecals.rsi/j.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/j.png rename to Resources/Textures/Effects/crayondecals.rsi/j.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/k.png b/Resources/Textures/Effects/crayondecals.rsi/k.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/k.png rename to Resources/Textures/Effects/crayondecals.rsi/k.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/l.png b/Resources/Textures/Effects/crayondecals.rsi/l.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/l.png rename to Resources/Textures/Effects/crayondecals.rsi/l.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/largebrush.png b/Resources/Textures/Effects/crayondecals.rsi/largebrush.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/largebrush.png rename to Resources/Textures/Effects/crayondecals.rsi/largebrush.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/like.png b/Resources/Textures/Effects/crayondecals.rsi/like.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/like.png rename to Resources/Textures/Effects/crayondecals.rsi/like.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/line.png b/Resources/Textures/Effects/crayondecals.rsi/line.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/line.png rename to Resources/Textures/Effects/crayondecals.rsi/line.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/m.png b/Resources/Textures/Effects/crayondecals.rsi/m.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/m.png rename to Resources/Textures/Effects/crayondecals.rsi/m.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/matt.png b/Resources/Textures/Effects/crayondecals.rsi/matt.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/matt.png rename to Resources/Textures/Effects/crayondecals.rsi/matt.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/med.png b/Resources/Textures/Effects/crayondecals.rsi/med.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/med.png rename to Resources/Textures/Effects/crayondecals.rsi/med.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/meta.json b/Resources/Textures/Effects/crayondecals.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/meta.json rename to Resources/Textures/Effects/crayondecals.rsi/meta.json diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/minus.png b/Resources/Textures/Effects/crayondecals.rsi/minus.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/minus.png rename to Resources/Textures/Effects/crayondecals.rsi/minus.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/n.png b/Resources/Textures/Effects/crayondecals.rsi/n.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/n.png rename to Resources/Textures/Effects/crayondecals.rsi/n.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/nay.png b/Resources/Textures/Effects/crayondecals.rsi/nay.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/nay.png rename to Resources/Textures/Effects/crayondecals.rsi/nay.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/o.png b/Resources/Textures/Effects/crayondecals.rsi/o.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/o.png rename to Resources/Textures/Effects/crayondecals.rsi/o.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/p.png b/Resources/Textures/Effects/crayondecals.rsi/p.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/p.png rename to Resources/Textures/Effects/crayondecals.rsi/p.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/pawprint.png b/Resources/Textures/Effects/crayondecals.rsi/pawprint.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/pawprint.png rename to Resources/Textures/Effects/crayondecals.rsi/pawprint.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/peace.png b/Resources/Textures/Effects/crayondecals.rsi/peace.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/peace.png rename to Resources/Textures/Effects/crayondecals.rsi/peace.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/percent.png b/Resources/Textures/Effects/crayondecals.rsi/percent.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/percent.png rename to Resources/Textures/Effects/crayondecals.rsi/percent.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/plus.png b/Resources/Textures/Effects/crayondecals.rsi/plus.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/plus.png rename to Resources/Textures/Effects/crayondecals.rsi/plus.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/pound.png b/Resources/Textures/Effects/crayondecals.rsi/pound.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/pound.png rename to Resources/Textures/Effects/crayondecals.rsi/pound.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/prolizard.png b/Resources/Textures/Effects/crayondecals.rsi/prolizard.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/prolizard.png rename to Resources/Textures/Effects/crayondecals.rsi/prolizard.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/q.png b/Resources/Textures/Effects/crayondecals.rsi/q.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/q.png rename to Resources/Textures/Effects/crayondecals.rsi/q.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/questionmark.png b/Resources/Textures/Effects/crayondecals.rsi/questionmark.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/questionmark.png rename to Resources/Textures/Effects/crayondecals.rsi/questionmark.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/r.png b/Resources/Textures/Effects/crayondecals.rsi/r.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/r.png rename to Resources/Textures/Effects/crayondecals.rsi/r.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/radiation.png b/Resources/Textures/Effects/crayondecals.rsi/radiation.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/radiation.png rename to Resources/Textures/Effects/crayondecals.rsi/radiation.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/revolution.png b/Resources/Textures/Effects/crayondecals.rsi/revolution.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/revolution.png rename to Resources/Textures/Effects/crayondecals.rsi/revolution.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/rune1.png b/Resources/Textures/Effects/crayondecals.rsi/rune1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/rune1.png rename to Resources/Textures/Effects/crayondecals.rsi/rune1.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/rune2.png b/Resources/Textures/Effects/crayondecals.rsi/rune2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/rune2.png rename to Resources/Textures/Effects/crayondecals.rsi/rune2.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/rune3.png b/Resources/Textures/Effects/crayondecals.rsi/rune3.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/rune3.png rename to Resources/Textures/Effects/crayondecals.rsi/rune3.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/rune4.png b/Resources/Textures/Effects/crayondecals.rsi/rune4.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/rune4.png rename to Resources/Textures/Effects/crayondecals.rsi/rune4.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/rune5.png b/Resources/Textures/Effects/crayondecals.rsi/rune5.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/rune5.png rename to Resources/Textures/Effects/crayondecals.rsi/rune5.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/rune6.png b/Resources/Textures/Effects/crayondecals.rsi/rune6.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/rune6.png rename to Resources/Textures/Effects/crayondecals.rsi/rune6.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/s.png b/Resources/Textures/Effects/crayondecals.rsi/s.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/s.png rename to Resources/Textures/Effects/crayondecals.rsi/s.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/safe.png b/Resources/Textures/Effects/crayondecals.rsi/safe.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/safe.png rename to Resources/Textures/Effects/crayondecals.rsi/safe.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/scroll.png b/Resources/Textures/Effects/crayondecals.rsi/scroll.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/scroll.png rename to Resources/Textures/Effects/crayondecals.rsi/scroll.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/shop.png b/Resources/Textures/Effects/crayondecals.rsi/shop.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/shop.png rename to Resources/Textures/Effects/crayondecals.rsi/shop.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/shortline.png b/Resources/Textures/Effects/crayondecals.rsi/shortline.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/shortline.png rename to Resources/Textures/Effects/crayondecals.rsi/shortline.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/shotgun.png b/Resources/Textures/Effects/crayondecals.rsi/shotgun.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/shotgun.png rename to Resources/Textures/Effects/crayondecals.rsi/shotgun.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/skull.png b/Resources/Textures/Effects/crayondecals.rsi/skull.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/skull.png rename to Resources/Textures/Effects/crayondecals.rsi/skull.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/slash.png b/Resources/Textures/Effects/crayondecals.rsi/slash.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/slash.png rename to Resources/Textures/Effects/crayondecals.rsi/slash.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/smallbrush.png b/Resources/Textures/Effects/crayondecals.rsi/smallbrush.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/smallbrush.png rename to Resources/Textures/Effects/crayondecals.rsi/smallbrush.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/snake.png b/Resources/Textures/Effects/crayondecals.rsi/snake.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/snake.png rename to Resources/Textures/Effects/crayondecals.rsi/snake.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/space.png b/Resources/Textures/Effects/crayondecals.rsi/space.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/space.png rename to Resources/Textures/Effects/crayondecals.rsi/space.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/splatter.png b/Resources/Textures/Effects/crayondecals.rsi/splatter.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/splatter.png rename to Resources/Textures/Effects/crayondecals.rsi/splatter.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/star.png b/Resources/Textures/Effects/crayondecals.rsi/star.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/star.png rename to Resources/Textures/Effects/crayondecals.rsi/star.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/stickman.png b/Resources/Textures/Effects/crayondecals.rsi/stickman.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/stickman.png rename to Resources/Textures/Effects/crayondecals.rsi/stickman.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/t.png b/Resources/Textures/Effects/crayondecals.rsi/t.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/t.png rename to Resources/Textures/Effects/crayondecals.rsi/t.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/taser.png b/Resources/Textures/Effects/crayondecals.rsi/taser.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/taser.png rename to Resources/Textures/Effects/crayondecals.rsi/taser.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/thinline.png b/Resources/Textures/Effects/crayondecals.rsi/thinline.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/thinline.png rename to Resources/Textures/Effects/crayondecals.rsi/thinline.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/toilet.png b/Resources/Textures/Effects/crayondecals.rsi/toilet.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/toilet.png rename to Resources/Textures/Effects/crayondecals.rsi/toilet.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/toolbox.png b/Resources/Textures/Effects/crayondecals.rsi/toolbox.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/toolbox.png rename to Resources/Textures/Effects/crayondecals.rsi/toolbox.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/trade.png b/Resources/Textures/Effects/crayondecals.rsi/trade.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/trade.png rename to Resources/Textures/Effects/crayondecals.rsi/trade.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/u.png b/Resources/Textures/Effects/crayondecals.rsi/u.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/u.png rename to Resources/Textures/Effects/crayondecals.rsi/u.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/uboa.png b/Resources/Textures/Effects/crayondecals.rsi/uboa.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/uboa.png rename to Resources/Textures/Effects/crayondecals.rsi/uboa.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/v.png b/Resources/Textures/Effects/crayondecals.rsi/v.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/v.png rename to Resources/Textures/Effects/crayondecals.rsi/v.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/w.png b/Resources/Textures/Effects/crayondecals.rsi/w.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/w.png rename to Resources/Textures/Effects/crayondecals.rsi/w.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/x.png b/Resources/Textures/Effects/crayondecals.rsi/x.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/x.png rename to Resources/Textures/Effects/crayondecals.rsi/x.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/y.png b/Resources/Textures/Effects/crayondecals.rsi/y.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/y.png rename to Resources/Textures/Effects/crayondecals.rsi/y.png diff --git a/Resources/Textures/Constructible/Misc/crayondecals.rsi/z.png b/Resources/Textures/Effects/crayondecals.rsi/z.png similarity index 100% rename from Resources/Textures/Constructible/Misc/crayondecals.rsi/z.png rename to Resources/Textures/Effects/crayondecals.rsi/z.png diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json index cccb2a2d42..ddafbbb98b 100644 --- a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json @@ -18,34 +18,6 @@ }, { "name": "drum_makeshift" - }, - { - "name": "minimoog", - "directions": 4 - }, - { - "name": "minimoog-broken", - "directions": 4 - }, - { - "name": "church_organ", - "directions": 4 - }, - { - "name": "piano", - "directions": 4 - }, - { - "name": "piano-broken", - "directions": 4 - }, - { - "name": "xylophone", - "directions": 4 - }, - { - "name": "xylophone-broken", - "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoogbroken.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoogbroken.png deleted file mode 100644 index 71ca879106..0000000000 Binary files a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoogbroken.png and /dev/null differ diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/synthesizer.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/synthesizer.png deleted file mode 100644 index 91c1c253de..0000000000 Binary files a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/synthesizer.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Misc/module.rsi/abductor_mod.png b/Resources/Textures/Objects/Misc/module.rsi/abductor_mod.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/abductor_mod.png rename to Resources/Textures/Objects/Misc/module.rsi/abductor_mod.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/airalarm_electronics.png b/Resources/Textures/Objects/Misc/module.rsi/airalarm_electronics.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/airalarm_electronics.png rename to Resources/Textures/Objects/Misc/module.rsi/airalarm_electronics.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/ash_plating.png b/Resources/Textures/Objects/Misc/module.rsi/ash_plating.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/ash_plating.png rename to Resources/Textures/Objects/Misc/module.rsi/ash_plating.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/beaker_holder.png b/Resources/Textures/Objects/Misc/module.rsi/beaker_holder.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/beaker_holder.png rename to Resources/Textures/Objects/Misc/module.rsi/beaker_holder.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/blank_mod.png b/Resources/Textures/Objects/Misc/module.rsi/blank_mod.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/blank_mod.png rename to Resources/Textures/Objects/Misc/module.rsi/blank_mod.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/bluespacearray.png b/Resources/Textures/Objects/Misc/module.rsi/bluespacearray.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/bluespacearray.png rename to Resources/Textures/Objects/Misc/module.rsi/bluespacearray.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/boris.png b/Resources/Textures/Objects/Misc/module.rsi/boris.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/boris.png rename to Resources/Textures/Objects/Misc/module.rsi/boris.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/boris_recharging.png b/Resources/Textures/Objects/Misc/module.rsi/boris_recharging.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/boris_recharging.png rename to Resources/Textures/Objects/Misc/module.rsi/boris_recharging.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/card_mini.png b/Resources/Textures/Objects/Misc/module.rsi/card_mini.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/card_mini.png rename to Resources/Textures/Objects/Misc/module.rsi/card_mini.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/card_mod.png b/Resources/Textures/Objects/Misc/module.rsi/card_mod.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/card_mod.png rename to Resources/Textures/Objects/Misc/module.rsi/card_mod.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cargodisk.png b/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cargodisk.png rename to Resources/Textures/Objects/Misc/module.rsi/cargodisk.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cart_connector.png b/Resources/Textures/Objects/Misc/module.rsi/cart_connector.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cart_connector.png rename to Resources/Textures/Objects/Misc/module.rsi/cart_connector.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cddrive.png b/Resources/Textures/Objects/Misc/module.rsi/cddrive.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cddrive.png rename to Resources/Textures/Objects/Misc/module.rsi/cddrive.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cell.png b/Resources/Textures/Objects/Misc/module.rsi/cell.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cell.png rename to Resources/Textures/Objects/Misc/module.rsi/cell.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cell_con.png b/Resources/Textures/Objects/Misc/module.rsi/cell_con.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cell_con.png rename to Resources/Textures/Objects/Misc/module.rsi/cell_con.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cell_con_micro.png b/Resources/Textures/Objects/Misc/module.rsi/cell_con_micro.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cell_con_micro.png rename to Resources/Textures/Objects/Misc/module.rsi/cell_con_micro.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cell_micro.png b/Resources/Textures/Objects/Misc/module.rsi/cell_micro.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cell_micro.png rename to Resources/Textures/Objects/Misc/module.rsi/cell_micro.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cell_mini.png b/Resources/Textures/Objects/Misc/module.rsi/cell_mini.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cell_mini.png rename to Resources/Textures/Objects/Misc/module.rsi/cell_mini.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/charger_APC.png b/Resources/Textures/Objects/Misc/module.rsi/charger_APC.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/charger_APC.png rename to Resources/Textures/Objects/Misc/module.rsi/charger_APC.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/charger_lambda.png b/Resources/Textures/Objects/Misc/module.rsi/charger_lambda.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/charger_lambda.png rename to Resources/Textures/Objects/Misc/module.rsi/charger_lambda.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/charger_pda.png b/Resources/Textures/Objects/Misc/module.rsi/charger_pda.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/charger_pda.png rename to Resources/Textures/Objects/Misc/module.rsi/charger_pda.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/charger_wire.png b/Resources/Textures/Objects/Misc/module.rsi/charger_wire.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/charger_wire.png rename to Resources/Textures/Objects/Misc/module.rsi/charger_wire.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/clock_mod.png b/Resources/Textures/Objects/Misc/module.rsi/clock_mod.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/clock_mod.png rename to Resources/Textures/Objects/Misc/module.rsi/clock_mod.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/command.png b/Resources/Textures/Objects/Misc/module.rsi/command.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/command.png rename to Resources/Textures/Objects/Misc/module.rsi/command.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cpu.png b/Resources/Textures/Objects/Misc/module.rsi/cpu.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cpu.png rename to Resources/Textures/Objects/Misc/module.rsi/cpu.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cpu_adv.png b/Resources/Textures/Objects/Misc/module.rsi/cpu_adv.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cpu_adv.png rename to Resources/Textures/Objects/Misc/module.rsi/cpu_adv.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cpu_super.png b/Resources/Textures/Objects/Misc/module.rsi/cpu_super.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cpu_super.png rename to Resources/Textures/Objects/Misc/module.rsi/cpu_super.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cpuboard.png b/Resources/Textures/Objects/Misc/module.rsi/cpuboard.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cpuboard.png rename to Resources/Textures/Objects/Misc/module.rsi/cpuboard.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cpuboard_adv.png b/Resources/Textures/Objects/Misc/module.rsi/cpuboard_adv.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cpuboard_adv.png rename to Resources/Textures/Objects/Misc/module.rsi/cpuboard_adv.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cpuboard_super.png b/Resources/Textures/Objects/Misc/module.rsi/cpuboard_super.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cpuboard_super.png rename to Resources/Textures/Objects/Misc/module.rsi/cpuboard_super.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade.png rename to Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade1.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade1.png rename to Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade1.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade2.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade2.png rename to Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade2.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade3.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade3.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade3.png rename to Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade3.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade4.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade4.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade4.png rename to Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade4.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade5.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade5.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/cyborg_upgrade5.png rename to Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade5.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk0.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk0.png rename to Resources/Textures/Objects/Misc/module.rsi/datadisk0.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk1.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk1.png rename to Resources/Textures/Objects/Misc/module.rsi/datadisk1.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk2.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk2.png rename to Resources/Textures/Objects/Misc/module.rsi/datadisk2.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk3.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk3.png rename to Resources/Textures/Objects/Misc/module.rsi/datadisk3.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk4.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk4.png rename to Resources/Textures/Objects/Misc/module.rsi/datadisk4.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk5.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk5.png rename to Resources/Textures/Objects/Misc/module.rsi/datadisk5.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk6.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk6.png rename to Resources/Textures/Objects/Misc/module.rsi/datadisk6.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk_gene.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk_gene.png rename to Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/datadisk_hydro.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/datadisk_hydro.png rename to Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/depositbox.png b/Resources/Textures/Objects/Misc/module.rsi/depositbox.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/depositbox.png rename to Resources/Textures/Objects/Misc/module.rsi/depositbox.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/door_electronics.png b/Resources/Textures/Objects/Misc/module.rsi/door_electronics.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/door_electronics.png rename to Resources/Textures/Objects/Misc/module.rsi/door_electronics.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/engineering.png b/Resources/Textures/Objects/Misc/module.rsi/engineering.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/engineering.png rename to Resources/Textures/Objects/Misc/module.rsi/engineering.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/flopdrive.png b/Resources/Textures/Objects/Misc/module.rsi/flopdrive.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/flopdrive.png rename to Resources/Textures/Objects/Misc/module.rsi/flopdrive.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/generic.png b/Resources/Textures/Objects/Misc/module.rsi/generic.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/generic.png rename to Resources/Textures/Objects/Misc/module.rsi/generic.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/harddisk.png b/Resources/Textures/Objects/Misc/module.rsi/harddisk.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/harddisk.png rename to Resources/Textures/Objects/Misc/module.rsi/harddisk.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/harddisk_micro.png b/Resources/Textures/Objects/Misc/module.rsi/harddisk_micro.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/harddisk_micro.png rename to Resources/Textures/Objects/Misc/module.rsi/harddisk_micro.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/harddisk_mini.png b/Resources/Textures/Objects/Misc/module.rsi/harddisk_mini.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/harddisk_mini.png rename to Resources/Textures/Objects/Misc/module.rsi/harddisk_mini.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/holodisk.png b/Resources/Textures/Objects/Misc/module.rsi/holodisk.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/holodisk.png rename to Resources/Textures/Objects/Misc/module.rsi/holodisk.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/id_mod.png b/Resources/Textures/Objects/Misc/module.rsi/id_mod.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/id_mod.png rename to Resources/Textures/Objects/Misc/module.rsi/id_mod.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/mainboard.png b/Resources/Textures/Objects/Misc/module.rsi/mainboard.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/mainboard.png rename to Resources/Textures/Objects/Misc/module.rsi/mainboard.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/mcontroller.png b/Resources/Textures/Objects/Misc/module.rsi/mcontroller.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/mcontroller.png rename to Resources/Textures/Objects/Misc/module.rsi/mcontroller.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/medical.png b/Resources/Textures/Objects/Misc/module.rsi/medical.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/medical.png rename to Resources/Textures/Objects/Misc/module.rsi/medical.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/meta.json b/Resources/Textures/Objects/Misc/module.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/meta.json rename to Resources/Textures/Objects/Misc/module.rsi/meta.json diff --git a/Resources/Textures/Constructible/Misc/module.rsi/net_wired.png b/Resources/Textures/Objects/Misc/module.rsi/net_wired.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/net_wired.png rename to Resources/Textures/Objects/Misc/module.rsi/net_wired.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/nucleardisk.png b/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/nucleardisk.png rename to Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/power_mod.png b/Resources/Textures/Objects/Misc/module.rsi/power_mod.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/power_mod.png rename to Resources/Textures/Objects/Misc/module.rsi/power_mod.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/printer.png b/Resources/Textures/Objects/Misc/module.rsi/printer.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/printer.png rename to Resources/Textures/Objects/Misc/module.rsi/printer.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/printer_mini.png b/Resources/Textures/Objects/Misc/module.rsi/printer_mini.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/printer_mini.png rename to Resources/Textures/Objects/Misc/module.rsi/printer_mini.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/prizevendor.png b/Resources/Textures/Objects/Misc/module.rsi/prizevendor.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/prizevendor.png rename to Resources/Textures/Objects/Misc/module.rsi/prizevendor.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/radio.png b/Resources/Textures/Objects/Misc/module.rsi/radio.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/radio.png rename to Resources/Textures/Objects/Misc/module.rsi/radio.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/radio_micro.png b/Resources/Textures/Objects/Misc/module.rsi/radio_micro.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/radio_micro.png rename to Resources/Textures/Objects/Misc/module.rsi/radio_micro.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/radio_mini.png b/Resources/Textures/Objects/Misc/module.rsi/radio_mini.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/radio_mini.png rename to Resources/Textures/Objects/Misc/module.rsi/radio_mini.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/ram.png b/Resources/Textures/Objects/Misc/module.rsi/ram.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/ram.png rename to Resources/Textures/Objects/Misc/module.rsi/ram.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/rndmajordisk.png b/Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/rndmajordisk.png rename to Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/science.png b/Resources/Textures/Objects/Misc/module.rsi/science.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/science.png rename to Resources/Textures/Objects/Misc/module.rsi/science.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/secmodschematic.png b/Resources/Textures/Objects/Misc/module.rsi/secmodschematic.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/secmodschematic.png rename to Resources/Textures/Objects/Misc/module.rsi/secmodschematic.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/security.png b/Resources/Textures/Objects/Misc/module.rsi/security.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/security.png rename to Resources/Textures/Objects/Misc/module.rsi/security.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/selfrepair_off.png b/Resources/Textures/Objects/Misc/module.rsi/selfrepair_off.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/selfrepair_off.png rename to Resources/Textures/Objects/Misc/module.rsi/selfrepair_off.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/selfrepair_on.png b/Resources/Textures/Objects/Misc/module.rsi/selfrepair_on.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/selfrepair_on.png rename to Resources/Textures/Objects/Misc/module.rsi/selfrepair_on.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/service.png b/Resources/Textures/Objects/Misc/module.rsi/service.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/service.png rename to Resources/Textures/Objects/Misc/module.rsi/service.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/servo.png b/Resources/Textures/Objects/Misc/module.rsi/servo.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/servo.png rename to Resources/Textures/Objects/Misc/module.rsi/servo.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/ssd.png b/Resources/Textures/Objects/Misc/module.rsi/ssd.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/ssd.png rename to Resources/Textures/Objects/Misc/module.rsi/ssd.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/ssd_large.png b/Resources/Textures/Objects/Misc/module.rsi/ssd_large.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/ssd_large.png rename to Resources/Textures/Objects/Misc/module.rsi/ssd_large.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/ssd_micro.png b/Resources/Textures/Objects/Misc/module.rsi/ssd_micro.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/ssd_micro.png rename to Resources/Textures/Objects/Misc/module.rsi/ssd_micro.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/ssd_mini.png b/Resources/Textures/Objects/Misc/module.rsi/ssd_mini.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/ssd_mini.png rename to Resources/Textures/Objects/Misc/module.rsi/ssd_mini.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/std_mod.png b/Resources/Textures/Objects/Misc/module.rsi/std_mod.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/std_mod.png rename to Resources/Textures/Objects/Misc/module.rsi/std_mod.png diff --git a/Resources/Textures/Constructible/Misc/module.rsi/supply.png b/Resources/Textures/Objects/Misc/module.rsi/supply.png similarity index 100% rename from Resources/Textures/Constructible/Misc/module.rsi/supply.png rename to Resources/Textures/Objects/Misc/module.rsi/supply.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/adv_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/adv_capacitor.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/adv_electrolite.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_electrolite.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/adv_electrolite.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/adv_electrolite.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/adv_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/adv_scan_module.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/advanced_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/advanced_matter_bin.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/ansible_crystal.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/ansible_crystal.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/ansible_crystal.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/ansible_crystal.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/bluespace_electrolite.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_electrolite.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/bluespace_electrolite.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_electrolite.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/bluespace_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/bluespace_matter_bin.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/capacitor.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/card_reader.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/card_reader.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/card_reader.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/card_reader.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk0.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk0.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk0.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk0.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk1.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk1.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk1.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk2.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk2.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk2.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk3.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk3.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk3.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk3.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk4.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk4.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk4.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk4.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk5.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk5.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk5.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk5.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk6.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk6.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/datadisk6.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk6.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/electrolite.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/electrolite.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/electrolite.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/electrolite.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/femto_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/femto_mani.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/hdd1.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/hdd1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/hdd1.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/hdd1.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/hdd2.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/hdd2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/hdd2.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/hdd2.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/high_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/high_micro_laser.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/hyperwave_filter.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/hyperwave_filter.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/hyperwave_filter.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/hyperwave_filter.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/matter_bin.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json new file mode 100644 index 0000000000..5636b3e436 --- /dev/null +++ b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json @@ -0,0 +1,414 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0", + "states": [ + { + "name": "adv_capacitor", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "adv_electrolite", + "delays": [ + [ + 0.13, + 0.13 + ] + ] + }, + { + "name": "adv_scan_module", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "advanced_matter_bin", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "ansible_crystal", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "bluespace_electrolite", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "bluespace_matter_bin", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "capacitor", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "card_reader", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "datadisk0", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "datadisk1", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "datadisk2", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "datadisk3", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "datadisk4", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "datadisk5", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "datadisk6", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "electrolite", + "delays": [ + [ + 0.16, + 0.16 + ] + ] + }, + { + "name": "femto_mani", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "hdd1", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "hdd2", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "high_micro_laser", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "hyperwave_filter", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "matter_bin", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "micro_laser", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "micro_mani", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "nano_mani", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "pico_mani", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "quadratic_capacitor", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "quadultra_micro_laser", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "rom1", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "rom2", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "romos1", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "romos2", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "scan_module", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "subspace_amplifier", + "delays": [ + [ + 0.2, + 0.4, + 0.2, + 0.4 + ] + ] + }, + { + "name": "subspace_ansible", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "subspace_transmitter", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "super_capacitor", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "super_electrolite", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "super_matter_bin", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "super_scan_module", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "treatment_disk", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "triphasic_scan_module", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "ultra_high_micro_laser", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "wavelength_analyzer", + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/micro_laser.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/micro_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/micro_mani.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/nano_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/nano_mani.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/pico_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/pico_mani.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/quadratic_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/quadratic_capacitor.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/quadultra_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/quadultra_micro_laser.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/rom1.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/rom1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/rom1.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/rom1.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/rom2.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/rom2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/rom2.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/rom2.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/romos1.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/romos1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/romos1.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/romos1.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/romos2.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/romos2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/romos2.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/romos2.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/scan_module.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/subspace_amplifier.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_amplifier.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/subspace_amplifier.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_amplifier.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/subspace_ansible.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_ansible.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/subspace_ansible.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_ansible.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/subspace_transmitter.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_transmitter.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/subspace_transmitter.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_transmitter.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/super_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/super_capacitor.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/super_electrolite.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_electrolite.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/super_electrolite.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/super_electrolite.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/super_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/super_matter_bin.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/super_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/super_scan_module.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/treatment_disk.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/treatment_disk.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/treatment_disk.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/treatment_disk.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/triphasic_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/triphasic_scan_module.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/ultra_high_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/ultra_high_micro_laser.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/wavelength_analyzer.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/wavelength_analyzer.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/wavelength_analyzer.png rename to Resources/Textures/Objects/Misc/stock_parts.rsi/wavelength_analyzer.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/deny.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/welded_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/welded_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/welded_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/welded_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/medical.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/science.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Glass/security.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/basic.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/cargo.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/command.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/engineering.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/external.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/deny.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame1.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame1.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame2.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame2.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame3.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame3.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame4.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/frame4.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/welded_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/welded_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/firelock.rsi/welded_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/welded_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/freezer.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/maint.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/medical.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/science.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/assembly.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closed.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/locked.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/meta.json rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/spark.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/Standard/security.rsi/welded.png rename to Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/assembly_0.png b/Resources/Textures/Structures/Doors/assembly.rsi/assembly_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/assembly_0.png rename to Resources/Textures/Structures/Doors/assembly.rsi/assembly_0.png diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/assembly_1.png b/Resources/Textures/Structures/Doors/assembly.rsi/assembly_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/assembly_1.png rename to Resources/Textures/Structures/Doors/assembly.rsi/assembly_1.png diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/assembly_2.png b/Resources/Textures/Structures/Doors/assembly.rsi/assembly_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/assembly_2.png rename to Resources/Textures/Structures/Doors/assembly.rsi/assembly_2.png diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_0.png b/Resources/Textures/Structures/Doors/assembly.rsi/fire_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_0.png rename to Resources/Textures/Structures/Doors/assembly.rsi/fire_0.png diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_1.png b/Resources/Textures/Structures/Doors/assembly.rsi/fire_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_1.png rename to Resources/Textures/Structures/Doors/assembly.rsi/fire_1.png diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_2.png b/Resources/Textures/Structures/Doors/assembly.rsi/fire_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_2.png rename to Resources/Textures/Structures/Doors/assembly.rsi/fire_2.png diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_3.png b/Resources/Textures/Structures/Doors/assembly.rsi/fire_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/fire_3.png rename to Resources/Textures/Structures/Doors/assembly.rsi/fire_3.png diff --git a/Resources/Textures/Constructible/Structures/Doors/assembly.rsi/meta.json b/Resources/Textures/Structures/Doors/assembly.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/assembly.rsi/meta.json rename to Resources/Textures/Structures/Doors/assembly.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/alert_cold.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/alert_cold.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/alert_cold.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/alert_cold.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/alert_hot.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/alert_hot.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/alert_hot.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/alert_hot.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closed.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closed.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closed.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closing.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closing.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/deny.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/deny.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/deny.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/deny.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/door_spark.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/door_spark.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/door_spark.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/door_spark.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/locked.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/locked.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/meta.json b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/meta.json rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/open.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/open.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/opening.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/opening.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/palert.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/palert.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/palert.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/palert.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/panel_open.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/welded.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/welded.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/welded_open.png b/Resources/Textures/Structures/Doors/edge_door_hazard.rsi/welded_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/edge_door_hazard.rsi/welded_open.png rename to Resources/Textures/Structures/Doors/edge_door_hazard.rsi/welded_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/effects.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/bolted_unlit.png rename to Resources/Textures/Structures/Doors/effects.rsi/bolted_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/effects.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/closed_unlit.png rename to Resources/Textures/Structures/Doors/effects.rsi/closed_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/effects.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/closing_unlit.png rename to Resources/Textures/Structures/Doors/effects.rsi/closing_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/effects.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/deny_unlit.png rename to Resources/Textures/Structures/Doors/effects.rsi/deny_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/meta.json b/Resources/Textures/Structures/Doors/effects.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/meta.json rename to Resources/Textures/Structures/Doors/effects.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/effects.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/opening_unlit.png rename to Resources/Textures/Structures/Doors/effects.rsi/opening_unlit.png diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/effects.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/panel_closing.png rename to Resources/Textures/Structures/Doors/effects.rsi/panel_closing.png diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/panel_open.png b/Resources/Textures/Structures/Doors/effects.rsi/panel_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/panel_open.png rename to Resources/Textures/Structures/Doors/effects.rsi/panel_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/effects.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/panel_opening.png rename to Resources/Textures/Structures/Doors/effects.rsi/panel_opening.png diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/effects.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/sparks_broken.png rename to Resources/Textures/Structures/Doors/effects.rsi/sparks_broken.png diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/effects.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/sparks_damaged.png rename to Resources/Textures/Structures/Doors/effects.rsi/sparks_damaged.png diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/effects.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/sparks_open.png rename to Resources/Textures/Structures/Doors/effects.rsi/sparks_open.png diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/welded.png b/Resources/Textures/Structures/Doors/effects.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Doors/effects.rsi/welded.png rename to Resources/Textures/Structures/Doors/effects.rsi/welded.png diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_0.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_0.png rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_0.png diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_1.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_1.png rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_1.png diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_2.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_2.png rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_2.png diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_3.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_3.png rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_3.png diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_4.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_4.png rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_4.png diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_5.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_5.png rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_5.png diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_6.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_6.png rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_6.png diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_7.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_7.png rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_7.png diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/full.png rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/full.png diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Carpets/black_carpet.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_0.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_0.png rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_0.png diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_1.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_1.png rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_1.png diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_2.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_2.png rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_2.png diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_3.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_3.png rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_3.png diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_4.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_4.png rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_4.png diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_5.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_5.png rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_5.png diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_6.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_6.png rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_6.png diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_7.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_7.png rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_7.png diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/full.png rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/full.png diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Carpets/blue_carpet.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Carpets/blue_carpet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_0.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_0.png rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_0.png diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_1.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_1.png rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_1.png diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_2.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_2.png rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_2.png diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_3.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_3.png rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_3.png diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_4.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_4.png rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_4.png diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_5.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_5.png rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_5.png diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_6.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_6.png rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_6.png diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_7.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_7.png rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/carpet_7.png diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/full.png rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/full.png diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Carpets/gay_carpet.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Carpets/gay_carpet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_0.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_0.png rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_0.png diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_1.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_1.png rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_1.png diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_2.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_2.png rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_2.png diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_3.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_3.png rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_3.png diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_4.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_4.png rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_4.png diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_5.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_5.png rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_5.png diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_6.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_6.png rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_6.png diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_7.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_7.png rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/carpet_7.png diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/full.png rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/full.png diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Carpets/green_carpet.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Carpets/green_carpet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_0.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_0.png rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_0.png diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_1.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_1.png rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_1.png diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_2.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_2.png rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_2.png diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_3.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_3.png rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_3.png diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_4.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_4.png rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_4.png diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_5.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_5.png rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_5.png diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_6.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_6.png rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_6.png diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_7.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_7.png rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/carpet_7.png diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/full.png rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/full.png diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Carpets/orange_carpet.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Carpets/orange_carpet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_0.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_0.png rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_0.png diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_1.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_1.png rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_1.png diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_2.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_2.png rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_2.png diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_3.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_3.png rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_3.png diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_4.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_4.png rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_4.png diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_5.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_5.png rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_5.png diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_6.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_6.png rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_6.png diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_7.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_7.png rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/carpet_7.png diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/full.png rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/full.png diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Carpets/purple_carpet.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Carpets/purple_carpet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_0.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_0.png rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_0.png diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_1.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_1.png rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_1.png diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_2.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_2.png rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_2.png diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_3.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_3.png rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_3.png diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_4.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_4.png rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_4.png diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_5.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_5.png rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_5.png diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_6.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_6.png rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_6.png diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_7.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_7.png rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/carpet_7.png diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/full.png rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/full.png diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Carpets/red_carpet.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Carpets/red_carpet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_0.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_0.png rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_0.png diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_1.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_1.png rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_1.png diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_2.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_2.png rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_2.png diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_3.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_3.png rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_3.png diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_4.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_4.png rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_4.png diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_5.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_5.png rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_5.png diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_6.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_6.png rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_6.png diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_7.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_7.png rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/carpet_7.png diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/full.png rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/full.png diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Carpets/skyblue_carpet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/full.png rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_0.png rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_1.png rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_2.png rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_3.png rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_4.png rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_5.png rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_6.png rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_7.png rename to Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/full.png rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_0.png rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_1.png rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_2.png rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_3.png rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_4.png rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_5.png rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_6.png rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_7.png rename to Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/full.png rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_0.png rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_1.png rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_2.png rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_3.png rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_4.png rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_5.png rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_6.png rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_7.png rename to Resources/Textures/Structures/Furniture/Tables/debug.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/full.png rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_0.png rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_1.png rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_2.png rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_3.png rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_4.png rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_5.png rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_6.png rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_7.png rename to Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/full.png rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_0.png rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_1.png rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_2.png rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_3.png rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_4.png rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_5.png rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_6.png rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_7.png rename to Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/full.png rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_0.png rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_1.png rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_2.png rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_3.png rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_4.png rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_5.png rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_6.png rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_7.png rename to Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/full.png rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_0.png rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_1.png rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_2.png rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_3.png rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_4.png rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_5.png rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_6.png rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_7.png rename to Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/full.png rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_0.png rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_1.png rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_2.png rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_3.png rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_4.png rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_5.png rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_6.png rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_7.png rename to Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/full.png rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_0.png rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_1.png rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_2.png rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_3.png rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_4.png rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_5.png rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_6.png rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_7.png rename to Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/full.png rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_0.png rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_1.png rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_2.png rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_3.png rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_4.png rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_5.png rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_6.png rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_7.png rename to Resources/Textures/Structures/Furniture/Tables/stone.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/full.png rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_0.png rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_1.png rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_2.png rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_3.png rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_4.png rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_5.png rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_6.png rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_7.png rename to Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/base.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/base.png similarity index 100% rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/base.png rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/base.png diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-0.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/book-0.png similarity index 100% rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/book-0.png rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/book-0.png diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-1.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/book-1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/book-1.png rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/book-1.png diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-2.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/book-2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/book-2.png rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/book-2.png diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-3.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/book-3.png similarity index 100% rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/book-3.png rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/book-3.png diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-4.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/book-4.png similarity index 100% rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/book-4.png rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/book-4.png diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-5.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/book-5.png similarity index 100% rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/book-5.png rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/book-5.png diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/meta.json b/Resources/Textures/Structures/Furniture/bookshelf.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Misc/bookshelf.rsi/meta.json rename to Resources/Textures/Structures/Furniture/bookshelf.rsi/meta.json diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/armchair_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/armchair_preview.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/armchair_preview.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/armchair_preview.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/bar_chair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/bar_chair.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/bar_chair_over.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair_over.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/bar_chair_over.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair_over.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/bar_stool.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bar_stool.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/bar_stool.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/bar_stool.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/bed.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bed.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/bed.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/bed.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/bed_padding.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bed_padding.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/bed_padding.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/bed_padding.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/chair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/chair.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/chair.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/chair_armrest.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair_armrest.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/chair_armrest.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/chair_armrest.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/chair_padding.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/chair_padding.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/chair_padding_over.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding_over.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/chair_padding_over.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding_over.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/chair_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair_preview.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/chair_preview.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/chair_preview.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/comfychair_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/comfychair_preview.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/comfychair_preview.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/comfychair_preview.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/meta.json b/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/meta.json rename to Resources/Textures/Structures/Furniture/furniture.rsi/meta.json diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/officechair_dark.png b/Resources/Textures/Structures/Furniture/furniture.rsi/officechair_dark.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/officechair_dark.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/officechair_dark.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/officechair_white.png b/Resources/Textures/Structures/Furniture/furniture.rsi/officechair_white.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/officechair_white.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/officechair_white.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/psychbed.png b/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/psychbed.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/psychbed.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/psychbed_padding.png b/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed_padding.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/psychbed_padding.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/psychbed_padding.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/rack.png b/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/rack.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/rack.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/shelf.png b/Resources/Textures/Structures/Furniture/furniture.rsi/shelf.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/shelf.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/shelf.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/shuttle_chair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/shuttle_chair.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/shuttle_chair.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/shuttle_chair.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/stool_base.png b/Resources/Textures/Structures/Furniture/furniture.rsi/stool_base.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/stool_base.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/stool_base.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/stool_padded_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/stool_padded_preview.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/stool_padded_preview.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/stool_padded_preview.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/stool_padding.png b/Resources/Textures/Structures/Furniture/furniture.rsi/stool_padding.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/stool_padding.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/stool_padding.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/stool_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/stool_preview.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/stool_preview.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/stool_preview.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/w_overlay.png b/Resources/Textures/Structures/Furniture/furniture.rsi/w_overlay.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/w_overlay.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/w_overlay.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/wheelchair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/wheelchair.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/wheelchair_folded.png b/Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair_folded.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/wheelchair_folded.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair_folded.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/wooden_chair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/wooden_chair.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair.png diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/wooden_chair_wings.png b/Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair_wings.png similarity index 100% rename from Resources/Textures/Constructible/Misc/furniture.rsi/wooden_chair_wings.png rename to Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair_wings.png diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/church_organ.png b/Resources/Textures/Structures/Furniture/instruments.rsi/church-organ.png similarity index 100% rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/church_organ.png rename to Resources/Textures/Structures/Furniture/instruments.rsi/church-organ.png diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json b/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json new file mode 100644 index 0000000000..58223fccbe --- /dev/null +++ b/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "states": [ + { + "name": "minimoog", + "directions": 4 + }, + { + "name": "church-organ", + "directions": 4 + }, + { + "name": "minimoog-broken", + "directions": 4 + }, + { + "name": "piano", + "directions": 4 + }, + { + "name": "piano-broken", + "directions": 4 + }, + { + "name": "xylophone", + "directions": 4 + }, + { + "name": "xylophone-broken", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoog-broken.png b/Resources/Textures/Structures/Furniture/instruments.rsi/minimoog-broken.png similarity index 100% rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoog-broken.png rename to Resources/Textures/Structures/Furniture/instruments.rsi/minimoog-broken.png diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoog.png b/Resources/Textures/Structures/Furniture/instruments.rsi/minimoog.png similarity index 100% rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/minimoog.png rename to Resources/Textures/Structures/Furniture/instruments.rsi/minimoog.png diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/piano-broken.png b/Resources/Textures/Structures/Furniture/instruments.rsi/piano-broken.png similarity index 100% rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/piano-broken.png rename to Resources/Textures/Structures/Furniture/instruments.rsi/piano-broken.png diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/piano.png b/Resources/Textures/Structures/Furniture/instruments.rsi/piano.png similarity index 100% rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/piano.png rename to Resources/Textures/Structures/Furniture/instruments.rsi/piano.png diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/pianobroken.png b/Resources/Textures/Structures/Furniture/instruments.rsi/pianobroken.png similarity index 100% rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/pianobroken.png rename to Resources/Textures/Structures/Furniture/instruments.rsi/pianobroken.png diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/xylophone-broken.png b/Resources/Textures/Structures/Furniture/instruments.rsi/xylophone-broken.png similarity index 100% rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/xylophone-broken.png rename to Resources/Textures/Structures/Furniture/instruments.rsi/xylophone-broken.png diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/xylophone.png b/Resources/Textures/Structures/Furniture/instruments.rsi/xylophone.png similarity index 100% rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/xylophone.png rename to Resources/Textures/Structures/Furniture/instruments.rsi/xylophone.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/applebush.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/applebush.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/applebush.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/applebush.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/meta.json b/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/meta.json rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-01.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-01.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-01.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-01.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-02.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-02.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-02.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-02.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-03.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-03.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-03.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-03.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-04.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-04.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-04.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-04.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-05.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-05.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-05.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-05.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-06.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-06.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-06.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-06.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-07.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-07.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-07.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-07.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-08.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-08.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-08.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-08.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-09.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-09.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-09.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-09.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-10.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-10.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-10.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-10.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-11.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-11.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-11.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-11.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-12.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-12.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-12.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-12.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-13.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-13.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-13.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-13.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-14.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-14.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-14.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-14.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-15.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-15.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-15.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-15.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-16.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-16.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-16.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-16.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-17.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-17.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-17.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-17.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-18.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-18.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-18.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-18.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-19.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-19.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-19.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-19.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-20.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-20.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-20.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-20.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-21.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-21.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-21.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-21.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-22.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-22.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-22.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-22.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-23.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-23.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-23.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-23.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-24.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-24.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-24.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-24.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-25.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-25.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-25.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-25.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-26.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-26.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-26.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-26.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-27.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-27.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-27.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-27.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-28.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-28.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-28.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-28.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-29.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-29.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/plant-29.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-29.png diff --git a/Resources/Textures/Constructible/Misc/potted_plants.rsi/random.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/random.png similarity index 100% rename from Resources/Textures/Constructible/Misc/potted_plants.rsi/random.png rename to Resources/Textures/Structures/Furniture/potted_plants.rsi/random.png diff --git a/Resources/Textures/Constructible/Watercloset/toilet.rsi/closed_toilet_seat_down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png similarity index 100% rename from Resources/Textures/Constructible/Watercloset/toilet.rsi/closed_toilet_seat_down.png rename to Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_down.png diff --git a/Resources/Textures/Constructible/Watercloset/toilet.rsi/closed_toilet_seat_up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png similarity index 100% rename from Resources/Textures/Constructible/Watercloset/toilet.rsi/closed_toilet_seat_up.png rename to Resources/Textures/Structures/Furniture/toilet.rsi/closed_toilet_seat_up.png diff --git a/Resources/Textures/Constructible/Watercloset/toilet.rsi/meta.json b/Resources/Textures/Structures/Furniture/toilet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Watercloset/toilet.rsi/meta.json rename to Resources/Textures/Structures/Furniture/toilet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Watercloset/toilet.rsi/open_toilet_seat_down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png similarity index 100% rename from Resources/Textures/Constructible/Watercloset/toilet.rsi/open_toilet_seat_down.png rename to Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_down.png diff --git a/Resources/Textures/Constructible/Watercloset/toilet.rsi/open_toilet_seat_up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png similarity index 100% rename from Resources/Textures/Constructible/Watercloset/toilet.rsi/open_toilet_seat_up.png rename to Resources/Textures/Structures/Furniture/toilet.rsi/open_toilet_seat_up.png diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot-item.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-item.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot-item.png rename to Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-item.png diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot-large.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-large.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot-large.png rename to Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-large.png diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/claypot.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/claypot.png rename to Resources/Textures/Structures/Hydroponics/containers.rsi/claypot.png diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrocover.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/hydrocover.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrocover.png rename to Resources/Textures/Structures/Hydroponics/containers.rsi/hydrocover.png diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/hydrotray.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray.png rename to Resources/Textures/Structures/Hydroponics/containers.rsi/hydrotray.png diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray2.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/hydrotray2.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray2.png rename to Resources/Textures/Structures/Hydroponics/containers.rsi/hydrotray2.png diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray3.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/hydrotray3.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/hydrotray3.png rename to Resources/Textures/Structures/Hydroponics/containers.rsi/hydrotray3.png diff --git a/Resources/Textures/Constructible/Hydroponics/containers.rsi/meta.json b/Resources/Textures/Structures/Hydroponics/containers.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/containers.rsi/meta.json rename to Resources/Textures/Structures/Hydroponics/containers.rsi/meta.json diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/meta.json b/Resources/Textures/Structures/Hydroponics/misc.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/meta.json rename to Resources/Textures/Structures/Hydroponics/misc.rsi/meta.json diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep0.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/moldcreep0.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep0.png rename to Resources/Textures/Structures/Hydroponics/misc.rsi/moldcreep0.png diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep1.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/moldcreep1.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep1.png rename to Resources/Textures/Structures/Hydroponics/misc.rsi/moldcreep1.png diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep2.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/moldcreep2.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/moldcreep2.png rename to Resources/Textures/Structures/Hydroponics/misc.rsi/moldcreep2.png diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/soil.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/soil.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/soil.png rename to Resources/Textures/Structures/Hydroponics/misc.rsi/soil.png diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/spaceworms.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/spaceworms.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/spaceworms.png rename to Resources/Textures/Structures/Hydroponics/misc.rsi/spaceworms.png diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/vine_flowers.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/vine_flowers.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/vine_flowers.png rename to Resources/Textures/Structures/Hydroponics/misc.rsi/vine_flowers.png diff --git a/Resources/Textures/Constructible/Hydroponics/misc.rsi/vine_fruit.png b/Resources/Textures/Structures/Hydroponics/misc.rsi/vine_fruit.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/misc.rsi/vine_fruit.png rename to Resources/Textures/Structures/Hydroponics/misc.rsi/vine_fruit.png diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/alert3.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/alert3.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/alert3.png rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/alert3.png diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/harvest3.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/harvest3.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/harvest3.png rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/harvest3.png diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/lowhealth3.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/lowhealth3.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/lowhealth3.png rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/lowhealth3.png diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/lownutri.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/lownutri.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/lownutri.png rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/lownutri.png diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/lownutri3.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/lownutri3.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/lownutri3.png rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/lownutri3.png diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/lowwater3.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/lowwater3.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/lowwater3.png rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/lowwater3.png diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/meta.json b/Resources/Textures/Structures/Hydroponics/overlays.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/overlays.rsi/meta.json rename to Resources/Textures/Structures/Hydroponics/overlays.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/ammo.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/bardrobe.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/bardrobe.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/clothing.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/hellfire.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/hellfire.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/hellfire.png rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/hellfire.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/screen.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/screen.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/screen.png rename to Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/screen.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal.png rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/maintenance_panel.png b/Resources/Textures/Structures/Machines/VendingMachines/maintenance_panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/maintenance_panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/maintenance_panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/screen.png b/Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/screen.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/screen.png rename to Resources/Textures/Structures/Machines/VendingMachines/theater.rsi/screen.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject.png rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/wallmed.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/broken.png rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/deny-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject.png rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/normal-unshaded.png rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/off.png rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/panel.png rename to Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/building.png b/Resources/Textures/Structures/Machines/autolathe.rsi/building.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/building.png rename to Resources/Textures/Structures/Machines/autolathe.rsi/building.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/building_unlit.png b/Resources/Textures/Structures/Machines/autolathe.rsi/building_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/building_unlit.png rename to Resources/Textures/Structures/Machines/autolathe.rsi/building_unlit.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/icon.png b/Resources/Textures/Structures/Machines/autolathe.rsi/icon.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/icon.png rename to Resources/Textures/Structures/Machines/autolathe.rsi/icon.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_glass.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_glass.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_glass.png rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_glass.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_gold.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_gold.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_gold.png rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_gold.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_metal.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_metal.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_metal.png rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_metal.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_phoron.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_phoron.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_phoron.png rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_phoron.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plasma.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_plasma.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plasma.png rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_plasma.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plastic.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_plastic.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plastic.png rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_plastic.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_unlit.png b/Resources/Textures/Structures/Machines/autolathe.rsi/inserting_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/inserting_unlit.png rename to Resources/Textures/Structures/Machines/autolathe.rsi/inserting_unlit.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json b/Resources/Textures/Structures/Machines/autolathe.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/meta.json rename to Resources/Textures/Structures/Machines/autolathe.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/panel.png b/Resources/Textures/Structures/Machines/autolathe.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/panel.png rename to Resources/Textures/Structures/Machines/autolathe.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/unlit.png b/Resources/Textures/Structures/Machines/autolathe.rsi/unlit.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/unlit.png rename to Resources/Textures/Structures/Machines/autolathe.rsi/unlit.png diff --git a/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/meta.json b/Resources/Textures/Structures/Machines/cloning.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/cloning.rsi/meta.json rename to Resources/Textures/Structures/Machines/cloning.rsi/meta.json diff --git a/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_0.png b/Resources/Textures/Structures/Machines/cloning.rsi/pod_0.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_0.png rename to Resources/Textures/Structures/Machines/cloning.rsi/pod_0.png diff --git a/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_1.png b/Resources/Textures/Structures/Machines/cloning.rsi/pod_1.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_1.png rename to Resources/Textures/Structures/Machines/cloning.rsi/pod_1.png diff --git a/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_e.png b/Resources/Textures/Structures/Machines/cloning.rsi/pod_e.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_e.png rename to Resources/Textures/Structures/Machines/cloning.rsi/pod_e.png diff --git a/Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_g.png b/Resources/Textures/Structures/Machines/cloning.rsi/pod_g.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/cloning.rsi/pod_g.png rename to Resources/Textures/Structures/Machines/cloning.rsi/pod_g.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-404.png b/Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-404.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-404.png rename to Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-404.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-empty.png b/Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-empty.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-empty.png rename to Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-empty.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-full.png b/Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-full.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-full.png rename to Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-full.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-on.png b/Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-on.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/ai-fixer-on.png rename to Resources/Textures/Structures/Machines/computers.rsi/ai-fixer-on.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/ai-fixer.png b/Resources/Textures/Structures/Machines/computers.rsi/ai-fixer.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/ai-fixer.png rename to Resources/Textures/Structures/Machines/computers.rsi/ai-fixer.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/aiupload.png b/Resources/Textures/Structures/Machines/computers.rsi/aiupload.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/aiupload.png rename to Resources/Textures/Structures/Machines/computers.rsi/aiupload.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/aiupload_key.png b/Resources/Textures/Structures/Machines/computers.rsi/aiupload_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/aiupload_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/aiupload_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/alert-0.png b/Resources/Textures/Structures/Machines/computers.rsi/alert-0.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/alert-0.png rename to Resources/Textures/Structures/Machines/computers.rsi/alert-0.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/alert-1.png b/Resources/Textures/Structures/Machines/computers.rsi/alert-1.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/alert-1.png rename to Resources/Textures/Structures/Machines/computers.rsi/alert-1.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/alert-2.png b/Resources/Textures/Structures/Machines/computers.rsi/alert-2.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/alert-2.png rename to Resources/Textures/Structures/Machines/computers.rsi/alert-2.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/arcade.png b/Resources/Textures/Structures/Machines/computers.rsi/arcade.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/arcade.png rename to Resources/Textures/Structures/Machines/computers.rsi/arcade.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/arcade_broken.png b/Resources/Textures/Structures/Machines/computers.rsi/arcade_broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/arcade_broken.png rename to Resources/Textures/Structures/Machines/computers.rsi/arcade_broken.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/area_atmos.png b/Resources/Textures/Structures/Machines/computers.rsi/area_atmos.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/area_atmos.png rename to Resources/Textures/Structures/Machines/computers.rsi/area_atmos.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/atmos_key.png b/Resources/Textures/Structures/Machines/computers.rsi/atmos_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/atmos_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/atmos_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/atmos_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/atmos_key_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/atmos_key_off.png rename to Resources/Textures/Structures/Machines/computers.rsi/atmos_key_off.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/broken.png b/Resources/Textures/Structures/Machines/computers.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/broken.png rename to Resources/Textures/Structures/Machines/computers.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/cameras.png b/Resources/Textures/Structures/Machines/computers.rsi/cameras.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/cameras.png rename to Resources/Textures/Structures/Machines/computers.rsi/cameras.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/comm.png b/Resources/Textures/Structures/Machines/computers.rsi/comm.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/comm.png rename to Resources/Textures/Structures/Machines/computers.rsi/comm.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/comm_logs.png b/Resources/Textures/Structures/Machines/computers.rsi/comm_logs.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/comm_logs.png rename to Resources/Textures/Structures/Machines/computers.rsi/comm_logs.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/comm_monitor.png b/Resources/Textures/Structures/Machines/computers.rsi/comm_monitor.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/comm_monitor.png rename to Resources/Textures/Structures/Machines/computers.rsi/comm_monitor.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/command.png b/Resources/Textures/Structures/Machines/computers.rsi/command.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/command.png rename to Resources/Textures/Structures/Machines/computers.rsi/command.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/computer-datatheory.png b/Resources/Textures/Structures/Machines/computers.rsi/computer-datatheory.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/computer-datatheory.png rename to Resources/Textures/Structures/Machines/computers.rsi/computer-datatheory.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/computer.png b/Resources/Textures/Structures/Machines/computers.rsi/computer.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/computer.png rename to Resources/Textures/Structures/Machines/computers.rsi/computer.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/computer_broken.png b/Resources/Textures/Structures/Machines/computers.rsi/computer_broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/computer_broken.png rename to Resources/Textures/Structures/Machines/computers.rsi/computer_broken.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/crew.png b/Resources/Textures/Structures/Machines/computers.rsi/crew.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/crew.png rename to Resources/Textures/Structures/Machines/computers.rsi/crew.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/dna.png b/Resources/Textures/Structures/Machines/computers.rsi/dna.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/dna.png rename to Resources/Textures/Structures/Machines/computers.rsi/dna.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/dron_control_monitor.png b/Resources/Textures/Structures/Machines/computers.rsi/dron_control_monitor.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/dron_control_monitor.png rename to Resources/Textures/Structures/Machines/computers.rsi/dron_control_monitor.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/engie_cams.png b/Resources/Textures/Structures/Machines/computers.rsi/engie_cams.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/engie_cams.png rename to Resources/Textures/Structures/Machines/computers.rsi/engie_cams.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/engine.png b/Resources/Textures/Structures/Machines/computers.rsi/engine.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/engine.png rename to Resources/Textures/Structures/Machines/computers.rsi/engine.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/entertainment.png b/Resources/Textures/Structures/Machines/computers.rsi/entertainment.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/entertainment.png rename to Resources/Textures/Structures/Machines/computers.rsi/entertainment.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/eris_control.png b/Resources/Textures/Structures/Machines/computers.rsi/eris_control.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/eris_control.png rename to Resources/Textures/Structures/Machines/computers.rsi/eris_control.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/error.png b/Resources/Textures/Structures/Machines/computers.rsi/error.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/error.png rename to Resources/Textures/Structures/Machines/computers.rsi/error.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/explosive.png b/Resources/Textures/Structures/Machines/computers.rsi/explosive.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/explosive.png rename to Resources/Textures/Structures/Machines/computers.rsi/explosive.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/forensic.png b/Resources/Textures/Structures/Machines/computers.rsi/forensic.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/forensic.png rename to Resources/Textures/Structures/Machines/computers.rsi/forensic.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/generic.png b/Resources/Textures/Structures/Machines/computers.rsi/generic.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/generic.png rename to Resources/Textures/Structures/Machines/computers.rsi/generic.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/generic_key.png b/Resources/Textures/Structures/Machines/computers.rsi/generic_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/generic_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/generic_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/generic_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/generic_key_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/generic_key_off.png rename to Resources/Textures/Structures/Machines/computers.rsi/generic_key_off.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/holocontrol.png b/Resources/Textures/Structures/Machines/computers.rsi/holocontrol.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/holocontrol.png rename to Resources/Textures/Structures/Machines/computers.rsi/holocontrol.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/id.png b/Resources/Textures/Structures/Machines/computers.rsi/id.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/id.png rename to Resources/Textures/Structures/Machines/computers.rsi/id.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/id_key.png b/Resources/Textures/Structures/Machines/computers.rsi/id_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/id_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/id_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/id_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/id_key_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/id_key_off.png rename to Resources/Textures/Structures/Machines/computers.rsi/id_key_off.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/invaders.png b/Resources/Textures/Structures/Machines/computers.rsi/invaders.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/invaders.png rename to Resources/Textures/Structures/Machines/computers.rsi/invaders.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/mass_driver.png b/Resources/Textures/Structures/Machines/computers.rsi/mass_driver.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/mass_driver.png rename to Resources/Textures/Structures/Machines/computers.rsi/mass_driver.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/mecha.png b/Resources/Textures/Structures/Machines/computers.rsi/mecha.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/mecha.png rename to Resources/Textures/Structures/Machines/computers.rsi/mecha.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/med_key.png b/Resources/Textures/Structures/Machines/computers.rsi/med_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/med_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/med_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/med_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/med_key_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/med_key_off.png rename to Resources/Textures/Structures/Machines/computers.rsi/med_key_off.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/medcomp.png b/Resources/Textures/Structures/Machines/computers.rsi/medcomp.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/medcomp.png rename to Resources/Textures/Structures/Machines/computers.rsi/medcomp.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/meta.json rename to Resources/Textures/Structures/Machines/computers.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/computers.rsi/mining.png b/Resources/Textures/Structures/Machines/computers.rsi/mining.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/mining.png rename to Resources/Textures/Structures/Machines/computers.rsi/mining.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/mining_key.png b/Resources/Textures/Structures/Machines/computers.rsi/mining_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/mining_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/mining_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/mining_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/mining_key_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/mining_key_off.png rename to Resources/Textures/Structures/Machines/computers.rsi/mining_key_off.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/power_key.png b/Resources/Textures/Structures/Machines/computers.rsi/power_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/power_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/power_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/power_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/power_key_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/power_key_off.png rename to Resources/Textures/Structures/Machines/computers.rsi/power_key_off.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/power_monitor.png b/Resources/Textures/Structures/Machines/computers.rsi/power_monitor.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/power_monitor.png rename to Resources/Textures/Structures/Machines/computers.rsi/power_monitor.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/power_monitor_warn.png b/Resources/Textures/Structures/Machines/computers.rsi/power_monitor_warn.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/power_monitor_warn.png rename to Resources/Textures/Structures/Machines/computers.rsi/power_monitor_warn.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/rd_key.png b/Resources/Textures/Structures/Machines/computers.rsi/rd_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/rd_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/rd_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/rd_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/rd_key_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/rd_key_off.png rename to Resources/Textures/Structures/Machines/computers.rsi/rd_key_off.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/rdcomp.png b/Resources/Textures/Structures/Machines/computers.rsi/rdcomp.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/rdcomp.png rename to Resources/Textures/Structures/Machines/computers.rsi/rdcomp.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/recharge_comp.png b/Resources/Textures/Structures/Machines/computers.rsi/recharge_comp.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/recharge_comp.png rename to Resources/Textures/Structures/Machines/computers.rsi/recharge_comp.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/recharge_comp_on.png b/Resources/Textures/Structures/Machines/computers.rsi/recharge_comp_on.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/recharge_comp_on.png rename to Resources/Textures/Structures/Machines/computers.rsi/recharge_comp_on.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/request.png b/Resources/Textures/Structures/Machines/computers.rsi/request.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/request.png rename to Resources/Textures/Structures/Machines/computers.rsi/request.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/robot.png b/Resources/Textures/Structures/Machines/computers.rsi/robot.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/robot.png rename to Resources/Textures/Structures/Machines/computers.rsi/robot.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/security.png b/Resources/Textures/Structures/Machines/computers.rsi/security.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/security.png rename to Resources/Textures/Structures/Machines/computers.rsi/security.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/security_key.png b/Resources/Textures/Structures/Machines/computers.rsi/security_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/security_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/security_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/security_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/security_key_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/security_key_off.png rename to Resources/Textures/Structures/Machines/computers.rsi/security_key_off.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/shuttle.png b/Resources/Textures/Structures/Machines/computers.rsi/shuttle.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/shuttle.png rename to Resources/Textures/Structures/Machines/computers.rsi/shuttle.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/solar_screen.png b/Resources/Textures/Structures/Machines/computers.rsi/solar_screen.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/solar_screen.png rename to Resources/Textures/Structures/Machines/computers.rsi/solar_screen.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/supply.png b/Resources/Textures/Structures/Machines/computers.rsi/supply.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/supply.png rename to Resources/Textures/Structures/Machines/computers.rsi/supply.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/syndie_key.png b/Resources/Textures/Structures/Machines/computers.rsi/syndie_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/syndie_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/syndie_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/syndie_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/syndie_key_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/syndie_key_off.png rename to Resources/Textures/Structures/Machines/computers.rsi/syndie_key_off.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/syndishuttle.png b/Resources/Textures/Structures/Machines/computers.rsi/syndishuttle.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/syndishuttle.png rename to Resources/Textures/Structures/Machines/computers.rsi/syndishuttle.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/tank.png b/Resources/Textures/Structures/Machines/computers.rsi/tank.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/tank.png rename to Resources/Textures/Structures/Machines/computers.rsi/tank.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/tcboss.png b/Resources/Textures/Structures/Machines/computers.rsi/tcboss.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/tcboss.png rename to Resources/Textures/Structures/Machines/computers.rsi/tcboss.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/tech_key.png b/Resources/Textures/Structures/Machines/computers.rsi/tech_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/tech_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/tech_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/tech_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/tech_key_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/tech_key_off.png rename to Resources/Textures/Structures/Machines/computers.rsi/tech_key_off.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/teleport.png b/Resources/Textures/Structures/Machines/computers.rsi/teleport.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/teleport.png rename to Resources/Textures/Structures/Machines/computers.rsi/teleport.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/teleport_key.png b/Resources/Textures/Structures/Machines/computers.rsi/teleport_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/teleport_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/teleport_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/teleport_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/teleport_key_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/teleport_key_off.png rename to Resources/Textures/Structures/Machines/computers.rsi/teleport_key_off.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/telesci.png b/Resources/Textures/Structures/Machines/computers.rsi/telesci.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/telesci.png rename to Resources/Textures/Structures/Machines/computers.rsi/telesci.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/telesci_key.png b/Resources/Textures/Structures/Machines/computers.rsi/telesci_key.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/telesci_key.png rename to Resources/Textures/Structures/Machines/computers.rsi/telesci_key.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/telesci_key_off.png b/Resources/Textures/Structures/Machines/computers.rsi/telesci_key_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/telesci_key_off.png rename to Resources/Textures/Structures/Machines/computers.rsi/telesci_key_off.png diff --git a/Resources/Textures/Constructible/Power/computers.rsi/turbinecomp.png b/Resources/Textures/Structures/Machines/computers.rsi/turbinecomp.png similarity index 100% rename from Resources/Textures/Constructible/Power/computers.rsi/turbinecomp.png rename to Resources/Textures/Structures/Machines/computers.rsi/turbinecomp.png diff --git a/Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_empty.png b/Resources/Textures/Structures/Machines/genesplicer.rsi/genesplicer_empty.png similarity index 100% rename from Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_empty.png rename to Resources/Textures/Structures/Machines/genesplicer.rsi/genesplicer_empty.png diff --git a/Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_loaded.png b/Resources/Textures/Structures/Machines/genesplicer.rsi/genesplicer_loaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_loaded.png rename to Resources/Textures/Structures/Machines/genesplicer.rsi/genesplicer_loaded.png diff --git a/Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_screens.png b/Resources/Textures/Structures/Machines/genesplicer.rsi/genesplicer_screens.png similarity index 100% rename from Resources/Textures/Constructible/Power/genesplicer.rsi/genesplicer_screens.png rename to Resources/Textures/Structures/Machines/genesplicer.rsi/genesplicer_screens.png diff --git a/Resources/Textures/Constructible/Power/genesplicer.rsi/meta.json b/Resources/Textures/Structures/Machines/genesplicer.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/genesplicer.rsi/meta.json rename to Resources/Textures/Structures/Machines/genesplicer.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/gravity_generator.rsi/broken.png b/Resources/Textures/Structures/Machines/gravity_generator.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/gravity_generator.rsi/broken.png rename to Resources/Textures/Structures/Machines/gravity_generator.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/gravity_generator.rsi/meta.json b/Resources/Textures/Structures/Machines/gravity_generator.rsi/meta.json old mode 100755 new mode 100644 similarity index 100% rename from Resources/Textures/Constructible/Power/gravity_generator.rsi/meta.json rename to Resources/Textures/Structures/Machines/gravity_generator.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/gravity_generator.rsi/off.png b/Resources/Textures/Structures/Machines/gravity_generator.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/gravity_generator.rsi/off.png rename to Resources/Textures/Structures/Machines/gravity_generator.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/gravity_generator.rsi/on.png b/Resources/Textures/Structures/Machines/gravity_generator.rsi/on.png old mode 100755 new mode 100644 similarity index 100% rename from Resources/Textures/Constructible/Power/gravity_generator.rsi/on.png rename to Resources/Textures/Structures/Machines/gravity_generator.rsi/on.png diff --git a/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/activated.png b/Resources/Textures/Structures/Machines/gravity_generator_core.rsi/activated.png similarity index 100% rename from Resources/Textures/Constructible/Power/gravity_generator_core.rsi/activated.png rename to Resources/Textures/Structures/Machines/gravity_generator_core.rsi/activated.png diff --git a/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/activating.png b/Resources/Textures/Structures/Machines/gravity_generator_core.rsi/activating.png similarity index 100% rename from Resources/Textures/Constructible/Power/gravity_generator_core.rsi/activating.png rename to Resources/Textures/Structures/Machines/gravity_generator_core.rsi/activating.png diff --git a/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/idle.png b/Resources/Textures/Structures/Machines/gravity_generator_core.rsi/idle.png similarity index 100% rename from Resources/Textures/Constructible/Power/gravity_generator_core.rsi/idle.png rename to Resources/Textures/Structures/Machines/gravity_generator_core.rsi/idle.png diff --git a/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/meta.json b/Resources/Textures/Structures/Machines/gravity_generator_core.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/gravity_generator_core.rsi/meta.json rename to Resources/Textures/Structures/Machines/gravity_generator_core.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/gravity_generator_core.rsi/startup.png b/Resources/Textures/Structures/Machines/gravity_generator_core.rsi/startup.png similarity index 100% rename from Resources/Textures/Constructible/Power/gravity_generator_core.rsi/startup.png rename to Resources/Textures/Structures/Machines/gravity_generator_core.rsi/startup.png diff --git a/Resources/Textures/Constructible/Power/juicer.rsi/juicer0.png b/Resources/Textures/Structures/Machines/juicer.rsi/juicer0.png similarity index 100% rename from Resources/Textures/Constructible/Power/juicer.rsi/juicer0.png rename to Resources/Textures/Structures/Machines/juicer.rsi/juicer0.png diff --git a/Resources/Textures/Constructible/Power/juicer.rsi/juicer1.png b/Resources/Textures/Structures/Machines/juicer.rsi/juicer1.png similarity index 100% rename from Resources/Textures/Constructible/Power/juicer.rsi/juicer1.png rename to Resources/Textures/Structures/Machines/juicer.rsi/juicer1.png diff --git a/Resources/Textures/Constructible/Power/juicer.rsi/meta.json b/Resources/Textures/Structures/Machines/juicer.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/juicer.rsi/meta.json rename to Resources/Textures/Structures/Machines/juicer.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/meta.json b/Resources/Textures/Structures/Machines/microwave.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/microwave.rsi/meta.json rename to Resources/Textures/Structures/Machines/microwave.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mw.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw.png similarity index 100% rename from Resources/Textures/Constructible/Power/microwave.rsi/mw.png rename to Resources/Textures/Structures/Machines/microwave.rsi/mw.png diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mw0.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw0.png similarity index 100% rename from Resources/Textures/Constructible/Power/microwave.rsi/mw0.png rename to Resources/Textures/Structures/Machines/microwave.rsi/mw0.png diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mw1.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw1.png similarity index 100% rename from Resources/Textures/Constructible/Power/microwave.rsi/mw1.png rename to Resources/Textures/Structures/Machines/microwave.rsi/mw1.png diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mw_running_unlit.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Power/microwave.rsi/mw_running_unlit.png rename to Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mw_unlit.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Power/microwave.rsi/mw_unlit.png rename to Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mwb.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwb.png similarity index 100% rename from Resources/Textures/Constructible/Power/microwave.rsi/mwb.png rename to Resources/Textures/Structures/Machines/microwave.rsi/mwb.png diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mwbloody.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png similarity index 100% rename from Resources/Textures/Constructible/Power/microwave.rsi/mwbloody.png rename to Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mwbloody0.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png similarity index 100% rename from Resources/Textures/Constructible/Power/microwave.rsi/mwbloody0.png rename to Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mwbloody1.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png similarity index 100% rename from Resources/Textures/Constructible/Power/microwave.rsi/mwbloody1.png rename to Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mwbloodyo.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png similarity index 100% rename from Resources/Textures/Constructible/Power/microwave.rsi/mwbloodyo.png rename to Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png diff --git a/Resources/Textures/Constructible/Power/microwave.rsi/mwo.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwo.png similarity index 100% rename from Resources/Textures/Constructible/Power/microwave.rsi/mwo.png rename to Resources/Textures/Structures/Machines/microwave.rsi/mwo.png diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/meta.json b/Resources/Textures/Structures/Machines/mixer.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/mixer.rsi/meta.json rename to Resources/Textures/Structures/Machines/mixer.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/mixer_broken.png b/Resources/Textures/Structures/Machines/mixer.rsi/mixer_broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/mixer.rsi/mixer_broken.png rename to Resources/Textures/Structures/Machines/mixer.rsi/mixer_broken.png diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/mixer_empty.png b/Resources/Textures/Structures/Machines/mixer.rsi/mixer_empty.png similarity index 100% rename from Resources/Textures/Constructible/Power/mixer.rsi/mixer_empty.png rename to Resources/Textures/Structures/Machines/mixer.rsi/mixer_empty.png diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/mixer_loaded.png b/Resources/Textures/Structures/Machines/mixer.rsi/mixer_loaded.png similarity index 100% rename from Resources/Textures/Constructible/Power/mixer.rsi/mixer_loaded.png rename to Resources/Textures/Structures/Machines/mixer.rsi/mixer_loaded.png diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/mixer_screen_broken.png b/Resources/Textures/Structures/Machines/mixer.rsi/mixer_screen_broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/mixer.rsi/mixer_screen_broken.png rename to Resources/Textures/Structures/Machines/mixer.rsi/mixer_screen_broken.png diff --git a/Resources/Textures/Constructible/Power/mixer.rsi/mixer_screens.png b/Resources/Textures/Structures/Machines/mixer.rsi/mixer_screens.png similarity index 100% rename from Resources/Textures/Constructible/Power/mixer.rsi/mixer_screens.png rename to Resources/Textures/Structures/Machines/mixer.rsi/mixer_screens.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/0.png b/Resources/Textures/Structures/Machines/parts.rsi/0.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/0.png rename to Resources/Textures/Structures/Machines/parts.rsi/0.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/1.png b/Resources/Textures/Structures/Machines/parts.rsi/1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/1.png rename to Resources/Textures/Structures/Machines/parts.rsi/1.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/2.png b/Resources/Textures/Structures/Machines/parts.rsi/2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/2.png rename to Resources/Textures/Structures/Machines/parts.rsi/2.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/3.png b/Resources/Textures/Structures/Machines/parts.rsi/3.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/3.png rename to Resources/Textures/Structures/Machines/parts.rsi/3.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/4.png b/Resources/Textures/Structures/Machines/parts.rsi/4.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/4.png rename to Resources/Textures/Structures/Machines/parts.rsi/4.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/box_0.png b/Resources/Textures/Structures/Machines/parts.rsi/box_0.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/box_0.png rename to Resources/Textures/Structures/Machines/parts.rsi/box_0.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/box_1.png b/Resources/Textures/Structures/Machines/parts.rsi/box_1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/box_1.png rename to Resources/Textures/Structures/Machines/parts.rsi/box_1.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/box_2.png b/Resources/Textures/Structures/Machines/parts.rsi/box_2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/box_2.png rename to Resources/Textures/Structures/Machines/parts.rsi/box_2.png diff --git a/Resources/Textures/Structures/Machines/parts.rsi/meta.json b/Resources/Textures/Structures/Machines/parts.rsi/meta.json new file mode 100644 index 0000000000..3071772281 --- /dev/null +++ b/Resources/Textures/Structures/Machines/parts.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0d9c9a8233dfc3fc55edc538955a761a6328bee0", + "states": [ + { + "name": "0", + "directions": 4 + }, + { + "name": "1", + "directions": 4 + }, + { + "name": "2", + "directions": 4 + }, + { + "name": "3", + "directions": 4 + }, + { + "name": "4", + "directions": 4 + }, + { + "name": "box_0" + }, + { + "name": "box_1" + }, + { + "name": "box_2" + }, + { + "name": "vbox_0" + }, + { + "name": "vbox_1" + }, + { + "name": "vbox_2" + }, + { + "name": "vbox_3" + } + ] +} diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_0.png b/Resources/Textures/Structures/Machines/parts.rsi/vbox_0.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_0.png rename to Resources/Textures/Structures/Machines/parts.rsi/vbox_0.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_1.png b/Resources/Textures/Structures/Machines/parts.rsi/vbox_1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_1.png rename to Resources/Textures/Structures/Machines/parts.rsi/vbox_1.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_2.png b/Resources/Textures/Structures/Machines/parts.rsi/vbox_2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_2.png rename to Resources/Textures/Structures/Machines/parts.rsi/vbox_2.png diff --git a/Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_3.png b/Resources/Textures/Structures/Machines/parts.rsi/vbox_3.png similarity index 100% rename from Resources/Textures/Constructible/Misc/stock_parts.rsi/vbox_3.png rename to Resources/Textures/Structures/Machines/parts.rsi/vbox_3.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/building.png b/Resources/Textures/Structures/Machines/protolathe.rsi/building.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/building.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/building.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/building_unlit.png b/Resources/Textures/Structures/Machines/protolathe.rsi/building_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/building_unlit.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/building_unlit.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/icon.png b/Resources/Textures/Structures/Machines/protolathe.rsi/icon.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/icon.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/icon.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_adamantine.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_adamantine.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_adamantine.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_adamantine.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_bananium.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_bananium.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_bananium.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_bananium.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_diamond.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_diamond.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_diamond.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_diamond.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_glass.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_glass.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_glass.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_glass.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_gold.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_gold.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_gold.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_gold.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_metal.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_metal.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_metal.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_metal.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_phoron.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_phoron.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_phoron.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_phoron.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plasma.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_plasma.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plasma.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_plasma.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plastic.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_plastic.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plastic.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_plastic.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_silver.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_silver.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_silver.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_silver.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_unlit.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_unlit.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_unlit.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_uranium.png b/Resources/Textures/Structures/Machines/protolathe.rsi/inserting_uranium.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/inserting_uranium.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/inserting_uranium.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/meta.json b/Resources/Textures/Structures/Machines/protolathe.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/meta.json rename to Resources/Textures/Structures/Machines/protolathe.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/panel.png b/Resources/Textures/Structures/Machines/protolathe.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/panel.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/unlit.png b/Resources/Textures/Structures/Machines/protolathe.rsi/unlit.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/unlit.png rename to Resources/Textures/Structures/Machines/protolathe.rsi/unlit.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-a0.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-a0.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-a0.png rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-a0.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-a1.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-a1.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-a1.png rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-a1.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-b0.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-b0.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-b0.png rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-b0.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-b1.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-b1.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-b1.png rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-b1.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-o0.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-o0.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-o0.png rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-o0.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-o0bld.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-o0bld.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-o0bld.png rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-o0bld.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-o1.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-o1.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-o1.png rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-o1.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/grinder-o1bld.png b/Resources/Textures/Structures/Machines/recycling.rsi/grinder-o1bld.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/grinder-o1bld.png rename to Resources/Textures/Structures/Machines/recycling.rsi/grinder-o1bld.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/meta.json b/Resources/Textures/Structures/Machines/recycling.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/meta.json rename to Resources/Textures/Structures/Machines/recycling.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-.png rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-0.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-0.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-0.png rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-0.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-A0.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-A0.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-A0.png rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-A0.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-A1.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-A1.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-A1.png rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-A1.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-AO0.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-AO0.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-AO0.png rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-AO0.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-AO1.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-AO1.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-AO1.png rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-AO1.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-B0.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-B0.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-B0.png rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-B0.png diff --git a/Resources/Textures/Constructible/Power/recycling.rsi/separator-BO0.png b/Resources/Textures/Structures/Machines/recycling.rsi/separator-BO0.png similarity index 100% rename from Resources/Textures/Constructible/Power/recycling.rsi/separator-BO0.png rename to Resources/Textures/Structures/Machines/recycling.rsi/separator-BO0.png diff --git a/Resources/Textures/Constructible/Power/rndpointsource.rsi/meta.json b/Resources/Textures/Structures/Machines/rndpointsource.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/rndpointsource.rsi/meta.json rename to Resources/Textures/Structures/Machines/rndpointsource.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource-broken.png b/Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource-broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource-broken.png rename to Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource-broken.png diff --git a/Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource-icon.png b/Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource-icon.png similarity index 100% rename from Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource-icon.png rename to Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource-icon.png diff --git a/Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource-off.png b/Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource-off.png similarity index 100% rename from Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource-off.png rename to Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource-off.png diff --git a/Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource.png b/Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource.png similarity index 100% rename from Resources/Textures/Constructible/Power/rndpointsource.rsi/rndpointsource.png rename to Resources/Textures/Structures/Machines/rndpointsource.rsi/rndpointsource.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed.png b/Resources/Textures/Structures/Machines/scanner.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed.png rename to Resources/Textures/Structures/Machines/scanner.rsi/closed.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed_unpowered.png b/Resources/Textures/Structures/Machines/scanner.rsi/closed_unpowered.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/closed_unpowered.png rename to Resources/Textures/Structures/Machines/scanner.rsi/closed_unpowered.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/idle_unlit.png b/Resources/Textures/Structures/Machines/scanner.rsi/idle_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/idle_unlit.png rename to Resources/Textures/Structures/Machines/scanner.rsi/idle_unlit.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/maint_unlit.png b/Resources/Textures/Structures/Machines/scanner.rsi/maint_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/maint_unlit.png rename to Resources/Textures/Structures/Machines/scanner.rsi/maint_unlit.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/meta.json b/Resources/Textures/Structures/Machines/scanner.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/meta.json rename to Resources/Textures/Structures/Machines/scanner.rsi/meta.json diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied.png b/Resources/Textures/Structures/Machines/scanner.rsi/occupied.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied.png rename to Resources/Textures/Structures/Machines/scanner.rsi/occupied.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied_unlit.png b/Resources/Textures/Structures/Machines/scanner.rsi/occupied_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/occupied_unlit.png rename to Resources/Textures/Structures/Machines/scanner.rsi/occupied_unlit.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/off_unlit.png b/Resources/Textures/Structures/Machines/scanner.rsi/off_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/off_unlit.png rename to Resources/Textures/Structures/Machines/scanner.rsi/off_unlit.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open.png b/Resources/Textures/Structures/Machines/scanner.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open.png rename to Resources/Textures/Structures/Machines/scanner.rsi/open.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open_unpowered.png b/Resources/Textures/Structures/Machines/scanner.rsi/open_unpowered.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/open_unpowered.png rename to Resources/Textures/Structures/Machines/scanner.rsi/open_unpowered.png diff --git a/Resources/Textures/Constructible/Specific/Medical/scanner.rsi/red_unlit.png b/Resources/Textures/Structures/Machines/scanner.rsi/red_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Medical/scanner.rsi/red_unlit.png rename to Resources/Textures/Structures/Machines/scanner.rsi/red_unlit.png diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/meta.json b/Resources/Textures/Structures/Machines/seed_extractor.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/meta.json rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/meta.json diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor-off.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-off.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor-off.png rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-off.png diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor-unlit.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-unlit.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor-unlit.png rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor-unlit.png diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/seedextractor.png rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/seedextractor.png diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/spawner.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/spawner.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/spawner.png rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/spawner.png diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/traitcopier.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/traitcopier.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/traitcopier.png rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/traitcopier.png diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/traitgun.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/traitgun.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/traitgun.png rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/traitgun.png diff --git a/Resources/Textures/Constructible/Hydroponics/machines.rsi/traitscanner.png b/Resources/Textures/Structures/Machines/seed_extractor.rsi/traitscanner.png similarity index 100% rename from Resources/Textures/Constructible/Hydroponics/machines.rsi/traitscanner.png rename to Resources/Textures/Structures/Machines/seed_extractor.rsi/traitscanner.png diff --git a/Resources/Textures/Constructible/Power/server.rsi/meta.json b/Resources/Textures/Structures/Machines/server.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/server.rsi/meta.json rename to Resources/Textures/Structures/Machines/server.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/server.rsi/server-nopower.png b/Resources/Textures/Structures/Machines/server.rsi/server-nopower.png similarity index 100% rename from Resources/Textures/Constructible/Power/server.rsi/server-nopower.png rename to Resources/Textures/Structures/Machines/server.rsi/server-nopower.png diff --git a/Resources/Textures/Constructible/Power/server.rsi/server-off.png b/Resources/Textures/Structures/Machines/server.rsi/server-off.png similarity index 100% rename from Resources/Textures/Constructible/Power/server.rsi/server-off.png rename to Resources/Textures/Structures/Machines/server.rsi/server-off.png diff --git a/Resources/Textures/Constructible/Power/server.rsi/server-on.png b/Resources/Textures/Structures/Machines/server.rsi/server-on.png similarity index 100% rename from Resources/Textures/Constructible/Power/server.rsi/server-on.png rename to Resources/Textures/Structures/Machines/server.rsi/server-on.png diff --git a/Resources/Textures/Constructible/Power/server.rsi/server.png b/Resources/Textures/Structures/Machines/server.rsi/server.png similarity index 100% rename from Resources/Textures/Constructible/Power/server.rsi/server.png rename to Resources/Textures/Structures/Machines/server.rsi/server.png diff --git a/Resources/Textures/Constructible/Power/server.rsi/server_o.png b/Resources/Textures/Structures/Machines/server.rsi/server_o.png similarity index 100% rename from Resources/Textures/Constructible/Power/server.rsi/server_o.png rename to Resources/Textures/Structures/Machines/server.rsi/server_o.png diff --git a/Resources/Textures/Objects/Misc/traitordm.rsi/meta.json b/Resources/Textures/Structures/Machines/traitordm.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Misc/traitordm.rsi/meta.json rename to Resources/Textures/Structures/Machines/traitordm.rsi/meta.json diff --git a/Resources/Textures/Objects/Misc/traitordm.rsi/redemption-unshaded.png b/Resources/Textures/Structures/Machines/traitordm.rsi/redemption-unshaded.png similarity index 100% rename from Resources/Textures/Objects/Misc/traitordm.rsi/redemption-unshaded.png rename to Resources/Textures/Structures/Machines/traitordm.rsi/redemption-unshaded.png diff --git a/Resources/Textures/Objects/Misc/traitordm.rsi/redemption.png b/Resources/Textures/Structures/Machines/traitordm.rsi/redemption.png similarity index 100% rename from Resources/Textures/Objects/Misc/traitordm.rsi/redemption.png rename to Resources/Textures/Structures/Machines/traitordm.rsi/redemption.png diff --git a/Resources/Textures/Constructible/Atmos/gascanisterport.rsi/gasCanisterPort.png b/Resources/Textures/Structures/Piping/Atmospherics/gascanisterport.rsi/gasCanisterPort.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/gascanisterport.rsi/gasCanisterPort.png rename to Resources/Textures/Structures/Piping/Atmospherics/gascanisterport.rsi/gasCanisterPort.png diff --git a/Resources/Textures/Constructible/Atmos/gascanisterport.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/gascanisterport.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Atmos/gascanisterport.rsi/meta.json rename to Resources/Textures/Structures/Piping/Atmospherics/gascanisterport.rsi/meta.json diff --git a/Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilter.png b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilter.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilter.png rename to Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilter.png diff --git a/Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilterOn.png b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/gasfilter.rsi/gasFilterOn.png rename to Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/gasFilterOn.png diff --git a/Resources/Textures/Constructible/Atmos/gasfilter.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Atmos/gasfilter.rsi/meta.json rename to Resources/Textures/Structures/Piping/Atmospherics/gasfilter.rsi/meta.json diff --git a/Resources/Textures/Constructible/Atmos/gasgenerator.rsi/gasGenerator.png b/Resources/Textures/Structures/Piping/Atmospherics/gasgenerator.rsi/gasGenerator.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/gasgenerator.rsi/gasGenerator.png rename to Resources/Textures/Structures/Piping/Atmospherics/gasgenerator.rsi/gasGenerator.png diff --git a/Resources/Textures/Constructible/Atmos/gasgenerator.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/gasgenerator.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Atmos/gasgenerator.rsi/meta.json rename to Resources/Textures/Structures/Piping/Atmospherics/gasgenerator.rsi/meta.json diff --git a/Resources/Textures/Constructible/Atmos/miners.rsi/broken.png b/Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/miners.rsi/broken.png rename to Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/broken.png diff --git a/Resources/Textures/Constructible/Atmos/miners.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Atmos/miners.rsi/meta.json rename to Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/meta.json diff --git a/Resources/Textures/Constructible/Atmos/miners.rsi/miner.png b/Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/miner.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/miners.rsi/miner.png rename to Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/miner.png diff --git a/Resources/Textures/Constructible/Atmos/miners.rsi/on.png b/Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/on.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/miners.rsi/on.png rename to Resources/Textures/Structures/Piping/Atmospherics/miners.rsi/on.png diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Atmos/pipe.rsi/meta.json rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeBend.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeBend.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeBend.png rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeBend.png diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorEast.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorEast.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorEast.png rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorEast.png diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorNorth.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorNorth.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorNorth.png rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorNorth.png diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorSouth.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorSouth.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorSouth.png rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorSouth.png diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorWest.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorWest.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeConnectorWest.png rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeConnectorWest.png diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeFourway.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeFourway.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeFourway.png rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeFourway.png diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeHalf.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeHalf.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeHalf.png rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeHalf.png diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeStraight.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeStraight.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeStraight.png rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeStraight.png diff --git a/Resources/Textures/Constructible/Atmos/pipe.rsi/pipeTJunction.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeTJunction.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pipe.rsi/pipeTJunction.png rename to Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeTJunction.png diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Atmos/pump.rsi/meta.json rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpDigitalValve.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpDigitalValve.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpDigitalValve.png rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpDigitalValve.png diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpManualValve.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpManualValve.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpManualValve.png rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpManualValve.png diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpPassiveGate.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPassiveGate.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpPassiveGate.png rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPassiveGate.png diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpPassiveGateOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPassiveGateOn.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpPassiveGateOn.png rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPassiveGateOn.png diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressure.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressure.png rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressure.png diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressureOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureOn.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpPressureOn.png rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpPressureOn.png diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpVolume.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolume.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpVolume.png rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolume.png diff --git a/Resources/Textures/Constructible/Atmos/pump.rsi/pumpVolumeOn.png b/Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolumeOn.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/pump.rsi/pumpVolumeOn.png rename to Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/pumpVolumeOn.png diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json rename to Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_off.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_off.png rename to Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_on.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_on.png rename to Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_purge.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_purge.png rename to Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_welded.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_welded.png rename to Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png diff --git a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_wide.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/scrubber.rsi/scrub_wide.png rename to Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/freezer_off.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezer_off.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/freezer_off.png rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezer_off.png diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/freezer_on.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezer_on.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/freezer_on.png rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezer_on.png diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/freezer_open.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezer_open.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/freezer_open.png rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezer_open.png diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/heater_off.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heater_off.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/heater_off.png rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heater_off.png diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/heater_on.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heater_on.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/heater_on.png rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heater_on.png diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/heater_open.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heater_open.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/heater_open.png rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heater_open.png diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/meta.json rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/meta.json diff --git a/Resources/Textures/Constructible/Atmos/thermomachine.rsi/pipe.png b/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/pipe.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/thermomachine.rsi/pipe.png rename to Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/pipe.png diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Atmos/vent.rsi/meta.json rename to Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/vent_in.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/vent.rsi/vent_in.png rename to Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/vent_off.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/vent.rsi/vent_off.png rename to Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/vent_out.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/vent.rsi/vent_out.png rename to Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png diff --git a/Resources/Textures/Constructible/Atmos/vent.rsi/vent_welded.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/vent.rsi/vent_welded.png rename to Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/condisposal.png b/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/condisposal.png rename to Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-c.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-c.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-c.png rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-c.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j1.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j1.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j1.png rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j1.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j1s.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j1s.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j1s.png rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j1s.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j2.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j2.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j2.png rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j2.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j2s.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j2s.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-j2s.png rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-j2s.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-s.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-s.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-s.png rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-s.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-t.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-t.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-t.png rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-t.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-tagger.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-tagger.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-tagger.png rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-tagger.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/conpipe-y.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-y.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/conpipe-y.png rename to Resources/Textures/Structures/Piping/disposal.rsi/conpipe-y.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/disposal-charging.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/disposal-charging.png rename to Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/disposal-flush.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/disposal-flush.png rename to Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/disposal.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/disposal.png rename to Resources/Textures/Structures/Piping/disposal.rsi/disposal.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/dispover-charge.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/dispover-charge.png rename to Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/dispover-full.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/dispover-full.png rename to Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/dispover-handle.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/dispover-handle.png rename to Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/dispover-ready.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/dispover-ready.png rename to Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/intake-closing.png b/Resources/Textures/Structures/Piping/disposal.rsi/intake-closing.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/intake-closing.png rename to Resources/Textures/Structures/Piping/disposal.rsi/intake-closing.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/intake.png b/Resources/Textures/Structures/Piping/disposal.rsi/intake.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/intake.png rename to Resources/Textures/Structures/Piping/disposal.rsi/intake.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/meta.json b/Resources/Textures/Structures/Piping/disposal.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/meta.json rename to Resources/Textures/Structures/Piping/disposal.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/outlet-open.png b/Resources/Textures/Structures/Piping/disposal.rsi/outlet-open.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/outlet-open.png rename to Resources/Textures/Structures/Piping/disposal.rsi/outlet-open.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/outlet.png b/Resources/Textures/Structures/Piping/disposal.rsi/outlet.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/outlet.png rename to Resources/Textures/Structures/Piping/disposal.rsi/outlet.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-b.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-b.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-b.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-b.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-bf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-bf.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-bf.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-bf.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-c.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-c.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-c.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-c.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-cf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-cf.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-cf.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-cf.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-d.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-d.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-d.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-d.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1f.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1f.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1f.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1f.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1s.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1s.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1s.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1s.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1sf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1sf.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j1sf.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j1sf.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2f.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2f.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2f.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2f.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2s.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2s.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2s.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2s.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2sf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2sf.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-j2sf.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-j2sf.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-s.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-s.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-s.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-s.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-sf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-sf.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-sf.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-sf.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-t.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-t.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-t.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-t.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-tagger-partial.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-tagger-partial.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-tagger-partial.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-tagger-partial.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-tagger.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-tagger.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-tagger.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-tagger.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-tf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-tf.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-tf.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-tf.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-u.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-u.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-u.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-u.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-y.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-y.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-y.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-y.png diff --git a/Resources/Textures/Constructible/Power/disposal.rsi/pipe-yf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-yf.png similarity index 100% rename from Resources/Textures/Constructible/Power/disposal.rsi/pipe-yf.png rename to Resources/Textures/Structures/Piping/disposal.rsi/pipe-yf.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_0.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_0.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_0.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_0.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_1.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_1.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_1.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_1.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_10.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_10.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_10.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_10.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_11.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_11.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_11.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_11.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_12.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_12.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_12.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_12.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_13.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_13.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_13.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_13.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_14.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_14.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_14.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_14.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_15.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_15.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_15.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_15.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_2.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_2.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_2.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_2.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_3.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_3.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_3.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_3.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_4.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_4.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_5.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_5.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_5.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_5.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_6.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_6.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_6.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_6.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_7.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_7.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_7.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_7.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_8.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_8.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_8.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_8.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_9.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_9.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/hvcable_9.png rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_9.png diff --git a/Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/meta.json b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/hv_cable.rsi/meta.json rename to Resources/Textures/Structures/Power/Cables/hv_cable.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_0.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_0.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_0.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_0.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_1.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_1.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_1.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_1.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_10.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_10.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_10.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_10.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_11.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_11.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_11.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_11.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_12.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_12.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_12.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_12.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_13.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_13.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_13.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_13.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_14.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_14.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_14.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_14.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_15.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_15.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_15.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_15.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_2.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_2.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_2.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_2.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_3.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_3.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_3.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_3.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_4.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_4.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_4.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_4.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_5.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_5.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_5.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_5.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_6.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_6.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_6.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_6.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_7.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_7.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_7.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_7.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_8.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_8.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_8.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_8.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_9.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_9.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/lvcable_9.png rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_9.png diff --git a/Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/meta.json b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/lv_cable.rsi/meta.json rename to Resources/Textures/Structures/Power/Cables/lv_cable.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/meta.json b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/meta.json rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_0.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_0.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_1.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_1.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_10.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_10.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_11.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_11.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_12.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_12.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_13.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_13.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_14.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_14.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_15.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_15.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_2.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_2.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_3.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_3.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_4.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_4.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_5.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_5.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_6.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_6.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_7.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_7.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_8.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_8.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png diff --git a/Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_9.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png similarity index 100% rename from Resources/Textures/Constructible/Power/Wires/mv_cable.rsi/mvcable_9.png rename to Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/box.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/box.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/box.png rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/box.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/boxc.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/boxc.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/boxc.png rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/boxc.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/boxw.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/boxw.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/boxw.png rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/boxw.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/meta.json diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp.png rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp0.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp0.png rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp0.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp1.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp1.png rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp1.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp2.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp2.png rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp2.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp3.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/control_box.rsi/unlitp3.png rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp3.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/center.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/center.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/center.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/center.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/centerc.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/centerc.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/centerc.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/centerc.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/centerw.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/centerw.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/centerw.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/centerw.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/meta.json diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp0.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp0.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp0.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp1.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp1.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp1.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp2.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp2.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp2.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp3.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_center.rsi/unlitp3.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unlitp3.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/left.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/left.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/left.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/left.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/leftc.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/leftc.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/leftc.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/leftc.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/leftw.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/leftw.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/leftw.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/leftw.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/meta.json diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp0.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp0.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp0.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp1.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp1.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp1.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp2.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp2.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp2.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp3.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_left.rsi/unlitp3.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unlitp3.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/meta.json diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/right.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/right.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/right.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/right.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/rightc.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/rightc.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/rightc.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/rightc.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/rightw.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/rightw.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/rightw.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/rightw.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp0.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp0.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp0.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp1.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp1.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp1.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp2.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp2.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp2.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp3.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/emitter_right.rsi/unlitp3.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unlitp3.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/cap.png b/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/cap.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/cap.png rename to Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/cap.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/capc.png b/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/capc.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/capc.png rename to Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/capc.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/capw.png b/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/capw.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/capw.png rename to Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/capw.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/end_cap.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/meta.json diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/chamber.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamber.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/chamber.png rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamber.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/chamberc.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamberc.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/chamberc.png rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamberc.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/chamberw.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamberw.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/chamberw.png rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamberw.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/meta.json diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp.png rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp0.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp0.png rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp0.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp1.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp1.png rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp1.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp2.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp2.png rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp2.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp3.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/fuel_chamber.rsi/unlitp3.png rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp3.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/particle.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/PA/particle.rsi/meta.json diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle0.png b/Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle0.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle0.png rename to Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle0.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle1.png b/Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle1.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle1.png rename to Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle1.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle2.png b/Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle2.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle2.png rename to Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle2.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle3.png b/Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle3.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/particle.rsi/particle3.png rename to Resources/Textures/Structures/Power/Generation/PA/particle.rsi/particle3.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/box.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/box.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/box.png rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/box.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/boxc.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/boxc.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/boxc.png rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/boxc.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/boxw.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/boxw.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/boxw.png rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/boxw.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/meta.json diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp.png rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp0.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp0.png rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp0.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp1.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp1.png rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp1.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp2.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp2.png rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp2.png diff --git a/Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp3.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Engines/PA/power_box.rsi/unlitp3.png rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unlitp3.png diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_active.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_active.png rename to Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_deactive.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_deactive.png rename to Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_off.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_off.png rename to Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_on.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/collector.rsi/ca_on.png rename to Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/cu.png b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/collector.rsi/cu.png rename to Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/cu.png diff --git a/Resources/Textures/Constructible/Power/Singularity/collector.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/collector.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/a1.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/a1.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/a1.png rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/a1.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/a2.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/a2.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/a2.png rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/a2.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/a3.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/a3.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/a3.png rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/a3.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/icon.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/icon.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/icon.png rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/icon.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/on.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/on.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/on.png rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/on.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p1.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p1.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/p1.png rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p1.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p2.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p2.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/p2.png rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p2.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p3.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p3.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/p3.png rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p3.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p4.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p4.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/p4.png rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p4.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p5.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p5.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/p5.png rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p5.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment.rsi/p6.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p6.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment.rsi/p6.png rename to Resources/Textures/Structures/Power/Generation/Singularity/containment.rsi/p6.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/field.png b/Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/field.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/field.png rename to Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/field.png diff --git a/Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/containment_field.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/Singularity/containment_field.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/beam.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/beam.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/beam.png rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/beam.png diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter0.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/emitter0.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter0.png rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/emitter0.png diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter1.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/emitter1.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter1.png rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/emitter1.png diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter2.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/emitter2.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/emitter2.png rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/emitter2.png diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/lock.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/lock.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/lock.png rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/lock.png diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/projectile.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/projectile.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/projectile.png rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/projectile.png diff --git a/Resources/Textures/Constructible/Power/Singularity/emitter.rsi/underpowered.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/underpowered.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/emitter.rsi/underpowered.png rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/underpowered.png diff --git a/Resources/Textures/Constructible/Power/Singularity/generator.rsi/icon.png b/Resources/Textures/Structures/Power/Generation/Singularity/generator.rsi/icon.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/generator.rsi/icon.png rename to Resources/Textures/Structures/Power/Generation/Singularity/generator.rsi/icon.png diff --git a/Resources/Textures/Constructible/Power/Singularity/generator.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/generator.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/generator.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/Singularity/generator.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/singularity_1.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/singularity_1.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/singularity_1.rsi/singularity_1.png rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/singularity_1.png diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/singularity_2.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/singularity_2.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/singularity_2.rsi/singularity_2.png rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/singularity_2.png diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/singularity_3.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/singularity_3.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/singularity_3.rsi/singularity_3.png rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/singularity_3.png diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/singularity_4.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/singularity_4.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/singularity_4.rsi/singularity_4.png rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/singularity_4.png diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/singularity_5.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/singularity_5.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/singularity_5.rsi/singularity_5.png rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/singularity_5.png diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/singularity_6.png b/Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/singularity_6.png similarity index 100% rename from Resources/Textures/Constructible/Power/Singularity/singularity_6.rsi/singularity_6.png rename to Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/singularity_6.png diff --git a/Resources/Textures/Constructible/Power/ame_controller.rsi/control.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/control.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_controller.rsi/control.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/control.png diff --git a/Resources/Textures/Constructible/Power/ame_controller.rsi/control_critical.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/control_critical.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_controller.rsi/control_critical.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/control_critical.png diff --git a/Resources/Textures/Constructible/Power/ame_controller.rsi/control_fuck.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/control_fuck.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_controller.rsi/control_fuck.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/control_fuck.png diff --git a/Resources/Textures/Constructible/Power/ame_controller.rsi/control_on.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/control_on.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_controller.rsi/control_on.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/control_on.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/core.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/core.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/core.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/core.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/core_strong.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/core_strong.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/core_strong.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/core_strong.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/core_weak.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/core_weak.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/core_weak.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/core_weak.png diff --git a/Resources/Textures/Structures/Power/Generation/ame.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/ame.rsi/meta.json new file mode 100644 index 0000000000..fd88680d91 --- /dev/null +++ b/Resources/Textures/Structures/Power/Generation/ame.rsi/meta.json @@ -0,0 +1,188 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/b440af09b52ba6bc5248e7934d148e991c928b07", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "shield_0" + }, + { + "name": "shield_1" + }, + { + "name": "shield_10" + }, + { + "name": "shield_11" + }, + { + "name": "shield_12" + }, + { + "name": "shield_13" + }, + { + "name": "shield_14" + }, + { + "name": "shield_15" + }, + { + "name": "shield_2" + }, + { + "name": "shield_3" + }, + { + "name": "shield_4" + }, + { + "name": "shield_5" + }, + { + "name": "shield_6" + }, + { + "name": "shield_7" + }, + { + "name": "shield_8" + }, + { + "name": "core" + }, + { + "name": "shield_9" + }, + { + "name": "core_weak", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "core_strong", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "control" + }, + { + "name": "control_critical", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "control_fuck", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "control_on", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_0.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_0.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_0.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_0.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_1.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_1.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_1.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_1.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_10.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_10.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_10.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_10.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_11.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_11.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_11.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_11.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_12.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_12.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_12.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_12.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_13.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_13.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_13.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_13.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_14.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_14.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_14.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_14.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_15.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_15.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_15.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_15.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_2.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_2.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_2.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_2.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_3.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_3.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_3.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_3.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_4.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_4.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_4.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_4.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_5.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_5.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_5.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_5.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_6.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_6.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_6.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_6.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_7.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_7.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_7.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_7.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_8.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_8.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_8.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_8.png diff --git a/Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_9.png b/Resources/Textures/Structures/Power/Generation/ame.rsi/shield_9.png similarity index 100% rename from Resources/Textures/Constructible/Power/ame_shielding.rsi/shield_9.png rename to Resources/Textures/Structures/Power/Generation/ame.rsi/shield_9.png diff --git a/Resources/Textures/Constructible/Power/solar_panel.rsi/broken.png b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Power/solar_panel.rsi/broken.png rename to Resources/Textures/Structures/Power/Generation/solar_panel.rsi/broken.png diff --git a/Resources/Textures/Constructible/Power/solar_panel.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/solar_panel.rsi/meta.json rename to Resources/Textures/Structures/Power/Generation/solar_panel.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/solar_panel.rsi/normal.png b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/normal.png similarity index 100% rename from Resources/Textures/Constructible/Power/solar_panel.rsi/normal.png rename to Resources/Textures/Structures/Power/Generation/solar_panel.rsi/normal.png diff --git a/Resources/Textures/Constructible/Power/solar_panel.rsi/solar_assembly.png b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_assembly.png similarity index 100% rename from Resources/Textures/Constructible/Power/solar_panel.rsi/solar_assembly.png rename to Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_assembly.png diff --git a/Resources/Textures/Constructible/Power/solar_panel.rsi/solar_tracker.png b/Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_tracker.png similarity index 100% rename from Resources/Textures/Constructible/Power/solar_panel.rsi/solar_tracker.png rename to Resources/Textures/Structures/Power/Generation/solar_panel.rsi/solar_tracker.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc-b.png b/Resources/Textures/Structures/Power/apc.rsi/apc-b.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apc-b.png rename to Resources/Textures/Structures/Power/apc.rsi/apc-b.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc-spark.png b/Resources/Textures/Structures/Power/apc.rsi/apc-spark.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apc-spark.png rename to Resources/Textures/Structures/Power/apc.rsi/apc-spark.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc0.png b/Resources/Textures/Structures/Power/apc.rsi/apc0.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apc0.png rename to Resources/Textures/Structures/Power/apc.rsi/apc0.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc1-b-nocover.png b/Resources/Textures/Structures/Power/apc.rsi/apc1-b-nocover.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apc1-b-nocover.png rename to Resources/Textures/Structures/Power/apc.rsi/apc1-b-nocover.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc1-nocover.png b/Resources/Textures/Structures/Power/apc.rsi/apc1-nocover.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apc1-nocover.png rename to Resources/Textures/Structures/Power/apc.rsi/apc1-nocover.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc1.png b/Resources/Textures/Structures/Power/apc.rsi/apc1.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apc1.png rename to Resources/Textures/Structures/Power/apc.rsi/apc1.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc2-b-nocover.png b/Resources/Textures/Structures/Power/apc.rsi/apc2-b-nocover.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apc2-b-nocover.png rename to Resources/Textures/Structures/Power/apc.rsi/apc2-b-nocover.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc2-nocover.png b/Resources/Textures/Structures/Power/apc.rsi/apc2-nocover.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apc2-nocover.png rename to Resources/Textures/Structures/Power/apc.rsi/apc2-nocover.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apc2.png b/Resources/Textures/Structures/Power/apc.rsi/apc2.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apc2.png rename to Resources/Textures/Structures/Power/apc.rsi/apc2.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apcemag.png b/Resources/Textures/Structures/Power/apc.rsi/apcemag.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apcemag.png rename to Resources/Textures/Structures/Power/apc.rsi/apcemag.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apcewires.png b/Resources/Textures/Structures/Power/apc.rsi/apcewires.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apcewires.png rename to Resources/Textures/Structures/Power/apc.rsi/apcewires.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apcmaint.png b/Resources/Textures/Structures/Power/apc.rsi/apcmaint.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apcmaint.png rename to Resources/Textures/Structures/Power/apc.rsi/apcmaint.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco0-0.png b/Resources/Textures/Structures/Power/apc.rsi/apco0-0.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco0-0.png rename to Resources/Textures/Structures/Power/apc.rsi/apco0-0.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco0-1.png b/Resources/Textures/Structures/Power/apc.rsi/apco0-1.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco0-1.png rename to Resources/Textures/Structures/Power/apc.rsi/apco0-1.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco0-2.png b/Resources/Textures/Structures/Power/apc.rsi/apco0-2.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco0-2.png rename to Resources/Textures/Structures/Power/apc.rsi/apco0-2.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco0-3.png b/Resources/Textures/Structures/Power/apc.rsi/apco0-3.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco0-3.png rename to Resources/Textures/Structures/Power/apc.rsi/apco0-3.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco1-0.png b/Resources/Textures/Structures/Power/apc.rsi/apco1-0.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco1-0.png rename to Resources/Textures/Structures/Power/apc.rsi/apco1-0.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco1-1.png b/Resources/Textures/Structures/Power/apc.rsi/apco1-1.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco1-1.png rename to Resources/Textures/Structures/Power/apc.rsi/apco1-1.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco1-2.png b/Resources/Textures/Structures/Power/apc.rsi/apco1-2.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco1-2.png rename to Resources/Textures/Structures/Power/apc.rsi/apco1-2.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco1-3.png b/Resources/Textures/Structures/Power/apc.rsi/apco1-3.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco1-3.png rename to Resources/Textures/Structures/Power/apc.rsi/apco1-3.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco2-0.png b/Resources/Textures/Structures/Power/apc.rsi/apco2-0.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco2-0.png rename to Resources/Textures/Structures/Power/apc.rsi/apco2-0.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco2-1.png b/Resources/Textures/Structures/Power/apc.rsi/apco2-1.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco2-1.png rename to Resources/Textures/Structures/Power/apc.rsi/apco2-1.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco2-2.png b/Resources/Textures/Structures/Power/apc.rsi/apco2-2.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco2-2.png rename to Resources/Textures/Structures/Power/apc.rsi/apco2-2.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco2-3.png b/Resources/Textures/Structures/Power/apc.rsi/apco2-3.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco2-3.png rename to Resources/Textures/Structures/Power/apc.rsi/apco2-3.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco3-0.png b/Resources/Textures/Structures/Power/apc.rsi/apco3-0.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco3-0.png rename to Resources/Textures/Structures/Power/apc.rsi/apco3-0.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco3-1.png b/Resources/Textures/Structures/Power/apc.rsi/apco3-1.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco3-1.png rename to Resources/Textures/Structures/Power/apc.rsi/apco3-1.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apco3-2.png b/Resources/Textures/Structures/Power/apc.rsi/apco3-2.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apco3-2.png rename to Resources/Textures/Structures/Power/apc.rsi/apco3-2.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apcox-0.png b/Resources/Textures/Structures/Power/apc.rsi/apcox-0.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apcox-0.png rename to Resources/Textures/Structures/Power/apc.rsi/apcox-0.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/apcox-1.png b/Resources/Textures/Structures/Power/apc.rsi/apcox-1.png similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/apcox-1.png rename to Resources/Textures/Structures/Power/apc.rsi/apcox-1.png diff --git a/Resources/Textures/Constructible/Power/apc.rsi/meta.json b/Resources/Textures/Structures/Power/apc.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/apc.rsi/meta.json rename to Resources/Textures/Structures/Power/apc.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/wire_terminal.rsi/meta.json b/Resources/Textures/Structures/Power/cable_terminal.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/wire_terminal.rsi/meta.json rename to Resources/Textures/Structures/Power/cable_terminal.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/wire_terminal.rsi/term.png b/Resources/Textures/Structures/Power/cable_terminal.rsi/term.png similarity index 100% rename from Resources/Textures/Constructible/Power/wire_terminal.rsi/term.png rename to Resources/Textures/Structures/Power/cable_terminal.rsi/term.png diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/empty.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png similarity index 100% rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/empty.png rename to Resources/Textures/Structures/Power/cell_recharger.rsi/empty.png diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/full.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/full.png rename to Resources/Textures/Structures/Power/cell_recharger.rsi/full.png diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/light-charged.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png similarity index 100% rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/light-charged.png rename to Resources/Textures/Structures/Power/cell_recharger.rsi/light-charged.png diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/light-charging.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png similarity index 100% rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/light-charging.png rename to Resources/Textures/Structures/Power/cell_recharger.rsi/light-charging.png diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/light-empty.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png similarity index 100% rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/light-empty.png rename to Resources/Textures/Structures/Power/cell_recharger.rsi/light-empty.png diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/light-off.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/light-off.png similarity index 100% rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/light-off.png rename to Resources/Textures/Structures/Power/cell_recharger.rsi/light-off.png diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/meta.json b/Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/meta.json rename to Resources/Textures/Structures/Power/cell_recharger.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/cell_recharger.rsi/open.png b/Resources/Textures/Structures/Power/cell_recharger.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Power/cell_recharger.rsi/open.png rename to Resources/Textures/Structures/Power/cell_recharger.rsi/open.png diff --git a/Resources/Textures/Constructible/Power/power.rsi/eightdirwire.png b/Resources/Textures/Structures/Power/power.rsi/eightdirwire.png similarity index 100% rename from Resources/Textures/Constructible/Power/power.rsi/eightdirwire.png rename to Resources/Textures/Structures/Power/power.rsi/eightdirwire.png diff --git a/Resources/Textures/Constructible/Power/power.rsi/generator.png b/Resources/Textures/Structures/Power/power.rsi/generator.png similarity index 100% rename from Resources/Textures/Constructible/Power/power.rsi/generator.png rename to Resources/Textures/Structures/Power/power.rsi/generator.png diff --git a/Resources/Textures/Constructible/Power/power.rsi/meta.json b/Resources/Textures/Structures/Power/power.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/power.rsi/meta.json rename to Resources/Textures/Structures/Power/power.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/power.rsi/provider.png b/Resources/Textures/Structures/Power/power.rsi/provider.png similarity index 100% rename from Resources/Textures/Constructible/Power/power.rsi/provider.png rename to Resources/Textures/Structures/Power/power.rsi/provider.png diff --git a/Resources/Textures/Constructible/Power/power.rsi/storage.png b/Resources/Textures/Structures/Power/power.rsi/storage.png similarity index 100% rename from Resources/Textures/Constructible/Power/power.rsi/storage.png rename to Resources/Textures/Structures/Power/power.rsi/storage.png diff --git a/Resources/Textures/Constructible/Power/power.rsi/wiredmachine.png b/Resources/Textures/Structures/Power/power.rsi/wiredmachine.png similarity index 100% rename from Resources/Textures/Constructible/Power/power.rsi/wiredmachine.png rename to Resources/Textures/Structures/Power/power.rsi/wiredmachine.png diff --git a/Resources/Textures/Constructible/Power/power.rsi/wirelessmachine.png b/Resources/Textures/Structures/Power/power.rsi/wirelessmachine.png similarity index 100% rename from Resources/Textures/Constructible/Power/power.rsi/wirelessmachine.png rename to Resources/Textures/Structures/Power/power.rsi/wirelessmachine.png diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/empty.png b/Resources/Textures/Structures/Power/recharger.rsi/empty.png similarity index 100% rename from Resources/Textures/Constructible/Power/recharger.rsi/empty.png rename to Resources/Textures/Structures/Power/recharger.rsi/empty.png diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/full.png b/Resources/Textures/Structures/Power/recharger.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Power/recharger.rsi/full.png rename to Resources/Textures/Structures/Power/recharger.rsi/full.png diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/light-charged.png b/Resources/Textures/Structures/Power/recharger.rsi/light-charged.png similarity index 100% rename from Resources/Textures/Constructible/Power/recharger.rsi/light-charged.png rename to Resources/Textures/Structures/Power/recharger.rsi/light-charged.png diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/light-charging.png b/Resources/Textures/Structures/Power/recharger.rsi/light-charging.png similarity index 100% rename from Resources/Textures/Constructible/Power/recharger.rsi/light-charging.png rename to Resources/Textures/Structures/Power/recharger.rsi/light-charging.png diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/light-empty.png b/Resources/Textures/Structures/Power/recharger.rsi/light-empty.png similarity index 100% rename from Resources/Textures/Constructible/Power/recharger.rsi/light-empty.png rename to Resources/Textures/Structures/Power/recharger.rsi/light-empty.png diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/light-off.png b/Resources/Textures/Structures/Power/recharger.rsi/light-off.png similarity index 100% rename from Resources/Textures/Constructible/Power/recharger.rsi/light-off.png rename to Resources/Textures/Structures/Power/recharger.rsi/light-off.png diff --git a/Resources/Textures/Constructible/Power/recharger.rsi/meta.json b/Resources/Textures/Structures/Power/recharger.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/recharger.rsi/meta.json rename to Resources/Textures/Structures/Power/recharger.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/smes.rsi/meta.json b/Resources/Textures/Structures/Power/smes.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/meta.json rename to Resources/Textures/Structures/Power/smes.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-crit.png b/Resources/Textures/Structures/Power/smes.rsi/smes-crit.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-crit.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-crit.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-display.png b/Resources/Textures/Structures/Power/smes.rsi/smes-display.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-display.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-display.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-oc0.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-oc0.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-oc1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-oc1.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-oc2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-oc2.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-og1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og1.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-og1.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-og1.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-og2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og2.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-og2.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-og2.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-og3.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og3.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-og3.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-og3.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-og4.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og4.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-og4.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-og4.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-og5.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og5.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-og5.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-og5.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-op0.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op0.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-op0.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-op0.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-op1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op1.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-op1.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-op1.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes-op2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op2.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes-op2.png rename to Resources/Textures/Structures/Power/smes.rsi/smes-op2.png diff --git a/Resources/Textures/Constructible/Power/smes.rsi/smes.png b/Resources/Textures/Structures/Power/smes.rsi/smes.png similarity index 100% rename from Resources/Textures/Constructible/Power/smes.rsi/smes.png rename to Resources/Textures/Structures/Power/smes.rsi/smes.png diff --git a/Resources/Textures/Constructible/Power/substation.rsi/charging.png b/Resources/Textures/Structures/Power/substation.rsi/charging.png similarity index 100% rename from Resources/Textures/Constructible/Power/substation.rsi/charging.png rename to Resources/Textures/Structures/Power/substation.rsi/charging.png diff --git a/Resources/Textures/Constructible/Power/substation.rsi/dead.png b/Resources/Textures/Structures/Power/substation.rsi/dead.png similarity index 100% rename from Resources/Textures/Constructible/Power/substation.rsi/dead.png rename to Resources/Textures/Structures/Power/substation.rsi/dead.png diff --git a/Resources/Textures/Constructible/Power/substation.rsi/full.png b/Resources/Textures/Structures/Power/substation.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Power/substation.rsi/full.png rename to Resources/Textures/Structures/Power/substation.rsi/full.png diff --git a/Resources/Textures/Constructible/Power/substation.rsi/meta.json b/Resources/Textures/Structures/Power/substation.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/substation.rsi/meta.json rename to Resources/Textures/Structures/Power/substation.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/substation.rsi/screen.png b/Resources/Textures/Structures/Power/substation.rsi/screen.png similarity index 100% rename from Resources/Textures/Constructible/Power/substation.rsi/screen.png rename to Resources/Textures/Structures/Power/substation.rsi/screen.png diff --git a/Resources/Textures/Constructible/Power/substation.rsi/substation.png b/Resources/Textures/Structures/Power/substation.rsi/substation.png similarity index 100% rename from Resources/Textures/Constructible/Power/substation.rsi/substation.png rename to Resources/Textures/Structures/Power/substation.rsi/substation.png diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/empty.png b/Resources/Textures/Structures/Power/wall_recharger.rsi/empty.png similarity index 100% rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/empty.png rename to Resources/Textures/Structures/Power/wall_recharger.rsi/empty.png diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/full.png b/Resources/Textures/Structures/Power/wall_recharger.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/full.png rename to Resources/Textures/Structures/Power/wall_recharger.rsi/full.png diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/light-charged.png b/Resources/Textures/Structures/Power/wall_recharger.rsi/light-charged.png similarity index 100% rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/light-charged.png rename to Resources/Textures/Structures/Power/wall_recharger.rsi/light-charged.png diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/light-charging.png b/Resources/Textures/Structures/Power/wall_recharger.rsi/light-charging.png similarity index 100% rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/light-charging.png rename to Resources/Textures/Structures/Power/wall_recharger.rsi/light-charging.png diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/light-empty.png b/Resources/Textures/Structures/Power/wall_recharger.rsi/light-empty.png similarity index 100% rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/light-empty.png rename to Resources/Textures/Structures/Power/wall_recharger.rsi/light-empty.png diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/light-off.png b/Resources/Textures/Structures/Power/wall_recharger.rsi/light-off.png similarity index 100% rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/light-off.png rename to Resources/Textures/Structures/Power/wall_recharger.rsi/light-off.png diff --git a/Resources/Textures/Constructible/Power/wall_recharger.rsi/meta.json b/Resources/Textures/Structures/Power/wall_recharger.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/wall_recharger.rsi/meta.json rename to Resources/Textures/Structures/Power/wall_recharger.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate.png b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate.png rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate_door.png b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate_door.png rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate_icon.png b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate_open.png b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/electricalcrate_open.png rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/electricalcrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/electricalcrate.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/electricalcrate.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate.png b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate.png rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate_door.png b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate_door.png rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate_icon.png b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate_open.png b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/engicrate_open.png rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/engicrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/engicrate.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/engicrate.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure.png rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure_door.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure_door.png rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure_icon.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure_icon.png rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure_open.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/engicratesecure_open.png rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/engicratesecure_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/locked.png rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/off.png rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/off.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/unlocked.png rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/engicrate_secure.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer.png rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer.png diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer_door.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer_door.png rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer_icon.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer_icon.png rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer_open.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/freezer_open.png rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/freezer_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/freezer.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/freezer.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/crate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate.png rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/crate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate_door.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/crate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate_door.png rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/crate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate_icon.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/crate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate_icon.png rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/crate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate_open.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/crate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/crate_open.png rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/crate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/generic.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/generic.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate.png b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate.png rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate_door.png b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate_door.png rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate_icon.png b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate_open.png b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/hydrocrate_open.png rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/hydrocrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/hydro.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/hydro.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure.png rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure_door.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure_door.png rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure_icon.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure_icon.png rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure_open.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/hydrocratesecure_open.png rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/hydrocratesecure_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/locked.png rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/off.png rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/off.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/unlocked.png rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/hydro_secure.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/livestock.rsi/livestockcrate.png b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/livestockcrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/livestock.rsi/livestockcrate.png rename to Resources/Textures/Structures/Storage/Crates/livestock.rsi/livestockcrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/livestock.rsi/livestockcrate_door.png b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/livestockcrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/livestock.rsi/livestockcrate_door.png rename to Resources/Textures/Structures/Storage/Crates/livestock.rsi/livestockcrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/livestock.rsi/livestockcrate_open.png b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/livestockcrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/livestock.rsi/livestockcrate_open.png rename to Resources/Textures/Structures/Storage/Crates/livestock.rsi/livestockcrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/livestock.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/livestock.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/livestock.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate.png rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate_door.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate_door.png rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate_icon.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate_open.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/medicalcrate_open.png rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/medicalcrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medical.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medical.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/locked.png rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure.png rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_door.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_door.png rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_icon.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_icon.png rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_open.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_open.png rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/medicalcratesecure_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/off.png rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/off.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/unlocked.png rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/medicalcrate_secure.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate.png rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate_door.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate_door.png rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate_icon.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate_icon.png rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate_open.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/o2crate_open.png rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/o2crate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/o2.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/o2.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/locked.png rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/off.png rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/off.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate.png rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_door.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_door.png rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_icon.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_open.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/plasmacrate_open.png rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/plasmacrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/unlocked.png rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plasma.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plasma.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate.png rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate_door.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate_door.png rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate_icon.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate_open.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/plasticcrate_open.png rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/plasticcrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/plastic.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/plastic.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/locked.png rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/off.png rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/off.png diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate.png rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate_door.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate_door.png rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate_icon.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate_open.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/privatecrate_open.png rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/privatecrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/unlocked.png rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/privatecrate_secure.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate.png rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate_door.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate_door.png rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate_icon.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate_open.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/radiationcrate_open.png rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/radiationcrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/radiation.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/radiation.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate.png b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate.png rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate_door.png b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate_door.png rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate_icon.png b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate_open.png b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/scicrate_open.png rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/scicrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/scicrate.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/scicrate.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/locked.png rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/off.png rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/off.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure.png rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure_door.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure_door.png rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure_icon.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure_icon.png rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure_open.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/scicratesecure_open.png rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/scicratesecure_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/unlocked.png rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/scicrate_secure.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/locked.png rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/off.png rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/off.png diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate.png rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate_door.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate_door.png rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate_icon.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate_open.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/secgearcrate_open.png rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/secgearcrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/unlocked.png rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/sec_gear.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/locked.png rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/off.png rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/off.png diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate.png rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate_door.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate_door.png rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate_icon.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate_open.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/securecrate_open.png rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/securecrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/unlocked.png rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/secure.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate.png b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate.png rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate_door.png b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate_door.png rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate_icon.png b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate_open.png b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/surgerycrate_open.png rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/surgerycrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/surgerycrate.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/surgerycrate.rsi/welded.png diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/locked.png rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/meta.json rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/off.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/off.png rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/off.png diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/sparking.png rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/unlocked.png rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate.png rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate.png diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate_door.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate_door.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate_door.png rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate_door.png diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate_icon.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate_icon.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate_icon.png rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate_icon.png diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate_open.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate_open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/weaponcrate_open.png rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/weaponcrate_open.png diff --git a/Resources/Textures/Constructible/Storage/Crates/weapon.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Crates/weapon.rsi/welded.png rename to Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/black-1.png b/Resources/Textures/Structures/Storage/canister.rsi/black-1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/black-1.png rename to Resources/Textures/Structures/Storage/canister.rsi/black-1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/black.png b/Resources/Textures/Structures/Storage/canister.rsi/black.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/black.png rename to Resources/Textures/Structures/Storage/canister.rsi/black.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/blue-1.png b/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/blue-1.png rename to Resources/Textures/Structures/Storage/canister.rsi/blue-1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/blue.png b/Resources/Textures/Structures/Storage/canister.rsi/blue.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/blue.png rename to Resources/Textures/Structures/Storage/canister.rsi/blue.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-connector.png b/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-connector.png rename to Resources/Textures/Structures/Storage/canister.rsi/can-connector.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o0.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-o0.png rename to Resources/Textures/Structures/Storage/canister.rsi/can-o0.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o1.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-o1.png rename to Resources/Textures/Structures/Storage/canister.rsi/can-o1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o2.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-o2.png rename to Resources/Textures/Structures/Storage/canister.rsi/can-o2.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-o3.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-o3.png rename to Resources/Textures/Structures/Storage/canister.rsi/can-o3.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-oa1.png b/Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-oa1.png rename to Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/can-open.png b/Resources/Textures/Structures/Storage/canister.rsi/can-open.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/can-open.png rename to Resources/Textures/Structures/Storage/canister.rsi/can-open.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/darkblue-1.png b/Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/darkblue-1.png rename to Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/darkblue.png b/Resources/Textures/Structures/Storage/canister.rsi/darkblue.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/darkblue.png rename to Resources/Textures/Structures/Storage/canister.rsi/darkblue.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/freon-1.png b/Resources/Textures/Structures/Storage/canister.rsi/freon-1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/freon-1.png rename to Resources/Textures/Structures/Storage/canister.rsi/freon-1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/freon.png b/Resources/Textures/Structures/Storage/canister.rsi/freon.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/freon.png rename to Resources/Textures/Structures/Storage/canister.rsi/freon.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/green-1.png b/Resources/Textures/Structures/Storage/canister.rsi/green-1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/green-1.png rename to Resources/Textures/Structures/Storage/canister.rsi/green-1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/green.png b/Resources/Textures/Structures/Storage/canister.rsi/green.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/green.png rename to Resources/Textures/Structures/Storage/canister.rsi/green.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/grey-1.png b/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/grey-1.png rename to Resources/Textures/Structures/Storage/canister.rsi/grey-1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/grey.png b/Resources/Textures/Structures/Storage/canister.rsi/grey.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/grey.png rename to Resources/Textures/Structures/Storage/canister.rsi/grey.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/meta.json rename to Resources/Textures/Structures/Storage/canister.rsi/meta.json diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/orange-1.png b/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/orange-1.png rename to Resources/Textures/Structures/Storage/canister.rsi/orange-1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/orange.png b/Resources/Textures/Structures/Storage/canister.rsi/orange.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/orange.png rename to Resources/Textures/Structures/Storage/canister.rsi/orange.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/red-1.png b/Resources/Textures/Structures/Storage/canister.rsi/red-1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/red-1.png rename to Resources/Textures/Structures/Storage/canister.rsi/red-1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/red.png b/Resources/Textures/Structures/Storage/canister.rsi/red.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/red.png rename to Resources/Textures/Structures/Storage/canister.rsi/red.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/redws-1.png b/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/redws-1.png rename to Resources/Textures/Structures/Storage/canister.rsi/redws-1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/redws.png b/Resources/Textures/Structures/Storage/canister.rsi/redws.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/redws.png rename to Resources/Textures/Structures/Storage/canister.rsi/redws.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/scrubber-connector.png b/Resources/Textures/Structures/Storage/canister.rsi/scrubber-connector.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/scrubber-connector.png rename to Resources/Textures/Structures/Storage/canister.rsi/scrubber-connector.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/scrubber-open.png b/Resources/Textures/Structures/Storage/canister.rsi/scrubber-open.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/scrubber-open.png rename to Resources/Textures/Structures/Storage/canister.rsi/scrubber-open.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor-1.png b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor-1.png rename to Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor.png b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/water_vapor.png rename to Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/yellow-1.png b/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/yellow-1.png rename to Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png diff --git a/Resources/Textures/Constructible/Atmos/canister.rsi/yellow.png b/Resources/Textures/Structures/Storage/canister.rsi/yellow.png similarity index 100% rename from Resources/Textures/Constructible/Atmos/canister.rsi/yellow.png rename to Resources/Textures/Structures/Storage/canister.rsi/yellow.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/abductor.png b/Resources/Textures/Structures/Storage/closet.rsi/abductor.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/abductor.png rename to Resources/Textures/Structures/Storage/closet.rsi/abductor.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/abductor_door.png b/Resources/Textures/Structures/Storage/closet.rsi/abductor_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/abductor_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/abductor_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/abductor_open.png b/Resources/Textures/Structures/Storage/closet.rsi/abductor_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/abductor_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/abductor_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/agentbox.png b/Resources/Textures/Structures/Storage/closet.rsi/agentbox.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/agentbox.png rename to Resources/Textures/Structures/Storage/closet.rsi/agentbox.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/alien.png b/Resources/Textures/Structures/Storage/closet.rsi/alien.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/alien.png rename to Resources/Textures/Structures/Storage/closet.rsi/alien.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/alien_door.png b/Resources/Textures/Structures/Storage/closet.rsi/alien_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/alien_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/alien_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/alien_open.png b/Resources/Textures/Structures/Storage/closet.rsi/alien_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/alien_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/alien_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/armory.png b/Resources/Textures/Structures/Storage/closet.rsi/armory.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/armory.png rename to Resources/Textures/Structures/Storage/closet.rsi/armory.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/armory_door.png b/Resources/Textures/Structures/Storage/closet.rsi/armory_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/armory_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/armory_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/armory_open.png b/Resources/Textures/Structures/Storage/closet.rsi/armory_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/armory_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/armory_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/atmos.png b/Resources/Textures/Structures/Storage/closet.rsi/atmos.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/atmos.png rename to Resources/Textures/Structures/Storage/closet.rsi/atmos.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/atmos_door.png b/Resources/Textures/Structures/Storage/closet.rsi/atmos_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/atmos_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/atmos_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/atmos_open.png b/Resources/Textures/Structures/Storage/closet.rsi/atmos_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/atmos_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/atmos_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/atmos_wardrobe_door.png b/Resources/Textures/Structures/Storage/closet.rsi/atmos_wardrobe_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/atmos_wardrobe_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/atmos_wardrobe_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio.png b/Resources/Textures/Structures/Storage/closet.rsi/bio.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bio.png rename to Resources/Textures/Structures/Storage/closet.rsi/bio.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/bio_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_jan.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_jan.png rename to Resources/Textures/Structures/Storage/closet.rsi/bio_jan.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_jan_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_jan_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/bio_jan_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_jan_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_jan_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/bio_jan_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/bio_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_sec.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_sec.png rename to Resources/Textures/Structures/Storage/closet.rsi/bio_sec.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_sec_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_sec_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/bio_sec_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_sec_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_sec_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/bio_sec_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_viro.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_viro.png rename to Resources/Textures/Structures/Storage/closet.rsi/bio_viro.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_viro_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_viro_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/bio_viro_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bio_viro_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bio_viro_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/bio_viro_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/black_door.png b/Resources/Textures/Structures/Storage/closet.rsi/black_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/black_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/black_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/blue_door.png b/Resources/Textures/Structures/Storage/closet.rsi/blue_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/blue_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/blue_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bomb.png b/Resources/Textures/Structures/Storage/closet.rsi/bomb.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bomb.png rename to Resources/Textures/Structures/Storage/closet.rsi/bomb.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bomb_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bomb_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bomb_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/bomb_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/bomb_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bomb_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/bomb_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/bomb_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cabinet.png b/Resources/Textures/Structures/Storage/closet.rsi/cabinet.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cabinet.png rename to Resources/Textures/Structures/Storage/closet.rsi/cabinet.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cabinet_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cabinet_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cabinet_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/cabinet_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cabinet_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cabinet_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cabinet_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/cabinet_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cap.png b/Resources/Textures/Structures/Storage/closet.rsi/cap.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cap.png rename to Resources/Textures/Structures/Storage/closet.rsi/cap.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cap_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cap_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cap_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/cap_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cap_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cap_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cap_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/cap_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cardboard.png b/Resources/Textures/Structures/Storage/closet.rsi/cardboard.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cardboard.png rename to Resources/Textures/Structures/Storage/closet.rsi/cardboard.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cardboard_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cardboard_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cardboard_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/cardboard_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cardboard_special.png b/Resources/Textures/Structures/Storage/closet.rsi/cardboard_special.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cardboard_special.png rename to Resources/Textures/Structures/Storage/closet.rsi/cardboard_special.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cargo.png b/Resources/Textures/Structures/Storage/closet.rsi/cargo.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cargo.png rename to Resources/Textures/Structures/Storage/closet.rsi/cargo.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cargo_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cargo_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cargo_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/cargo_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cargo_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cargo_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cargo_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/cargo_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/ce.png b/Resources/Textures/Structures/Storage/closet.rsi/ce.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/ce.png rename to Resources/Textures/Structures/Storage/closet.rsi/ce.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/ce_door.png b/Resources/Textures/Structures/Storage/closet.rsi/ce_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/ce_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/ce_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/ce_open.png b/Resources/Textures/Structures/Storage/closet.rsi/ce_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/ce_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/ce_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/chemical_door.png b/Resources/Textures/Structures/Storage/closet.rsi/chemical_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/chemical_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/chemical_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cmo.png b/Resources/Textures/Structures/Storage/closet.rsi/cmo.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cmo.png rename to Resources/Textures/Structures/Storage/closet.rsi/cmo.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cmo_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cmo_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cmo_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/cmo_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cmo_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cmo_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cmo_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/cmo_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cursed.png b/Resources/Textures/Structures/Storage/closet.rsi/cursed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cursed.png rename to Resources/Textures/Structures/Storage/closet.rsi/cursed.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cursed_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cursed_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cursed_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/cursed_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cursed_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cursed_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cursed_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/cursed_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/cursed_whole.png b/Resources/Textures/Structures/Storage/closet.rsi/cursed_whole.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/cursed_whole.png rename to Resources/Textures/Structures/Storage/closet.rsi/cursed_whole.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/decursed.png b/Resources/Textures/Structures/Storage/closet.rsi/decursed.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/decursed.png rename to Resources/Textures/Structures/Storage/closet.rsi/decursed.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/decursed_door.png b/Resources/Textures/Structures/Storage/closet.rsi/decursed_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/decursed_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/decursed_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/decursed_open.png b/Resources/Textures/Structures/Storage/closet.rsi/decursed_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/decursed_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/decursed_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/ecase.png b/Resources/Textures/Structures/Storage/closet.rsi/ecase.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/ecase.png rename to Resources/Textures/Structures/Storage/closet.rsi/ecase.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/ecase_door.png b/Resources/Textures/Structures/Storage/closet.rsi/ecase_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/ecase_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/ecase_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/ecase_open.png b/Resources/Textures/Structures/Storage/closet.rsi/ecase_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/ecase_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/ecase_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/egun.png b/Resources/Textures/Structures/Storage/closet.rsi/egun.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/egun.png rename to Resources/Textures/Structures/Storage/closet.rsi/egun.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/emergency.png b/Resources/Textures/Structures/Storage/closet.rsi/emergency.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/emergency.png rename to Resources/Textures/Structures/Storage/closet.rsi/emergency.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/emergency_door.png b/Resources/Textures/Structures/Storage/closet.rsi/emergency_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/emergency_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/emergency_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/emergency_open.png b/Resources/Textures/Structures/Storage/closet.rsi/emergency_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/emergency_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/emergency_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng.png b/Resources/Textures/Structures/Storage/closet.rsi/eng.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/eng.png rename to Resources/Textures/Structures/Storage/closet.rsi/eng.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_elec_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_elec_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_elec_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/eng_elec_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_open.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/eng_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_rad_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_rad_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_rad_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/eng_rad_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_secure.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_secure.png rename to Resources/Textures/Structures/Storage/closet.rsi/eng_secure.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_secure_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_secure_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/eng_secure_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_secure_open.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_secure_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/eng_secure_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_tool_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_tool_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_tool_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/eng_tool_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/eng_weld_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_weld_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/eng_weld_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/eng_weld_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/fire.png b/Resources/Textures/Structures/Storage/closet.rsi/fire.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/fire.png rename to Resources/Textures/Structures/Storage/closet.rsi/fire.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/fire_door.png b/Resources/Textures/Structures/Storage/closet.rsi/fire_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/fire_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/fire_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/fire_open.png b/Resources/Textures/Structures/Storage/closet.rsi/fire_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/fire_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/fire_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/freezer.png b/Resources/Textures/Structures/Storage/closet.rsi/freezer.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/freezer.png rename to Resources/Textures/Structures/Storage/closet.rsi/freezer.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/freezer_door.png b/Resources/Textures/Structures/Storage/closet.rsi/freezer_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/freezer_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/freezer_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/freezer_open.png b/Resources/Textures/Structures/Storage/closet.rsi/freezer_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/freezer_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/freezer_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/generic.png b/Resources/Textures/Structures/Storage/closet.rsi/generic.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/generic.png rename to Resources/Textures/Structures/Storage/closet.rsi/generic.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/generic_door.png b/Resources/Textures/Structures/Storage/closet.rsi/generic_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/generic_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/generic_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/generic_open.png b/Resources/Textures/Structures/Storage/closet.rsi/generic_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/generic_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/generic_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/green_door.png b/Resources/Textures/Structures/Storage/closet.rsi/green_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/green_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/green_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/grey_door.png b/Resources/Textures/Structures/Storage/closet.rsi/grey_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/grey_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/grey_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hop.png b/Resources/Textures/Structures/Storage/closet.rsi/hop.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/hop.png rename to Resources/Textures/Structures/Storage/closet.rsi/hop.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hop_door.png b/Resources/Textures/Structures/Storage/closet.rsi/hop_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/hop_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/hop_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hop_open.png b/Resources/Textures/Structures/Storage/closet.rsi/hop_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/hop_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/hop_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hos.png b/Resources/Textures/Structures/Storage/closet.rsi/hos.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/hos.png rename to Resources/Textures/Structures/Storage/closet.rsi/hos.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hos_door.png b/Resources/Textures/Structures/Storage/closet.rsi/hos_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/hos_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/hos_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hos_open.png b/Resources/Textures/Structures/Storage/closet.rsi/hos_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/hos_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/hos_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hydro.png b/Resources/Textures/Structures/Storage/closet.rsi/hydro.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/hydro.png rename to Resources/Textures/Structures/Storage/closet.rsi/hydro.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hydro_door.png b/Resources/Textures/Structures/Storage/closet.rsi/hydro_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/hydro_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/hydro_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/hydro_open.png b/Resources/Textures/Structures/Storage/closet.rsi/hydro_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/hydro_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/hydro_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/locked.png b/Resources/Textures/Structures/Storage/closet.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/locked.png rename to Resources/Textures/Structures/Storage/closet.rsi/locked.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/med.png b/Resources/Textures/Structures/Storage/closet.rsi/med.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/med.png rename to Resources/Textures/Structures/Storage/closet.rsi/med.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/med_door.png b/Resources/Textures/Structures/Storage/closet.rsi/med_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/med_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/med_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/med_open.png b/Resources/Textures/Structures/Storage/closet.rsi/med_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/med_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/med_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/med_secure.png b/Resources/Textures/Structures/Storage/closet.rsi/med_secure.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/med_secure.png rename to Resources/Textures/Structures/Storage/closet.rsi/med_secure.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/med_secure_door.png b/Resources/Textures/Structures/Storage/closet.rsi/med_secure_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/med_secure_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/med_secure_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/med_secure_open.png b/Resources/Textures/Structures/Storage/closet.rsi/med_secure_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/med_secure_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/med_secure_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/meta.json rename to Resources/Textures/Structures/Storage/closet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/metalbox.png b/Resources/Textures/Structures/Storage/closet.rsi/metalbox.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/metalbox.png rename to Resources/Textures/Structures/Storage/closet.rsi/metalbox.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/metalbox_open.png b/Resources/Textures/Structures/Storage/closet.rsi/metalbox_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/metalbox_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/metalbox_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/mining.png b/Resources/Textures/Structures/Storage/closet.rsi/mining.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/mining.png rename to Resources/Textures/Structures/Storage/closet.rsi/mining.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/mining_door.png b/Resources/Textures/Structures/Storage/closet.rsi/mining_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/mining_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/mining_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/mining_open.png b/Resources/Textures/Structures/Storage/closet.rsi/mining_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/mining_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/mining_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/mixed_door.png b/Resources/Textures/Structures/Storage/closet.rsi/mixed_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/mixed_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/mixed_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/oldcloset.png b/Resources/Textures/Structures/Storage/closet.rsi/oldcloset.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/oldcloset.png rename to Resources/Textures/Structures/Storage/closet.rsi/oldcloset.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/orange_door.png b/Resources/Textures/Structures/Storage/closet.rsi/orange_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/orange_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/orange_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/pink_door.png b/Resources/Textures/Structures/Storage/closet.rsi/pink_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/pink_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/pink_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/qm.png b/Resources/Textures/Structures/Storage/closet.rsi/qm.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/qm.png rename to Resources/Textures/Structures/Storage/closet.rsi/qm.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/qm_door.png b/Resources/Textures/Structures/Storage/closet.rsi/qm_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/qm_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/qm_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/qm_open.png b/Resources/Textures/Structures/Storage/closet.rsi/qm_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/qm_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/qm_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/rd.png b/Resources/Textures/Structures/Storage/closet.rsi/rd.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/rd.png rename to Resources/Textures/Structures/Storage/closet.rsi/rd.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/rd_door.png b/Resources/Textures/Structures/Storage/closet.rsi/rd_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/rd_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/rd_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/rd_open.png b/Resources/Textures/Structures/Storage/closet.rsi/rd_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/rd_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/rd_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/red_door.png b/Resources/Textures/Structures/Storage/closet.rsi/red_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/red_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/red_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/science.png b/Resources/Textures/Structures/Storage/closet.rsi/science.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/science.png rename to Resources/Textures/Structures/Storage/closet.rsi/science.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/science_door.png b/Resources/Textures/Structures/Storage/closet.rsi/science_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/science_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/science_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/science_open.png b/Resources/Textures/Structures/Storage/closet.rsi/science_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/science_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/science_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/sec.png b/Resources/Textures/Structures/Storage/closet.rsi/sec.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/sec.png rename to Resources/Textures/Structures/Storage/closet.rsi/sec.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/sec_door.png b/Resources/Textures/Structures/Storage/closet.rsi/sec_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/sec_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/sec_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/sec_open.png b/Resources/Textures/Structures/Storage/closet.rsi/sec_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/sec_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/sec_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/secure.png b/Resources/Textures/Structures/Storage/closet.rsi/secure.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/secure.png rename to Resources/Textures/Structures/Storage/closet.rsi/secure.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/secure_door.png b/Resources/Textures/Structures/Storage/closet.rsi/secure_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/secure_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/secure_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/secure_open.png b/Resources/Textures/Structures/Storage/closet.rsi/secure_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/secure_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/secure_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/shotgun.png b/Resources/Textures/Structures/Storage/closet.rsi/shotgun.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/shotgun.png rename to Resources/Textures/Structures/Storage/closet.rsi/shotgun.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/shotguncase.png b/Resources/Textures/Structures/Storage/closet.rsi/shotguncase.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/shotguncase.png rename to Resources/Textures/Structures/Storage/closet.rsi/shotguncase.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/shotguncase_door.png b/Resources/Textures/Structures/Storage/closet.rsi/shotguncase_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/shotguncase_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/shotguncase_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/shotguncase_open.png b/Resources/Textures/Structures/Storage/closet.rsi/shotguncase_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/shotguncase_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/shotguncase_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/sparking.png b/Resources/Textures/Structures/Storage/closet.rsi/sparking.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/sparking.png rename to Resources/Textures/Structures/Storage/closet.rsi/sparking.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/syndicate.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/syndicate.png rename to Resources/Textures/Structures/Storage/closet.rsi/syndicate.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/syndicate_door.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/syndicate_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/syndicate_open.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/syndicate_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/tac.png b/Resources/Textures/Structures/Storage/closet.rsi/tac.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/tac.png rename to Resources/Textures/Structures/Storage/closet.rsi/tac.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/tac_door.png b/Resources/Textures/Structures/Storage/closet.rsi/tac_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/tac_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/tac_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/tac_open.png b/Resources/Textures/Structures/Storage/closet.rsi/tac_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/tac_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/tac_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/unlocked.png b/Resources/Textures/Structures/Storage/closet.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/unlocked.png rename to Resources/Textures/Structures/Storage/closet.rsi/unlocked.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/warden.png b/Resources/Textures/Structures/Storage/closet.rsi/warden.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/warden.png rename to Resources/Textures/Structures/Storage/closet.rsi/warden.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/warden_door.png b/Resources/Textures/Structures/Storage/closet.rsi/warden_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/warden_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/warden_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/warden_open.png b/Resources/Textures/Structures/Storage/closet.rsi/warden_open.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/warden_open.png rename to Resources/Textures/Structures/Storage/closet.rsi/warden_open.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/welded.png b/Resources/Textures/Structures/Storage/closet.rsi/welded.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/welded.png rename to Resources/Textures/Structures/Storage/closet.rsi/welded.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/white_door.png b/Resources/Textures/Structures/Storage/closet.rsi/white_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/white_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/white_door.png diff --git a/Resources/Textures/Constructible/Structures/closet.rsi/yellow_door.png b/Resources/Textures/Structures/Storage/closet.rsi/yellow_door.png similarity index 100% rename from Resources/Textures/Constructible/Structures/closet.rsi/yellow_door.png rename to Resources/Textures/Structures/Storage/closet.rsi/yellow_door.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_active_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_active_light.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_active_light.png rename to Resources/Textures/Structures/Storage/morgue.rsi/crema_active_light.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_closed.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_closed.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_closed.png rename to Resources/Textures/Structures/Storage/morgue.rsi/crema_closed.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_contents_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_contents_light.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_contents_light.png rename to Resources/Textures/Structures/Storage/morgue.rsi/crema_contents_light.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_open.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_open.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_open.png rename to Resources/Textures/Structures/Storage/morgue.rsi/crema_open.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_tray.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_tray.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_tray.png rename to Resources/Textures/Structures/Storage/morgue.rsi/crema_tray.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/meta.json b/Resources/Textures/Structures/Storage/morgue.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/meta.json rename to Resources/Textures/Structures/Storage/morgue.rsi/meta.json diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_closed.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_closed.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_closed.png rename to Resources/Textures/Structures/Storage/morgue.rsi/morgue_closed.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_nomob_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_nomob_light.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_nomob_light.png rename to Resources/Textures/Structures/Storage/morgue.rsi/morgue_nomob_light.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_nosoul_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_nosoul_light.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_nosoul_light.png rename to Resources/Textures/Structures/Storage/morgue.rsi/morgue_nosoul_light.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_open.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_open.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_open.png rename to Resources/Textures/Structures/Storage/morgue.rsi/morgue_open.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_soul_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_soul_light.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_soul_light.png rename to Resources/Textures/Structures/Storage/morgue.rsi/morgue_soul_light.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_tray.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_tray.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_tray.png rename to Resources/Textures/Structures/Storage/morgue.rsi/morgue_tray.png diff --git a/Resources/Textures/Constructible/Misc/tanks.rsi/fueltank.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank.png similarity index 100% rename from Resources/Textures/Constructible/Misc/tanks.rsi/fueltank.png rename to Resources/Textures/Structures/Storage/tanks.rsi/fueltank.png diff --git a/Resources/Textures/Constructible/Misc/tanks.rsi/meta.json b/Resources/Textures/Structures/Storage/tanks.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Misc/tanks.rsi/meta.json rename to Resources/Textures/Structures/Storage/tanks.rsi/meta.json diff --git a/Resources/Textures/Constructible/Misc/tanks.rsi/watertank.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank.png similarity index 100% rename from Resources/Textures/Constructible/Misc/tanks.rsi/watertank.png rename to Resources/Textures/Structures/Storage/tanks.rsi/watertank.png diff --git a/Resources/Textures/Constructible/Lighting/emergency_light.rsi/emergency_light_off.png b/Resources/Textures/Structures/Wallmounts/Lighting/emergency_light.rsi/emergency_light_off.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/emergency_light.rsi/emergency_light_off.png rename to Resources/Textures/Structures/Wallmounts/Lighting/emergency_light.rsi/emergency_light_off.png diff --git a/Resources/Textures/Constructible/Lighting/emergency_light.rsi/emergency_light_on.png b/Resources/Textures/Structures/Wallmounts/Lighting/emergency_light.rsi/emergency_light_on.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/emergency_light.rsi/emergency_light_on.png rename to Resources/Textures/Structures/Wallmounts/Lighting/emergency_light.rsi/emergency_light_on.png diff --git a/Resources/Textures/Constructible/Lighting/emergency_light.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/emergency_light.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Lighting/emergency_light.rsi/meta.json rename to Resources/Textures/Structures/Wallmounts/Lighting/emergency_light.rsi/meta.json diff --git a/Resources/Textures/Constructible/Lighting/light_small.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/light_small.rsi/broken.png rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/broken.png diff --git a/Resources/Textures/Constructible/Lighting/light_small.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/burned.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/light_small.rsi/burned.png rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/burned.png diff --git a/Resources/Textures/Constructible/Lighting/light_small.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/empty.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/light_small.rsi/empty.png rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/empty.png diff --git a/Resources/Textures/Constructible/Lighting/light_small.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Lighting/light_small.rsi/meta.json rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/meta.json diff --git a/Resources/Textures/Constructible/Lighting/light_small.rsi/off.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/light_small.rsi/off.png rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/off.png diff --git a/Resources/Textures/Constructible/Lighting/light_small.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/on.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/light_small.rsi/on.png rename to Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/on.png diff --git a/Resources/Textures/Constructible/Lighting/light_tube.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/light_tube.rsi/broken.png rename to Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png diff --git a/Resources/Textures/Constructible/Lighting/light_tube.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/light_tube.rsi/burned.png rename to Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png diff --git a/Resources/Textures/Constructible/Lighting/light_tube.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/light_tube.rsi/empty.png rename to Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png diff --git a/Resources/Textures/Constructible/Lighting/light_tube.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Lighting/light_tube.rsi/meta.json rename to Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json diff --git a/Resources/Textures/Constructible/Lighting/light_tube.rsi/off.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/light_tube.rsi/off.png rename to Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/off.png diff --git a/Resources/Textures/Constructible/Lighting/light_tube.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/on.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/light_tube.rsi/on.png rename to Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/on.png diff --git a/Resources/Textures/Constructible/Lighting/lighting.rsi/construct.png b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/construct.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/lighting.rsi/construct.png rename to Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/construct.png diff --git a/Resources/Textures/Constructible/Lighting/lighting.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/empty.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/lighting.rsi/empty.png rename to Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/empty.png diff --git a/Resources/Textures/Constructible/Lighting/lighting.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Lighting/lighting.rsi/meta.json rename to Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/meta.json diff --git a/Resources/Textures/Constructible/Lighting/lighting.rsi/off.png b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/lighting.rsi/off.png rename to Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/off.png diff --git a/Resources/Textures/Constructible/Lighting/lighting.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/on.png similarity index 100% rename from Resources/Textures/Constructible/Lighting/lighting.rsi/on.png rename to Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/on.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/birdcage.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/birdcage.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/birdcage.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/birdcage.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/combocafe.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/combocafe.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/combocafe.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/combocafe.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/emergencyrumparty.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/emergencyrumparty.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/emergencyrumparty.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/emergencyrumparty.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/empbarsign.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/empbarsign.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/empbarsign.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/empbarsign.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/emprah.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/emprah.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/emprah.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/emprah.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/empty.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/empty.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/empty.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/enginechange.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/enginechange.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/enginechange.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/enginechange.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/goose.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/goose.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/goose.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/goose.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/lv426.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/lv426.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/lv426.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/lv426.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/maidcafe.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/maidcafe.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/maidcafe.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/maidcafe.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/maltesefalcon.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/maltesefalcon.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/maltesefalcon.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/maltesefalcon.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/meta.json rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/officerbeersky.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/officerbeersky.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/robustacafe.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/robustacafe.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/robustacafe.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/robustacafe.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/the_lightbulb.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/the_lightbulb.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/the_lightbulb.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/the_lightbulb.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thealenath.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thealenath.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/thealenath.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thealenath.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thecoderbus.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thecoderbus.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/thecoderbus.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thecoderbus.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thedrunkcarp.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thedrunkcarp.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/thedrunkcarp.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thedrunkcarp.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/theharmbaton.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/theharmbaton.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/theharmbaton.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/theharmbaton.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thenet.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thenet.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/thenet.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thenet.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/theouterspess.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/theouterspess.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/theouterspess.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/theouterspess.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thesingulo.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thesingulo.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/thesingulo.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thesingulo.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thesun.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thesun.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/thesun.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thesun.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thewiggleroom.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thewiggleroom.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/thewiggleroom.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thewiggleroom.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thewretchedhive.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/thewretchedhive.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/thewretchedhive.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/thewretchedhive.png diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/zocalo.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/zocalo.png similarity index 100% rename from Resources/Textures/Constructible/Misc/barsign.rsi/zocalo.png rename to Resources/Textures/Structures/Wallmounts/barsign.rsi/zocalo.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/closed.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/closed.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/closed.png rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/closed.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher-mini.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher-mini.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher-mini.png rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher-mini.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher.png rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_closed.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_closed.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_closed.png rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_closed.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_empty.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_empty.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_empty.png rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_empty.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_full.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_full.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_full.png rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_full.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_mini.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_mini.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/extinguisher_mini.png rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/extinguisher_mini.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/frame.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/frame.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/frame.png rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/frame.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/meta.json rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/open.png b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/extinguisher_cabinet.rsi/open.png rename to Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/open.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-empty-closed.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-empty-closed.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-empty-closed.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-empty-closed.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-empty-open.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-empty-open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-empty-open.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-empty-open.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-filled-closed.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-filled-closed.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-filled-closed.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-filled-closed.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-filled-open.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-filled-open.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet-filled-open.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet-filled-open.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/cabinet.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/cabinet.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/fireaxe.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/fireaxe.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/fireaxe.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/fireaxe.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-1.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-1.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-1.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-1.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-2.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-2.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-2.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-2.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-3.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-3.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-3.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-3.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-4.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-4.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-4.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-4.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-up.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-up.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass-up.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass-up.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/glass.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/glass.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/locked.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/locked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/locked.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/locked.png diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/meta.json rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/meta.json diff --git a/Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/unlocked.png b/Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/unlocked.png similarity index 100% rename from Resources/Textures/Constructible/Storage/Cabinets/fireaxe_cabinet.rsi/unlocked.png rename to Resources/Textures/Structures/Wallmounts/fireaxe_cabinet.rsi/unlocked.png diff --git a/Resources/Textures/Constructible/Misc/mirror.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/mirror.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Misc/mirror.rsi/meta.json rename to Resources/Textures/Structures/Wallmounts/mirror.rsi/meta.json diff --git a/Resources/Textures/Constructible/Misc/mirror.rsi/mirror.png b/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror.png similarity index 100% rename from Resources/Textures/Constructible/Misc/mirror.rsi/mirror.png rename to Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror.png diff --git a/Resources/Textures/Constructible/Misc/mirror.rsi/mirror_broke.png b/Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror_broke.png similarity index 100% rename from Resources/Textures/Constructible/Misc/mirror.rsi/mirror_broke.png rename to Resources/Textures/Structures/Wallmounts/mirror.rsi/mirror_broke.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/ai.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/ai.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/anomaly.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/anomaly.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/armory.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/armory.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/ass.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/ass.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_air.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_air.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_air.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_air.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_co2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_co2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_co2.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_co2.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_n2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_n2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_n2.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_n2.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_n2o.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_n2o.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_n2o.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_n2o.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_o2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_o2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_o2.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_o2.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_plasma.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_plasma.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_plasma.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_plasma.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmos_waste.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_waste.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/atmos_waste.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmos_waste.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/atmosplaque.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmosplaque.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/atmosplaque.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/atmosplaque.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/bar.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/bar.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/biblio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/biblio.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/bio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bio.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/bio.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/bio.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/biohazard.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/biohazard.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/biohazard.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/biohazard.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/bridge.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/bridge.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/canisters.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/canisters.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/canisters.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/canisters.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/cargo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/cargo.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/cargo_dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/cargo_dock.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/chapel.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/chapel.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/chem.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/chem.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/chemistry1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/chemistry1.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/chemistry2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/chemistry2.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/cloning.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/cloning.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/commander.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/commander.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/conference_room.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/conference_room.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/corrosives.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/corrosives.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/corrosives.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/corrosives.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/cryogenics.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cryogenics.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/cryogenics.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/cryogenics.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/danger.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/danger.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/danger.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/danger.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/deathsposal.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/deathsposal.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_bridge.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bridge.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_bridge.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bridge.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_eng.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_eng.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_eng.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_eng.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_evac.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_evac.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_med.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_med.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_med.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_med.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_sci.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sci.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_sci.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sci.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_sec.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sec.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_sec.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sec.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/direction_supply.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/direction_supply.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/dock.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/doors.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/doors.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/drones.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/drones.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/electrical.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/electrical.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/electrical.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/electrical.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/eng.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/eng.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/engine.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/engine.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/eva.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/eva.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/examroom.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/examroom.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/explosives.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/explosives.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/explosives.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/explosives.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/fire.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/fire.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/fire.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/fire.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/flammable.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/flammable.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/flammable.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/flammable.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/gravi.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/gravi.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/hydro1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/hydro1.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/hydro2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/hydro2.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/hydro3.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/hydro3.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/interrogation.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/interrogation.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/laser.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/laser.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/laser.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/laser.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/magnetics.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/magnetics.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/magnetics.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/magnetics.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/mail.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/mail.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/medbay.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/medbay.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/memetic.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/memetic.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/memetic.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/memetic.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/meta.json rename to Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/miner_dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/miner_dock.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/monkey_painting.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/monkey_painting.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/monkey_painting.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/monkey_painting.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/morgue.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/morgue.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/nosmoking.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/nosmoking.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/nosmoking.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/nosmoking.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/nosmoking2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/nosmoking2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/nosmoking2.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/nosmoking2.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/optical.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/optical.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/optical.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/optical.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/oxidants.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/oxidants.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/oxidants.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/oxidants.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/pods.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/pods.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/pods.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/pods.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/prison.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/prison.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/radiation.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/radiation.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/radiation.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/radiation.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/rnd.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/rnd.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/robo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/robo.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/sci.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/sci.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/science1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/science1.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/science2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/science2.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/secure.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/secure.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/secure.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/secure.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/securearea.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/securearea.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/securearea.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/securearea.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/shield.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/shield.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/shock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/shock.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/shock.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/shock.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/something-old1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/something-old1.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/something-old1.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/something-old1.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/something-old2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/something-old2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/something-old2.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/something-old2.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/space.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/space.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/space.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/surgery.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/surgery.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/telecoms.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/telecoms.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/toxin_res.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxin_res.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/toxin_res.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/toxin_res.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/toxins.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/toxins.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/virology.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/virology.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/xenobio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/xenobio.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/xenobio2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/xenobio2.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/xenolab.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/xenolab.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png diff --git a/Resources/Textures/Constructible/Misc/decals.rsi/zumosplaque.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/zumosplaque.png similarity index 100% rename from Resources/Textures/Constructible/Misc/decals.rsi/zumosplaque.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/zumosplaque.png diff --git a/Resources/Textures/Constructible/Power/switch.rsi/dead.png b/Resources/Textures/Structures/Wallmounts/switch.rsi/dead.png similarity index 100% rename from Resources/Textures/Constructible/Power/switch.rsi/dead.png rename to Resources/Textures/Structures/Wallmounts/switch.rsi/dead.png diff --git a/Resources/Textures/Constructible/Power/switch.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/switch.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/switch.rsi/meta.json rename to Resources/Textures/Structures/Wallmounts/switch.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/switch.rsi/off.png b/Resources/Textures/Structures/Wallmounts/switch.rsi/off.png similarity index 100% rename from Resources/Textures/Constructible/Power/switch.rsi/off.png rename to Resources/Textures/Structures/Wallmounts/switch.rsi/off.png diff --git a/Resources/Textures/Constructible/Power/switch.rsi/on.png b/Resources/Textures/Structures/Wallmounts/switch.rsi/on.png similarity index 100% rename from Resources/Textures/Constructible/Power/switch.rsi/on.png rename to Resources/Textures/Structures/Wallmounts/switch.rsi/on.png diff --git a/Resources/Textures/Constructible/Misc/sylphs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/sylphs.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Misc/sylphs.rsi/meta.json rename to Resources/Textures/Structures/Wallmounts/sylphs.rsi/meta.json diff --git a/Resources/Textures/Constructible/Misc/sylphs.rsi/sylph.png b/Resources/Textures/Structures/Wallmounts/sylphs.rsi/sylph.png similarity index 100% rename from Resources/Textures/Constructible/Misc/sylphs.rsi/sylph.png rename to Resources/Textures/Structures/Wallmounts/sylphs.rsi/sylph.png diff --git a/Resources/Textures/Constructible/Misc/sylphs.rsi/sylphicon.png b/Resources/Textures/Structures/Wallmounts/sylphs.rsi/sylphicon.png similarity index 100% rename from Resources/Textures/Constructible/Misc/sylphs.rsi/sylphicon.png rename to Resources/Textures/Structures/Wallmounts/sylphs.rsi/sylphicon.png diff --git a/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/0.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/0.png rename to Resources/Textures/Structures/Walls/asteroid_rock.rsi/0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/1.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/1.png rename to Resources/Textures/Structures/Walls/asteroid_rock.rsi/1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/2.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/2.png rename to Resources/Textures/Structures/Walls/asteroid_rock.rsi/2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/3.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/3.png rename to Resources/Textures/Structures/Walls/asteroid_rock.rsi/3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/4.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/4.png rename to Resources/Textures/Structures/Walls/asteroid_rock.rsi/4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/meta.json b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/asteroid_rock.rsi/meta.json rename to Resources/Textures/Structures/Walls/asteroid_rock.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/barricades.rsi/barricadewooden.png b/Resources/Textures/Structures/Walls/barricades.rsi/barricadewooden.png similarity index 100% rename from Resources/Textures/Constructible/Structures/barricades.rsi/barricadewooden.png rename to Resources/Textures/Structures/Walls/barricades.rsi/barricadewooden.png diff --git a/Resources/Textures/Constructible/Structures/barricades.rsi/meta.json b/Resources/Textures/Structures/Walls/barricades.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/barricades.rsi/meta.json rename to Resources/Textures/Structures/Walls/barricades.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick0.png b/Resources/Textures/Structures/Walls/brick.rsi/brick0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick0.png rename to Resources/Textures/Structures/Walls/brick.rsi/brick0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick1.png b/Resources/Textures/Structures/Walls/brick.rsi/brick1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick1.png rename to Resources/Textures/Structures/Walls/brick.rsi/brick1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick2.png b/Resources/Textures/Structures/Walls/brick.rsi/brick2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick2.png rename to Resources/Textures/Structures/Walls/brick.rsi/brick2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick3.png b/Resources/Textures/Structures/Walls/brick.rsi/brick3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick3.png rename to Resources/Textures/Structures/Walls/brick.rsi/brick3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick4.png b/Resources/Textures/Structures/Walls/brick.rsi/brick4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick4.png rename to Resources/Textures/Structures/Walls/brick.rsi/brick4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick5.png b/Resources/Textures/Structures/Walls/brick.rsi/brick5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick5.png rename to Resources/Textures/Structures/Walls/brick.rsi/brick5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick6.png b/Resources/Textures/Structures/Walls/brick.rsi/brick6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick6.png rename to Resources/Textures/Structures/Walls/brick.rsi/brick6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick7.png b/Resources/Textures/Structures/Walls/brick.rsi/brick7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/brick7.png rename to Resources/Textures/Structures/Walls/brick.rsi/brick7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/full.png b/Resources/Textures/Structures/Walls/brick.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/full.png rename to Resources/Textures/Structures/Walls/brick.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/brick.rsi/meta.json b/Resources/Textures/Structures/Walls/brick.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/brick.rsi/meta.json rename to Resources/Textures/Structures/Walls/brick.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock0.png b/Resources/Textures/Structures/Walls/clock.rsi/clock0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock0.png rename to Resources/Textures/Structures/Walls/clock.rsi/clock0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock1.png b/Resources/Textures/Structures/Walls/clock.rsi/clock1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock1.png rename to Resources/Textures/Structures/Walls/clock.rsi/clock1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock2.png b/Resources/Textures/Structures/Walls/clock.rsi/clock2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock2.png rename to Resources/Textures/Structures/Walls/clock.rsi/clock2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock3.png b/Resources/Textures/Structures/Walls/clock.rsi/clock3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock3.png rename to Resources/Textures/Structures/Walls/clock.rsi/clock3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock4.png b/Resources/Textures/Structures/Walls/clock.rsi/clock4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock4.png rename to Resources/Textures/Structures/Walls/clock.rsi/clock4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock5.png b/Resources/Textures/Structures/Walls/clock.rsi/clock5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock5.png rename to Resources/Textures/Structures/Walls/clock.rsi/clock5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock6.png b/Resources/Textures/Structures/Walls/clock.rsi/clock6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock6.png rename to Resources/Textures/Structures/Walls/clock.rsi/clock6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock7.png b/Resources/Textures/Structures/Walls/clock.rsi/clock7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/clock7.png rename to Resources/Textures/Structures/Walls/clock.rsi/clock7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/full.png b/Resources/Textures/Structures/Walls/clock.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/full.png rename to Resources/Textures/Structures/Walls/clock.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clock.rsi/meta.json b/Resources/Textures/Structures/Walls/clock.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clock.rsi/meta.json rename to Resources/Textures/Structures/Walls/clock.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown0.png b/Resources/Textures/Structures/Walls/clown.rsi/clown0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown0.png rename to Resources/Textures/Structures/Walls/clown.rsi/clown0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown1.png b/Resources/Textures/Structures/Walls/clown.rsi/clown1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown1.png rename to Resources/Textures/Structures/Walls/clown.rsi/clown1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown2.png b/Resources/Textures/Structures/Walls/clown.rsi/clown2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown2.png rename to Resources/Textures/Structures/Walls/clown.rsi/clown2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown3.png b/Resources/Textures/Structures/Walls/clown.rsi/clown3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown3.png rename to Resources/Textures/Structures/Walls/clown.rsi/clown3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown4.png b/Resources/Textures/Structures/Walls/clown.rsi/clown4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown4.png rename to Resources/Textures/Structures/Walls/clown.rsi/clown4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown5.png b/Resources/Textures/Structures/Walls/clown.rsi/clown5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown5.png rename to Resources/Textures/Structures/Walls/clown.rsi/clown5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown6.png b/Resources/Textures/Structures/Walls/clown.rsi/clown6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown6.png rename to Resources/Textures/Structures/Walls/clown.rsi/clown6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown7.png b/Resources/Textures/Structures/Walls/clown.rsi/clown7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/clown7.png rename to Resources/Textures/Structures/Walls/clown.rsi/clown7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/full.png b/Resources/Textures/Structures/Walls/clown.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/full.png rename to Resources/Textures/Structures/Walls/clown.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/clown.rsi/meta.json b/Resources/Textures/Structures/Walls/clown.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/clown.rsi/meta.json rename to Resources/Textures/Structures/Walls/clown.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult0.png b/Resources/Textures/Structures/Walls/cult.rsi/cult0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult0.png rename to Resources/Textures/Structures/Walls/cult.rsi/cult0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult1.png b/Resources/Textures/Structures/Walls/cult.rsi/cult1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult1.png rename to Resources/Textures/Structures/Walls/cult.rsi/cult1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult2.png b/Resources/Textures/Structures/Walls/cult.rsi/cult2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult2.png rename to Resources/Textures/Structures/Walls/cult.rsi/cult2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult3.png b/Resources/Textures/Structures/Walls/cult.rsi/cult3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult3.png rename to Resources/Textures/Structures/Walls/cult.rsi/cult3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult4.png b/Resources/Textures/Structures/Walls/cult.rsi/cult4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult4.png rename to Resources/Textures/Structures/Walls/cult.rsi/cult4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult5.png b/Resources/Textures/Structures/Walls/cult.rsi/cult5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult5.png rename to Resources/Textures/Structures/Walls/cult.rsi/cult5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult6.png b/Resources/Textures/Structures/Walls/cult.rsi/cult6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult6.png rename to Resources/Textures/Structures/Walls/cult.rsi/cult6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult7.png b/Resources/Textures/Structures/Walls/cult.rsi/cult7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/cult7.png rename to Resources/Textures/Structures/Walls/cult.rsi/cult7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/full.png b/Resources/Textures/Structures/Walls/cult.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/full.png rename to Resources/Textures/Structures/Walls/cult.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/cult.rsi/meta.json b/Resources/Textures/Structures/Walls/cult.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/cult.rsi/meta.json rename to Resources/Textures/Structures/Walls/cult.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug0.png b/Resources/Textures/Structures/Walls/debug.rsi/debug0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug0.png rename to Resources/Textures/Structures/Walls/debug.rsi/debug0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug1.png b/Resources/Textures/Structures/Walls/debug.rsi/debug1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug1.png rename to Resources/Textures/Structures/Walls/debug.rsi/debug1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug2.png b/Resources/Textures/Structures/Walls/debug.rsi/debug2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug2.png rename to Resources/Textures/Structures/Walls/debug.rsi/debug2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug3.png b/Resources/Textures/Structures/Walls/debug.rsi/debug3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug3.png rename to Resources/Textures/Structures/Walls/debug.rsi/debug3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug4.png b/Resources/Textures/Structures/Walls/debug.rsi/debug4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug4.png rename to Resources/Textures/Structures/Walls/debug.rsi/debug4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug5.png b/Resources/Textures/Structures/Walls/debug.rsi/debug5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug5.png rename to Resources/Textures/Structures/Walls/debug.rsi/debug5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug6.png b/Resources/Textures/Structures/Walls/debug.rsi/debug6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug6.png rename to Resources/Textures/Structures/Walls/debug.rsi/debug6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug7.png b/Resources/Textures/Structures/Walls/debug.rsi/debug7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/debug7.png rename to Resources/Textures/Structures/Walls/debug.rsi/debug7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/full.png b/Resources/Textures/Structures/Walls/debug.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/full.png rename to Resources/Textures/Structures/Walls/debug.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/debug.rsi/meta.json b/Resources/Textures/Structures/Walls/debug.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/debug.rsi/meta.json rename to Resources/Textures/Structures/Walls/debug.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond0.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond0.png rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond1.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond1.png rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond2.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond2.png rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond3.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond3.png rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond4.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond4.png rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond5.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond5.png rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond6.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond6.png rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond7.png b/Resources/Textures/Structures/Walls/diamond.rsi/diamond7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/diamond7.png rename to Resources/Textures/Structures/Walls/diamond.rsi/diamond7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/full.png b/Resources/Textures/Structures/Walls/diamond.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/full.png rename to Resources/Textures/Structures/Walls/diamond.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/diamond.rsi/meta.json b/Resources/Textures/Structures/Walls/diamond.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/diamond.rsi/meta.json rename to Resources/Textures/Structures/Walls/diamond.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/full.png b/Resources/Textures/Structures/Walls/gold.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/full.png rename to Resources/Textures/Structures/Walls/gold.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold0.png b/Resources/Textures/Structures/Walls/gold.rsi/gold0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold0.png rename to Resources/Textures/Structures/Walls/gold.rsi/gold0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold1.png b/Resources/Textures/Structures/Walls/gold.rsi/gold1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold1.png rename to Resources/Textures/Structures/Walls/gold.rsi/gold1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold2.png b/Resources/Textures/Structures/Walls/gold.rsi/gold2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold2.png rename to Resources/Textures/Structures/Walls/gold.rsi/gold2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold3.png b/Resources/Textures/Structures/Walls/gold.rsi/gold3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold3.png rename to Resources/Textures/Structures/Walls/gold.rsi/gold3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold4.png b/Resources/Textures/Structures/Walls/gold.rsi/gold4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold4.png rename to Resources/Textures/Structures/Walls/gold.rsi/gold4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold5.png b/Resources/Textures/Structures/Walls/gold.rsi/gold5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold5.png rename to Resources/Textures/Structures/Walls/gold.rsi/gold5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold6.png b/Resources/Textures/Structures/Walls/gold.rsi/gold6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold6.png rename to Resources/Textures/Structures/Walls/gold.rsi/gold6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold7.png b/Resources/Textures/Structures/Walls/gold.rsi/gold7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/gold7.png rename to Resources/Textures/Structures/Walls/gold.rsi/gold7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/gold.rsi/meta.json b/Resources/Textures/Structures/Walls/gold.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/gold.rsi/meta.json rename to Resources/Textures/Structures/Walls/gold.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/full.png b/Resources/Textures/Structures/Walls/ice.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/full.png rename to Resources/Textures/Structures/Walls/ice.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice0.png b/Resources/Textures/Structures/Walls/ice.rsi/ice0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice0.png rename to Resources/Textures/Structures/Walls/ice.rsi/ice0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice1.png b/Resources/Textures/Structures/Walls/ice.rsi/ice1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice1.png rename to Resources/Textures/Structures/Walls/ice.rsi/ice1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice2.png b/Resources/Textures/Structures/Walls/ice.rsi/ice2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice2.png rename to Resources/Textures/Structures/Walls/ice.rsi/ice2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice3.png b/Resources/Textures/Structures/Walls/ice.rsi/ice3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice3.png rename to Resources/Textures/Structures/Walls/ice.rsi/ice3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice4.png b/Resources/Textures/Structures/Walls/ice.rsi/ice4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice4.png rename to Resources/Textures/Structures/Walls/ice.rsi/ice4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice5.png b/Resources/Textures/Structures/Walls/ice.rsi/ice5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice5.png rename to Resources/Textures/Structures/Walls/ice.rsi/ice5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice6.png b/Resources/Textures/Structures/Walls/ice.rsi/ice6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice6.png rename to Resources/Textures/Structures/Walls/ice.rsi/ice6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice7.png b/Resources/Textures/Structures/Walls/ice.rsi/ice7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/ice7.png rename to Resources/Textures/Structures/Walls/ice.rsi/ice7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/ice.rsi/meta.json b/Resources/Textures/Structures/Walls/ice.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/ice.rsi/meta.json rename to Resources/Textures/Structures/Walls/ice.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/meta.json b/Resources/Textures/Structures/Walls/low_wall.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/meta.json rename to Resources/Textures/Structures/Walls/low_wall.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_0.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_0.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_1.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_1.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_2.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_2.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_3.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_3.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_4.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_4.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_5.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_5.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_6.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_6.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_7.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_7.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_0.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_0.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_1.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_1.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_2.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_2.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_3.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_3.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_4.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_4.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_5.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_5.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_6.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_6.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_7.png b/Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/low_wall.rsi/metal_over_7.png rename to Resources/Textures/Structures/Walls/low_wall.rsi/metal_over_7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/full.png b/Resources/Textures/Structures/Walls/metal.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/full.png rename to Resources/Textures/Structures/Walls/metal.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/meta.json b/Resources/Textures/Structures/Walls/metal.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/meta.json rename to Resources/Textures/Structures/Walls/metal.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal0.png b/Resources/Textures/Structures/Walls/metal.rsi/metal0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal0.png rename to Resources/Textures/Structures/Walls/metal.rsi/metal0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal1.png b/Resources/Textures/Structures/Walls/metal.rsi/metal1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal1.png rename to Resources/Textures/Structures/Walls/metal.rsi/metal1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal2.png b/Resources/Textures/Structures/Walls/metal.rsi/metal2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal2.png rename to Resources/Textures/Structures/Walls/metal.rsi/metal2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal3.png b/Resources/Textures/Structures/Walls/metal.rsi/metal3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal3.png rename to Resources/Textures/Structures/Walls/metal.rsi/metal3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal4.png b/Resources/Textures/Structures/Walls/metal.rsi/metal4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal4.png rename to Resources/Textures/Structures/Walls/metal.rsi/metal4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal5.png b/Resources/Textures/Structures/Walls/metal.rsi/metal5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal5.png rename to Resources/Textures/Structures/Walls/metal.rsi/metal5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal6.png b/Resources/Textures/Structures/Walls/metal.rsi/metal6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal6.png rename to Resources/Textures/Structures/Walls/metal.rsi/metal6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal7.png b/Resources/Textures/Structures/Walls/metal.rsi/metal7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/metal.rsi/metal7.png rename to Resources/Textures/Structures/Walls/metal.rsi/metal7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/full.png b/Resources/Textures/Structures/Walls/plasma.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/full.png rename to Resources/Textures/Structures/Walls/plasma.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/meta.json b/Resources/Textures/Structures/Walls/plasma.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/meta.json rename to Resources/Textures/Structures/Walls/plasma.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma0.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma0.png rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma1.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma1.png rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma2.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma2.png rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma3.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma3.png rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma4.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma4.png rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma5.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma5.png rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma6.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma6.png rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma7.png b/Resources/Textures/Structures/Walls/plasma.rsi/plasma7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plasma.rsi/plasma7.png rename to Resources/Textures/Structures/Walls/plasma.rsi/plasma7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/full.png b/Resources/Textures/Structures/Walls/plastic.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/full.png rename to Resources/Textures/Structures/Walls/plastic.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/meta.json b/Resources/Textures/Structures/Walls/plastic.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/meta.json rename to Resources/Textures/Structures/Walls/plastic.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic0.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic0.png rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic1.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic1.png rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic2.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic2.png rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic3.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic3.png rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic4.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic4.png rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic5.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic5.png rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic6.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic6.png rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic7.png b/Resources/Textures/Structures/Walls/plastic.rsi/plastic7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/plastic.rsi/plastic7.png rename to Resources/Textures/Structures/Walls/plastic.rsi/plastic7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/full.png b/Resources/Textures/Structures/Walls/riveted.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/full.png rename to Resources/Textures/Structures/Walls/riveted.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/meta.json b/Resources/Textures/Structures/Walls/riveted.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/meta.json rename to Resources/Textures/Structures/Walls/riveted.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted0.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted0.png rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted1.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted1.png rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted2.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted2.png rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted3.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted3.png rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted4.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted4.png rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted5.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted5.png rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted6.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted6.png rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted7.png b/Resources/Textures/Structures/Walls/riveted.rsi/riveted7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/riveted.rsi/riveted7.png rename to Resources/Textures/Structures/Walls/riveted.rsi/riveted7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/full.png b/Resources/Textures/Structures/Walls/sandstone.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/full.png rename to Resources/Textures/Structures/Walls/sandstone.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/meta.json b/Resources/Textures/Structures/Walls/sandstone.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/meta.json rename to Resources/Textures/Structures/Walls/sandstone.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone0.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone0.png rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone1.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone1.png rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone2.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone2.png rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone3.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone3.png rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone4.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone4.png rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone5.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone5.png rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone6.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone6.png rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone7.png b/Resources/Textures/Structures/Walls/sandstone.rsi/sandstone7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/sandstone.rsi/sandstone7.png rename to Resources/Textures/Structures/Walls/sandstone.rsi/sandstone7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/full.png b/Resources/Textures/Structures/Walls/silver.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/full.png rename to Resources/Textures/Structures/Walls/silver.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/meta.json b/Resources/Textures/Structures/Walls/silver.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/meta.json rename to Resources/Textures/Structures/Walls/silver.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver0.png b/Resources/Textures/Structures/Walls/silver.rsi/silver0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver0.png rename to Resources/Textures/Structures/Walls/silver.rsi/silver0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver1.png b/Resources/Textures/Structures/Walls/silver.rsi/silver1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver1.png rename to Resources/Textures/Structures/Walls/silver.rsi/silver1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver2.png b/Resources/Textures/Structures/Walls/silver.rsi/silver2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver2.png rename to Resources/Textures/Structures/Walls/silver.rsi/silver2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver3.png b/Resources/Textures/Structures/Walls/silver.rsi/silver3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver3.png rename to Resources/Textures/Structures/Walls/silver.rsi/silver3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver4.png b/Resources/Textures/Structures/Walls/silver.rsi/silver4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver4.png rename to Resources/Textures/Structures/Walls/silver.rsi/silver4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver5.png b/Resources/Textures/Structures/Walls/silver.rsi/silver5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver5.png rename to Resources/Textures/Structures/Walls/silver.rsi/silver5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver6.png b/Resources/Textures/Structures/Walls/silver.rsi/silver6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver6.png rename to Resources/Textures/Structures/Walls/silver.rsi/silver6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver7.png b/Resources/Textures/Structures/Walls/silver.rsi/silver7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/silver.rsi/silver7.png rename to Resources/Textures/Structures/Walls/silver.rsi/silver7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/full.png b/Resources/Textures/Structures/Walls/solid.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/full.png rename to Resources/Textures/Structures/Walls/solid.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/meta.json b/Resources/Textures/Structures/Walls/solid.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/meta.json rename to Resources/Textures/Structures/Walls/solid.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-0.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-1.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-2.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-3.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-4.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_construct-5.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_cult.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_cult.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_cult.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_cult.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_metal.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_metal.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_metal.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_metal.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over0.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over1.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over2.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over3.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over4.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over5.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over6.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinf_over7.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinforced_wall_girder.png b/Resources/Textures/Structures/Walls/solid.rsi/reinforced_wall_girder.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/reinforced_wall_girder.png rename to Resources/Textures/Structures/Walls/solid.rsi/reinforced_wall_girder.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/rgeneric.png rename to Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid0.png rename to Resources/Textures/Structures/Walls/solid.rsi/solid0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid1.png rename to Resources/Textures/Structures/Walls/solid.rsi/solid1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid.rsi/solid2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid2.png rename to Resources/Textures/Structures/Walls/solid.rsi/solid2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid3.png rename to Resources/Textures/Structures/Walls/solid.rsi/solid3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid.rsi/solid4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid4.png rename to Resources/Textures/Structures/Walls/solid.rsi/solid4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid5.png rename to Resources/Textures/Structures/Walls/solid.rsi/solid5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid.rsi/solid6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid6.png rename to Resources/Textures/Structures/Walls/solid.rsi/solid6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/solid7.png rename to Resources/Textures/Structures/Walls/solid.rsi/solid7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/solid.rsi/wall_girder.png b/Resources/Textures/Structures/Walls/solid.rsi/wall_girder.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/solid.rsi/wall_girder.png rename to Resources/Textures/Structures/Walls/solid.rsi/wall_girder.png diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/full.png b/Resources/Textures/Structures/Walls/uranium.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/full.png rename to Resources/Textures/Structures/Walls/uranium.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/meta.json b/Resources/Textures/Structures/Walls/uranium.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/meta.json rename to Resources/Textures/Structures/Walls/uranium.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium0.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium0.png rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium1.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium1.png rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium2.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium2.png rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium3.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium3.png rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium4.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium4.png rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium5.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium5.png rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium6.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium6.png rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium7.png b/Resources/Textures/Structures/Walls/uranium.rsi/uranium7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/uranium.rsi/uranium7.png rename to Resources/Textures/Structures/Walls/uranium.rsi/uranium7.png diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/full.png b/Resources/Textures/Structures/Walls/wood.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/full.png rename to Resources/Textures/Structures/Walls/wood.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/meta.json b/Resources/Textures/Structures/Walls/wood.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/meta.json rename to Resources/Textures/Structures/Walls/wood.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood0.png b/Resources/Textures/Structures/Walls/wood.rsi/wood0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood0.png rename to Resources/Textures/Structures/Walls/wood.rsi/wood0.png diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood1.png b/Resources/Textures/Structures/Walls/wood.rsi/wood1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood1.png rename to Resources/Textures/Structures/Walls/wood.rsi/wood1.png diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood2.png b/Resources/Textures/Structures/Walls/wood.rsi/wood2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood2.png rename to Resources/Textures/Structures/Walls/wood.rsi/wood2.png diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood3.png b/Resources/Textures/Structures/Walls/wood.rsi/wood3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood3.png rename to Resources/Textures/Structures/Walls/wood.rsi/wood3.png diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood4.png b/Resources/Textures/Structures/Walls/wood.rsi/wood4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood4.png rename to Resources/Textures/Structures/Walls/wood.rsi/wood4.png diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood5.png b/Resources/Textures/Structures/Walls/wood.rsi/wood5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood5.png rename to Resources/Textures/Structures/Walls/wood.rsi/wood5.png diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood6.png b/Resources/Textures/Structures/Walls/wood.rsi/wood6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood6.png rename to Resources/Textures/Structures/Walls/wood.rsi/wood6.png diff --git a/Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood7.png b/Resources/Textures/Structures/Walls/wood.rsi/wood7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Walls/wood.rsi/wood7.png rename to Resources/Textures/Structures/Walls/wood.rsi/wood7.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_1.png rename to Resources/Textures/Structures/Windows/cracks.rsi/0_1.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_2.png rename to Resources/Textures/Structures/Windows/cracks.rsi/0_2.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_3.png rename to Resources/Textures/Structures/Windows/cracks.rsi/0_3.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_4.png rename to Resources/Textures/Structures/Windows/cracks.rsi/0_4.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/0_5.png rename to Resources/Textures/Structures/Windows/cracks.rsi/0_5.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_1.png rename to Resources/Textures/Structures/Windows/cracks.rsi/1_1.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_2.png rename to Resources/Textures/Structures/Windows/cracks.rsi/1_2.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_3.png rename to Resources/Textures/Structures/Windows/cracks.rsi/1_3.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_4.png rename to Resources/Textures/Structures/Windows/cracks.rsi/1_4.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/1_5.png rename to Resources/Textures/Structures/Windows/cracks.rsi/1_5.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_1.png rename to Resources/Textures/Structures/Windows/cracks.rsi/2_1.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_2.png rename to Resources/Textures/Structures/Windows/cracks.rsi/2_2.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_3.png rename to Resources/Textures/Structures/Windows/cracks.rsi/2_3.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_4.png rename to Resources/Textures/Structures/Windows/cracks.rsi/2_4.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/2_5.png rename to Resources/Textures/Structures/Windows/cracks.rsi/2_5.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_1.png rename to Resources/Textures/Structures/Windows/cracks.rsi/3_1.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_2.png rename to Resources/Textures/Structures/Windows/cracks.rsi/3_2.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_3.png rename to Resources/Textures/Structures/Windows/cracks.rsi/3_3.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_4.png rename to Resources/Textures/Structures/Windows/cracks.rsi/3_4.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/3_5.png rename to Resources/Textures/Structures/Windows/cracks.rsi/3_5.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_1.png rename to Resources/Textures/Structures/Windows/cracks.rsi/4_1.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_2.png rename to Resources/Textures/Structures/Windows/cracks.rsi/4_2.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_3.png rename to Resources/Textures/Structures/Windows/cracks.rsi/4_3.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_4.png rename to Resources/Textures/Structures/Windows/cracks.rsi/4_4.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/4_5.png rename to Resources/Textures/Structures/Windows/cracks.rsi/4_5.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_1.png rename to Resources/Textures/Structures/Windows/cracks.rsi/5_1.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_2.png rename to Resources/Textures/Structures/Windows/cracks.rsi/5_2.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_3.png rename to Resources/Textures/Structures/Windows/cracks.rsi/5_3.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_4.png rename to Resources/Textures/Structures/Windows/cracks.rsi/5_4.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/5_5.png rename to Resources/Textures/Structures/Windows/cracks.rsi/5_5.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_1.png rename to Resources/Textures/Structures/Windows/cracks.rsi/6_1.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_2.png rename to Resources/Textures/Structures/Windows/cracks.rsi/6_2.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_3.png rename to Resources/Textures/Structures/Windows/cracks.rsi/6_3.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_4.png rename to Resources/Textures/Structures/Windows/cracks.rsi/6_4.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/6_5.png rename to Resources/Textures/Structures/Windows/cracks.rsi/6_5.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_1.png rename to Resources/Textures/Structures/Windows/cracks.rsi/7_1.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_2.png rename to Resources/Textures/Structures/Windows/cracks.rsi/7_2.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_3.png rename to Resources/Textures/Structures/Windows/cracks.rsi/7_3.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_4.png rename to Resources/Textures/Structures/Windows/cracks.rsi/7_4.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/7_5.png rename to Resources/Textures/Structures/Windows/cracks.rsi/7_5.png diff --git a/Resources/Textures/Constructible/Structures/Windows/cracks.rsi/meta.json b/Resources/Textures/Structures/Windows/cracks.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/cracks.rsi/meta.json rename to Resources/Textures/Structures/Windows/cracks.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/full.png rename to Resources/Textures/Structures/Windows/plasma_window.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/meta.json rename to Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow0.png rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow1.png rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow2.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow2.png rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow3.png rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow4.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow4.png rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow5.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow5.png rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow6.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow6.png rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png diff --git a/Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow7.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/plasma_window.rsi/pwindow7.png rename to Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/full.png rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/meta.json rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow0.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow0.png rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow1.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow1.png rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow2.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow2.png rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow3.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow3.png rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow4.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow4.png rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow5.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow5.png rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow6.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow6.png rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png diff --git a/Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow7.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/reinforced_window.rsi/rwindow7.png rename to Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/full.png b/Resources/Textures/Structures/Windows/window.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/full.png rename to Resources/Textures/Structures/Windows/window.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/meta.json b/Resources/Textures/Structures/Windows/window.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/meta.json rename to Resources/Textures/Structures/Windows/window.rsi/meta.json diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window0.png b/Resources/Textures/Structures/Windows/window.rsi/window0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window0.png rename to Resources/Textures/Structures/Windows/window.rsi/window0.png diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window1.png b/Resources/Textures/Structures/Windows/window.rsi/window1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window1.png rename to Resources/Textures/Structures/Windows/window.rsi/window1.png diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window2.png b/Resources/Textures/Structures/Windows/window.rsi/window2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window2.png rename to Resources/Textures/Structures/Windows/window.rsi/window2.png diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window3.png b/Resources/Textures/Structures/Windows/window.rsi/window3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window3.png rename to Resources/Textures/Structures/Windows/window.rsi/window3.png diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window4.png b/Resources/Textures/Structures/Windows/window.rsi/window4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window4.png rename to Resources/Textures/Structures/Windows/window.rsi/window4.png diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window5.png b/Resources/Textures/Structures/Windows/window.rsi/window5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window5.png rename to Resources/Textures/Structures/Windows/window.rsi/window5.png diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window6.png b/Resources/Textures/Structures/Windows/window.rsi/window6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window6.png rename to Resources/Textures/Structures/Windows/window.rsi/window6.png diff --git a/Resources/Textures/Constructible/Structures/Windows/window.rsi/window7.png b/Resources/Textures/Structures/Windows/window.rsi/window7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Windows/window.rsi/window7.png rename to Resources/Textures/Structures/Windows/window.rsi/window7.png diff --git a/Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/beam.png b/Resources/Textures/Structures/cargo_telepad.rsi/beam.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/beam.png rename to Resources/Textures/Structures/cargo_telepad.rsi/beam.png diff --git a/Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/idle.png b/Resources/Textures/Structures/cargo_telepad.rsi/idle.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/idle.png rename to Resources/Textures/Structures/cargo_telepad.rsi/idle.png diff --git a/Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/meta.json b/Resources/Textures/Structures/cargo_telepad.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/meta.json rename to Resources/Textures/Structures/cargo_telepad.rsi/meta.json diff --git a/Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/offline.png b/Resources/Textures/Structures/cargo_telepad.rsi/offline.png similarity index 100% rename from Resources/Textures/Constructible/Specific/Cargo/teleporter.rsi/offline.png rename to Resources/Textures/Structures/cargo_telepad.rsi/offline.png diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_0.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_0.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_0.png rename to Resources/Textures/Structures/catwalk.rsi/catwalk_0.png diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_1.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_1.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_1.png rename to Resources/Textures/Structures/catwalk.rsi/catwalk_1.png diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_2.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_2.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_2.png rename to Resources/Textures/Structures/catwalk.rsi/catwalk_2.png diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_3.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_3.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_3.png rename to Resources/Textures/Structures/catwalk.rsi/catwalk_3.png diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_4.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_4.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_4.png rename to Resources/Textures/Structures/catwalk.rsi/catwalk_4.png diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_5.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_5.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_5.png rename to Resources/Textures/Structures/catwalk.rsi/catwalk_5.png diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_6.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_6.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_6.png rename to Resources/Textures/Structures/catwalk.rsi/catwalk_6.png diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_7.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_7.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_7.png rename to Resources/Textures/Structures/catwalk.rsi/catwalk_7.png diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_preview.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/catwalk_preview.png rename to Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png diff --git a/Resources/Textures/Constructible/Tiles/catwalk.rsi/meta.json b/Resources/Textures/Structures/catwalk.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Tiles/catwalk.rsi/meta.json rename to Resources/Textures/Structures/catwalk.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_loose.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_loose.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_loose.png rename to Resources/Textures/Structures/conveyor.rsi/conveyor_loose.png diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_ccw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_ccw.png rename to Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw.png diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_ccw_r.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw_r.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_ccw_r.png rename to Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw_r.png diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_cw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_cw.png rename to Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw.png diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_cw_r.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw_r.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_started_cw_r.png rename to Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw_r.png diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_stopped_ccw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_ccw.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_stopped_ccw.png rename to Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_ccw.png diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_stopped_cw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_cw.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/conveyor_stopped_cw.png rename to Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_cw.png diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/greenlight.png b/Resources/Textures/Structures/conveyor.rsi/greenlight.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/greenlight.png rename to Resources/Textures/Structures/conveyor.rsi/greenlight.png diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/meta.json b/Resources/Textures/Structures/conveyor.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/meta.json rename to Resources/Textures/Structures/conveyor.rsi/meta.json diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/redlight.png b/Resources/Textures/Structures/conveyor.rsi/redlight.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/redlight.png rename to Resources/Textures/Structures/conveyor.rsi/redlight.png diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/switch-fwd.png b/Resources/Textures/Structures/conveyor.rsi/switch-fwd.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/switch-fwd.png rename to Resources/Textures/Structures/conveyor.rsi/switch-fwd.png diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/switch-off.png b/Resources/Textures/Structures/conveyor.rsi/switch-off.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/switch-off.png rename to Resources/Textures/Structures/conveyor.rsi/switch-off.png diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/switch-rev.png b/Resources/Textures/Structures/conveyor.rsi/switch-rev.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/switch-rev.png rename to Resources/Textures/Structures/conveyor.rsi/switch-rev.png diff --git a/Resources/Textures/Constructible/Power/conveyor.rsi/switch.png b/Resources/Textures/Structures/conveyor.rsi/switch.png similarity index 100% rename from Resources/Textures/Constructible/Power/conveyor.rsi/switch.png rename to Resources/Textures/Structures/conveyor.rsi/switch.png diff --git a/Resources/Textures/Constructible/Power/dispensers.rsi/booze_dispenser.png b/Resources/Textures/Structures/dispensers.rsi/booze_dispenser.png similarity index 100% rename from Resources/Textures/Constructible/Power/dispensers.rsi/booze_dispenser.png rename to Resources/Textures/Structures/dispensers.rsi/booze_dispenser.png diff --git a/Resources/Textures/Constructible/Power/dispensers.rsi/dispenser.png b/Resources/Textures/Structures/dispensers.rsi/dispenser.png similarity index 100% rename from Resources/Textures/Constructible/Power/dispensers.rsi/dispenser.png rename to Resources/Textures/Structures/dispensers.rsi/dispenser.png diff --git a/Resources/Textures/Constructible/Power/industrial_dispenser.rsi/industrial_dispenser.png b/Resources/Textures/Structures/dispensers.rsi/industrial_dispenser.png similarity index 100% rename from Resources/Textures/Constructible/Power/industrial_dispenser.rsi/industrial_dispenser.png rename to Resources/Textures/Structures/dispensers.rsi/industrial_dispenser.png diff --git a/Resources/Textures/Constructible/Power/dispensers.rsi/meta.json b/Resources/Textures/Structures/dispensers.rsi/meta.json similarity index 52% rename from Resources/Textures/Constructible/Power/dispensers.rsi/meta.json rename to Resources/Textures/Structures/dispensers.rsi/meta.json index 763c13fbcb..bef6bf2fad 100644 --- a/Resources/Textures/Constructible/Power/dispensers.rsi/meta.json +++ b/Resources/Textures/Structures/dispensers.rsi/meta.json @@ -1,35 +1,23 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", "states": [ { - "name": "booze_dispenser", - "delays": [ - [ - 1 - ] - ] + "name": "booze_dispenser" }, { - "name": "soda_dispenser", - "delays": [ - [ - 1 - ] - ] + "name": "industrial_dispenser" }, { - "name": "dispenser", - "delays": [ - [ - 1 - ] - ] + "name": "soda_dispenser" + }, + { + "name": "dispenser" } ] } diff --git a/Resources/Textures/Constructible/Power/dispensers.rsi/soda_dispenser.png b/Resources/Textures/Structures/dispensers.rsi/soda_dispenser.png similarity index 100% rename from Resources/Textures/Constructible/Power/dispensers.rsi/soda_dispenser.png rename to Resources/Textures/Structures/dispensers.rsi/soda_dispenser.png diff --git a/Resources/Textures/Constructible/Misc/kitchen.rsi/meta.json b/Resources/Textures/Structures/meat_spike.rsi/meta.json similarity index 100% rename from Resources/Textures/Constructible/Misc/kitchen.rsi/meta.json rename to Resources/Textures/Structures/meat_spike.rsi/meta.json diff --git a/Resources/Textures/Constructible/Misc/kitchen.rsi/spike.png b/Resources/Textures/Structures/meat_spike.rsi/spike.png similarity index 100% rename from Resources/Textures/Constructible/Misc/kitchen.rsi/spike.png rename to Resources/Textures/Structures/meat_spike.rsi/spike.png diff --git a/Resources/Textures/Constructible/Misc/kitchen.rsi/spikebloody.png b/Resources/Textures/Structures/meat_spike.rsi/spikebloody.png similarity index 100% rename from Resources/Textures/Constructible/Misc/kitchen.rsi/spikebloody.png rename to Resources/Textures/Structures/meat_spike.rsi/spikebloody.png diff --git a/Resources/Textures/Constructible/Misc/kitchen.rsi/spikebloodygreen.png b/Resources/Textures/Structures/meat_spike.rsi/spikebloodygreen.png similarity index 100% rename from Resources/Textures/Constructible/Misc/kitchen.rsi/spikebloodygreen.png rename to Resources/Textures/Structures/meat_spike.rsi/spikebloodygreen.png diff --git a/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand0.png b/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand0.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand0.png rename to Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand0.png diff --git a/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand1.png b/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand1.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand1.png rename to Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand1.png diff --git a/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand2.png b/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand2.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand2.png rename to Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand2.png diff --git a/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand_dug.png b/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand_dug.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/Asteroid/asteroid_coarse_sand_dug.png rename to Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand_dug.png diff --git a/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_sand.png b/Resources/Textures/Tiles/Asteroid/asteroid_sand.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/Asteroid/asteroid_sand.png rename to Resources/Textures/Tiles/Asteroid/asteroid_sand.png diff --git a/Resources/Textures/Constructible/Tiles/Asteroid/asteroid_tile.png b/Resources/Textures/Tiles/Asteroid/asteroid_tile.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/Asteroid/asteroid_tile.png rename to Resources/Textures/Tiles/Asteroid/asteroid_tile.png diff --git a/Resources/Textures/Constructible/Tiles/blue.png b/Resources/Textures/Tiles/blue.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/blue.png rename to Resources/Textures/Tiles/blue.png diff --git a/Resources/Textures/Constructible/Tiles/copyright.txt b/Resources/Textures/Tiles/copyright.txt similarity index 100% rename from Resources/Textures/Constructible/Tiles/copyright.txt rename to Resources/Textures/Tiles/copyright.txt diff --git a/Resources/Textures/Constructible/Tiles/dark.png b/Resources/Textures/Tiles/dark.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/dark.png rename to Resources/Textures/Tiles/dark.png diff --git a/Resources/Textures/Constructible/Tiles/elevator_shaft.png b/Resources/Textures/Tiles/elevator_shaft.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/elevator_shaft.png rename to Resources/Textures/Tiles/elevator_shaft.png diff --git a/Resources/Textures/Constructible/Tiles/freezer.png b/Resources/Textures/Tiles/freezer.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/freezer.png rename to Resources/Textures/Tiles/freezer.png diff --git a/Resources/Textures/Constructible/Tiles/glass.png b/Resources/Textures/Tiles/glass.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/glass.png rename to Resources/Textures/Tiles/glass.png diff --git a/Resources/Textures/Constructible/Tiles/gold.png b/Resources/Textures/Tiles/gold.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/gold.png rename to Resources/Textures/Tiles/gold.png diff --git a/Resources/Textures/Constructible/Tiles/green_circuit.png b/Resources/Textures/Tiles/green_circuit.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/green_circuit.png rename to Resources/Textures/Tiles/green_circuit.png diff --git a/Resources/Textures/Constructible/Tiles/hydro.png b/Resources/Textures/Tiles/hydro.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/hydro.png rename to Resources/Textures/Tiles/hydro.png diff --git a/Resources/Textures/Constructible/Tiles/kitchen.png b/Resources/Textures/Tiles/kitchen.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/kitchen.png rename to Resources/Textures/Tiles/kitchen.png diff --git a/Resources/Textures/Constructible/Tiles/lattice.png b/Resources/Textures/Tiles/lattice.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/lattice.png rename to Resources/Textures/Tiles/lattice.png diff --git a/Resources/Textures/Constructible/Tiles/lino.png b/Resources/Textures/Tiles/lino.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/lino.png rename to Resources/Textures/Tiles/lino.png diff --git a/Resources/Textures/Constructible/Tiles/mono.png b/Resources/Textures/Tiles/mono.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/mono.png rename to Resources/Textures/Tiles/mono.png diff --git a/Resources/Textures/Constructible/Tiles/plating.png b/Resources/Textures/Tiles/plating.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/plating.png rename to Resources/Textures/Tiles/plating.png diff --git a/Resources/Textures/Constructible/Tiles/reinforced.png b/Resources/Textures/Tiles/reinforced.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/reinforced.png rename to Resources/Textures/Tiles/reinforced.png diff --git a/Resources/Textures/Constructible/Tiles/rglass.png b/Resources/Textures/Tiles/rglass.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/rglass.png rename to Resources/Textures/Tiles/rglass.png diff --git a/Resources/Textures/Constructible/Tiles/rock_vault.png b/Resources/Textures/Tiles/rock_vault.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/rock_vault.png rename to Resources/Textures/Tiles/rock_vault.png diff --git a/Resources/Textures/Constructible/Tiles/showroom.png b/Resources/Textures/Tiles/showroom.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/showroom.png rename to Resources/Textures/Tiles/showroom.png diff --git a/Resources/Textures/Constructible/Tiles/snow.png b/Resources/Textures/Tiles/snow.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/snow.png rename to Resources/Textures/Tiles/snow.png diff --git a/Resources/Textures/Constructible/Tiles/steel.png b/Resources/Textures/Tiles/steel.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/steel.png rename to Resources/Textures/Tiles/steel.png diff --git a/Resources/Textures/Constructible/Tiles/steel_dirty.png b/Resources/Textures/Tiles/steel_dirty.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/steel_dirty.png rename to Resources/Textures/Tiles/steel_dirty.png diff --git a/Resources/Textures/Constructible/Tiles/steel_warning1.png b/Resources/Textures/Tiles/steel_warning1.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/steel_warning1.png rename to Resources/Textures/Tiles/steel_warning1.png diff --git a/Resources/Textures/Constructible/Tiles/steel_warning2.png b/Resources/Textures/Tiles/steel_warning2.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/steel_warning2.png rename to Resources/Textures/Tiles/steel_warning2.png diff --git a/Resources/Textures/Constructible/Tiles/tech_maint.png b/Resources/Textures/Tiles/tech_maint.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/tech_maint.png rename to Resources/Textures/Tiles/tech_maint.png diff --git a/Resources/Textures/Constructible/Tiles/underplating.png b/Resources/Textures/Tiles/underplating.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/underplating.png rename to Resources/Textures/Tiles/underplating.png diff --git a/Resources/Textures/Constructible/Tiles/white.png b/Resources/Textures/Tiles/white.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/white.png rename to Resources/Textures/Tiles/white.png diff --git a/Resources/Textures/Constructible/Tiles/white_warning1.png b/Resources/Textures/Tiles/white_warning1.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/white_warning1.png rename to Resources/Textures/Tiles/white_warning1.png diff --git a/Resources/Textures/Constructible/Tiles/white_warning2.png b/Resources/Textures/Tiles/white_warning2.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/white_warning2.png rename to Resources/Textures/Tiles/white_warning2.png diff --git a/Resources/Textures/Constructible/Tiles/wood.png b/Resources/Textures/Tiles/wood.png similarity index 100% rename from Resources/Textures/Constructible/Tiles/wood.png rename to Resources/Textures/Tiles/wood.png