From 23211e94362b200bda3896b7e73ee03697029e59 Mon Sep 17 00:00:00 2001
From: gluesniffler <linebarrelerenthusiast@gmail.com>
Date: Thu, 4 Jul 2024 19:42:16 -0400
Subject: [PATCH 1/8] Porting contents from the Wizden repo

---
 Content.Server/Alert/Click/ToggleWalking.cs   |  22 ++++++++++
 .../Components/InputMoverComponent.cs         |   4 ++
 .../Movement/Systems/SharedMoverController.cs |  39 +++++++++++++++++-
 Resources/Locale/en-US/alerts/alerts.ftl      |   3 ++
 Resources/Prototypes/Alerts/alerts.yml        |  13 ++++++
 .../Mobs/Cyborgs/base_borg_chassis.yml        |   1 +
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |   1 +
 .../Entities/Mobs/NPCs/regalrat.yml           |   1 +
 .../Prototypes/Entities/Mobs/NPCs/slimes.yml  |   1 +
 .../Prototypes/Entities/Mobs/Species/base.yml |   1 +
 Resources/Prototypes/tags.yml                 |   3 ++
 .../Interface/Alerts/walking.rsi/meta.json    |  17 ++++++++
 .../Interface/Alerts/walking.rsi/walking0.png | Bin 0 -> 1639 bytes
 .../Interface/Alerts/walking.rsi/walking1.png | Bin 0 -> 1686 bytes
 14 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 Content.Server/Alert/Click/ToggleWalking.cs
 create mode 100644 Resources/Textures/Interface/Alerts/walking.rsi/meta.json
 create mode 100644 Resources/Textures/Interface/Alerts/walking.rsi/walking0.png
 create mode 100644 Resources/Textures/Interface/Alerts/walking.rsi/walking1.png

diff --git a/Content.Server/Alert/Click/ToggleWalking.cs b/Content.Server/Alert/Click/ToggleWalking.cs
new file mode 100644
index 00000000000..45e46673e5a
--- /dev/null
+++ b/Content.Server/Alert/Click/ToggleWalking.cs
@@ -0,0 +1,22 @@
+using Content.Shared.Movement.Systems;
+using Content.Shared.Movement.Components;
+using Content.Shared.Alert;
+using JetBrains.Annotations;
+
+namespace Content.Server.Alert.Click;
+
+/// <summary>
+/// Attempts to toggle the internals for a particular entity
+/// </summary>
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class ToggleWalking : IAlertClick
+{
+    public void AlertClicked(EntityUid player)
+    {
+        var movementSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SharedMoverController>();
+        var entManager = IoCManager.Resolve<IEntityManager>();
+        entManager.TryGetComponent<InputMoverComponent>(player, out var mover);
+        movementSystem.ToggleWalking(player);
+    }
+}
diff --git a/Content.Shared/Movement/Components/InputMoverComponent.cs b/Content.Shared/Movement/Components/InputMoverComponent.cs
index f1e34c90df4..f193ee389f0 100644
--- a/Content.Shared/Movement/Components/InputMoverComponent.cs
+++ b/Content.Shared/Movement/Components/InputMoverComponent.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Alert;
 using Content.Shared.Movement.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
@@ -74,6 +75,9 @@ public sealed partial class InputMoverComponent : Component
 
         [ViewVariables(VVAccess.ReadWrite)]
         public bool CanMove = true;
+
+        [DataField]
+        public ProtoId<AlertPrototype> WalkingAlert = "Walking";
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 4d9eedbf7c4..acb9b7411d1 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
+using Content.Shared.Alert;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.CCVar;
 using Content.Shared.Friction;
