diff --git a/Content.Client/Mech/Ui/MechMenu.xaml b/Content.Client/Mech/Ui/MechMenu.xaml
index f1cafc534356..b72e514f97e6 100644
--- a/Content.Client/Mech/Ui/MechMenu.xaml
+++ b/Content.Client/Mech/Ui/MechMenu.xaml
@@ -31,12 +31,12 @@
                                VerticalAlignment="Center"></Label>
                     </ProgressBar>
                 </BoxContainer>
-                <Label Name="SlotDisplay"
-                       HorizontalAlignment="Left"
-                       Access="Public"
-                       HorizontalExpand="True" />
+                <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                    <Label Name="ActiveSlotDisplay" HorizontalAlignment="Left" Access="Public" HorizontalExpand="True" Margin="0 0 5 0"/>
+                    <Label Name="PassiveSlotDisplay" HorizontalAlignment="Right" Access="Public" HorizontalExpand="True" Margin="5 0 0 0"/>
+                </BoxContainer>
             </BoxContainer>
-            
+
             <SpriteView Name="MechView"
                         Margin="10 0 0 0"
                         VerticalAlignment="Center"
@@ -54,23 +54,29 @@
         </BoxContainer>
         <BoxContainer VerticalExpand="True" Margin="10 0 10 10" Orientation="Vertical">
             <PanelContainer VerticalExpand="True" MinSize="0 200">
-                <PanelContainer.PanelOverride>
-                    <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
-                </PanelContainer.PanelOverride>
-                <ScrollContainer
-                    HScrollEnabled="False"
-                    HorizontalExpand="True"
-                    MinSize="100 256"
-                    SizeFlagsStretchRatio="2"
-                    VerticalExpand="True">
-                    <BoxContainer
-                        Name="EquipmentControlContainer"
-                        MinSize="100 256"
-                        Orientation="Vertical"
-                        SizeFlagsStretchRatio="2"
-                        VerticalExpand="True">
-                    </BoxContainer>
-                </ScrollContainer>
+                <BoxContainer Orientation="Vertical" VerticalExpand="True">
+                    <!-- Active Equipment -->
+                    <Label Text="Active Equipment" Margin="5" />
+                    <PanelContainer>
+                        <PanelContainer.PanelOverride>
+                            <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
+                        </PanelContainer.PanelOverride>
+                        <ScrollContainer HScrollEnabled="False" MinSize="100 100" HorizontalExpand="True" SizeFlagsStretchRatio="2" VerticalExpand="True">
+                            <BoxContainer Name="ActiveEquipmentContainer" MinSize="100 100" Orientation="Vertical" SizeFlagsStretchRatio="2" VerticalExpand="True" />
+                        </ScrollContainer>
+                    </PanelContainer>
+
+                    <!-- Passive Equipment -->
+                    <Label Text="Passive Equipment" Margin="5" />
+                    <PanelContainer>
+                        <PanelContainer.PanelOverride>
+                            <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
+                        </PanelContainer.PanelOverride>
+                        <ScrollContainer HScrollEnabled="False" MinSize="100 100" HorizontalExpand="True" SizeFlagsStretchRatio="2" VerticalExpand="True">
+                            <BoxContainer Name="PassiveEquipmentContainer" MinSize="100 100" Orientation="Vertical" SizeFlagsStretchRatio="2" VerticalExpand="True" />
+                        </ScrollContainer>
+                    </PanelContainer>
+                </BoxContainer>
             </PanelContainer>
         </BoxContainer>
     </BoxContainer>
diff --git a/Content.Client/Mech/Ui/MechMenu.xaml.cs b/Content.Client/Mech/Ui/MechMenu.xaml.cs
index c2334749e66c..d1d54648cb44 100644
--- a/Content.Client/Mech/Ui/MechMenu.xaml.cs
+++ b/Content.Client/Mech/Ui/MechMenu.xaml.cs
@@ -1,6 +1,8 @@
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Fragments;
 using Content.Shared.Mech.Components;
+using Content.Shared.Mech.Equipment.Components;
+using Content.Shared.Mech;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.XAML;
@@ -51,7 +53,7 @@ public void UpdateMechStats()
             EnergyDisplay.Text = Loc.GetString("mech-energy-missing");
         }
 
-        SlotDisplay.Text = Loc.GetString("mech-slot-display",
+        ActiveSlotDisplay.Text = Loc.GetString("mech-slot-display",
             ("amount", mechComp.MaxEquipmentAmount - mechComp.EquipmentContainer.ContainedEntities.Count));
     }
 
@@ -60,7 +62,7 @@ public void UpdateEquipmentView()
         if (!_ent.TryGetComponent<MechComponent>(_mech, out var mechComp))
             return;
 
-        EquipmentControlContainer.Children.Clear();
+        ActiveEquipmentContainer.Children.Clear();
         foreach (var ent in mechComp.EquipmentContainer.ContainedEntities)
         {
             if (!_ent.TryGetComponent<MetaDataComponent>(ent, out var metaData))
@@ -73,7 +75,13 @@ public void UpdateEquipmentView()
 
             control.OnRemoveButtonPressed += () => OnRemoveButtonPressed?.Invoke(ent);
 
-            EquipmentControlContainer.AddChild(control);
+            if (_ent.TryGetComponent<MechEquipmentComponent>(ent, out var equipmentComp))
+            {
+                if (equipmentComp.EquipmentType == EquipmentType.Active)
+                    ActiveEquipmentContainer.AddChild(control);
+                else if (equipmentComp.EquipmentType == EquipmentType.Passive)
+                    PassiveEquipmentContainer.AddChild(control);
+            }
         }
     }
     
