diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 0775b414aba..8040e79c352 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: china lake
-  parent: BaseWeaponLauncher
+  parent: [BaseWeaponLauncher, BaseGunWieldable]
   suffix: Robot, energy based
   id: WeaponLauncherChinaLakeBorg
   description: PLOOP! Contains a built in replicator to slowly make more ammo.
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index efae99e1390..a93657a325b 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: Vulcan
-  parent: BaseWeaponRifle
+  parent: [BaseWeaponRifle, BaseGunWieldable]
   id: WeaponRifleVulcan
   description: One of the heaviest small arms to grace Security's armory, this rifle is a modern take on a classic, informally dubbed the "Right Arm of the Free World". Uses .30 rifle ammo.
   components:
@@ -11,9 +11,12 @@
         map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
+  - type: GunWieldBonus
+    minAngle: -20
+    maxAngle: -30
   - type: Gun
-    minAngle: 1
-    maxAngle: 24
+    minAngle: 21
+    maxAngle: 54
     angleIncrease: 6
     angleDecay: 24
     fireRate: 5
@@ -54,7 +57,7 @@
 
 - type: entity
   name: CAWS-25 Jackdaw
-  parent: BaseWeaponRifle
+  parent: [BaseWeaponRifle, BaseGunWieldable]
   id: WeaponRifleJackdaw
   description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo.
   suffix: Deathsquad
@@ -113,7 +116,7 @@
 
 - type: entity
   name: Tenebra
-  parent: BaseWeaponRifle
+  parent: [BaseWeaponRifle, BaseGunWieldable]
   id: WeaponRifleTenebra
   description: A mass-produced and minimalist rifle in bullpup design. Uses .20 rifle ammo.
   suffix: Mercenary
@@ -171,7 +174,7 @@
 - type: entity
   name: M-90
   id: WeaponRifleM90
-  parent: WeaponRifleM90GrenadeLauncher
+  parent: [WeaponRifleM90GrenadeLauncher, BaseGunWieldable]
   description: An older bullpup carbine model. Uses .20 rifle ammo.
   components:
   - type: Sprite
@@ -182,7 +185,7 @@
 - type: entity
   name: musket
   id: WeaponRifleMusket
-  parent: Musket
+  parent: [Musket, BaseGunWieldable]
   suffix: "craftable"
   description: An old flintlock musket. Uses musket cartridges.
   components:
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index e9122ff47fb..d610a1c2aed 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: Typewriter
-  parent: BaseWeaponSubMachineGun
+  parent: [BaseWeaponSubMachineGun, BaseGunWieldable]
   id: WeaponSubMachineGunTypewriter
   description: A modern take on the classic design used by mobsters throughout space and time. Types .35 auto ammo.
   components:
@@ -13,9 +13,12 @@
       map: ["enum.GunVisualLayers.Mag"]
   - type: Clothing
     sprite: DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi
+  - type: GunWieldBonus
+    minAngle: -20
+    maxAngle: -30
   - type: Gun
-    minAngle: 1
-    maxAngle: 15
+    minAngle: 21
+    maxAngle: 45
     angleIncrease: 5
     angleDecay: 20
     fireRate: 8
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index d3424de0061..862d3369ae6 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: adjutant
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
   id: WeaponShotgunAdjutant
   description: Sold as a "riot" shotgun, this shotgun has a special gas-operated mechanism that makes it highly effective for CQC and suppressive fire.
   components:
@@ -10,6 +10,7 @@
     sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi
   - type: Item
     size: Large
+  - type: GunRequiresWield
   - type: Gun
     fireRate: 1.5
     selectedMode: SemiAuto
@@ -31,7 +32,7 @@
 
 - type: entity
   name: Kammerer
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
   id: WeaponShotgunKammererNonLethal #Legacy name
   description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells.
   suffix: Beanbag