@@ -33,6 +34,7 @@ namespace Content.Shared.Movement.Systems
     /// </summary>
     public abstract partial class SharedMoverController : VirtualController
     {
+        [Dependency] private   readonly AlertsSystem _alerts = default!;
         [Dependency] private   readonly IConfigurationManager _configManager = default!;
         [Dependency] protected readonly IGameTiming Timing = default!;
         [Dependency] private   readonly IMapManager _mapManager = default!;
@@ -165,6 +167,17 @@ protected void HandleMobMovement(
             var (walkDir, sprintDir) = GetVelocityInput(mover);
             var touching = false;
 
+            if (_tags.HasTag(uid, "CanWalk"))
+            {
+                if (!mover.Sprinting)
+                {
+                    _alerts.ShowAlert(uid, mover.WalkingAlert, 0);
+                } else
+                {
+                    _alerts.ShowAlert(uid, mover.WalkingAlert, 1);
+                }
+            }
+
             // Handle wall-pushes.
             if (weightless)
             {
@@ -285,6 +298,30 @@ protected void HandleMobMovement(
             PhysicsSystem.SetAngularVelocity(physicsUid, 0, body: physicsComponent);
         }
 
+        public void ToggleWalking(EntityUid player)
+        {
+
+            var mover = MoverQuery.GetComponent(player);
+            //var buttons = mover.HeldMoveButtons;
+            bool containsWalk = (mover.HeldMoveButtons & MoveButtons.Walk) == MoveButtons.Walk;
+            //var moveEvent = new MoveInputEvent(mover.Owner, mover, mover.HeldMoveButtons);
+            /*if (!containsWalk)
+            {
+                mover.HeldMoveButtons |= MoveButtons.Walk;
+            }
+            else
+            {
+                mover.HeldMoveButtons &= ~MoveButtons.Walk;
+            }*/
+
+            //RaiseLocalEvent(player, ref moveEvent);
+            //Dirty(mover.Owner, mover);*/
+            HandleRunChange(player, Timing.TickFraction, !containsWalk);
+            //var funcId = InputManager.NetworkBindMap.KeyFunctionID(EngineKeyFunctions.Walk);
+            //var message = new IFullInputCmdMessage(Timing.CurTick, (containsWalk ? BoundKeyState.Up : BoundKeyState.Down), 145, Timing.TickFraction);
+            //await Client.WaitPost(() => InputSystem.HandleInputCommand(ClientSession, key, message));
+        }
+
         public void LerpRotation(EntityUid uid, InputMoverComponent mover, float frameTime)
         {
             var angleDiff = Angle.ShortestDistance(mover.RelativeRotation, mover.TargetRelativeRotation);
@@ -440,7 +477,7 @@ private bool TryGetSound(
                 sound = moverModifier.FootstepSoundCollection;
                 return true;
             }
-            
+
             // If got the component in yml and no shoes = no sound. Delta V
             if (_entities.TryGetComponent(uid, out NoShoesSilentFootstepsComponent? _) &
                 !_inventory.TryGetSlotEntity(uid, "shoes", out var _))
diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl
index 795d740141b..20e9d311e2b 100644
--- a/Resources/Locale/en-US/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/alerts/alerts.ftl
@@ -110,3 +110,6 @@ alerts-revenant-essence-desc = The power of souls. It sustains you and is used f
 
 alerts-revenant-corporeal-name = Corporeal
 alerts-revenant-corporeal-desc = You have manifested physically. People around you can see and hurt you.
+
+alerts-walking-name = Walking
+alerts-walking-desc = Toggles your movement speed to be slower or faster.
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 2d1c9062e61..f79649f6b93 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -419,6 +419,19 @@
   name: alerts-pacified-name
   description: alerts-pacified-desc
 
+- type: alert
+  id: Walking
+  onClick: !type:ToggleWalking  { }
+  icons:
+  - sprite: /Textures/Interface/Alerts/walking.rsi
+    state: walking0
+  - sprite: /Textures/Interface/Alerts/walking.rsi
+    state: walking1
+  name: alerts-walking-name
+  description: alerts-walking-desc
+  minSeverity: 0
+  maxSeverity: 1
+
 - type: alert
   id: Debug1
   icons:
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 0645e451af2..23eda535ee4 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -205,6 +205,7 @@
     - ShoesRequiredStepTriggerImmune
     - DoorBumpOpener
     - CanPilot
+    - CanWalk
   - type: Emoting
   - type: GuideHelp
     guides:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index e311681ce5f..43fa13f1112 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1299,6 +1299,7 @@
     tags:
     - VimPilot
     - DoorBumpOpener
+    - CanWalk
 
 - type: entity
   name: monkey
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 50fe3b6765e..662e90b8bf5 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -95,6 +95,7 @@
     tags:
       - CannotSuicide
       - FootstepSound
+      - CanWalk
   - type: NoSlip
   - type: RatKing
     hungerPerArmyUse: 25
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index 901bf149cbc..e46347b79e5 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -43,6 +43,7 @@
   - type: Tag
     tags:
     - FootstepSound
+    - CanWalk
   - type: Butcherable
     butcheringType: Knife
     spawned:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 67212d416fe..42c73e4663a 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -229,6 +229,7 @@
     - CanPilot
     - FootstepSound
     - DoorBumpOpener
+    - CanWalk
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index c6a0ab3f8fd..5237febc2b3 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -286,6 +286,9 @@
 - type: Tag
   id: CanPilot
 
+- type: Tag
+  id: CanWalk
+
 - type: Tag
   id: CannonBall
 
diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/meta.json b/Resources/Textures/Interface/Alerts/walking.rsi/meta.json
new file mode 100644
index 00000000000..fc1a55d48ea
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/walking.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Walking icon by /tg/station (placeholder)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "walking0"
+        },
+        {
+            "name": "walking1"
+        }
+    ]
+}
diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/walking0.png b/Resources/Textures/Interface/Alerts/walking.rsi/walking0.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1ab277a99fcc6cc1615ad6d2e065a8c9058b8fd
GIT binary patch
literal 1639
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/walking1.png b/Resources/Textures/Interface/Alerts/walking.rsi/walking1.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb4264c33420d299a20a63c184ed237b58fe8359
GIT binary patch
literal 1686
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

literal 0
HcmV?d00001


From 325de7fe05d591f368c660284afc6c797df53641 Mon Sep 17 00:00:00 2001
From: gluesniffler <linebarrelerenthusiast@gmail.com>
Date: Thu, 4 Jul 2024 21:02:12 -0400
Subject: [PATCH 2/8] Fixed some oopsies

---
 .vscode/settings.json                                     | 2 +-
 Content.Shared/Alert/AlertType.cs                         | 1 +
 Content.Shared/Movement/Components/InputMoverComponent.cs | 1 +
 Content.Shared/Movement/Systems/SharedMoverController.cs  | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0e0d3ae890c..3386947c62b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,4 @@
 {
     "omnisharp.analyzeOpenDocumentsOnly": true,
-    "dotnet.defaultSolution": "SpaceStation14.sln"
+    "dotnet.defaultSolution": "SpaceStation14.sln",
 }
diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs
index b917dd692d7..a4423cad6c5 100644
--- a/Content.Shared/Alert/AlertType.cs
+++ b/Content.Shared/Alert/AlertType.cs
@@ -37,6 +37,7 @@ public enum AlertType : byte
         Internals,
         Toxins,
         Muted,
+        Walking,
         VowOfSilence,
         VowBroken,
         Essence,
diff --git a/Content.Shared/Movement/Components/InputMoverComponent.cs b/Content.Shared/Movement/Components/InputMoverComponent.cs
index f193ee389f0..263190d46fd 100644
--- a/Content.Shared/Movement/Components/InputMoverComponent.cs
+++ b/Content.Shared/Movement/Components/InputMoverComponent.cs
@@ -5,6 +5,7 @@
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.Timing;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Movement.Components
 {
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index acb9b7411d1..067c0656faf 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -171,10 +171,10 @@ protected void HandleMobMovement(
             {
                 if (!mover.Sprinting)
                 {
-                    _alerts.ShowAlert(uid, mover.WalkingAlert, 0);
+                    _alerts.ShowAlert(uid, AlertType.Walking, 0);
                 } else
                 {
-                    _alerts.ShowAlert(uid, mover.WalkingAlert, 1);
+                    _alerts.ShowAlert(uid, AlertType.Walking, 1);
                 }
             }
 

From 9134379ca1c741297fb6786339f7495dd537f951 Mon Sep 17 00:00:00 2001
From: gluesniffler <linebarrelerenthusiast@gmail.com>
Date: Mon, 8 Jul 2024 03:07:07 -0400
Subject: [PATCH 3/8] Added new sprites, fixed interaction issues, gave up on
 the Alert Click event.

---
 .gitignore                                    |   1 +
 Content.Server/Alert/Click/ToggleWalking.cs   |  22 ---------
 .../Systems/SharedMoverController.Input.cs    |   7 ++-
 .../Movement/Systems/SharedMoverController.cs |  44 ++++++------------
 Resources/Locale/en-US/alerts/alerts.ftl      |   2 +-
 Resources/Prototypes/Alerts/alerts.yml        |   1 -
 .../Entities/Objects/Specific/Mech/mechs.yml  |   1 +
 .../Interface/Alerts/walking.rsi/meta.json    |   2 +-
 .../Interface/Alerts/walking.rsi/walking0.png | Bin 1639 -> 1376 bytes
 .../Interface/Alerts/walking.rsi/walking1.png | Bin 1686 -> 1048 bytes
 10 files changed, 23 insertions(+), 57 deletions(-)
 delete mode 100644 Content.Server/Alert/Click/ToggleWalking.cs

diff --git a/.gitignore b/.gitignore
index 0cd376f5dcd..91a6317c1db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -264,6 +264,7 @@ __pycache__/
 
 # Visual Studio Code workspace settings.
 .vscode/*
+.vscode
 !.vscode/extensions.json
 !.vscode/launch.json
 !.vscode/tasks.json
diff --git a/Content.Server/Alert/Click/ToggleWalking.cs b/Content.Server/Alert/Click/ToggleWalking.cs
deleted file mode 100644
index 45e46673e5a..00000000000
--- a/Content.Server/Alert/Click/ToggleWalking.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Shared.Movement.Systems;
-using Content.Shared.Movement.Components;
-using Content.Shared.Alert;
-using JetBrains.Annotations;
-
-namespace Content.Server.Alert.Click;
-
-/// <summary>
-/// Attempts to toggle the internals for a particular entity
-/// </summary>
-[UsedImplicitly]
-[DataDefinition]
-public sealed partial class ToggleWalking : IAlertClick
-{
-    public void AlertClicked(EntityUid player)
-    {
-        var movementSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SharedMoverController>();
-        var entManager = IoCManager.Resolve<IEntityManager>();
-        entManager.TryGetComponent<InputMoverComponent>(player, out var mover);
-        movementSystem.ToggleWalking(player);
-    }
-}
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index bce3aeff527..d323125f1dc 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Alert;
 using Content.Shared.CCVar;
 using Content.Shared.Follower.Components;
 using Content.Shared.Input;
@@ -333,6 +334,8 @@ private void OnInputInit(EntityUid uid, InputMoverComponent component, Component
 
             component.RelativeEntity = xform.GridUid ?? xform.MapUid;
             component.TargetRelativeRotation = Angle.Zero;
+            WalkingAlert(uid, !component.Sprinting);
+
         }
 
         private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
@@ -344,6 +347,7 @@ private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
                 // if we swap to relay then stop our existing input if we ever change back.
                 if (moverComp != null)
                 {
+                    WalkingAlert(uid, walking);
                     SetMoveInput(moverComp, MoveButtons.None);
                 }
 
@@ -460,10 +464,11 @@ private void ResetSubtick(InputMoverComponent component)
             component.LastInputSubTick = 0;
         }
 
+
         public void SetSprinting(EntityUid entity, InputMoverComponent component, ushort subTick, bool walking)
         {
             // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}");
-
+            WalkingAlert(entity, walking);
             SetMoveInput(entity, component, subTick, walking, MoveButtons.Walk);
         }
 
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 067c0656faf..785e6c33ae8 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -24,7 +24,8 @@
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Shared.StepTrigger.Components; // Delta V-NoShoesSilentFootstepsComponent
+using Content.Shared.StepTrigger.Components;
+using System.Diagnostics; // Delta V-NoShoesSilentFootstepsComponent
 
 namespace Content.Shared.Movement.Systems
 {
@@ -162,21 +163,13 @@ protected void HandleMobMovement(
 
 
             UsedMobMovement[uid] = true;
+            //Logger.Debug($"Beginning movement with {mover.Sprinting} owned by {mover.Owner}. Relative entity is {mover.RelativeEntity} Current UID is {uid}, Physics UID is {physicsUid}");
             // Specifically don't use mover.Owner because that may be different to the actual physics body being moved.
             var weightless = _gravity.IsWeightless(physicsUid, physicsComponent, xform);
             var (walkDir, sprintDir) = GetVelocityInput(mover);
             var touching = false;
 
-            if (_tags.HasTag(uid, "CanWalk"))
-            {
-                if (!mover.Sprinting)
-                {
-                    _alerts.ShowAlert(uid, AlertType.Walking, 0);
-                } else
-                {
-                    _alerts.ShowAlert(uid, AlertType.Walking, 1);
-                }
-            }
+
 
             // Handle wall-pushes.
             if (weightless)
@@ -298,28 +291,17 @@ protected void HandleMobMovement(
             PhysicsSystem.SetAngularVelocity(physicsUid, 0, body: physicsComponent);
         }
 
-        public void ToggleWalking(EntityUid player)
-        {
-
-            var mover = MoverQuery.GetComponent(player);
-            //var buttons = mover.HeldMoveButtons;
-            bool containsWalk = (mover.HeldMoveButtons & MoveButtons.Walk) == MoveButtons.Walk;
-            //var moveEvent = new MoveInputEvent(mover.Owner, mover, mover.HeldMoveButtons);
-            /*if (!containsWalk)
+        public void WalkingAlert(EntityUid player, bool walking) {
+            if (_tags.HasTag(player, "CanWalk"))
             {
-                mover.HeldMoveButtons |= MoveButtons.Walk;
+                if (walking)
+                {
+                    _alerts.ShowAlert(player, AlertType.Walking, 0);
+                } else
+                {
+                    _alerts.ShowAlert(player, AlertType.Walking, 1);
+                }
             }
-            else
-            {
-                mover.HeldMoveButtons &= ~MoveButtons.Walk;
-            }*/
-
-            //RaiseLocalEvent(player, ref moveEvent);
-            //Dirty(mover.Owner, mover);*/
-            HandleRunChange(player, Timing.TickFraction, !containsWalk);
-            //var funcId = InputManager.NetworkBindMap.KeyFunctionID(EngineKeyFunctions.Walk);
-            //var message = new IFullInputCmdMessage(Timing.CurTick, (containsWalk ? BoundKeyState.Up : BoundKeyState.Down), 145, Timing.TickFraction);
-            //await Client.WaitPost(() => InputSystem.HandleInputCommand(ClientSession, key, message));
         }
 
         public void LerpRotation(EntityUid uid, InputMoverComponent mover, float frameTime)
diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl
index 20e9d311e2b..ac134ff7002 100644
--- a/Resources/Locale/en-US/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/alerts/alerts.ftl
@@ -112,4 +112,4 @@ alerts-revenant-corporeal-name = Corporeal
 alerts-revenant-corporeal-desc = You have manifested physically. People around you can see and hurt you.
 
 alerts-walking-name = Walking
-alerts-walking-desc = Toggles your movement speed to be slower or faster.
+alerts-walking-desc = Indicates how fast you're moving.
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index f79649f6b93..7146f0589ca 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -421,7 +421,6 @@
 
 - type: alert
   id: Walking
-  onClick: !type:ToggleWalking  { }
   icons:
   - sprite: /Textures/Interface/Alerts/walking.rsi
     state: walking0
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index 5a2587ff710..d985d5a7667 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -59,6 +59,7 @@
     baseSprintSpeed: 2
   - type: Tag
     tags:
+    - CanWalk
     - DoorBumpOpener
     - FootstepSound
   - type: Pullable
diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/meta.json b/Resources/Textures/Interface/Alerts/walking.rsi/meta.json
index fc1a55d48ea..d328b01a45f 100644
--- a/Resources/Textures/Interface/Alerts/walking.rsi/meta.json
+++ b/Resources/Textures/Interface/Alerts/walking.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Walking icon by /tg/station (placeholder)",
+    "copyright": "Walking/Running icons modified by Mocho, original taken from /tg/station https://github.com/tgstation/tgstation/pull/52691/commits/6a1261187c108c8f151c99ebfa567bd1ec34044c",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/walking0.png b/Resources/Textures/Interface/Alerts/walking.rsi/walking0.png
index d1ab277a99fcc6cc1615ad6d2e065a8c9058b8fd..2547d35c8f1ba0d2ab2ddb48847bf5f303015282 100644
GIT binary patch
delta 1358
zcmV-U1+n_)4B!foBYyx1a7bBm000XT000XT0n*)m`~Uz25=lfsR9HvFSIui&RTMw>
z%}kQ9lcbYLCNCe-4>W#2!6H`FO`3%zrBDsUg)|{93et_Z68r-MSK>wjE(|5hQmlwY
z7wxPB7lNRmEoduE(`G)C`OZw<yPn^D^Jeawc{39W)f0x7cYp7Bzw^82<DPp(B9Wl~
zQ-ZGXrKJo1DUWN{t}1&19&nA%P9JTN5R!xtB&BSQ;T>W$o|w_+{dA$P#-;NuWOM7D
zdV)mL128@m9&}h4L;=H~pglmAQ6rlHV01tZk`a&;<oW#}K}K0pMb;fsR*3dl7sgy&
zjN{unk6X4)(tmacz?Msbp<0qorwPAoCPSrko{ldq%Sxs|`DBr**#aFoe^C}ijiwft
z<<qAx%9(S^vREroE!)sd7ii~EkxH4o(k%xnbc`{81xy!Tx7qXn2FJ(8)#|Z=kq~=>
z8BaVrO;){5!2y0}Pfkuwsqx|;H$~*d1!<a7BrQvgnSW-C$~B_UD1$)PoKfTP_yiTL
zDp{5j&T3_^$-zSa3=!u5e_t9IA~r?&LW!PRd{5rK@s%+7J-4$<WBiOfzaRmg%jJ~Y
zp_{A~Nakw1fFYXY_pz7Hs_!bP9V*#-O#+ca!~O)|0Z1Sq=#b&$Lu@RjRx=*sInJZQ
zBN28H(SPnQ-;2?g&d6vq+5|J%JN4)u89`@V*`L1?AphXo4G})52k;^1AMILUN?rY2
zoP6g4`TI9tiWkmZlD~fag}`cKr--(;Hfi*v^Mu#nor%}pRzCji`kFAA?DnGvG{#uT
zWQxkt-viAuY_9?oO)wCk5LW^OhW7(b#;Y+dQ-3Z9LRg_2;vr=8zAb2<Qv&lSJ-;eI
z4xkD=We8y8fGb#)s$2lIiJIeIus%p34wqyd%VNX9sv@d?;qCz-;!58f=&;x}fDmDy
z7!HKVJo~OfUjKNtwbN+&r(SuZ1FmNkv}^x$_jXr4tDmgPV{uMW7X0r=Lig%pd7u{o
z0DnH@4Q3h@(nZ|L(x?BG2l|Br^Lh_x*MDLjfXknmbXLB}$=fXlo`?sOag(=g{_C}R
zkb5i-pdTQmk>1^MKouz~VD*h8gcmv@HW3F=2g~h-dJc4S!we@CI#({6Rb8-Mu=?W+
zdOwx&to}$Wic09v2L`Z!3G8-{cnE-PoPU4Qu^E~@Izz9%|6%7Y#3l@0(ky5GW+qKj
zQKt;IcXGb@3JhQY6WFk!i-$ml-MP#CyhsH?zrS<iitpy45|52T9_BKNgc(JT>=a-C
z3z)!$4P83U17Q(XhY8~SeD2K^Id^77ZSw0Md3QS311^b1n45%GKV4VtS_Pk<Cx70$
zEdRc~Au6&$<x-FHzyNo_Ja@el=P%1UKU@(%CT?~ttNpA9g(?%)lh7sn`uu`g2s&wH
zyGAuWB|Q~xod-N2i1B$~)QnJshUxyT4KcU4;+q4CkrteWao=zO16aTWHf(eaK`QB-
zh|p||te~y6&pe>20(kSWY)M;<9Dnc)yf*j~W7t9GV9V!HRXKgTp}P+#oV#8V0Kopg
z*2oEv>P2EC9_hIcbesuwFn#%M=hKb%TRrCC)pqIY0sVtNwRYTV+wInl`}G3fdx3j?
z*LN*6n|rCO%68rDdK2;shmPfUFX(<X^TdL0Lwr6|SF-95*#l)h3p%04m`8q9({DiC
zLZn~K6amOVE~iaHZRfsj<Gpgkb2&XoGPydp=I4#miA3X;*ZQ*Cct7la05o90eh12)
Q0ssI207*qoM6N<$f>BL_+yDRo

delta 1623
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
VO}Q{Wlac@c002ovPDHLkV1j4i7Igps

diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/walking1.png b/Resources/Textures/Interface/Alerts/walking.rsi/walking1.png
index eb4264c33420d299a20a63c184ed237b58fe8359..3980ee73b5d0cb96b651a22f2fd2faba324f0d87 100644
GIT binary patch
delta 1027
zcmV+e1pND!4VVa!BYyx1a7bBm000XT000XT0n*)m`~Uz0%1J~)R9HvlSKUigK@>l;
zD}J}SAGzupr7Vh&M9>!$v4t6-MfB2($VLbfz4R3I2NXR9Jwy>n_|S_%XbK@=VMU5a
z5Q!xkWa_SW@0xD3y6jHp%<gsXdS`XB&<6)(_RgLAJHK=0cYn?tS$}^&Y}W92JVsNS
zNkHbPX|udfXJ^X^WXYISRo0{|o6QU?<{YT=UgN;yuSR<wvD(JVe6;%^t8HrKqc7sm
z^zP%cdn~L(AYuwbES7|tm>e^hlM-+^94i|c#>i|kL4hS7$arY9pB2`4xYJoCo>$N6
za1Yye;VS>p-G9MC(J(}#3C4(+F#$zUk^~roER4W1F9H{OQ&{a0h^nfB4d>v`MKP<v
z`Q(f{e7_Y4FCYQ@hVvwe)gk!12#{hBP#x)E#YGl@Ww+VIY_k@N*;=#%fC0D)>@c6b
z1Ti$u6UVTj2oNY~U`fpdmj__%<zrTJ<`Vzh^?*6hP=E3M2H~FHKMOW|_W5SOjzni?
z0}$e=M_>>DEo}QbAl1O3gGZ&&(iSN*Fxn_iGYq_Y1KwNh;uzX*dTBXj=&=Te-WqVF
z1oT-TV?tJlL@v)0#w$zWLZsiTNvwypZWc%hpm7tXr-kK-*E4|tl-rZFL;sDwrffJ1
z^njZ8Ie)Qyh&UsF<w%Tlx&F@)ke!=G$lKb^-Ojk@<32^If&U(X72|l`?otPek*!(j
z){B7jHr!d_fD-(pd96Xl={}gk(w%D-A~bAY4@*iwMNtK@)-U)&Qv0O#DkS%PZZ5_9
z-FB;i1Yr;sVakS-K)Kxo6?<H8xDBu0G{c0>SAU@LrveI;S>tKwn-3cH69!=sX2t|U
zun4<OH1jXLPYi`c4?@O88U_P`M5&eTMXh6q?<5SuB23wk)`7b7S2#ogsvBB(_30K&
zdaQESja5#IfJQ=Zz<WDh9R(e{4GDAj!=S+-DS=PV@3Xz<+W2^12OD_RCuPpC5Ut96
z7Jo+4SP8}c_8W1+$4=IRyS|wdX2wTgVFloO-^tvkn$vd@gr<W;<5Y$XHVA{T2s7g&
z2r2={#(vHz`9fp>7N2O0!-PNCIZ4qIi_|?WE5D>$q*+knE`!>}R;~_pOT$K?C*ySS
z$ZkNrCBh&q!pt}VWydcH5!wzkaqq#Vm3%YRZoWx>Kw5TFM0f{9NUc~xgaWg-*Wi#e
z0@JUbGE#nEsEd)9G(ibbuhC#?eSr`mW(|Eu7=$G-B|}c&>kN!^-evY9XH!H-;r=$K
x3YZjQx<*95PWuRhu%;1HI<|dJxaI#F{sG%!r1=3Q)=2;W002ovPDHLkV1fx5;K=|0

delta 1670
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
Q)&Kwi07*qoM6N<$g5^LpDgXcg


From 2bb2ae009b1dfdf83fbe5f7033bb30be6d812c5b Mon Sep 17 00:00:00 2001
From: gluesniffler <linebarrelerenthusiast@gmail.com>
Date: Mon, 8 Jul 2024 03:50:30 -0400
Subject: [PATCH 4/8] Tying up a few loose ends (why were these modified?)

---
 .gitignore            | 1 -
 .vscode/settings.json | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 91a6317c1db..0cd376f5dcd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -264,7 +264,6 @@ __pycache__/
 
 # Visual Studio Code workspace settings.
 .vscode/*
-.vscode
 !.vscode/extensions.json
 !.vscode/launch.json
 !.vscode/tasks.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3386947c62b..0e0d3ae890c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,4 @@
 {
     "omnisharp.analyzeOpenDocumentsOnly": true,
-    "dotnet.defaultSolution": "SpaceStation14.sln",
+    "dotnet.defaultSolution": "SpaceStation14.sln"
 }

From d9e7eee3224d229da32a2314987db1c2a4b81da8 Mon Sep 17 00:00:00 2001
From: gluesniffler <linebarrelerenthusiast@gmail.com>
Date: Mon, 8 Jul 2024 08:56:21 -0400
Subject: [PATCH 5/8] minor kerning mistake :trollface:

---
 .../Interface/Alerts/walking.rsi/walking0.png | Bin 1376 -> 1335 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/walking0.png b/Resources/Textures/Interface/Alerts/walking.rsi/walking0.png
index 2547d35c8f1ba0d2ab2ddb48847bf5f303015282..1d1f048fb918d8c09a4d044f3850e16da939d583 100644
GIT binary patch
delta 1296
zcmV+r1@HRc3bzW7IDZ7`Nkl<ZSVzTI&2Jl35TCUjCk7`aUdM5qpr%n90a76d(W>M?
zk^`s}P>47nXrdfZZ=4YP0U%C@3#!D$s(P#{H~<2P#zLr44+sekKqY9QiQU9s@ke4~
z$9~N3t=E3L-nHFBVXW2j&c6N4_sm-@kx0=0Nj_8f>gwzNsec~Vu3eS#G<d)iJ`<bm
zD4_|`G>wE1Z65AHp4N&d>T{>P*f06Qco(#lydzgA(e?m@j|7Gdtvp0tkB59sKQ%lx
zYBB(X`o%DLyn=lE{BT4g&w-$dsM8NOz8}bYr=DGu`yk6yf}uK;$z%vuE}NzOOp)eR
z*F+^-qT+6us(-l>9X)?Rl(ia7om~@;E?*GSFRh7Mu1Fgn#l_Pn7U=QW1zMPYiZ(us
zi_?pXlJA7C^4cB%GaL>}>tXHK5PPFZG;tzEje4DYe!ge8$;m0nFaLI33qG+T#*Z2I
z(Wp)bHKL&-41j&nX~|a!_@HX#pEkSO1L-Vf*$b)ttbg28EbY_G@>`-%EXn))UO}$G
z$5sRc<O|0AZmmS6e3tfF`$Es06Y=*pI)UdsriWFfEDAtFUDrwHH8P^heR_yjwkWK#
z_6+yPSdd*rRQUNDP6DD(C?xkq*)!p}sPrNz_v2R@LSgrS`P}3?=0G}~rercpKVAJq
z3!iyK{D1o8XPSQMW%0}BpK9CNe@jJ@$t}62Qri-1;>>Fz_WT<HR)W8CkNFmKXAiW?
z&|U@bozLr~A+7`vO6kyBm;WV?%ajX(8hmZu{7yC0^}ksK$N^M=r3~?w)V@Wic^N<!
zWGDHIFJFC_hP)a*d3=Ey4UG<cRjH`@hS>v9%6}$)@Zr%mWLFgoVhXni*(XN50g9e`
zQ_73KZ%sH8$Fy3-Rja_Ffa(GBg+Fiq?yA$q2XS#MVk9g6J1OCWd0!srr2qt{xM{^u
zAueRkdThHd4-66#bq3h?KQIr#<;N!t%eOdr-E!c8ct8q|a@*!#FYE1<WqPM?4qzUj
z1b>m<ZaE-}lsCZoRuaMsT@jmzKv4rrv}QxkS&-$V!Zgh1a&ijV3D(as=w0rXs`W?p
zaa2OreqaC#n83E@gr!+R+X!DVeVS%wr|I<D?{s$|7U5x&W;pY=vKg8hH_C8lFYlPI
zzyKC7fejfdSrot&EZi$onM#Ctf9vbZmVarcz6jx<6i+}X5gj*%lAVA7EMNi~GF0m7
zgaIue4<6JYntx$k%)huUhf4fiYo{|kU@FlHb6a6~7(vY8Ltan5dQtrK#TBh0Ds-^l
zIS+JoLVqJbMV@*m&tDX`zP+s7NL=r-%6?YFhAJzpCZVbDb4x4I5KPj_PK|2b3V%Hm
z=*$932yhNK5)D$2M(OV66>a|Px?>JVjg;WDggb@{7{CH1upz@W1nJ$3oN^d8o}5O>
zOCMW6Wd(5aX*2~TTRGquc!hbBF`7Q(VB6$SpmGN80}|)9RRjRg|1Y(20!sB#Vk{Eu
z*#~+~L)Cn9@~Oi6S&!%Ns-60JK!1JV4`m$pYP)XZxZf;rJQJFySG8+l*xX6yWVWkr
zSBH>OI8-dBQ?dJ}nd$~Umf?ITKgp^i)bt<lS<nbQc<QHGgEP(S`EDUnKh2~9pg}%P
z+k$N8J~w`^9I<?y4w6jfp3S8t&vGJR`{v=3u?xQ+_P_7|ihLZ6>3#qJ00{s|MNUMn
GLSTa1&2Ux#

delta 1337
zcmV-91;+Zf3g8NmIDZ8aNkl<ZSVzTI&1+m$6hHUPOp>vaq?1V|FCWqmG=4zAB39H*
znuR5$Pz}X}G$Aeu(v7$h`~w76;zj~43?<7_tcXPy?W_bBf}o%+Xe&+AW<Hbo&P?9B
zp5J}*X6~DLGZPEd6NZ;}?|HxTyXWJcdqpCVp#M{XuJNU%3xEG9k89ViDtiJRaE;GS
zA8nBkl7tW>rEHGj9bz<|n9=9`bfK@trSmOhbL*aZf<)5;Fg_F>bXXZg0mGo6JwTRG
zBbxzWbU+T05s(z*`TZe5Mp;rt)*Vt-i1t|*##~*D<J&rqTeeNob_l?hOM;<Vl1`@y
zzicK$rF5Q-FMln|N~S>hWRa@b0v$PjQ5HpwrWTjw)2A=WnRCmsSSwL2+t5uHXy;Lp
zN}0UUEe9%ej4^-(Oc!6b+4KMg$H&Lj>al{65PO3ePdqzKR=rNa0e)vsPEJm#@!}sh
zMdZZ=X_`|cElZ7=W{k=;qR=RVK-Zj6<MH?e6|E{+mVXn@YGtp<!9xHH5$6DZUm6)A
zHbwbDiJn`0Pu{-ql`#1|x3f!Q{ER%mAOW7s<&@i@o2(T`=4!lvA)4j)v6s)P?<%Ps
zD%pEY0+B<*{siCwNFX5Skm2M*Y%Hc$GalnP&ZEO45q1&L?l0eq(U;E1Xf)acGub=!
z=pGqCXMbJUpT83z|KQsV5k9B~@FC|P?OI_<UHx2~eCGrC`!`>T7tURhzkdCNz-nWs
zh_<#iY4oJ?gxBDmiPzp%KK||cnlPE{_M-<h##qT@iptX81I;pQuL2ZJFc6>+R{{iv
z_XAGGt1&K9E(k(cp&Q~MWc0o*XrEI8^C&&PDt|x@pb9)?2w>!ZD_E7PTmZF+n&V%v
zK1d-Bmt-BwV#C3zBC3Dk?g1d;O5Yslu-G<$5MiGf4ur`(`>sM>|9G{v(`fpqUU{Pf
zu4fgrYyWlkc2_>DpRCJcaZXYe{O?CX_v&MLpcerEKI9E%8Wqw-+{)6Y|CI;&g#+_?
z4}WOae_|eh%b%HaR=&x}+bsv4hzFE$lecaD>$Q52dn^y2A0VZX-raIQ6)7uV^^GKi
z7dj#~5eHER%k74G4s>+G3?~&jS1y}XU9erS`r{0GKb7*V{zxo}O6brB2C#q$>~@cM
z2!L&zf77uUnmsy0ufG3b=Ptx13|`VKXMg@?CQVaOrwq4ua=!Tr3}68h*s!6Chd_qi
zxy${$NCiT_zjNb?@8+TskBvhf<}!+e8AXrm6kq@gn81b&T{_MKVG&k`3F7^H?#&fB
zcV<Ox^6MXYcRJStE{R5%n}k<CU03Z|1)rZM-nuORzP=$UvO?ujkMqC)cfmY&y?+zu
zFUvbWToFGeZgwoI{j3OuDihX|&?Wr({DN8tI%#FQMm0VqJr!=92RtE&@p)j>j8KGz
z>He(^F}Jwln*)lG7MzB0-*5o~Sil4}Y;+AlD(Rev&}@vXpslsfJfNxqc=NGrNn4E^
z@D02+_!DE;LFZu0=TcQUeY>H%4}U0}yIvCj!2ZA1$O(|@MPei#>A4SdoC$R>efe(Z
z(~b9AJ?7!ncIoQ@{ewTXcHC>*?beR_^#b2}fqQ<}cP%uVd#S9-cHQlI6Y>j(j^%eR
z=zcZx#DZ@_d_GiHvg#1o17$u7I-$pyepS<NK;1&5U(FN&$U!crO+#(xzA|p(y>i5J
vIXy@+xjMJz=Z({eMB|p%`m)=2KkR=1G+@Af2g;rT00000NkvXXu0mjfp@4q5


From 621619ac74025f1ac1008c7e166cf52a301465a4 Mon Sep 17 00:00:00 2001
From: gluesniffler <159397573+gluesniffler@users.noreply.github.com>
Date: Tue, 9 Jul 2024 15:43:24 -0400
Subject: [PATCH 6/8] Adding changes from the review

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: gluesniffler <159397573+gluesniffler@users.noreply.github.com>
---
 .../Movement/Systems/SharedMoverController.Input.cs  |  1 -
 .../Movement/Systems/SharedMoverController.cs        | 12 ++----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index d323125f1dc..891bd518b1c 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -335,7 +335,6 @@ private void OnInputInit(EntityUid uid, InputMoverComponent component, Component
             component.RelativeEntity = xform.GridUid ?? xform.MapUid;
             component.TargetRelativeRotation = Angle.Zero;
             WalkingAlert(uid, !component.Sprinting);
-
         }
 
         private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 785e6c33ae8..09dd4f19b60 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -25,7 +25,7 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Content.Shared.StepTrigger.Components;
-using System.Diagnostics; // Delta V-NoShoesSilentFootstepsComponent
+using System.Diagnostics;
 
 namespace Content.Shared.Movement.Systems
 {
@@ -163,14 +163,12 @@ protected void HandleMobMovement(
 
 
             UsedMobMovement[uid] = true;
-            //Logger.Debug($"Beginning movement with {mover.Sprinting} owned by {mover.Owner}. Relative entity is {mover.RelativeEntity} Current UID is {uid}, Physics UID is {physicsUid}");
             // Specifically don't use mover.Owner because that may be different to the actual physics body being moved.
             var weightless = _gravity.IsWeightless(physicsUid, physicsComponent, xform);
             var (walkDir, sprintDir) = GetVelocityInput(mover);
             var touching = false;
 
 
-
             // Handle wall-pushes.
             if (weightless)
             {
@@ -294,13 +292,7 @@ protected void HandleMobMovement(
         public void WalkingAlert(EntityUid player, bool walking) {
             if (_tags.HasTag(player, "CanWalk"))
             {
-                if (walking)
-                {
-                    _alerts.ShowAlert(player, AlertType.Walking, 0);
-                } else
-                {
-                    _alerts.ShowAlert(player, AlertType.Walking, 1);
-                }
+                _alerts.ShowAlert(player, AlertType.Walking, walking ? 0 : 1);
             }
         }
 

From de080a80cd3770e0851834d066b8e00dfcf6bd57 Mon Sep 17 00:00:00 2001
From: gluesniffler <linebarrelerenthusiast@gmail.com>
Date: Thu, 11 Jul 2024 14:09:47 -0400
Subject: [PATCH 7/8] Apparently C# doesn't implicitly cast death's review
 suggestion into a Short, added this ugly cast on both sides

---
 Content.Shared/Movement/Systems/SharedMoverController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 94c0ad8ce9b..03c0d800594 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -292,7 +292,7 @@ protected void HandleMobMovement(
         public void WalkingAlert(EntityUid player, bool walking) {
             if (_tags.HasTag(player, "CanWalk"))
             {
-                _alerts.ShowAlert(player, AlertType.Walking, walking ? 0 : 1);
+                _alerts.ShowAlert(player, AlertType.Walking, walking ? (short) 0 : (short) 1);
             }
         }
 

From 3046cee34c23324166fd25e4c5c18fa90a4f08a8 Mon Sep 17 00:00:00 2001
From: gluesniffler <linebarrelerenthusiast@gmail.com>
Date: Tue, 16 Jul 2024 17:21:30 -0400
Subject: [PATCH 8/8] Turned CanWalk into a component, added it to the prev
 entities and the Reagent Slime

---
 .../Movement/Components/CanWalkComponent.cs           | 11 +++++++++++
 .../Movement/Systems/SharedMoverController.cs         |  5 +++--
 .../Entities/Mobs/Cyborgs/base_borg_chassis.yml       |  2 +-
 Resources/Prototypes/Entities/Mobs/NPCs/animals.yml   |  2 +-
 Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml |  1 +
 Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml  |  2 +-
 Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml    |  2 +-
 Resources/Prototypes/Entities/Mobs/Species/base.yml   |  2 +-
 .../Entities/Objects/Specific/Mech/mechs.yml          |  2 +-
 Resources/Prototypes/tags.yml                         |  3 ---
 10 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 Content.Shared/Movement/Components/CanWalkComponent.cs

diff --git a/Content.Shared/Movement/Components/CanWalkComponent.cs b/Content.Shared/Movement/Components/CanWalkComponent.cs
new file mode 100644
index 00000000000..fab851595c7
--- /dev/null
+++ b/Content.Shared/Movement/Components/CanWalkComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+/// Indicates if the entity can toggle walking or not.
+/// </summary>
+[NetworkedComponent, RegisterComponent]
+public sealed partial class CanWalkComponent : Component
+{
+}
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 078beae17ed..4c2c91db6a1 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -289,8 +289,9 @@ protected void HandleMobMovement(
             PhysicsSystem.SetAngularVelocity(physicsUid, 0, body: physicsComponent);
         }
 
-        public void WalkingAlert(EntityUid player, bool walking) {
-            if (_tags.HasTag(player, "CanWalk"))
+        public void WalkingAlert(EntityUid player, bool walking)
+        {
+            if (HasComp<CanWalkComponent>(player))
             {
                 _alerts.ShowAlert(player, AlertType.Walking, walking ? (short) 0 : (short) 1);
             }
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 86a2606c8a7..a75be106f3c 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -205,7 +205,6 @@
     - ShoesRequiredStepTriggerImmune
     - DoorBumpOpener
     - CanPilot
-    - CanWalk
   - type: Emoting
   - type: GuideHelp
     guides:
@@ -221,6 +220,7 @@
     understands:
     - GalacticCommon
     - RobotTalk
+  - type: CanWalk
 
 - type: entity
   id: BaseBorgChassisNT
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 80e29f6b82e..5d8753e669e 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1309,7 +1309,7 @@
     tags:
     - VimPilot
     - DoorBumpOpener
-    - CanWalk
+  - type: CanWalk
 
 - type: entity
   name: monkey
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index 01fce382e37..f19879c9eaa 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -292,6 +292,7 @@
     solution: bloodstream
   - type: DrainableSolution
     solution: bloodstream
+  - type: CanWalk
 
 - type: entity
   name: Reagent Slime Spawner
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 943b470b5be..db594873fe3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -95,7 +95,6 @@
     tags:
       - CannotSuicide
       - FootstepSound
-      - CanWalk
   - type: NoSlip
   - type: RatKing
     hungerPerArmyUse: 25
@@ -127,6 +126,7 @@
     understands:
     - GalacticCommon
     - Mouse
+  - type: CanWalk
 
 - type: entity
   id: MobRatKingBuff
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index 1c79d83682f..690a4c5d291 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -44,7 +44,6 @@
   - type: Tag
     tags:
     - FootstepSound
-    - CanWalk
   - type: Butcherable
     butcheringType: Knife
     spawned:
@@ -129,6 +128,7 @@
     speechSounds: Slime
   - type: TypingIndicator
     proto: slime
+  - type: CanWalk
 
 - type: entity
   name: blue slime
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 8bdfa6715ab..9f3269abda6 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -229,7 +229,7 @@
     - CanPilot
     - FootstepSound
     - DoorBumpOpener
-    - CanWalk
+  - type: CanWalk
 
 - type: entity
   save: false
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index d985d5a7667..ffa4e7ade7a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -59,7 +59,6 @@
     baseSprintSpeed: 2
   - type: Tag
     tags:
-    - CanWalk
     - DoorBumpOpener
     - FootstepSound
   - type: Pullable
@@ -96,6 +95,7 @@
   - type: GuideHelp
     guides:
     - Robotics
+  - type: CanWalk
 
 - type: entity
   id: MechRipley
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 83a4de4033c..231326e5b11 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -301,9 +301,6 @@
 - type: Tag
   id: CanPilot
 
-- type: Tag
-  id: CanWalk
-
 - type: Tag
   id: CannonBall