diff --git a/Content.Server/Construction/Completions/BuildMech.cs b/Content.Server/Construction/Completions/BuildMech.cs
index e11c79d851e4..4095a177fef7 100644
--- a/Content.Server/Construction/Completions/BuildMech.cs
+++ b/Content.Server/Construction/Completions/BuildMech.cs
@@ -20,8 +20,11 @@ public sealed partial class BuildMech : IGraphAction
     [DataField("mechPrototype", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
     public string MechPrototype = string.Empty;
 
-    [DataField("container")]
-    public string Container = "battery-container";
+    [DataField("batteryContainer")]
+    public string BatteryContainer = "battery-container";
+    
+    [DataField("gasTankContainer")]
+    public string GasTankContainer = "gas-tank-container";
 
     // TODO use or generalize ConstructionSystem.ChangeEntity();
     public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager entityManager)
@@ -35,22 +38,29 @@ public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager enti
         var containerSystem = entityManager.EntitySysManager.GetEntitySystem<ContainerSystem>();
         var mechSys = entityManager.System<MechSystem>();
 
-        if (!containerSystem.TryGetContainer(uid, Container, out var container, containerManager))
+        if (!containerSystem.TryGetContainer(uid, BatteryContainer, out var container, containerManager))
         {
-            Logger.Warning($"Mech construct entity {uid} did not have the specified '{Container}' container! Aborting build mech action.");
+            Logger.Warning($"Mech construct entity {uid} did not have the specified '{BatteryContainer}' container! Aborting build mech action.");
+            return;
+        }
+        
+        if (!containerSystem.TryGetContainer(uid, GasTankContainer, out var gasTankContainer))
+        {
+            Logger.Warning($"Mech construct entity {uid} did not have the specified '{GasTankContainer}' container! Aborting build mech action.");
             return;
         }
 
         if (container.ContainedEntities.Count != 1)
         {
-            Logger.Warning($"Mech construct entity {uid} did not have exactly one item in the specified '{Container}' container! Aborting build mech action.");
+            Logger.Warning($"Mech construct entity {uid} did not have exactly one item in the specified '{BatteryContainer}' container! Aborting build mech action.");
         }
 
         var cell = container.ContainedEntities[0];
+        var gasTank = gasTankContainer.ContainedEntities[0];
 
         if (!entityManager.TryGetComponent<BatteryComponent>(cell, out var batteryComponent))
         {
-            Logger.Warning($"Mech construct entity {uid} had an invalid entity in container \"{Container}\"! Aborting build mech action.");
+            Logger.Warning($"Mech construct entity {uid} had an invalid entity in container \"{BatteryContainer}\"! Aborting build mech action.");
             return;
         }
 
@@ -63,6 +73,10 @@ public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager enti
         {
             mechSys.InsertBattery(mech, cell, mechComp, batteryComponent);
             containerSystem.Insert(cell, mechComp.BatterySlot);
+            if (mechComp.GasTankSlot.ContainedEntity == null && gasTank != null)
+            {
+                containerSystem.Insert(gasTank, mechComp.GasTankSlot);
+            }
         }
 
         var entChangeEv = new ConstructionChangeEntityEvent(mech, uid);
diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs
index 4226589dd911..e9bf746303ef 100644
--- a/Content.Server/Mech/Systems/MechSystem.cs
+++ b/Content.Server/Mech/Systems/MechSystem.cs
@@ -3,6 +3,8 @@
 using Content.Server.Mech.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
+using Content.Server.PowerCell;
+using Content.Shared.PowerCell;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
 using Content.Shared.Damage;
@@ -24,6 +26,7 @@
 using Content.Shared.Tools.Systems;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
+using Robust.Shared.Timing;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Containers;
@@ -54,6 +57,8 @@ public sealed partial class MechSystem : SharedMechSystem
     [Dependency] private readonly HandsSystem _hands = default!;
     [Dependency] private readonly NpcFactionSystem _factionSystem = default!;
     [Dependency] private readonly SharedPointLightSystem _light = default!;
+    [Dependency] private readonly PowerCellSystem _powerCell = default!;
+    [Dependency] protected readonly IGameTiming Timing = default!;
     
     /// <inheritdoc/>
     public override void Initialize()
@@ -67,6 +72,7 @@ public override void Initialize()
         SubscribeLocalEvent<MechComponent, GetVerbsEvent<AlternativeVerb>>(OnAlternativeVerb);
         SubscribeLocalEvent<MechComponent, MechOpenUiEvent>(OnOpenUi);
         SubscribeLocalEvent<MechComponent, RemoveBatteryEvent>(OnRemoveBattery);
+        SubscribeLocalEvent<MechComponent, ChargeChangedEvent>(OnChargeChanged);
         SubscribeLocalEvent<MechComponent, MechEntryEvent>(OnMechEntry);
         SubscribeLocalEvent<MechComponent, MechExitEvent>(OnMechExit);
 
@@ -91,16 +97,67 @@ public override void Initialize()
         #endregion
     }
     
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        var query = EntityQueryEnumerator<PowerCellDrawComponent, MechComponent>();
+
+        while (query.MoveNext(out var uid, out var comp, out var mechComp))
+        {
+            if (!mechComp.Light)
+                continue;
+
+            if (Timing.CurTime < comp.NextUpdateTime)
+                continue;
+
+            comp.NextUpdateTime += comp.Delay;
+
+            if (mechComp.BatterySlot.ContainedEntity == null 
+                || !TryComp<BatteryComponent>(mechComp.BatterySlot.ContainedEntity.Value, out var battery) )
+                continue;
+
+            if (!_battery.TryUseCharge(mechComp.BatterySlot.ContainedEntity.Value, comp.DrawRate))
+                continue;
+            
+            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery.MaxCharge);
+            RaiseLocalEvent(uid, ref ev);
+        }
+    }
+
+    
     private void OnToggleLightEvent(EntityUid uid, MechComponent component, ToggleActionEvent args)
     {
         if (args.Handled)
             return;
         
-        if (!_light.TryGetLight(uid, out var light))
+        if (component.BatterySlot.ContainedEntity == null 
+            || !TryComp<BatteryComponent>(component.BatterySlot.ContainedEntity, out var battery) 
+            || battery.CurrentCharge <= 0)
             return;
         
         args.Handled = true;
         
+        ToggleLight(uid, component);
+    }
+    
+    private void OnChargeChanged(Entity<MechComponent> ent, ref ChargeChangedEvent args)
+    {
+        if (args.Charge == 0 && ent.Comp.Light)
+            ToggleLight(ent.Owner, ent.Comp);
+        
+        ent.Comp.Energy = args.Charge;
+        ent.Comp.MaxEnergy = args.MaxCharge;
+        
+        _actionBlocker.UpdateCanMove(ent.Owner);
+        
+        Dirty(ent.Owner, ent.Comp);
+    }
+    
+    public void ToggleLight(EntityUid uid, MechComponent component)
+    {
+        if (!_light.TryGetLight(uid, out var light))
+            return;
+        
         _light.SetEnabled(uid, !component.Light, comp: light);
         
         _actions.SetToggled(component.MechToggleLightActionEntity, !component.Light);
diff --git a/Content.Shared/Mech/Components/MechComponent.cs b/Content.Shared/Mech/Components/MechComponent.cs
index 86fd86ca4770..818128260b22 100644
--- a/Content.Shared/Mech/Components/MechComponent.cs
+++ b/Content.Shared/Mech/Components/MechComponent.cs
@@ -69,6 +69,15 @@ public sealed partial class MechComponent : Component
 
     [ViewVariables]
     public readonly string BatterySlotId = "mech-battery-slot";
+    
+    /// <summary>
+    /// The slot the gas tank is stored in.
+    /// </summary>
+    [ViewVariables]
+    public ContainerSlot GasTankSlot = default!;
+
+    [ViewVariables]
+    public readonly string GasTankSlotId = "mech-gas-tank-slot";
 
     /// <summary>
     /// A multiplier used to calculate how much of the damage done to a mech
@@ -194,7 +203,7 @@ public sealed partial class MechComponent : Component
     public SoundSpecifier CriticalDamageSound = new SoundPathSpecifier("/Audio/Mecha/critnano.ogg");
     
     [DataField]
-    public bool FirstStart = true;
+    public bool FirstStart = false;
     
     [DataField]
     public bool PlayPowerSound = true;
diff --git a/Content.Shared/Mech/Equipment/Components/MechEquipmentComponent.cs b/Content.Shared/Mech/Equipment/Components/MechEquipmentComponent.cs
index 3933f1228470..a34c58828c73 100644
--- a/Content.Shared/Mech/Equipment/Components/MechEquipmentComponent.cs
+++ b/Content.Shared/Mech/Equipment/Components/MechEquipmentComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.DoAfter;
 using Content.Shared.Mech.Components;
+using Content.Shared.Mech;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Mech.Equipment.Components;
@@ -19,6 +20,8 @@ public sealed partial class MechEquipmentComponent : Component
     /// The mech that the equipment is inside of.
     /// </summary>
     [ViewVariables] public EntityUid? EquipmentOwner;
+    
+    [ViewVariables] public EquipmentType EquipmentType = EquipmentType.Active;
 }
 
 /// <summary>
diff --git a/Content.Shared/Mech/SharedMech.cs b/Content.Shared/Mech/SharedMech.cs
index 265c83a42cac..2dc48eeec1dc 100644
--- a/Content.Shared/Mech/SharedMech.cs
+++ b/Content.Shared/Mech/SharedMech.cs
@@ -24,6 +24,13 @@ public enum MechVisualLayers : byte
     Light
 }
 
+[Serializable, NetSerializable]
+public enum EquipmentType : byte
+{
+    Active,
+    Passive
+}
+
 /// <summary>
 /// Event raised on equipment when it is inserted into a mech
 /// </summary>
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mechs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mechs.yml
index 699ed8903f16..0b52408f5b51 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/mechs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mechs.yml
@@ -6,8 +6,8 @@
   - type: Sprite
     layers:
       - state: green
