Merge branch 'DeltaV-Station:master' into Corrupted-Corgi-Removal

DeltaV-Station · Sep 20, 2024 · 4352897 · 4352897
2 parents 000dc56 + 4923bfc
commit 4352897
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Events;
+using Content.Shared.StepTrigger.Components; // DeltaV - NoShoesSilentFootstepsComponent
 using Content.Shared.Tag;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -59,6 +60,7 @@ public abstract partial class SharedMoverController : VirtualController
     protected EntityQuery<NoRotateOnMoveComponent> NoRotateQuery;
     protected EntityQuery<FootstepModifierComponent> FootstepModifierQuery;
     protected EntityQuery<MapGridComponent> MapGridQuery;
+    protected EntityQuery<NoShoesSilentFootstepsComponent> NoShoesSilentQuery; // DeltaV - NoShoesSilentFootstepsComponent
 
     /// <summary>
     /// <see cref="CCVars.StopSpeed"/>
@@ -88,6 +90,7 @@ public override void Initialize()
         CanMoveInAirQuery = GetEntityQuery<CanMoveInAirComponent>();
         FootstepModifierQuery = GetEntityQuery<FootstepModifierComponent>();
         MapGridQuery = GetEntityQuery<MapGridComponent>();
+        NoShoesSilentQuery = GetEntityQuery<NoShoesSilentFootstepsComponent>(); // DeltaV - NoShoesSilentFootstepsComponent
 
         InitializeInput();
         InitializeRelay();
@@ -429,6 +432,14 @@ private bool TryGetSound(
             return false;
         }
 
+        // DeltaV - Don't play the sound if they have no shoes and the component
+        if (NoShoesSilentQuery.HasComp(uid) &
+            !_inventory.TryGetSlotEntity(uid, "shoes", out var _))
+        {
+            return false;
+        }
+        // End DeltaV code
+
         mobMover.LastPosition = coordinates;
 
         if (mobMover.StepSoundDistance < distanceNeeded)

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,10 +1,4 @@
 Entries:
-- author: VMSolidus
-  changes:
-  - message: 'Harpies have been added to the game as a new playable species! '
-    type: Add
-  id: 63
-  time: '2023-10-13T18:25:13.0000000+00:00'
 - author: Vordenburg
   changes:
   - message: Enhanced intrusion defenses have been deployed in electrical systems.
@@ -3605,3 +3599,10 @@
   id: 562
   time: '2024-09-19T08:39:15.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1864
+- author: MilonPL
+  changes:
+  - message: Fixed barefoot felinids making footsteps sounds.
+    type: Fix
+  id: 563
+  time: '2024-09-20T03:38:10.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1866
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
@@ -44,3 +44,4 @@
     - BruteAutoInjector
     - BurnAutoInjector
     - BurnAutoInjector
+    - MagazinePistol