Revolver fix (again) (space-wizards#8635)

EmoGarbage404 · Jun 5, 2022 · 209367a · 209367a
1 parent 354ad84
commit 209367a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
@@ -54,13 +54,8 @@ private void OnRevolverHandleState(EntityUid uid, RevolverAmmoProviderComponent
 
         var oldIndex = component.CurrentIndex;
         component.CurrentIndex = state.CurrentIndex;
-
-        component.AmmoSlots.EnsureCapacity(state.AmmoSlots.Count);
-        component.AmmoSlots.Clear();
         component.Chambers = new bool?[state.Chambers.Length];
 
-        DebugTools.Assert(component.AmmoSlots.Count == component.Chambers.Length);
-
         // Need to copy across the state rather than the ref.
         for (var i = 0; i < component.AmmoSlots.Count; i++)
         {
@@ -322,6 +317,8 @@ private void OnRevolverInit(EntityUid uid, RevolverAmmoProviderComponent compone
                 component.Chambers[i] = true;
             }
         }
+
+        DebugTools.Assert(component.AmmoSlots.Count == component.Capacity);
     }
 
     [Serializable, NetSerializable]

diff --git a/Resources/Locale/en-US/weapons/ranged/gun.ftl b/Resources/Locale/en-US/weapons/ranged/gun.ftl
@@ -23,6 +23,6 @@ gun-magazine-examine = It has [color={$color}]{$count}[/color] shots remaining.
 # RevolverAmmoProvider
 gun-revolver-empty = Empty revolver
 gun-revolver-full = Revolver full
-gun-revolver-insert = Insert
+gun-revolver-insert = Inserted
 gun-revolver-spin = Spin revolver
 gun-revolver-spun = Spun