-      - sprite: Objects/Specific/Mech/mecha.rsi
-        state: ripley
+      - sprite: Objects/Specific/Mech/Mechs/Basic/ripley.rsi
+        state: base
   - type: ConditionalSpawner
     prototypes:
       - MechRipleyBattery
@@ -20,8 +20,8 @@
   - type: Sprite
     layers:
       - state: green
-      - sprite: Objects/Specific/Mech/mecha.rsi
-        state: ripleymkii
+      - sprite: Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi
+        state: base
   - type: ConditionalSpawner
     prototypes:
       - MechRipley2Battery
@@ -34,8 +34,8 @@
   - type: Sprite
     layers:
       - state: green
-      - sprite: Objects/Specific/Mech/mecha.rsi
-        state: honker
+      - sprite: Objects/Specific/Mech/Mechs/Basic/honker.rsi
+        state: base
   - type: ConditionalSpawner
     prototypes:
       - MechHonkerBattery
@@ -44,13 +44,8 @@
   name: H.O.N.K. Spawner
   suffix: Filled
   id: SpawnMechHonkerFilled
-  parent: MarkerBase
+  parent: SpawnMechHonker
   components:
-  - type: Sprite
-    layers:
-      - state: green
-      - sprite: Objects/Specific/Mech/mecha.rsi
-        state: honker
   - type: ConditionalSpawner
     prototypes:
       - MechHonkerFilled
@@ -63,8 +58,8 @@
   - type: Sprite
     layers:
       - state: green
-      - sprite: Objects/Specific/Mech/mecha.rsi
-        state: clarke
+      - sprite: Objects/Specific/Mech/Mechs/Basic/clarke.rsi
+        state: base
   - type: ConditionalSpawner
     prototypes:
       - MechClarkeBattery
@@ -77,8 +72,8 @@
   - type: Sprite
     layers:
       - state: green
-      - sprite: Objects/Specific/Mech/mecha.rsi
-        state: gygax
+      - sprite: Objects/Specific/Mech/Mechs/Basic/gygax.rsi
+        state: base
   - type: ConditionalSpawner
     prototypes:
       - MechGygaxBattery
@@ -91,8 +86,8 @@
   - type: Sprite
     layers:
       - state: green
-      - sprite: Objects/Specific/Mech/mecha.rsi
-        state: durand
+      - sprite: Objects/Specific/Mech/Mechs/Basic/durand.rsi
+        state: base
   - type: ConditionalSpawner
     prototypes:
       - MechDurandBattery
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/exosuit_components.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/exosuit_components.yml
index 16e593a1f8b0..db72c1a01227 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/exosuit_components.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/exosuit_components.yml
@@ -25,7 +25,7 @@
     - type: Item
       storedRotation: 0
     - type: Sprite
-      sprite: Objects/Specific/Mech/durand_construction.rsi
+      sprite: Objects/Specific/Mech/Mechs/Basic/durand.rsi
       state: durand_armor
     - type: Tag
       tags:
@@ -43,7 +43,7 @@
     - type: Item
       storedRotation: 0
     - type: Sprite
-      sprite: Objects/Specific/Mech/gygax_construction.rsi
+      sprite: Objects/Specific/Mech/Mechs/Basic/gygax.rsi
       state: gygax_armor
     - type: Tag
       tags:
@@ -82,9 +82,23 @@
     - type: Tag
       tags:
       - MechAirTank
+      - GasTank
     - type: GuideHelp
       guides:
       - Robotics
+    - type: ActivatableUI
+      key: enum.SharedGasTankUiKey.Key
+    - type: UserInterface
+      interfaces:
+        enum.SharedGasTankUiKey.Key:
+          type: GasTankBoundUserInterface
+    - type: GasTank
+      outputPressure: 21.3
+      air:
+        # If gas tank volume is changed, adjust MinimumTritiumOxyburnEnergy in Atmospherics.cs by the same proportions
+        volume: 5
+        temperature: 293.15
+      tankLowPressure: 30.0
 
 - type: entity
   id: MechThruster
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml
index 41c5f28ba02b..25000b0fbbb8 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml
@@ -36,7 +36,7 @@
   - type: Sprite
     drawdepth: Items
     noRot: false
-    sprite: Objects/Specific/Mech/clarke_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/clarke.rsi
 
 - type: entity
   id: BaseClarkePartItem
@@ -71,7 +71,7 @@
         whitelist:
           tags:
           - ClarkeTreads
-    sprite: Objects/Specific/Mech/clarke_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/clarke.rsi
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
@@ -144,6 +144,7 @@
   - type: ContainerContainer
     containers:
       battery-container: !type:Container
+      gas-tank-container: !type:Container
   - type: MechAssemblyVisuals
     statePrefix: clarke
   - type: Sprite
@@ -164,7 +165,7 @@
   - type: Sprite
     drawdepth: Items
     noRot: false
-    sprite: Objects/Specific/Mech/durand_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/durand.rsi
 
 - type: entity
   id: BaseDurandPartItem
@@ -203,7 +204,7 @@
         whitelist:
           tags:
           - DurandRLeg
-    sprite: Objects/Specific/Mech/durand_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/durand.rsi
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
@@ -289,6 +290,7 @@
   - type: ContainerContainer
     containers:
       battery-container: !type:Container
+      gas-tank-container: !type:Container
   - type: MechAssemblyVisuals
     statePrefix: durand
   - type: Sprite
@@ -309,7 +311,7 @@
   - type: Sprite
     drawdepth: Items
     noRot: false
-    sprite: Objects/Specific/Mech/gygax_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/gygax.rsi
 
 - type: entity
   id: BaseGygaxPartItem
@@ -348,7 +350,7 @@
         whitelist:
           tags:
           - GygaxRLeg
-    sprite: Objects/Specific/Mech/gygax_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/gygax.rsi
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
@@ -434,6 +436,7 @@
   - type: ContainerContainer
     containers:
       battery-container: !type:Container
+      gas-tank-container: !type:Container
   - type: MechAssemblyVisuals
     statePrefix: gygax
   - type: Sprite
@@ -454,7 +457,7 @@
   - type: Sprite
     drawdepth: Items
     noRot: false
-    sprite: Objects/Specific/Mech/ripley_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/ripley.rsi
 
 - type: entity
   id: BaseRipleyPartItem
@@ -489,7 +492,7 @@
         whitelist:
           tags:
           - RipleyRLeg
-    sprite: Objects/Specific/Mech/ripley_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/ripley.rsi
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
@@ -562,6 +565,7 @@
   - type: ContainerContainer
     containers:
       battery-container: !type:Container
+      gas-tank-container: !type:Container
   - type: MechAssemblyVisuals
     statePrefix: ripley
   - type: Sprite
@@ -582,7 +586,7 @@
   - type: Sprite
     drawdepth: Items
     noRot: false
-    sprite: Objects/Specific/Mech/ripleymkii_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi
 
 - type: entity
   parent: BaseRipleyMKIIPart
@@ -613,7 +617,7 @@
         whitelist:
           tags:
           - RipleyRLeg
-    sprite: Objects/Specific/Mech/ripleymkii_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
@@ -639,6 +643,7 @@
   - type: ContainerContainer
     containers:
       battery-container: !type:Container
+      gas-tank-container: !type:Container
   - type: MechAssemblyVisuals
     statePrefix: ripleymkii
   - type: Sprite
@@ -659,7 +664,7 @@
   - type: Sprite
     drawdepth: Items
     noRot: false
-    sprite: Objects/Specific/Mech/honker_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/honker.rsi
 
 - type: entity
   id: BaseHonkerPartItem
