diff --git a/code/datums/outfits/misc/shitspawn.dm b/code/datums/outfits/misc/shitspawn.dm
index 0293b418e0e2..8148363c2959 100644
--- a/code/datums/outfits/misc/shitspawn.dm
+++ b/code/datums/outfits/misc/shitspawn.dm
@@ -266,7 +266,7 @@
 	back = /obj/item/weapon/storage/backpack/security
 	l_pocket = /obj/item/weapon/melee/energy/sword
 	r_pocket = /obj/item/weapon/grenade/empgrenade
-	belt = /obj/item/weapon/gun/projectile/automatic/silenced
+	belt = /obj/item/weapon/gun/projectile/automatic/pistol/silenced
 
 	backpack_contents = list(
 		/obj/item/weapon/storage/box,
diff --git a/code/game/objects/random/random_guns.dm b/code/game/objects/random/random_guns.dm
index af5342398ecb..0a28f956ecd5 100644
--- a/code/game/objects/random/random_guns.dm
+++ b/code/game/objects/random/random_guns.dm
@@ -57,10 +57,10 @@
 						prob(15);/obj/item/weapon/gun/projectile/automatic/pistol/glock,\
 						prob(15);/obj/item/weapon/gun/projectile/automatic/pistol/stechkin,\
 						prob(15);/obj/item/weapon/gun/projectile/automatic/pistol/colt1911,\
-						prob(15);/obj/item/weapon/gun/projectile/automatic/silenced,\
+						prob(15);/obj/item/weapon/gun/projectile/automatic/pistol/silenced,\
 						prob(15);/obj/item/weapon/gun/projectile/revolver/peacemaker,\
 						prob(15);/obj/item/weapon/gun/projectile/revolver/detective,\
-						prob(5);/obj/item/weapon/gun/projectile/automatic/silenced/nonlethal,\
+						prob(5);/obj/item/weapon/gun/projectile/automatic/pistol/silenced/nonlethal,\
 						prob(5);/obj/item/weapon/gun/projectile/revolver/syndie,\
 						prob(5);/obj/item/weapon/gun/projectile/revolver,\
 						prob(5);/obj/item/weapon/gun/projectile/automatic/pistol/deagle,\
diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm
index dac26949c934..34ec269cdd96 100644
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/bullets.dm
@@ -228,6 +228,11 @@
 	icon_state = "casing_incendiary"
 	projectile_type = /obj/item/projectile/bullet/incendiary
 
+/obj/item/ammo_casing/a556/nonlethal
+	desc = "Патрон для нелетальной пули калибра 5.56 мм."
+	icon_state = "casing_rubber"
+	projectile_type = /obj/item/projectile/bullet/weakbullet/nl_rifle
+
 /obj/item/ammo_casing/a74
 	desc = "Патрон от пули калибра 7.74мм."
 	caliber = "7.74mm"
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index f62b0ef51e59..4327d636ddd7 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -275,6 +275,12 @@
 	overlay = "silenced_pistol-mag"
 	multiple_sprites = TWO_STATES
 
+/obj/item/ammo_box/magazine/silenced_pistol/nonlethal
+	name = "magazine (.45NL)"
+	cases = list("магазин (.45 НЛ)", "магазина (.45 НЛ)", "магазину (.45 НЛ)", "магазин (.45 НЛ)", "магазином (.45 НЛ)", "магазине (.45 НЛ)")
+	icon_state = "silenced_pistol_mag_nl"
+	ammo_type = /obj/item/ammo_casing/c45r
+
 /obj/item/ammo_box/magazine/colt
 	name = "magazine (.45)"
 	cases = list("магазин (.45)", "магазина (.45)", "магазину (.45)", "магазин (.45)", "магазином (.45)", "магазине (.45)")
@@ -468,6 +474,12 @@
 	icon_state = "a28_mag_inc"
 	overlay = "a28-mag-i"
 
+/obj/item/ammo_box/magazine/a28/nonlethal
+	name = "A28 magazine (.556NL)"
+	cases = list("магазин А28 (5.56мм НЛ)", "магазина А28 (5.56мм НЛ)", "магазину А28 (5.56мм НЛ)", "магазин А28 (5.56мм НЛ)", "магазином А28 (5.56мм НЛ)", "магазине А28 (5.56мм НЛ)")
+	icon_state = "a28_mag_nl"
+	ammo_type = /obj/item/ammo_casing/a556/nonlethal
+
 /obj/item/ammo_box/magazine/a74
 	name = "A74 magazine (7.74mm)"
 	cases = list("магазин А74 (7.74мм)", "магазина А74 (7.74мм)", "магазину А74 (7.74мм)", "магазин А74 (7.74мм)", "магазином А74 (7.74мм)", "магазине А74 (7.74мм)")
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 48b983faa04e..ae0ee508ebd9 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -251,7 +251,7 @@
 
 /obj/item/weapon/gun/projectile/automatic/a28
 	name = "A28 assault rifle"
-	desc = "Автоматическая винтовка типа булл-пап с воздушным охлаждением, используемая военным корпусом пехоты НаноТрейзен. На ствольной коробке выгравировано - 'Сэр, я заканчиваю этот бой'. Использует патроны калибром 5.56мм."
+	desc = "Автоматическая винтовка типа булл-пап с воздушным охлаждением, используемая военным корпусом пехоты НаноТрейзен. На ствольной коробке выгравировано - 'Сэр, я заканчиваю этот бой'. Использует патроны калибра 5.56мм."
 	icon_state = "a28"
 	item_state = "a28"
 	w_class = SIZE_SMALL
@@ -268,6 +268,14 @@
 	. = ..()
 	AddComponent(/datum/component/automatic_fire, 0.25 SECONDS)
 
+/obj/item/weapon/gun/projectile/automatic/a28/nonlethal
+	name = "A28 assault rifle NL"
+	icon_state = "a28w"
+	item_state = "a28w"
+	silenced = TRUE
+	initial_mag = /obj/item/ammo_box/magazine/a28/nonlethal
+	fire_sound = 'sound/weapons/guns/gunshot_silencer.ogg'
+
 /obj/item/weapon/gun/projectile/automatic/a74
 	name = "A74 assault rifle"
 	desc = "Stradi and Practican Maid Bai Spess soviets corporation, bazed he original design of 20 centuriyu fin about baars and vodka vile patrimonial it, saunds of balalaika place minvile, yuzes 7.74 caliber"
diff --git a/code/modules/projectiles/guns/projectile/old_pirate_guns.dm b/code/modules/projectiles/guns/projectile/old_pirate_guns.dm
deleted file mode 100644
index 19d3742d636f..000000000000
--- a/code/modules/projectiles/guns/projectile/old_pirate_guns.dm
+++ /dev/null
@@ -1,40 +0,0 @@
-/obj/item/weapon/gun/projectile/automatic/a28/nonlethal
-	name = "A28 assault rifle NL"
-	icon_state = "a28w"
-	item_state = "a28w"
-	silenced = 1
-	initial_mag = /obj/item/ammo_box/magazine/a28/nonlethal
-	fire_sound = 'sound/weapons/guns/gunshot_silencer.ogg'
-
-/obj/item/weapon/gun/projectile/automatic/silenced/nonlethal
-	name = "Silenced pistol NL"
-	icon = 'icons/obj/gun.dmi'
-	icon_state = "silenced_pistol_nl"
-	initial_mag = /obj/item/ammo_box/magazine/silenced_pistol/nonlethal
-
-/obj/item/ammo_box/magazine/a28/nonlethal
-	name = "A28 magazine (.556NL)"
-	icon_state = "a28_mag_nl"
-	ammo_type = /obj/item/ammo_casing/a556/nonlethal
-	caliber = "5.56mm"
-	max_ammo = 30
-
-/obj/item/ammo_box/magazine/silenced_pistol/nonlethal
-	name = "magazine (.45NL)"
-	icon_state = "silenced_pistol_mag_nl"
-	ammo_type = /obj/item/ammo_casing/c45/nonlethal
-	caliber = ".45"
-	max_ammo = 12
-
-/obj/item/ammo_casing/a556/nonlethal
-	desc = "A 5.56mm bullet casing."
-	projectile_type = /obj/item/projectile/bullet/weakbullet/nl_rifle
-
-/obj/item/ammo_casing/c45/nonlethal
-	desc = "A .45 bullet casing."
-	caliber = ".45"
-	projectile_type = /obj/item/projectile/bullet/weakbullet/nl_rifle
-
-/obj/item/projectile/bullet/weakbullet/nl_rifle
-	stutter = 10
-	agony = 55
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index da7b49a15de4..77404ebbe740 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -14,6 +14,11 @@
 	suitable_mags = list(/obj/item/ammo_box/magazine/silenced_pistol, /obj/item/ammo_box/magazine/silenced_pistol/nonlethal)
 	fire_sound = 'sound/weapons/guns/gunshot_silencer.ogg'
 
+/obj/item/weapon/gun/projectile/automatic/pistol/silenced/nonlethal
+	name = "silenced pistol NL"
+	icon_state = "silenced_pistol_nl"
+	initial_mag = /obj/item/ammo_box/magazine/silenced_pistol/nonlethal
+
 /obj/item/weapon/gun/projectile/automatic/pistol/glock
 	name = "G17"
 	desc = "Полуавтоматический служебный пистолет калибра 9х19 мм. Предназначен для профессионалов."
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index ba946827310d..cf1d8b474b13 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -51,6 +51,10 @@
 /obj/item/projectile/bullet/weakbullet/rubber
 	name = "rubber bullet"
 
+/obj/item/projectile/bullet/weakbullet/nl_rifle
+	stutter = 10
+	agony = 55
+
 /obj/item/projectile/bullet/smg //.45 ACP
 	damage = 20
 
diff --git a/maps/RandomZLevels/spacebattle.dmm b/maps/RandomZLevels/spacebattle.dmm
index a5a6f7249083..7f578e8d2da8 100644
--- a/maps/RandomZLevels/spacebattle.dmm
+++ b/maps/RandomZLevels/spacebattle.dmm
@@ -418,7 +418,7 @@
 /area/awaymission/spacebattle/syndicate1)
 "bk" = (
 /obj/structure/table/reinforced,
-/obj/item/weapon/gun/projectile/automatic/silenced,
+/obj/item/weapon/gun/projectile/automatic/pistol/silenced,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
diff --git a/maps/RandomZLevels/stationCollision.dmm b/maps/RandomZLevels/stationCollision.dmm
index 0ba7c5611e09..a4d3815f5015 100644
--- a/maps/RandomZLevels/stationCollision.dmm
+++ b/maps/RandomZLevels/stationCollision.dmm
@@ -709,7 +709,7 @@
 	},
 /obj/item/clothing/shoes/syndigaloshes,
 /obj/effect/decal/cleanable/blood/splatter,
