From adbf21584ab718c3c5a558433c6f63b1aa3ebc50 Mon Sep 17 00:00:00 2001 From: Mr_DarkBladeS <48252701+MysticalFaceLesS@users.noreply.github.com> Date: Sat, 13 Jul 2024 19:57:33 +0300 Subject: [PATCH] HotFix Morita - Fix guncase --- mod_celadon/weapons/code/guncases.dm | 6 +++--- .../code/modules/projectiles/boxes_magazines/ammo_boxes.dm | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mod_celadon/weapons/code/guncases.dm b/mod_celadon/weapons/code/guncases.dm index 4f70daee28f6..16fae57170a2 100644 --- 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 index 043cf309aea1..a756eef448bc 100644 --- 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(Охотничий)"