@@ -694,7 +699,7 @@
         whitelist:
           tags:
           - HonkerRLeg
-    sprite: Objects/Specific/Mech/honker_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/honker.rsi
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
@@ -767,6 +772,7 @@
   - type: ContainerContainer
     containers:
       battery-container: !type:Container
+      gas-tank-container: !type:Container
   - type: MechAssemblyVisuals
     statePrefix: honker
   - type: Sprite
@@ -787,7 +793,7 @@
   - type: Sprite
     drawdepth: Items
     noRot: false
-    sprite: Objects/Specific/Mech/hamtr_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/hamtr.rsi
 
 - type: entity
   id: BaseHamtrPartItem
@@ -822,7 +828,7 @@
         whitelist:
           tags:
           - HamtrRLeg
-    sprite: Objects/Specific/Mech/hamtr_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/hamtr.rsi
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
@@ -895,6 +901,7 @@
   - type: ContainerContainer
     containers:
       battery-container: !type:Container
+      gas-tank-container: !type:Container
   - type: MechAssemblyVisuals
     statePrefix: hamtr
   - type: Sprite
@@ -915,7 +922,7 @@
   - type: Sprite
     drawdepth: Items
     noRot: false
-    sprite: Objects/Specific/Mech/vim_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/vim.rsi
 
 - type: entity
   parent: BaseVimPart
@@ -946,7 +953,7 @@
         whitelist:
           tags:
           - BorgLeg
-    sprite: Objects/Specific/Mech/vim_construction.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/vim.rsi
   - type: ContainerContainer
     containers:
       mech-assembly-container: !type:Container
@@ -969,6 +976,7 @@
   - type: ContainerContainer
     containers:
       battery-container: !type:Container
+      gas-tank-container: !type:Container
   - type: MechAssemblyVisuals
     statePrefix: vim
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index 468ef0b3554b..18edc8b9150c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -73,7 +73,6 @@
   components:
   - type: MobMover
   - type: Mech
-    firstStart: false
   - type: MechAir
   - type: AirFilter
     # everything except oxygen and nitrogen
@@ -152,6 +151,7 @@
       mech-pilot-slot: !type:ContainerSlot
       mech-equipment-container: !type:Container
       mech-battery-slot: !type:ContainerSlot
+      mech-gas-tank-slot: !type:ContainerSlot
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: LightArmor
@@ -180,6 +180,10 @@
     radius: 6
     energy: 5
     enabled: false
+  - type: PowerCellDraw
+    enabled: false
+    drawRate: 2
+    useRate: 0
 
 # Ripley MK-I
 - type: entity
@@ -191,17 +195,17 @@
   - type: Sprite
     drawdepth: Mobs
     noRot: true
-    sprite: Objects/Specific/Mech/mecha.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/ripley.rsi
     layers:
     - map: [ "enum.MechVisualLayers.Base" ]
-      state: ripley
+      state: base
   - type: FootstepModifier
     footstepSoundCollection:
       path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
   - type: Mech
-    baseState: ripley
-    openState: ripley-open
-    brokenState: ripley-broken
+    baseState: base
+    openState: base-open
+    brokenState: base-broken
     mechToPilotDamageMultiplier: 0.75
     pilotWhitelist:
       components:
@@ -236,17 +240,17 @@
   - type: Sprite
     drawdepth: Mobs
     noRot: true
-    sprite: Objects/Specific/Mech/mecha.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi
     layers:
     - map: [ "enum.MechVisualLayers.Base" ]
-      state: ripleymkii
+      state: base
   - type: FootstepModifier
     footstepSoundCollection:
       path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
   - type: Mech
-    baseState: ripleymkii
-    openState: ripleymkii-open
-    brokenState: ripleymkii-broken
+    baseState: base
+    openState: base-open
+    brokenState: base-broken
     mechToPilotDamageMultiplier: 0.4
     airtight: true
     pilotWhitelist:
@@ -284,17 +288,17 @@
   - type: Sprite
     drawdepth: Mobs
     noRot: true
-    sprite: Objects/Specific/Mech/mecha.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/clarke.rsi
     layers:
     - map: [ "enum.MechVisualLayers.Base" ]
-      state: clarke
+      state: base
   - type: FootstepModifier
     footstepSoundCollection:
       path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
   - type: Mech
-    baseState: clarke
-    openState: clarke-open
-    brokenState: clarke-broken
+    baseState: base
+    openState: base-open
+    brokenState: base-broken
     mechToPilotDamageMultiplier: 0.5
     airtight: true
     pilotWhitelist:
@@ -332,19 +336,19 @@
   - type: Sprite
     drawdepth: Mobs
     noRot: true
-    sprite: Objects/Specific/Mech/mecha.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/honker.rsi
     layers:
     - map: [ "enum.MechVisualLayers.Base" ]
-      state: honker
+      state: base
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepClown
       params:
         variation: 0.17
   - type: Mech
-    baseState: honker
-    openState: honker-open
-    brokenState: honker-broken
+    baseState: base
+    openState: base-open
+    brokenState: base-broken
     mechToPilotDamageMultiplier: 0.5
     airtight: true # Space Honks is real.
     pilotWhitelist:
@@ -382,17 +386,17 @@
   - type: Sprite
     drawdepth: Mobs
     noRot: true
-    sprite: Objects/Specific/Mech/mecha.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/hamtr.rsi
     layers:
     - map: [ "enum.MechVisualLayers.Base" ]
-      state: hamtr
+      state: base
   - type: FootstepModifier
     footstepSoundCollection:
       path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
   - type: Mech
-    baseState: hamtr
-    openState: hamtr-open
-    brokenState: hamtr-broken
+    baseState: base
+    openState: base-open
+    brokenState: base-broken
     mechToPilotDamageMultiplier: 0.2
     maxEquipmentAmount: 2
     airtight: true
@@ -431,10 +435,10 @@
   - type: Sprite
     drawdepth: Mobs
     noRot: true
-    sprite: Objects/Specific/Mech/mecha.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/vim.rsi
     layers:
     - map: [ "enum.MechVisualLayers.Base" ]
-      state: vim
+      state: base
   - type: Fixtures
     fixtures:
       fix1:
@@ -452,9 +456,9 @@
       params:
         volume: -10
   - type: Mech
-    baseState: vim
-    openState: vim-open
-    brokenState: vim-broken
+    baseState: base
+    openState: base-open
+    brokenState: base-broken
     maxEquipmentAmount: 0
     # keep mouse safe
     mechToPilotDamageMultiplier: 0.1
@@ -500,17 +504,17 @@
   - type: Sprite
     drawdepth: Mobs
     noRot: true
-    sprite: Objects/Specific/Mech/mecha.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/gygax.rsi
     layers:
     - map: [ "enum.MechVisualLayers.Base" ]
-      state: gygax
+      state: base
   - type: FootstepModifier
     footstepSoundCollection:
       path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
   - type: Mech
-    baseState: gygax
-    openState: gygax-open
-    brokenState: gygax-broken
+    baseState: base
+    openState: base-open
+    brokenState: base-broken
     mechToPilotDamageMultiplier: 0.3
     airtight: true
     pilotWhitelist:
@@ -547,17 +551,17 @@
   - type: Sprite
     drawdepth: Mobs
     noRot: true
-    sprite: Objects/Specific/Mech/mecha.rsi
+    sprite: Objects/Specific/Mech/Mechs/Basic/durand.rsi
     layers:
     - map: [ "enum.MechVisualLayers.Base" ]
-      state: durand
+      state: base
   - type: FootstepModifier
     footstepSoundCollection:
       path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
   - type: Mech
