diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_map_base/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_map_base/shared.lua
index 215db85..2139302 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_map_base/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_map_base/shared.lua
@@ -9,12 +9,12 @@ SWEP.AdminSpawnable = true
 SWEP.Primary.ClipSize = -1
 SWEP.Primary.DefaultClip = -1
 SWEP.Primary.Automatic = false
-SWEP.Primary.Ammo = "None"
+SWEP.Primary.Ammo = "none"
 
 SWEP.Secondary.ClipSize = -1
 SWEP.Secondary.DefaultClip = -1
 SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "None"
+SWEP.Secondary.Ammo = "none"
 
 SWEP.DrawCrosshair = false
 SWEP.Primary.Sound = Sound("")
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_arsenalcrate/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_arsenalcrate/shared.lua
index 6a5401e..5bd9e79 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_arsenalcrate/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_arsenalcrate/shared.lua
@@ -9,10 +9,10 @@ SWEP.Primary.Ammo = "airboatgun"
 SWEP.Primary.Delay = 1
 SWEP.Primary.Automatic = true
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
+SWEP.Secondary.Ammo = "dummy"
 SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
 
 SWEP.WalkSpeed = SPEED_NORMAL
 SWEP.FullWalkSpeed = SPEED_SLOWEST
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_barricadekit/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_barricadekit/shared.lua
index 4cb9099..ebe20da 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_barricadekit/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_barricadekit/shared.lua
@@ -7,10 +7,10 @@ SWEP.Primary.Ammo = "SniperRound"
 SWEP.Primary.Delay = 1.25
 SWEP.Primary.DefaultClip = 5
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
+SWEP.Secondary.Ammo = "dummy"
 SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
 
 SWEP.UseHands = true
 
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_base/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_base/shared.lua
index fc55bc2..43f943c 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_base/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_base/shared.lua
@@ -16,10 +16,10 @@ SWEP.Primary.Automatic = false
 SWEP.Primary.Ammo = "pistol"
 SWEP.RequiredClip = 1
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
 SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
+SWEP.Secondary.Ammo = "dummy"
 
 SWEP.WalkSpeed = SPEED_NORMAL
 
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_basemelee/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_basemelee/shared.lua
index 7376e47..9ac3f8d 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_basemelee/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_basemelee/shared.lua
@@ -18,10 +18,10 @@ SWEP.MeleeRange = 65
 SWEP.MeleeSize = 1.5
 SWEP.MeleeKnockBack = 0
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
+SWEP.Secondary.Ammo = "dummy"
 SWEP.Secondary.Automatic = true
-SWEP.Secondary.Ammo = "none"
 
 SWEP.WalkSpeed = SPEED_FAST
 
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_boardpack/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_boardpack/shared.lua
index 2511c91..1eea9f5 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_boardpack/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_boardpack/shared.lua
@@ -9,10 +9,10 @@ SWEP.Primary.Ammo = "SniperRound"
 SWEP.Primary.Delay = 1
 SWEP.Primary.DefaultClip = 3
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
+SWEP.Secondary.Ammo = "dummy"
 SWEP.Secondary.Automatic = true
