HotFix Morita - Fix guncase

CeladonSS13 · Jul 13, 2024 · adbf215 · adbf215
1 parent 2b0bfc0
commit adbf215
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/mod_celadon/weapons/code/guncases.dm b/mod_celadon/weapons/code/guncases.dm
@@ -19,20 +19,20 @@
 /obj/item/storage/guncase/morita1_forest
 /obj/item/storage/guncase/morita1_forest/PopulateContents()
 	new /obj/item/gun/ballistic/automatic/assault/morita1/forest/no_mag(src)
+	new /obj/item/ammo_box/magazine/morita1/drum/empty(src)
 	new /obj/item/ammo_box/magazine/morita1/empty(src)
-	new /obj/item/ammo_box/a308/empty
 
 /obj/item/storage/guncase/morita1_desert
 /obj/item/storage/guncase/morita1_desert/PopulateContents()
 	new /obj/item/gun/ballistic/automatic/assault/morita1/desert/no_mag(src)
+	new /obj/item/ammo_box/magazine/morita1/drum/empty(src)
 	new /obj/item/ammo_box/magazine/morita1/empty(src)
-	new /obj/item/ammo_box/a308/empty
 
 /obj/item/storage/guncase/morita1_swamp
 /obj/item/storage/guncase/morita1_swamp/PopulateContents()
 	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/a308/empty
+	new /obj/item/ammo_box/magazine/morita1/empty(src)
 
 /obj/item/storage/guncase/glock
 /obj/item/storage/guncase/glock/PopulateContents()

diff --git a/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -50,9 +50,6 @@
 	ammo_type = /obj/item/ammo_casing/a308
 	max_ammo = 30
 
-/obj/item/ammo_box/a308/empty
-	start_empty = TRUE
-
 //Пули против мяса , минусовое пробитие , не должно пробивать даже минимальную броню , но огромный урон здоровью
 /obj/item/ammo_box/a308/a308_sp
 	name = "Коробка патронов .308(Охотничий)"