diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index c8b64f90f9ad..26b29804acf8 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -142,25 +142,25 @@
   - type: FireProtection # Corvax-Forge: Armor rebalance
     reduction: 0.4
   - type: ExplosionResistance # Corvax-Forge: Armor rebalance
-    damageCoefficient: 0.7
+    damageCoefficient: 0.6
   - type: StaminaResistance # Corvax-Forge: Armor rebalance
-    damageCoefficient: 0.75
+    damageCoefficient: 0.9
   - type: ZombificationResistance # Corvax-Forge: Armor rebalance
     zombificationResistanceCoefficient: 0.6
   - type: Armor
     modifiers:
-      coefficients: # Corvax-Forge: Armor rebalance
-        Blunt: 0.7
-        Slash: 0.6
-        Piercing: 0.65
-        Heat: 0.7
-        Cold: 0.7
-        Radiation: 0.3
-        Shock: 0.8
-        Caustic: 0.7
-  - type: ClothingSpeedModifier # Corvax-Forge: Armor rebalance
-    walkModifier: 0.85
-    sprintModifier: 0.85
+      coefficients: # Forge-change: Heavy mining hardsuits
+        Blunt: 0.65
+        Slash: 0.8
+        Piercing: 0.9
+        Heat: 0.9
+        Cold: 0.9
+        Radiation: 0.7
+        Shock: 0.95
+        Caustic: 0.95
+  - type: ClothingSpeedModifier # Forge-change: Heavy mining hardsuits
+    walkModifier: 0.8
+    sprintModifier: 0.8
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSalvage
@@ -601,27 +601,27 @@
     highPressureMultiplier: 0.5
     lowPressureMultiplier: 1000
   - type: FireProtection # Corvax-Forge: Armor rebalance
-    reduction: 0.4
+    reduction: 0.3
   - type: ExplosionResistance # Corvax-Forge: Armor rebalance
-    damageCoefficient: 0.6
+    damageCoefficient: 0.8
   - type: StaminaResistance # Corvax-Forge: Armor rebalance
-    damageCoefficient: 0.75
+    damageCoefficient: 0.9
   - type: ZombificationResistance # Corvax-Forge: Armor rebalance
     zombificationResistanceCoefficient: 0.5
   - type: Armor
     modifiers:
-      coefficients: # Corvax-Forge: Armor rebalance
-        Blunt: 0.65
-        Slash: 0.6
-        Piercing: 0.65
-        Heat: 0.65
-        Cold: 0.65
-        Radiation: 0.1
-        Shock: 0.75
-        Caustic: 0.7
-  - type: ClothingSpeedModifier # Corvax-Forge: Armor rebalance
-    walkModifier: 0.9
-    sprintModifier: 0.9
+      coefficients: # Forge-change: Heavy mining hardsuits
+        Blunt: 0.55
+        Slash: 0.7
+        Piercing: 0.85
+        Heat: 0.9
+        Cold: 0.9
+        Radiation: 0.5
+        Shock: 0.95
+        Caustic: 0.95
+  - type: ClothingSpeedModifier # Forge-change: Heavy mining hardsuits
+    walkModifier: 0.75
+    sprintModifier: 0.75
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitLuxury
diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Guns/Pistols/moonwhisper.yml b/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Guns/Pistols/moonwhisper.yml
index 42e5426edf83..46658ae50fdd 100644
--- a/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Guns/Pistols/moonwhisper.yml
+++ b/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Guns/Pistols/moonwhisper.yml
@@ -15,7 +15,7 @@
     sprite: Forge/Objects/Weapons/Guns/Pistols/moonwhisper.rsi
   - type: Gun
     fireRate: 4.5
-    projectileSpeed: 35
+    projectileSpeed: 30
     selectedMode: SemiAuto
     availableModes:
       - SemiAuto
diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Guns/Pistols/swift.yml b/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Guns/Pistols/swift.yml
index 6b2439d82520..de66486d2c0b 100644
--- a/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Guns/Pistols/swift.yml
+++ b/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Guns/Pistols/swift.yml
@@ -24,5 +24,5 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
   - type: NFWeaponDetails
-    class: weapon-details-class-shotgun
+    class: weapon-details-class-pistol
     manufacturer: weapon-details-manufacturer-TechnicLogistic
diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapon/Guns/Pistol/pistol.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapon/Guns/Pistol/pistol.yml
index ddd2af1856d3..5fbaff5aa02e 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapon/Guns/Pistol/pistol.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapon/Guns/Pistol/pistol.yml
@@ -33,7 +33,7 @@
     - Belt
   - type: Gun
     fireRate: 3.5