-    baseState: durand
-    openState: durand-open
-    brokenState: durand-broken
+    baseState: base
+    openState: base-open
+    brokenState: base-broken
     mechToPilotDamageMultiplier: 0.25
     airtight: true
     maxIntegrity: 400
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/clarke_construction.yml b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/clarke_construction.yml
index 00d2e164ab3e..b9b319eadd1e 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/clarke_construction.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/clarke_construction.yml
@@ -131,6 +131,7 @@
 
       - tag: MechAirTank
         name: exosuit air tank
+        store: gas-tank-container
         icon:
           sprite: Objects/Specific/Mech/mecha_equipment.rsi
           state: mecha_air_tank
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/durand_construction.yml b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/durand_construction.yml
index a1e58b8c89a4..047a3d5bca39 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/durand_construction.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/durand_construction.yml
@@ -157,7 +157,7 @@
       - tag: DurandArmor
         name: durand armor plates
         icon:
-          sprite: "Objects/Specific/Mech/durand_construction.rsi"
+          sprite: "Objects/Specific/Mech/Mechs/Basic/durand.rsi"
           state: durand_armor
         completed:
         - !type:VisualizerDataInt
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/gygax_construction.yml b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/gygax_construction.yml
index 19eb2da6c973..01335dfb471b 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/mechs/gygax_construction.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/mechs/gygax_construction.yml
@@ -157,7 +157,7 @@
       - tag: GygaxArmor
         name: gygax armor plates
         icon:
