diff --git a/mod_celadon/weapons/_weapons.dme b/mod_celadon/weapons/_weapons.dme
index 1706ea5c819c..50dd32c985b2 100644
--- a/mod_celadon/weapons/_weapons.dme
+++ b/mod_celadon/weapons/_weapons.dme
@@ -13,6 +13,7 @@
 #include "code/ammo.dm"
 #include "code/gun.dm"
 #include "code/guncases.dm"
+#include "code/pistolcases.dm"
 
 #include "code/modules/research/all_nodes.dm"
 
diff --git a/mod_celadon/weapons/code/gun.dm b/mod_celadon/weapons/code/gun.dm
index 71cf1f91a848..9d4740a4cc3d 100644
--- a/mod_celadon/weapons/code/gun.dm
+++ b/mod_celadon/weapons/code/gun.dm
@@ -48,12 +48,12 @@
 	name = "Оружейный ящик Glock"
 	desc = "Содержит пустой пистолет Glock, калибра 9mm."
 	cost = 1300
-	contains = list(/obj/item/storage/guncase/glock)
+	contains = list(/obj/item/storage/pistolcase/glock)
 	crate_name = "auto rifle crate"
 
 /datum/supply_pack/gun/usp
 	name = "Оружейный ящик USP"
 	desc = "Содержит пустой пистолет USP, калибра .45"
 	cost = 1350
-	contains = list(/obj/item/storage/guncase/usp)
+	contains = list(/obj/item/storage/pistolcase/usp)
 	crate_name = "auto rifle crate"
diff --git a/mod_celadon/weapons/code/guncases.dm b/mod_celadon/weapons/code/guncases.dm
index 16fae57170a2..02ecb06d177f 100644
--- a/mod_celadon/weapons/code/guncases.dm
+++ b/mod_celadon/weapons/code/guncases.dm
@@ -33,13 +33,3 @@
 	new /obj/item/gun/ballistic/automatic/assault/morita1/swamp/no_mag(src)
 	new /obj/item/ammo_box/magazine/morita1/drum/empty(src)
 	new /obj/item/ammo_box/magazine/morita1/empty(src)
-
-/obj/item/storage/guncase/glock
-/obj/item/storage/guncase/glock/PopulateContents()
-	new /obj/item/gun/ballistic/automatic/pistol/glock/no_mag(src)
-	new /obj/item/ammo_box/magazine/glock_standart/empty(src)
-
-/obj/item/storage/guncase/usp
-/obj/item/storage/guncase/usp/PopulateContents()
-	new /obj/item/gun/ballistic/automatic/pistol/usp45/no_mag(src)
-	new /obj/item/ammo_box/magazine/usp45_standart/empty(src)
diff --git a/mod_celadon/weapons/code/pistolcases.dm b/mod_celadon/weapons/code/pistolcases.dm
new file mode 100644
index 000000000000..9019e0790aaa
--- /dev/null
+++ b/mod_celadon/weapons/code/pistolcases.dm
@@ -0,0 +1,11 @@
+/obj/item/storage/pistolcase/glock
+/obj/item/storage/pistolcase/glock/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/pistol/glock/no_mag(src)
+	new /obj/item/ammo_box/magazine/glock_standart/empty(src)
+	new /obj/item/ammo_box/magazine/glock_standart/empty(src)
+
+/obj/item/storage/pistolcase/usp
+/obj/item/storage/pistolcase/usp/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/pistol/usp45/no_mag(src)
+	new /obj/item/ammo_box/magazine/usp45_standart/empty(src)
+	new /obj/item/ammo_box/magazine/usp45_standart/empty(src)