-/obj/item/weapon/gun/projectile/automatic/silenced,
+/obj/item/weapon/gun/projectile/automatic/pistol/silenced,
 /turf/simulated/floor{
 	icon_state = "grimy"
 	},
diff --git a/maps/RandomZLevels/wildwest.dmm b/maps/RandomZLevels/wildwest.dmm
index 79fb15919508..09118849154e 100644
--- a/maps/RandomZLevels/wildwest.dmm
+++ b/maps/RandomZLevels/wildwest.dmm
@@ -1828,7 +1828,7 @@
 /turf/simulated/floor/wood,
 /area/awaymission/wildwest/mines)
 "gw" = (
-/obj/item/weapon/gun/projectile/automatic/silenced,
+/obj/item/weapon/gun/projectile/automatic/pistol/silenced,
 /turf/simulated/floor/wood,
 /area/awaymission/wildwest/mines)
 "gx" = (
diff --git a/maps/RandomZLevels/zresearchlabs.dmm b/maps/RandomZLevels/zresearchlabs.dmm
index 8fb5f3326f8f..ea98cd4e1d8d 100644
--- a/maps/RandomZLevels/zresearchlabs.dmm
+++ b/maps/RandomZLevels/zresearchlabs.dmm
@@ -3422,7 +3422,7 @@
 "iL" = (
 /obj/effect/decal/cleanable/blood/splatter,
 /obj/effect/gibspawner/human,
-/obj/item/weapon/gun/projectile/automatic/silenced{
+/obj/item/weapon/gun/projectile/automatic/pistol/silenced{
 	desc = "A sidearm commonly favored by terrestrial security forces.";
 	icon_state = "g115 Pistol";
 	name = "Pistol";
@@ -8316,7 +8316,7 @@
 "tQ" = (
 /obj/structure/rack,
 /obj/item/ammo_box/c45,
-/obj/item/weapon/gun/projectile/automatic/silenced{
+/obj/item/weapon/gun/projectile/automatic/pistol/silenced{
 	desc = "A sidearm commonly favored by terrestrial security forces.";
 	icon_state = "g115 Pistol";
 	name = "Pistol";
diff --git a/maps/templates/space_structures/space_villa.dmm b/maps/templates/space_structures/space_villa.dmm
index 9b8fd0183911..bf6201654b29 100644
--- a/maps/templates/space_structures/space_villa.dmm
+++ b/maps/templates/space_structures/space_villa.dmm
@@ -865,7 +865,7 @@
 /turf/simulated/floor/grass,
 /area/space_structures/space_villa)
 "Gy" = (
-/obj/item/weapon/gun/projectile/automatic/silenced,
+/obj/item/weapon/gun/projectile/automatic/pistol/silenced,
 /obj/effect/decal/turf_decal/set_damaged,
 /turf/simulated/floor/plating,
 /area/space_structures/space_villa)
diff --git a/taucetistation.dme b/taucetistation.dme
index 4cbf3b8f140b..749c4bd5669b 100644
--- a/taucetistation.dme
+++ b/taucetistation.dme
@@ -2222,7 +2222,6 @@
 #include "code\modules\projectiles\guns\projectile\automatic.dm"
 #include "code\modules\projectiles\guns\projectile\bow.dm"
 #include "code\modules\projectiles\guns\projectile\launcher.dm"
-#include "code\modules\projectiles\guns\projectile\old_pirate_guns.dm"
 #include "code\modules\projectiles\guns\projectile\pistol.dm"
 #include "code\modules\projectiles\guns\projectile\pneumatic.dm"
 #include "code\modules\projectiles\guns\projectile\revolver.dm"