-          sprite: "Objects/Specific/Mech/gygax_construction.rsi"
+          sprite: "Objects/Specific/Mech/Mechs/Basic/gygax.rsi"
           state: gygax_armor
         completed:
         - !type:VisualizerDataInt
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke-broken.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/base-broken.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke-broken.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/base-broken.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/base-open.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke-open.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/base-open.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/base.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/base.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke0.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke0.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke0.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke0.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke1.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke1.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke1.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke1.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke10.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke10.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke10.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke10.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke11.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke11.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke11.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke11.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke12.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke12.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke12.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke12.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke13.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke13.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke13.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke13.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke14.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke14.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke14.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke14.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke15.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke15.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke15.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke15.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke16.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke16.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke16.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke16.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke2.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke2.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke2.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke2.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke3.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke3.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke3.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke3.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke4.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke4.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke4.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke4.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke5.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke5.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke5.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke5.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke6.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke6.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke6.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke6.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke7.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke7.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke7.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke7.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke8.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke8.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke8.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke8.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke9.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke9.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke9.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke9.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_chassis.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_chassis.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_chassis.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_chassis.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_harness+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_harness+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_harness+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_harness+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_harness.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_harness.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_harness.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_harness.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_head+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_head+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_head+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_head+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_head.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_head.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_head.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_head.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_l_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_l_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_l_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_l_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_l_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_l_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_l_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_l_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_r_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_r_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_r_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_r_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_r_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_r_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_r_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_r_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_treads+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_treads+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_treads+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_treads+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_treads.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_treads.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/clarke_treads.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/clarke_treads.png
diff --git a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/meta.json
similarity index 76%
rename from Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/meta.json
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/meta.json
index bbba21764447..f2de3210e15b 100644
--- a/Resources/Textures/Objects/Specific/Mech/clarke_construction.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/clarke.rsi/meta.json
@@ -7,6 +7,38 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "base",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.05,
+          0.05
+        ],
+        [
+          0.1,
+          0.05,
+          0.05
+        ],
+        [
+          0.1,
+          0.05,
+          0.05
+        ],
+        [
+          0.1,
+          0.05,
+          0.05
+        ]
+      ]
+    },
+    {
+      "name": "base-open"
+    },
+    {
+      "name": "base-broken"
+    },
     {
       "name": "clarke_chassis"
     },
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/base-broken.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/base-broken.png
new file mode 100644
index 000000000000..939546e1dcc4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/base-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/base-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/base-open.png
new file mode 100644
index 000000000000..cddae854b971
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/base-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/base.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/base.png
new file mode 100644
index 000000000000..c1860eb55573
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand0.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand0.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand0.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand0.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand1.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand1.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand1.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand1.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand10.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand10.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand10.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand10.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand11.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand11.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand11.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand11.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand12.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand12.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand12.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand12.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand13.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand13.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand13.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand13.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand14.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand14.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand14.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand14.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand15.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand15.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand15.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand15.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand16.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand16.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand16.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand16.png
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand17.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand17.png
new file mode 100644
index 000000000000..5e60676e074a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand17.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand18.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand18.png
new file mode 100644
index 000000000000..53f4107c8a8b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand18.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand2.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand2.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand2.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand2.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand3.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand3.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand3.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand3.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand4.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand4.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand4.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand4.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand5.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand5.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand5.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand5.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand6.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand6.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand6.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand6.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand7.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand7.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand7.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand7.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand8.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand8.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand8.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand8.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand9.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand9.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand9.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand9.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_armor.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_armor.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_armor.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_armor.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_chassis.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_chassis.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_chassis.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_chassis.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_harness+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_harness+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_harness+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_harness+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_harness.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_harness.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_harness.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_harness.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_head+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_head+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_head+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_head+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_head.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_head.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_head.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_head.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_l_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_l_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_l_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_l_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_l_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_l_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_l_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_l_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_l_leg+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_l_leg+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_l_leg+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_l_leg+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_l_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_l_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_l_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_l_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_r_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_r_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_r_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_r_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_r_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_r_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_r_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_r_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_r_leg+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_r_leg+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_r_leg+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_r_leg+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_r_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_r_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand_r_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/durand_r_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/meta.json
similarity index 63%
rename from Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/meta.json
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/meta.json
index e238335c3d01..f3feed3fc49e 100644
--- a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/durand.rsi/meta.json
@@ -7,6 +7,72 @@
       "y": 32
     },
     "states": [
+      {
+        "name": "base",
+        "directions": 4,
+        "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
+          ]
+        ]
+      },
+      {
+        "name": "base-open",
+        "delays": [
+          [
+            0.4,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2
+          ]
+        ]
+      },
+      {
+        "name": "base-broken",
+        "delays": [
+          [
+            0.5,
+            1,
+            0.5,
+            1
+          ]
+        ]
+      },
       {
         "name": "durand_chassis"
       },
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/base-broken.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/base-broken.png
new file mode 100644
index 000000000000..c9c37aed6bcf
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/base-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/base-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/base-open.png
new file mode 100644
index 000000000000..5e8de32a4bc4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/base-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/base.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/base.png
new file mode 100644
index 000000000000..fff343cb6842
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax0.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax0.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax0.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax0.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax1.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax1.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax1.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax1.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax10.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax10.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax10.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax10.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax11.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax11.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax11.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax11.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax12.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax12.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax12.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax12.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax13.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax13.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax13.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax13.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax14.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax14.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax14.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax14.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax15.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax15.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax15.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax15.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax16.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax16.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax16.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax16.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax17.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax17.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax17.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax17.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax18.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax18.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax18.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax18.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax19.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax19.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax19.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax19.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax2.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax2.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax2.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax2.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax20.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax20.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax20.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax20.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax3.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax3.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax3.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax3.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax4.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax4.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax4.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax4.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax5.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax5.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax5.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax5.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax6.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax6.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax6.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax6.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax7.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax7.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax7.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax7.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax8.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax8.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax8.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax8.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax9.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax9.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax9.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax9.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_armor.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_armor.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_armor.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_armor.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_chassis.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_chassis.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_chassis.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_chassis.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_harness+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_harness+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_harness+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_harness+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_harness.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_harness.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_harness.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_harness.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_head+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_head+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_head+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_head+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_head.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_head.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_head.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_head.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_l_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_l_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_l_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_l_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_l_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_l_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_l_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_l_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_l_leg+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_l_leg+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_l_leg+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_l_leg+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_l_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_l_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_l_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_l_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_r_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_r_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_r_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_r_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_r_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_r_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_r_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_r_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_r_leg+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_r_leg+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_r_leg+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_r_leg+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_r_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_r_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/gygax_r_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/gygax_r_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/meta.json
similarity index 86%
rename from Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/meta.json
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/meta.json
index 9b0c05ab94c9..48bc10e63ee2 100644
--- a/Resources/Textures/Objects/Specific/Mech/gygax_construction.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/gygax.rsi/meta.json
@@ -7,6 +7,25 @@
       "y": 32
     },
     "states": [
+      {
+        "name": "base",
+        "directions": 4
+      },
+      {
+        "name": "base-open",
+        "delays": [
+          [
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2
+          ]
+        ]
+      },
+      {
+        "name": "base-broken"
+      },
       {
         "name": "gygax_chassis"
       },
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hamtr-broken.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/base-broken.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/hamtr-broken.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/base-broken.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hamtr-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/base-open.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/hamtr-open.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/base-open.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hamtr.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/base.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/hamtr.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/base.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr0.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr0.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr0.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr0.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr1.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr1.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr1.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr1.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr10.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr10.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr10.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr10.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr11.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr11.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr11.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr11.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr12.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr12.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr12.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr12.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr13.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr13.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr13.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr13.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr14.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr14.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr14.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr14.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr15.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr15.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr15.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr15.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr16.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr16.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr16.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr16.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr17.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr17.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr17.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr17.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr18.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr18.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr18.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr18.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr2.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr2.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr2.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr2.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr3.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr3.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr3.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr3.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr4.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr4.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr4.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr4.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr5.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr5.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr5.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr5.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr6.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr6.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr6.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr6.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr7.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr7.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr7.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr7.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr8.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr8.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr8.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr8.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr9.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr9.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr9.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr9.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_chassis.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_chassis.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_chassis.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_chassis.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_harness+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_harness+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_harness+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_harness+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_harness.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_harness.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_harness.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_harness.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_l_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_l_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_l_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_l_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_l_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_l_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_l_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_l_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_l_leg+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_l_leg+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_l_leg+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_l_leg+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_l_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_l_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_l_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_l_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_r_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_r_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_r_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_r_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_r_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_r_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_r_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_r_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_r_leg+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_r_leg+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_r_leg+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_r_leg+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_r_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_r_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/hamtr_r_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/hamtr_r_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/meta.json
similarity index 90%
rename from Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/meta.json
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/meta.json
index ad6b75248164..9b8032a50a66 100644
--- a/Resources/Textures/Objects/Specific/Mech/hamtr_construction.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/hamtr.rsi/meta.json
@@ -7,6 +7,16 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "base",
+      "directions": 4
+    },
+    {
+      "name": "base-open"
+    },
+    {
+      "name": "base-broken"
+    },
     {
       "name": "hamtr_chassis"
     },
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/honker-broken.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/base-broken.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/honker-broken.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/base-broken.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/honker-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/base-open.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/honker-open.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/base-open.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/honker.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/base.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/honker.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/base.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkhonker-broken.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/dark-broken.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkhonker-broken.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/dark-broken.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkhonker-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/dark-open.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkhonker-open.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/dark-open.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkhonker.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/dark.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkhonker.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/dark.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker0.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker0.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker0.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker0.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker1.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker1.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker1.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker1.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker10.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker10.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker10.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker10.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker11.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker11.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker11.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker11.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker2.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker2.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker2.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker2.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker3.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker3.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker3.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker3.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker4.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker4.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker4.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker4.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker5.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker5.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker5.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker5.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker6.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker6.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker6.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker6.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker7.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker7.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker7.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker7.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker8.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker8.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker8.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker8.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker9.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker9.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker9.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker9.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_chassis.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_chassis.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_chassis.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_chassis.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_harness+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_harness+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_harness+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_harness+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_harness.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_harness.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_harness.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_harness.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_l_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_l_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_l_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_l_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_l_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_l_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_l_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_l_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_l_leg+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_l_leg+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_l_leg+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_l_leg+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_l_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_l_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_l_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_l_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_r_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_r_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_r_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_r_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_r_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_r_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_r_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_r_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_r_leg+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_r_leg+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_r_leg+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_r_leg+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_r_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_r_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/honker_r_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/honker_r_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/meta.json
similarity index 81%
rename from Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/meta.json
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/meta.json
index 1011b46a0762..b991439095aa 100644
--- a/Resources/Textures/Objects/Specific/Mech/honker_construction.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/honker.rsi/meta.json
@@ -7,6 +7,26 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "base",
+      "directions": 4
+    },
+    {
+      "name": "base-open"
+    },
+    {
+      "name": "base-broken"
+    },
+    {
+      "name": "dark",
+      "directions": 4
+    },
+    {
+      "name": "dark-open"
+    },
+    {
+      "name": "dark-broken"
+    },
     {
       "name": "honker_chassis"
     },
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken-old.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-broken-old.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken-old.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-broken-old.png
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-broken.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-broken.png
new file mode 100644
index 000000000000..aee942d70940
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-empty.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-empty.png
new file mode 100644
index 000000000000..98267d682d43
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-g-full-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-g-full-open.png
new file mode 100644
index 000000000000..8dead4386186
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-g-full-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-g-full.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-g-full.png
new file mode 100644
index 000000000000..f1220a9887a0
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-g-full.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-g-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-g-open.png
new file mode 100644
index 000000000000..1f64a5d578f1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-g-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-g.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-g.png
new file mode 100644
index 000000000000..a08e3e39ec66
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-g.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-old.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-old.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-old.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-old.png
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-open.png
new file mode 100644
index 000000000000..f15577c232fd
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-p-full-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-p-full-open.png
new file mode 100644
index 000000000000..d0bbda9337ca
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-p-full-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-p-full.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-p-full.png
new file mode 100644
index 000000000000..52435f02abd6
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-p-full.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-p-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-p-open.png
new file mode 100644
index 000000000000..8166b799f52a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-p-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-p.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-p.png
new file mode 100644
index 000000000000..ba888e581544
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base-p.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base.png
new file mode 100644
index 000000000000..f573c68e91c2
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/meta.json
similarity index 65%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/meta.json
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/meta.json
index 42648a6f4071..3eb0b91d96fc 100644
--- a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/meta.json
@@ -1,5 +1,5 @@
 {
-  "copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, Ripley Resprite by Conflee",
+  "copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
   "license" : "CC-BY-SA-3.0",
   "version": 1,
   "size": {
@@ -7,6 +7,55 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "base",
+      "directions": 4
+    },
+    {
+      "name": "base-empty",
+      "directions": 4
+    },
+    {
+      "name": "base-open"
+    },
+    {
+      "name": "base-broken"
+    },
+    {
+      "name": "base-old",
+      "directions": 4
+    },
+    {
+      "name": "base-broken-old"
+    },
+    {
+      "name": "base-g"
+    },
+    {
+      "name": "base-g-open",
+      "directions": 4
+    },
+    {
+      "name": "base-g-full",
+      "directions": 4
+    },
+    {
+      "name": "base-g-full-open"
+    },
+    {
+      "name": "base-p"
+    },
+    {
+      "name": "base-p-open",
+      "directions": 4
+    },
+    {
+      "name": "base-p-full",
+      "directions": 4
+    },
+    {
+      "name": "base-p-full-open"
+    },
     {
       "name": "ripley_chassis"
     },
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley0.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley0.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley0.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley0.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley1.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley1.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley1.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley1.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley10.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley10.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley10.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley10.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley11.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley11.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley11.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley11.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley12.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley12.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley12.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley12.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley13.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley13.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley13.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley13.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley14.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley14.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley14.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley14.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley15.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley15.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley15.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley15.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley16.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley16.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley16.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley16.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley17.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley17.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley17.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley17.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley18.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley18.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley18.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley18.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley2.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley2.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley2.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley2.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley3.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley3.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley3.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley3.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley4.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley4.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley4.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley4.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley5.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley5.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley5.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley5.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley6.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley6.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley6.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley6.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley7.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley7.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley7.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley7.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley8.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley8.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley8.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley8.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley9.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley9.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley9.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley9.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_chassis.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_chassis.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_chassis.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_chassis.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_harness+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_harness+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_harness.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_harness.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_l_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_l_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_l_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_l_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_leg+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_l_leg+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_leg+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_l_leg+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_l_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_l_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_l_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_r_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_r_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_r_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_r_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_leg+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_r_leg+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_leg+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_r_leg+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_r_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_r_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripley.rsi/ripley_r_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/base-broken.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/base-broken.png
new file mode 100644
index 000000000000..bbbba83fb55d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/base-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/base-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/base-open.png
new file mode 100644
index 000000000000..b0d8fba68cbb
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/base-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/base.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/base.png
new file mode 100644
index 000000000000..b4671f418f49
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/death-broken.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/death-broken.png
new file mode 100644
index 000000000000..6e3ebc9359cf
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/death-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/death-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/death-open.png
new file mode 100644
index 000000000000..431f2a707141
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/death-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/death.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/death.png
new file mode 100644
index 000000000000..b7c582a5c598
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/death.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/meta.json
similarity index 86%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/meta.json
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/meta.json
index 2b33ff70b443..6675dc1c7d1e 100644
--- a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/meta.json
@@ -7,6 +7,26 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "base",
+      "directions": 4
+    },
+    {
+      "name": "base-open"
+    },
+    {
+      "name": "base-broken"
+    },
+    {
+      "name": "death",
+      "directions": 4
+    },
+    {
+      "name": "death-open"
+    },
+    {
+      "name": "death-broken"
+    },
     {
       "name": "ripleymkii_chassis"
     },
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii0.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii0.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii0.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii0.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii1.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii1.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii1.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii1.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii10.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii10.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii10.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii10.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii11.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii11.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii11.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii11.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii12.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii12.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii12.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii12.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii13.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii13.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii13.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii13.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii14.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii14.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii14.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii14.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii15.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii15.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii15.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii15.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii16.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii16.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii16.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii16.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii17.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii17.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii17.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii17.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii18.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii18.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii18.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii18.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii19.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii19.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii19.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii19.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii2.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii2.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii2.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii2.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii20.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii20.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii20.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii20.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii3.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii3.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii3.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii3.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii4.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii4.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii4.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii4.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii5.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii5.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii5.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii5.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii6.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii6.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii6.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii6.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii7.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii7.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii7.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii7.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii8.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii8.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii8.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii8.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii9.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii9.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii9.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii9.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_chassis.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_chassis.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_chassis.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_chassis.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_harness+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_harness+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_harness+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_harness+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_harness.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_harness.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_harness.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_harness.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_l_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_l_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_l_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_l_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_l_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_l_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_l_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_l_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_l_leg+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_l_leg+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_l_leg+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_l_leg+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_l_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_l_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_l_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_l_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_r_arm+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_r_arm+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_r_arm+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_r_arm+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_r_arm.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_r_arm.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_r_arm.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_r_arm.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_r_leg+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_r_leg+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_r_leg+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_r_leg+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_r_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_r_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_r_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_r_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_upgrade_kit+o.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_upgrade_kit+o.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_upgrade_kit+o.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_upgrade_kit+o.png
diff --git a/Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_upgrade_kit.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_upgrade_kit.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/ripleymkii_construction.rsi/ripleymkii_upgrade_kit.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/ripleymkii.rsi/ripleymkii_upgrade_kit.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/vim-broken.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/base-broken.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/vim-broken.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/base-broken.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/vim-open.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/base-open.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/vim-open.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/base-open.png
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/vim.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/base.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/vim.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/base.png
diff --git a/Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/chassis.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/chassis.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/chassis.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/chassis.png
diff --git a/Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/harness.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/harness.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/harness.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/harness.png
diff --git a/Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/helmet.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/helmet.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/helmet.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/helmet.png
diff --git a/Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/left_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/left_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/left_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/left_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/meta.json
similarity index 80%
rename from Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/meta.json
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/meta.json
index 1f56ac79487c..3c507636881a 100644
--- a/Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/meta.json
@@ -7,6 +7,16 @@
     "y": 32
   },
   "states": [
+    {
+      "name": "base",
+      "directions": 4
+    },
+    {
+      "name": "base-open"
+    },
+    {
+      "name": "base-broken"
+    },
     {
       "name": "chassis"
     },
diff --git a/Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/right_leg.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/right_leg.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/right_leg.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/right_leg.png
diff --git a/Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/vim0.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/vim0.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/vim0.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/vim0.png
diff --git a/Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/vim1.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/vim1.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/vim1.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/vim1.png
diff --git a/Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/vim2.png b/Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/vim2.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Mech/vim_construction.rsi/vim2.png
rename to Resources/Textures/Objects/Specific/Mech/Mechs/Basic/vim.rsi/vim2.png
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand17.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand17.png
deleted file mode 100644
index 3da36ede3822..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand17.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand18.png b/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand18.png
deleted file mode 100644
index b3f022df3c7c..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/durand_construction.rsi/durand18.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png
index 9b39c48b3b3f..9d3594b92443 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png
index eadf7ffd93b5..6ad718e57f7b 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png
index 6a65735f3f28..665f09da0b0e 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-broken.png
deleted file mode 100644
index 879ceef9c455..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-broken.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-open.png
deleted file mode 100644
index 7db78ab187da..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley.png
deleted file mode 100644
index f8f544ba2274..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-broken.png
deleted file mode 100644
index e65af10f1d47..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-broken.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-open.png
deleted file mode 100644
index 7a186b065133..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand.png
deleted file mode 100644
index 8f1424bb24c1..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png
index 2e45633ee28a..012714adc605 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-broken.png
deleted file mode 100644
index ab4f2ae3167c..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-broken.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-open.png
deleted file mode 100644
index 044eaa62df65..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax.png
deleted file mode 100644
index ab355dada507..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-broken.png
index 2496061ab467..dae4b4fca2ad 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-empty.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-empty.png
index 0562436f8bde..6aa5d72be10a 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-empty.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-open.png
index f2b08e5607d7..e426c734a4fd 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler.png
index 7e81fe2a3eef..7bdcdc870908 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png
index b926a6b2dada..5cc54dda03ea 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png
index 594eaa993e1a..47873f5d78eb 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png
index 8f51c76b20c0..6b5e02e9e812 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png
index b024f6d9b440..fec1da9023f8 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png
index 70252e39ba09..7acc487e68e4 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png
index fe3c934016b5..7695cab3be7b 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
index b2bb7643a6bb..7cb640679815 100644
--- a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
@@ -1,5 +1,5 @@
 {
-  "copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, hamtr made by brainfood1183 (github), Ripley Resprite by Conflee",
+  "copyright" : "Taken from https://github.com/Skyrat-SS13/Skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/blob/HEAD/icons/mob/rideables/mecha.dmi",
   "license" : "CC-BY-SA-3.0",
   "version": 1,
   "size": {
@@ -7,34 +7,6 @@
     "y": 32
   },
   "states": [
-    {
-      "name": "honker",
-      "directions": 4,
-      "delays": [
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ]
-      ]
-    },
-    {
-      "name": "honker-open"
-    },
-    {
-      "name": "honker-broken"
-    },
     {
       "name": "reticence",
       "directions": 4
@@ -45,33 +17,12 @@
     {
       "name": "reticence-broken"
     },
-    {
-      "name": "ripley",
-      "directions": 4
-    },
-    {
-      "name": "ripley-empty",
-      "directions": 4
-    },
-    {
-      "name": "ripley-open"
-    },
-    {
-      "name": "ripley-broken"
-    },
     {
       "name": "marauder",
       "directions": 4
     },
     {
-      "name": "marauder-open",
-      "delays": [
-        [
-          0.5,
-          0.1,
-          0.2
-        ]
-      ]
+      "name": "marauder-open"
     },
     {
       "name": "marauder-broken"
@@ -81,14 +32,7 @@
       "directions": 4
     },
     {
-      "name": "seraph-open",
-      "delays": [
-        [
-          0.5,
-          0.1,
-          0.2
-        ]
-      ]
+      "name": "seraph-open"
     },
     {
       "name": "seraph-broken"
@@ -138,103 +82,11 @@
       "name": "phazon-broken"
     },
     {
-      "name": "ripley-old",
+      "name": "mauler",
       "directions": 4
     },
     {
-      "name": "ripley-broken-old"
-    },
-    {
-      "name": "mauler",
-      "directions": 4,
-      "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,
-          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": "mauler-open",
-      "delays": [
-        [
-          0.5,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+      "name": "mauler-open"
     },
     {
       "name": "mauler-broken"
@@ -250,18 +102,7 @@
       "name": "odysseus-broken"
     },
     {
-      "name": "hamtr",
-      "directions": 4
-    },
-    {
-      "name": "hamtr-open"
-    },
-    {
-      "name": "hamtr-broken"
-    },
-    {
-      "name": "firefighter",
-      "directions": 4
+      "name": "firefighter"
     },
     {
       "name": "firefighter-open"
@@ -269,16 +110,6 @@
     {
       "name": "firefighter-broken"
     },
-    {
-      "name": "deathripley",
-      "directions": 4
-    },
-    {
-      "name": "deathripley-open"
-    },
-    {
-      "name": "deathripley-broken"
-    },
     {
       "name": "darkgygax",
       "directions": 4
@@ -287,205 +118,66 @@
       "name": "darkgygax-open",
       "delays": [
         [
-          0.1,
-          0.05,
-          0.05,
-          0.05,
-          0.1,
-          0.05,
-          0.05,
-          0.05,
-          0.1
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
         ]
       ]
     },
     {
-      "name": "darkgygax-broken",
-      "delays": [
-        [
-          0.3,
-          0.5,
-          0.3,
-          0.5,
-          0.3,
-          0.4,
-          0.5,
-          0.3
-        ]
-      ]
+      "name": "darkgygax-broken"
     },
     {
-      "name": "durand",
+      "name": "hauler",
       "directions": 4
     },
     {
-      "name": "durand-open",
-      "delays": [
-        [
-          1,
-          0.1,
-          0.1,
-          0.5,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "durand-broken",
-      "delays": [
-        [
-          0.5,
-          1,
-          0.5,
-          1
-        ]
-      ]
-    },
-    {
-      "name": "gygax",
+      "name": "hauler-empty",
       "directions": 4
     },
     {
-      "name": "gygax-open",
-      "delays": [
-        [
-          0.1,
-          0.05,
-          0.05,
-          0.05,
-          0.1,
-          0.05,
-          0.05,
-          0.05,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "gygax-broken",
-      "delays": [
-        [
-          5,
-          0.05,
-          0.05,
-          0.05,
-          0.1,
-          0.1,
-          0.5,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "ripley-g",
-      "directions": 4
+      "name": "hauler-open"
     },
     {
-      "name": "ripley-g-open"
+      "name": "hauler-broken"
     },
     {
-      "name": "ripley-g-full",
+      "name": "paddy",
       "directions": 4
     },
     {
-      "name": "ripley-g-full-open"
-    },
-    {
-      "name": "darkhonker",
-      "directions": 4,
-      "delays": [
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ],
-        [
-          1,
-          1
-        ]
-      ]
-    },
-    {
-      "name": "darkhonker-open"
-    },
-    {
-      "name": "darkhonker-broken"
-    },
-    {
-      "name": "ripleymkii",
+      "name": "paddy-empty",
       "directions": 4
     },
     {
-      "name": "ripleymkii-open"
+      "name": "paddy-open"
     },
     {
-      "name": "ripleymkii-broken"
+      "name": "paddy-broken"
     },
     {
-      "name": "clarke",
+      "name": "paddy_sirens",
       "directions": 4,
       "delays": [
         [
-          0.1,
-          0.05,
-          0.05
+          0.4,
+          0.4
         ],
         [
-          0.1,
-          0.05,
-          0.05
+          0.4,
+          0.4
         ],
         [
-          0.1,
-          0.05,
-          0.05
+          0.4,
+          0.4
         ],
         [
-          0.1,
-          0.05,
-          0.05
+          0.4,
+          0.4
         ]
       ]
-    },
-    {
-      "name": "clarke-open"
-    },
-    {
-      "name": "clarke-broken"
-    },
-    {
-      "name": "hauler",
-      "directions": 4
-    },
-    {
-      "name": "hauler-empty",
-      "directions": 4
-    },
-    {
-      "name": "hauler-open"
-    },
-    {
-      "name": "hauler-broken"
-    },
-    {
-      "name": "vim",
-      "directions": 4
-    },
-    {
-      "name": "vim-open",
-      "directions": 4
-    },
-    {
-      "name": "vim-broken",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-broken.png
index 12a01c8a66b4..1fbd4c3f2e4e 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-open.png
index cdc13c60b99f..79002e757d2e 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus.png
index 0daa691044fd..da521cc13463 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/odysseus.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-broken.png
new file mode 100644
index 000000000000..0e45b30d562f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-empty.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-empty.png
new file mode 100644
index 000000000000..f3641ac6f1cf
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-open.png
new file mode 100644
index 000000000000..6e6d5378aa3f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy.png
new file mode 100644
index 000000000000..5d5c4f86f32c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy_sirens.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy_sirens.png
new file mode 100644
index 000000000000..12095d277047
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/paddy_sirens.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png
deleted file mode 100644
index d9dc313d0082..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png
deleted file mode 100644
index 20edd52f3e1d..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-full-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-full-open.png
deleted file mode 100644
index ef0c66b44e11..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-full-open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-full.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-full.png
deleted file mode 100644
index 41faa001a73f..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-full.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-open.png
deleted file mode 100644
index fdb9c09458f5..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g.png
deleted file mode 100644
index a01defab94ae..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png
deleted file mode 100644
index 982118b402cc..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png
deleted file mode 100644
index 23af17cc95c8..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-broken.png
deleted file mode 100644
index 6d9304c839c6..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-broken.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-open.png
deleted file mode 100644
index 947d9eeb460f..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii.png
deleted file mode 100644
index cc9c182221f5..000000000000
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-broken.png
index 4fc3f7977632..5cb3bf7a9b19 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-open.png
index b5abfd86cb58..06f76dfed135 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-open.png differ
diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph.png
index 798e49c8dfda..c8e6c64eb3bd 100644
Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph.png differ