-SWEP.Secondary.Ammo = "none"
 SWEP.Secondary.Delay = 0.15
 
 SWEP.WalkSpeed = SPEED_NORMAL
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpack/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpack/shared.lua
index eefaa35..05e18a6 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpack/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpack/shared.lua
@@ -9,10 +9,9 @@ SWEP.Primary.Ammo = "sniperpenetratedround"
 SWEP.Primary.Delay = 1
 SWEP.Primary.Automatic = true
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
-SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
+SWEP.Secondary.Ammo = "dummy"
 
 SWEP.WalkSpeed = SPEED_NORMAL
 SWEP.FullWalkSpeed = SPEED_SLOW
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_drone.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_drone.lua
index b0c7866..9c0bcd7 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_drone.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_drone.lua
@@ -42,10 +42,9 @@ SWEP.Primary.Ammo = "drone"
 SWEP.Primary.Delay = 1
 SWEP.Primary.DefaultClip = 1
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
-SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
+SWEP.Secondary.Ammo = "dummy"
 
 SWEP.WalkSpeed = SPEED_FAST
 
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_ffemitter/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_ffemitter/shared.lua
index 6b8c986..79d736a 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_ffemitter/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_ffemitter/shared.lua
@@ -9,10 +9,9 @@ SWEP.Primary.Ammo = "slam"
 SWEP.Primary.Delay = 1
 SWEP.Primary.Automatic = true
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
-SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
+SWEP.Secondary.Ammo = "dummy"
 
 SWEP.WalkSpeed = SPEED_NORMAL
 SWEP.FullWalkSpeed = SPEED_SLOWEST
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_grenade/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_grenade/shared.lua
index a0800b1..f2a12f6 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_grenade/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_grenade/shared.lua
@@ -10,10 +10,9 @@ SWEP.Primary.Ammo = "grenade"
 SWEP.Primary.Delay = 1.25
 SWEP.Primary.DefaultClip = 1
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
-SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
+SWEP.Secondary.Ammo = "dummy"
 
 SWEP.WalkSpeed = SPEED_FAST
 
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_hammer/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_hammer/shared.lua
index 38092b8..c8b4dfb 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_hammer/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_hammer/shared.lua
@@ -13,10 +13,9 @@ SWEP.Primary.Ammo = "GaussEnergy"
 SWEP.Primary.Delay = 1
 SWEP.Primary.DefaultClip = 16
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
-SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
+SWEP.Secondary.Ammo = "dummy"
 
 SWEP.MeleeDamage = 35
 SWEP.MeleeRange = 50
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhack.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhack.lua
index b2a775c..e5588f5 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhack.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhack.lua
@@ -45,10 +45,9 @@ SWEP.Primary.Ammo = "manhack"
 SWEP.Primary.Delay = 1
 SWEP.Primary.DefaultClip = 1
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
-SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
+SWEP.Secondary.Ammo = "dummy"
 
 SWEP.WalkSpeed = SPEED_FAST
 
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_medicalkit.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_medicalkit.lua
index 2e1be8d..c1e2e4c 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_medicalkit.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_medicalkit.lua
@@ -29,9 +29,9 @@ SWEP.Primary.Ammo = "Battery"
 SWEP.Secondary.Delay = 20
 SWEP.Secondary.Heal = 10
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
-SWEP.Secondary.Ammo = "none"
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
+SWEP.Secondary.Ammo = "dummy"
 
 SWEP.WalkSpeed = SPEED_NORMAL
 
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_messagebeacon/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_messagebeacon/shared.lua
index 3d62ae9..48df276 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_messagebeacon/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_messagebeacon/shared.lua
@@ -9,10 +9,10 @@ SWEP.Primary.Ammo = "striderminigun"
 SWEP.Primary.Delay = 1
 SWEP.Primary.Automatic = true
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
 SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
+SWEP.Secondary.Ammo = "dummy"
 
 SWEP.WalkSpeed = SPEED_NORMAL
 SWEP.FullWalkSpeed = SPEED_SLOW
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_resupplybox/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_resupplybox/shared.lua
index 3c29674..04af369 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_resupplybox/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_resupplybox/shared.lua
@@ -9,10 +9,10 @@ SWEP.Primary.Ammo = "helicoptergun"
 SWEP.Primary.Delay = 1
 SWEP.Primary.Automatic = true
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
 SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
+SWEP.Secondary.Ammo = "dummy"
 
 SWEP.WalkSpeed = SPEED_NORMAL
 SWEP.FullWalkSpeed = SPEED_SLOWEST
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_spotlamp/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_spotlamp/shared.lua
index d36c81c..f49a4b2 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_spotlamp/shared.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_spotlamp/shared.lua
@@ -9,10 +9,10 @@ SWEP.Primary.Ammo = "spotlamp"
 SWEP.Primary.Delay = 1
 SWEP.Primary.Automatic = true
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
 SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
+SWEP.Secondary.Ammo = "dummy"
 
 SWEP.WalkSpeed = SPEED_NORMAL
 SWEP.FullWalkSpeed = SPEED_SLOWEST
diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_stone.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_stone.lua
index 0650cf8..eb6ae3e 100644
--- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_stone.lua
+++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_stone.lua
@@ -42,10 +42,10 @@ SWEP.Primary.Ammo = "stone"
 SWEP.Primary.Delay = 1
 SWEP.Primary.DefaultClip = 1
 
-SWEP.Secondary.ClipSize = -1
-SWEP.Secondary.DefaultClip = -1
+SWEP.Secondary.ClipSize = 1
+SWEP.Secondary.DefaultClip = 1
 SWEP.Secondary.Automatic = false
-SWEP.Secondary.Ammo = "none"
+SWEP.Secondary.Ammo = "dummy"
 
 SWEP.WalkSpeed = SPEED_FAST
 
diff --git a/gamemodes/zombiesurvival/gamemode/shared.lua b/gamemodes/zombiesurvival/gamemode/shared.lua
index 1385361..bb98f18 100644
--- a/gamemodes/zombiesurvival/gamemode/shared.lua
+++ b/gamemodes/zombiesurvival/gamemode/shared.lua
@@ -109,6 +109,8 @@ function GM:AddCustomAmmo()
 	game.AddAmmoType({name = "manhack"})
 	game.AddAmmoType({name = "manhack_saw"})
 	game.AddAmmoType({name = "drone"})
+
+	game.AddAmmoType({name = "dummy"})
 end
 
 function GM:CanRemoveOthersNail(pl, nailowner, ent)