-    projectileSpeed: 40 # Mono
+    projectileSpeed: 35 # Mono
     availableModes:
       - SemiAuto
     soundGunshot:
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/machine_pistols.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/machine_pistols.yml
index 0efba4383904..59a62d7a5fe0 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/machine_pistols.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/machine_pistols.yml
@@ -32,10 +32,14 @@
   components:
   - type: Gun # Corvax-Forge: Weaponary update
     fireRate: 6
+    projectileSpeed: 30
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/viper.rsi
   - type: Clothing
     sprite: Objects/Weapons/Guns/Pistols/viper.rsi
+  - type: NFWeaponDetails
+    class: weapon-details-class-pistol
+    manufacturer: weapon-details-manufacturer-gorlex-steel-works
 
 #region DeltaV
 - type: entity
@@ -46,10 +50,14 @@
   components:
   - type: Gun # Corvax-Forge: Weaponary update
     fireRate: 4.5
+    projectileSpeed: 30
   - type: Sprite
     sprite: _DV/Objects/Weapons/Guns/Pistols/pollock.rsi
   - type: Clothing
     sprite: _DV/Objects/Weapons/Guns/Pistols/pollock.rsi
+  - type: NFWeaponDetails
+    class: weapon-details-class-pistol
+    manufacturer: weapon-details-manufacturer-nanotrasen-munitions
 
 - type: entity
   id: NFWeaponPistolPollockHighCapacityMag
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index a33160f9c6ee..7039d3be0698 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -29,7 +29,7 @@
     sprite: Objects/Weapons/Guns/Pistols/N1984.rsi
   - type: Gun # Corvax-Forge: Weaponary update
     fireRate: 4
-    projectileSpeed: 40
+    projectileSpeed: 35
 
 - type: entity
   id: NFWeaponPistolCobra
@@ -40,7 +40,7 @@
   components:
   - type: Gun
     fireRate: 4 # Corvax-Forge: Weaponary update
-    projectileSpeed: 40
+    projectileSpeed: 35
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/silenced.ogg
       params:
@@ -59,7 +59,7 @@
   components:
   - type: Gun
     fireRate: 5 # Corvax-Forge: Weaponary update
-    projectileSpeed: 38
+    projectileSpeed: 30
     soundGunshot:
       path: /Audio/_DV/Weapons/Guns/Gunshots/universal.ogg
   - type: Sprite
@@ -75,7 +75,7 @@
     The Mark 32 Offensive Service Pistol. On the handle is a label that says 'for authorized use only.'
   components: &universalComponents
   - type: Gun
-    projectileSpeed: 38
+    projectileSpeed: 30
     soundGunshot:
       path: /Audio/_DV/Weapons/Guns/Gunshots/universal.ogg
 
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index 9ca0c0adb631..2941e36a62af 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -8,6 +8,7 @@
   components:
   - type: Gun # Corvax-Forge: Weaponary update
     fireRate: 2.5
+    projectileSpeed: 35
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
   - type: Clothing
@@ -25,7 +26,8 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
   - type: Gun
-    fireRate: 3.5
+    fireRate: 3.5 # Corvax-Forge: Weaponary update
+    projectileSpeed: 35
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
 
@@ -38,6 +40,7 @@
   components:
   - type: Gun # Corvax-Forge: Weaponary update
     fireRate: 2.6
+    projectileSpeed: 35
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
     layers:
@@ -68,6 +71,8 @@
     sprite: Objects/Weapons/Guns/Revolvers/python.rsi
   - type: Clothing
     sprite: Objects/Weapons/Guns/Revolvers/python.rsi
+  - type: Gun
+    projectileSpeed: 35 # Corvax-Forge: Weaponary update
 
 - type: entity
   id: NFWeaponRevolverPirate
@@ -114,6 +119,8 @@
     sprite: _DV/Objects/Weapons/Guns/Revolvers/fitz.rsi
   - type: Clothing
     sprite: _DV/Objects/Weapons/Guns/Revolvers/fitz.rsi
+  - type: Gun
+    projectileSpeed: 35 # Corvax-Forge: Weaponary update
 
 - type: entity
   id: NFWeaponRevolverFaith
@@ -126,6 +133,8 @@
     sprite: _DV/Objects/Weapons/Guns/Revolvers/faith.rsi
   - type: Clothing
     sprite: _DV/Objects/Weapons/Guns/Revolvers/faith.rsi
+  - type: Gun
+    projectileSpeed: 35 # Corvax-Forge: Weaponary update
   - type: RevolverAmmoProvider
     capacity: 4
     chambers: [ True, True, True, True ]
@@ -142,6 +151,8 @@
     sprite: _DV/Objects/Weapons/Guns/Revolvers/lucky.rsi
   - type: Clothing
     sprite: _DV/Objects/Weapons/Guns/Revolvers/lucky.rsi
+  - type: Gun
+    projectileSpeed: 35 # Corvax-Forge: Weaponary update
 
 #region Frontier
 - type: entity