From ad2575e8b7bc64087cc67874d428b2c8c702b9f3 Mon Sep 17 00:00:00 2001 From: XoMkA-BY <155300656+XoMkA-BY@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:14:23 +0300 Subject: [PATCH] grand modded ammo&guns fix --- code/modules/cargo/packs/ammo.dm | 37 +-- code/modules/cargo/packs/magazines.dm | 2 +- .../ammunition/ballistic/sniper.dm | 2 +- .../outpost_console/_outpost_console.dme | 1 - .../supply_pack/independent/ammunition.dm | 34 --- .../code/supply_pack/independent/gun.dm | 14 +- mod_celadon/weapons/code/ammo.dm | 230 +++++++++++------- mod_celadon/weapons/code/gun.dm | 22 +- mod_celadon/weapons/code/guncases.dm | 23 +- .../projectiles/boxes_magazines/ammo_boxes.dm | 166 +++++++++---- .../projectiles/guns/ballistic/assault.dm | 24 +- .../projectiles/guns/ballistic/pistol.dm | 4 +- .../projectiles/guns/ballistic/shotgun.dm | 4 +- .../code/modules/research/all_nodes.dm | 4 +- mod_celadon/weapons/code/pistolcases.dm | 4 +- 15 files changed, 336 insertions(+), 235 deletions(-) delete mode 100644 mod_celadon/outpost_console/code/supply_pack/independent/ammunition.dm diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index d3b87bb2aed9..1bb2425bc30f 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -375,24 +375,25 @@ /* .308 */ -/datum/supply_pack/ammo/a308_ammo_box - name = "308 Ammo Box Crate" - desc = "Contains a thirty-round .308 box for DMRs such as the SsG-04 and CM-GAL-S." - contains = list(/obj/item/storage/box/ammo/a308) - cost = 500 - -/datum/supply_pack/ammo/a308_ap - name = "308 Armour Piercing Ammo Box Crate" - desc = "Contains a thirty-round .308 armour piercing box for DMRs such as the SsG-04 and CM-GAL-S." - contains = list(/obj/item/storage/box/ammo/a308/ap) - cost = 500 - -/datum/supply_pack/ammo/a308_hp - name = "308 Hollow Point Ammo Box Crate" - desc = "Contains a thirty-round .308 hollow point box for DMRs such as the SsG-04 and CM-GAL-S." - contains = list(/obj/item/storage/box/ammo/a308/hp) - cost = 500 - +// [CELADON-DELETE] - cargo ammo fix +///datum/supply_pack/ammo/a308_ammo_box + //name = "308 Ammo Box Crate" + //desc = "Contains a thirty-round .308 box for DMRs such as the SsG-04 and CM-GAL-S." + //contains = list(/obj/item/storage/box/ammo/a308) + //cost = 500 + +///datum/supply_pack/ammo/a308_ap + //name = "308 Armour Piercing Ammo Box Crate" + //desc = "Contains a thirty-round .308 armour piercing box for DMRs such as the SsG-04 and CM-GAL-S." + //contains = list(/obj/item/storage/box/ammo/a308/ap) + //cost = 500 + +///datum/supply_pack/ammo/a308_hp + //name = "308 Hollow Point Ammo Box Crate" + //desc = "Contains a thirty-round .308 hollow point box for DMRs such as the SsG-04 and CM-GAL-S." + //contains = list(/obj/item/storage/box/ammo/a308/hp) + //cost = 500 +// [/CELADON-DELETE] - cargo ammo fix /* 6.5 */ /datum/supply_pack/ammo/a65clip_box diff --git a/code/modules/cargo/packs/magazines.dm b/code/modules/cargo/packs/magazines.dm index 40c2182f4433..364e58b95170 100644 --- a/code/modules/cargo/packs/magazines.dm +++ b/code/modules/cargo/packs/magazines.dm @@ -31,7 +31,7 @@ contains = list(/obj/item/ammo_box/c38) cost = 250 faction_discount = 20 - faction = /datum/faction/srm + faction = /datum/faction/srm /datum/supply_pack/magazine/c38match name = ".38 Match Grade Speedloader" diff --git a/code/modules/projectiles/ammunition/ballistic/sniper.dm b/code/modules/projectiles/ammunition/ballistic/sniper.dm index d481f4d74d53..4ef3686437c0 100644 --- a/code/modules/projectiles/ammunition/ballistic/sniper.dm +++ b/code/modules/projectiles/ammunition/ballistic/sniper.dm @@ -34,7 +34,7 @@ name = ".300 Magnum Trac bullet casing" desc = "A .300 Magnum Tracker casing." projectile_type = /obj/projectile/bullet/a300/trac - bullet_skin = "trac" + //[CELADON-DELETE] - iconstate fix //6.5 CLIP diff --git a/mod_celadon/outpost_console/_outpost_console.dme b/mod_celadon/outpost_console/_outpost_console.dme index 19d16c8674ab..9b2d424101fb 100644 --- a/mod_celadon/outpost_console/_outpost_console.dme +++ b/mod_celadon/outpost_console/_outpost_console.dme @@ -3,7 +3,6 @@ #include "_outpost_console.dm" -#include "code/supply_pack/independent/ammunition.dm" #include "code/supply_pack/independent/civilian.dm" #include "code/supply_pack/independent/costumes_toys.dm" #include "code/supply_pack/independent/food.dm" diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/ammunition.dm b/mod_celadon/outpost_console/code/supply_pack/independent/ammunition.dm deleted file mode 100644 index b875a036959b..000000000000 --- a/mod_celadon/outpost_console/code/supply_pack/independent/ammunition.dm +++ /dev/null @@ -1,34 +0,0 @@ - -/datum/supply_pack/faction/independent/ammo - group = "Ammunition" - crate_type = /obj/structure/closet/crate/secure/gear - -/datum/supply_pack/faction/independent/ammo/a858_box - name = "8x58mm Caseless Ammo box" - desc = "Contains a 8x58mm Caseless Ammo box for the standard-issue SSG-669C, containing fifty rounds." - contains = list(/obj/item/ammo_box/a858_ammo_box) - cost = 750 - -/datum/supply_pack/faction/independent/ammo/a858_clip - name = "8x58mm Caseless Clip" - desc = "A 5-round stripper clip for the SSG-669C rifle. These rounds do good damage with significant armor penetration" - contains = list(/obj/item/ammo_box/a858) - cost = 500 - -/datum/supply_pack/faction/independent/ammo/a410_buckshot - name = "410x76mm Buckshot Clip" - desc = "Дробь он же бакшот 8 металлических шаров, сняражённых в патрон, урон большой по целям в малой броне и без брони, при средних и больших показателях брони урон ниже. В коробке 75 пуль." - contains = list(/obj/item/ammo_box/a410_ammo_box) - cost = 1000 - -/datum/supply_pack/faction/independent/ammo/a410_slug - name = "410x76mm Slug Clip" - desc = "Жакан - пулевой патрон - slug, повышенный урон по не бронированным целям и немного пониженный по целям в броне. В коробке 65 пуль." - contains = list(/obj/item/ammo_box/a410_slug_ammo_box) - cost = 1500 - -/datum/supply_pack/faction/independent/ammo/a410_flechette - name = "410x76mm Flechette Clip" - desc = "Флешшет - дротик с повышенной пробиваемостью из-за своей формы, но меньшим уроном, чем пулевой патрон. В коробке 55 пуль." - contains = list(/obj/item/ammo_box/a410_flechette_ammo_box) - cost = 1500 diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/gun.dm b/mod_celadon/outpost_console/code/supply_pack/independent/gun.dm index 56eedb78c5b2..81df8390c7ac 100644 --- a/mod_celadon/outpost_console/code/supply_pack/independent/gun.dm +++ b/mod_celadon/outpost_console/code/supply_pack/independent/gun.dm @@ -173,13 +173,13 @@ cost = 3000 contains = list(/obj/item/storage/guncase/cobra) crate_name = "SMG crate" -/datum/supply_pack/faction/independent/gun/skm - name = "SKM-24 Rifle Crate" - desc = "Contains a high-powered, automatic rifle chambered in 7.62x40mm CLIP." - cost = 5000 - contains = list(/obj/item/storage/guncase/skm) - crate_name = "auto rifle crate" - +///datum/supply_pack/faction/independent/gun/skm + //name = "SKM-24 Rifle Crate" + //desc = "Contains a high-powered, automatic rifle chambered in 7.62x40mm CLIP." + //cost = 5000 + //contains = list(/obj/item/storage/guncase/skm) + //crate_name = "auto rifle crate" + //Оффы такой же ящик в игру ввели лол /datum/supply_pack/faction/independent/gun/attachment/rail_light name = "Tactical Rail Light Crate" desc = "Contains a single rail light to be mounted on a firearm." diff --git a/mod_celadon/weapons/code/ammo.dm b/mod_celadon/weapons/code/ammo.dm index b8c2585b3a39..52bcdca22cf9 100644 --- a/mod_celadon/weapons/code/ammo.dm +++ b/mod_celadon/weapons/code/ammo.dm @@ -1,75 +1,3 @@ -//Магазины для оружия - -/datum/supply_pack/ammo/p16_ammo - name = "Набор магазинов для P-16 5.56mm" - desc = "Содержит два магазина калибра 5,56 мм для винтовки P-16, каждый из которых содержит по 30 патронов." - contains = list(/obj/item/ammo_box/magazine/p16, - /obj/item/ammo_box/magazine/p16) - cost = 1950 - -/datum/supply_pack/ammo/g36_sh - name = "Набор магазинов для G36-SH 5.56mm" - desc = "Содержит два магазина калибра 5,56 мм для винтовки G36-SH, каждый из которых содержит по 20 патронов." - contains = list(/obj/item/ammo_box/magazine/g36/sh, - /obj/item/ammo_box/magazine/g36/sh) - cost = 1400 - -/datum/supply_pack/ammo/g36 - name = "Набор магазинов для G36 5.56mm" - desc = "Содержит два магазина калибра 5,56 мм для винтовки G36, каждый из которых содержит по 30 патронов." - contains = list(/obj/item/ammo_box/magazine/g36, - /obj/item/ammo_box/magazine/g36) - cost = 1950 - -/datum/supply_pack/ammo/g36_drum - name = "Барабанный магазин для G36 5.56mm" - desc = "Барабанный магазин калибра 5,56 мм для винтовки G36, вмещает до 75 патронов." - contains = list(/obj/item/ammo_box/magazine/g36/drum) - cost = 5000 - -/datum/supply_pack/ammo/morita_ammo_small - name = "Набор укороченых магазинов для Morita Mk.I" - desc = "Содержит два магазина калибра .308 мм для винтовки Morita Mk.I, каждый из которых содержит по 10 патронов." - contains = list(/obj/item/ammo_box/magazine/morita1/small, - /obj/item/ammo_box/magazine/morita1/small) - cost = 2000 - -/datum/supply_pack/ammo/morita_ammo - name = "Набор стандартных магазинов для Morita Mk.I" - desc = "Содержит два магазина калибра .308 мм для винтовки Morita Mk.I, каждый из которых содержит по 25 патронов." - contains = list(/obj/item/ammo_box/magazine/morita1, - /obj/item/ammo_box/magazine/morita1) - cost = 4000 - -/datum/supply_pack/ammo/morita_ammo_drum - name = "Барабанный магазин для Morita Mk.I .308" - desc = "Барабанный магазин калибра .308 мм для винтовки Morita Mk.I, барабан вмещает до 50 патронов." - contains = list(/obj/item/ammo_box/magazine/morita1/drum) - cost = 5000 - -/datum/supply_pack/ammo/usp_magazine - name = "Магазин для пистолета USP" - desc = "Магазин калибра .45 для пистолета USP, вмещает до 12 патронов." - contains = list(/obj/item/ammo_box/magazine/usp45_standart) - cost = 650 - -/datum/supply_pack/ammo/glock_magazine - name = "Магазин для пистолета Glock" - desc = "Магазин калибра 9 мм для пистолета Glock, вмещает до 17 патронов." - contains = list(/obj/item/ammo_box/magazine/glock_standart) - cost = 500 - -/datum/supply_pack/ammo/skm762_40_drum - name = "Барабанный магазин для СКМ 7.52x40" - desc = "Барабанный магазин калибра 7.62x40мм для винтовки СКМ-44, вмещает до 75 патронов." - contains = list(/obj/item/ammo_box/magazine/skm_762_40/drum) - cost = 5000 - -/datum/supply_pack/ammo/skm762_40_extended - name = "Увеличенный магазин для СКМ 7.52x40" - desc = "Увеличенный рожковый магазин калибра 7.62x40мм для винтовки СКМ-44, вмещает до 40 патронов." - contains = list(/obj/item/ammo_box/magazine/skm_762_40/extended) - cost = 2800 //Коробки патронов @@ -78,19 +6,19 @@ /datum/supply_pack/ammo/box556_box name = "Коробка патронов 5.56mm" desc = "Содержит одну коробку патронов." - contains = list(/obj/item/ammo_box/a556_box) + contains = list(/obj/item/storage/box/ammo/a556_box) cost = 500 /datum/supply_pack/ammo/box556/a856_box name = "Коробка патронов 5.56mm(а856)" desc = "Содержит одну коробку патронов." - contains = list(/obj/item/ammo_box/a556_box/a856) + contains = list(/obj/item/storage/box/ammo/a556_box/a856) cost = 650 /datum/supply_pack/ammo/box556/m903_box name = "Коробка патронов 5.56mm(m903)" desc = "Содержит одну коробку патронов." - contains = list(/obj/item/ammo_box/a556_box/m903) + contains = list(/obj/item/storage/box/ammo/a556_box/m903) cost = 1300 //.308 @@ -98,27 +26,39 @@ /datum/supply_pack/ammo/a308_box name = "Коробка патронов .308" desc = "Содержит одну коробку патронов." - contains = list(/obj/item/ammo_box/a308) + contains = list(/obj/item/storage/box/ammo/a308) cost = 650 /datum/supply_pack/ammo/a308_rubber_box name = "Коробка патронов .308(Резина)" desc = "Содержит одну коробку патронов." - contains = list(/obj/item/ammo_box/a308/a308_rubber) + contains = list(/obj/item/storage/box/ammo/a308/a308_rub) cost = 300 /datum/supply_pack/ammo/a308_sp_box name = "Коробка патронов .308(Охотничий)" desc = "Содержит одну коробку патронов." - contains = list(/obj/item/ammo_box/a308/a308_sp) + contains = list(/obj/item/storage/box/ammo/a308/a308_sp) cost = 800 /datum/supply_pack/ammo/a308_ap_box name = "Коробка патронов .308(Бронебойный)" desc = "Содержит одну коробку патронов." - contains = list(/obj/item/ammo_box/a308/a308_ap) + contains = list(/obj/item/storage/box/ammo/a308/a308_ap) cost = 1300 +/datum/supply_pack/ammo/a858_box + name = "8x58mm Caseless Ammo box" + desc = "Contains a 8x58mm Caseless Ammo box for the standard-issue SSG-669C, containing fifty rounds." + contains = list(/obj/item/storage/box/ammo/a858_ammo_box) + cost = 750 + +/datum/supply_pack/ammo/a858_clip + name = "8x58mm Caseless Clip" + desc = "A 5-round stripper clip for the SSG-669C rifle. These rounds do good damage with significant armor penetration" + contains = list(/obj/item/ammo_box/a858) + cost = 500 + // Antifauna bullets /obj/projectile/bullet/bof name = "4.6x30mm BoF" @@ -189,25 +129,137 @@ /datum/material/plasma = 2000, /datum/material/gold = 2000, ) - // 410x76 +/datum/supply_pack/ammo/a410_buckshot + name = "410x76mm Buckshot Box" + desc = "Содержит коробку с 60 дробными патронами калибра 410х76mm." + contains = list(/obj/item/storage/box/ammo/a410_ammo_box) + cost = 1000 + +/datum/supply_pack/ammo/a410_slug + name = "410x76mm Slug Box" + desc = "Содержит коробку с 60 пулевыми патронами калибра 410х76mm." + contains = list(/obj/item/storage/box/ammo/a410_ammo_box/slug) + cost = 1500 + +/datum/supply_pack/ammo/a410_flechette + name = "410x76mm Flechette Box" + desc = "Содержит коробку с 60 флешеттами калибра 410х76mm." + contains = list(/obj/item/storage/box/ammo/a410_ammo_box/flechette) + cost = 1500 + +//Магазины оффов для ИСВ карго + +/datum/supply_pack/magazine/c38_mag + faction = null + +/datum/supply_pack/magazine/c38match + faction = null + +/datum/supply_pack/magazine/c38dumdum + faction = null + +/datum/supply_pack/magazine/m45_mag + faction = null + +/datum/supply_pack/magazine/a44roum_speedloader + faction = null +//Магазины оружия(смещаем вниз в другой раздел) +/datum/supply_pack/magazine/skm762_40_extended + name = "SKM Extended Magazine Crate" + desc = "Contains a 7.62x40mm magazine for the SKM rifles, containing fourty rounds." + contains = list(/obj/item/ammo_box/magazine/skm_762_40/extended) + cost = 2800 + +/datum/supply_pack/magazine/skm762_40_drum + name = "SKM Drum Magazine Crate" + desc = "Contains a 7.62x40mm magazine for the SKM rifles, containing seventy-five rounds." + contains = list(/obj/item/ammo_box/magazine/skm_762_40/drum) + cost = 5000 + + +///datum/supply_pack/magazine/p16_ammo + //name = "Набор магазинов для P-16 5.56mm" + //desc = "Содержит два магазина калибра 5,56 мм для винтовки P-16, каждый из которых содержит по 30 патронов." + //contains = list(/obj/item/ammo_box/magazine/p16, + ///obj/item/ammo_box/magazine/p16) + //cost = 1950 + //Удаляем до возврата П16 в игру +/datum/supply_pack/magazine/a357_mag_independent + name = ".357 Speedloader Crate" + desc = "Contains a .357 speedloader for revolvers, containing seven rounds." + contains = list(/obj/item/ammo_box/a357) + cost = 1000 + +/datum/supply_pack/magazine/usp_magazine + name = "USP Pistol Magazine Crate" + desc = "Contains .45 caliber magazine for the USP pistol, containing twelve rounds." + contains = list(/obj/item/ammo_box/magazine/usp45_standart) + cost = 650 + +/datum/supply_pack/magazine/glock_magazine + name = "Glock Pistol Magazine Crate" + desc = "Contains 9mm magazine for the Glock pistol family, containing seventeen rounds." + contains = list(/obj/item/ammo_box/magazine/glock_standart) + cost = 500 + +/datum/supply_pack/magazine/g36_sh + name = "G36 Short Magazine Double Pack Crate" + desc = "Contains two 5.56x45mm magazines for the G36 family rifles, containing twenty rounds each." + contains = list(/obj/item/ammo_box/magazine/g36/sh, + /obj/item/ammo_box/magazine/g36/sh) + cost = 1400 + +/datum/supply_pack/magazine/g36 + name = "G36 Standard Magazine Double Pack Crate" + desc = "Contains two 5.56x45mm magazines for the G36 family rifles, containing thirty rounds each." + contains = list(/obj/item/ammo_box/magazine/g36, + /obj/item/ammo_box/magazine/g36) + cost = 1950 + +/datum/supply_pack/magazine/g36_drum + name = "G36 Drum Magazine Crate" + desc = "Contains 5.56x45mm drum magazine for the G36 family rifles, containing seventy-five rounds." + contains = list(/obj/item/ammo_box/magazine/g36/drum) + cost = 5000 + +/datum/supply_pack/magazine/morita_ammo_small + name = "Morita MK1 Short Magazine Double Pack Crate" + desc = "Contains two .310 caliber magazines for the Morita family rifles, containing ten rounds each." + contains = list(/obj/item/ammo_box/magazine/morita1/small, + /obj/item/ammo_box/magazine/morita1/small) + cost = 2000 + +/datum/supply_pack/magazine/morita_ammo + name = "Morita MK1 Standard Magazine Double Pack Crate" + desc = "Contains two .310 caliber magazines for the Morita family rifles, containing twenty-five rounds each." + contains = list(/obj/item/ammo_box/magazine/morita1, + /obj/item/ammo_box/magazine/morita1) + cost = 4000 + +/datum/supply_pack/magazine/morita_ammo_drum + name = "Morita MK1 Drum Magazine Crate" + desc = "Contains .310 caliber drum magazine for the Morita family rifles, containing fifty rounds." + contains = list(/obj/item/ammo_box/magazine/morita1/drum) + cost = 5000 + //Магазины для оружия -/datum/supply_pack/ammo/a410_saiga - name = "Набор магазинов для Saiga 410" - desc = "магазины калибра 410. для автоматического дробовика Saiga, вмещает 6 патронов." +/datum/supply_pack/magazine/a410_saiga + name = "Saiga-410 Short Magazine Double Pack Crate" + desc = "Contains two .410 caliber short magazines for the Saiga-410 shotgun, containing six rounds each." contains = list(/obj/item/ammo_box/magazine/saiga, /obj/item/ammo_box/magazine/saiga) cost = 1800 -/datum/supply_pack/ammo/a410_saiga_medium - name = "Увеличенный магазин для Saiga 410" - desc = "Увеличенный магазин калибра 410. для автоматического дробовика Saiga, вмещает 9 патронов." +/datum/supply_pack/magazine/a410_saiga_medium + name = "Saiga-410 Standard Magazine Crate" + desc = "Contains .410 caliber magazine for the Saiga-410 shotgun, containing nine rounds." contains = list(/obj/item/ammo_box/magazine/saiga/medium) cost = 2800 -/datum/supply_pack/ammo/a410_saiga_drum - name = "Барабанный магазин для Saiga 410" - desc = "Барабанный магазин калибра 410. для автоматического дробовика Saiga, вмещает 14 патронов." +/datum/supply_pack/magazine/a410_saiga_drum + name = "Saiga-410 Drum Magazine Crate" + desc = "Contains .410 caliber drum magazine for the Saiga-410 shotgun, containing fourteen rounds." contains = list (/obj/item/ammo_box/magazine/saiga/drum) cost = 5000 diff --git a/mod_celadon/weapons/code/gun.dm b/mod_celadon/weapons/code/gun.dm index e856805d9f6f..21c3d64eb686 100644 --- a/mod_celadon/weapons/code/gun.dm +++ b/mod_celadon/weapons/code/gun.dm @@ -4,59 +4,59 @@ /datum/supply_pack/gun/g36 name = "Оружейный ящик G36" - desc = "Содержит автоматическую винтовку G36 и 2 запасных пустых обойм." + desc = "Содержит автоматическую винтовку G36 и одну дополнительную обойму стандартного размера." cost = 12000 contains = list(/obj/item/storage/guncase/g36) crate_name = "auto rifle crate" /datum/supply_pack/gun/g36sh name = "Оружейный ящик G36-SH" - desc = "Содержит автоматическую винтовку G36-SH и 2 запасных пустых обойм." + desc = "Содержит автоматическую винтовку G36-SH и одну дополнительную обойму малого размера." cost = 12000 contains = list(/obj/item/storage/guncase/g36sh) crate_name = "auto rifle crate" /datum/supply_pack/gun/morita1 name = "Morita Mk.I Rifle crate" - desc = "Содержит Morita Mk.I. и дополнительную пустую обойму." + desc = "Содержит Morita Mk.I. и одну дополнительную обойму стандартного размера." cost = 11000 contains = list(/obj/item/storage/guncase/morita1) crate_name = "auto rifle crate" /datum/supply_pack/gun/morita1_forest name = "Morita/forest Mk.I Rifle crate" - desc = "Содержит Morita/forest Mk.I. и дополнительный пустой барабанный магазин." + desc = "Содержит Morita/forest Mk.I. и одну дополнительную обойму стандартного размера." cost = 12850 contains = list(/obj/item/storage/guncase/morita1_forest) crate_name = "auto rifle crate" /datum/supply_pack/gun/morita1_desert name = "Morita/desert Mk.I Rifle crate" - desc = "Содержит Morita/desert Mk.I. и дополнительный пустой барабанный магазин." + desc = "Содержит Morita/desert Mk.I. и одну дополнительную обойму стандартного размера." cost = 12850 contains = list(/obj/item/storage/guncase/morita1_desert) crate_name = "auto rifle crate" /datum/supply_pack/gun/morita1_swamp name = "Morita/swamp Mk.I Rifle crate" - desc = "Содержит Morita/swamp Mk.I. и дополнительный пустой барабанный магазин." + desc = "Содержит Morita/swamp Mk.I. и одну дополнительную обойму стандартного размера." cost = 12850 contains = list(/obj/item/storage/guncase/morita1_swamp) crate_name = "auto rifle crate" /datum/supply_pack/gun/glock name = "Оружейный ящик Glock" - desc = "Содержит пустой пистолет Glock, калибра 9mm." + desc = "Содержит пистолет Glock калибра 9mm и одну дополнительную обойму к нему." cost = 1300 contains = list(/obj/item/storage/pistolcase/glock) - crate_name = "auto rifle crate" + crate_name = "pistol crate" /datum/supply_pack/gun/usp name = "Оружейный ящик USP" - desc = "Содержит пустой пистолет USP, калибра .45" + desc = "Содержит пистолет USP калибра .45 и одну дополнительную обойму к нему." cost = 1350 contains = list(/obj/item/storage/pistolcase/usp) - crate_name = "auto rifle crate" + crate_name = "pistol crate" // ПР от Ганзы. Добавляет дробь для дробовиков // /datum/supply_pack/gun/riot_shotgun // Вроде есть уже ящик с таким оружием, и ценник там 5000 @@ -78,7 +78,7 @@ /// Сайга-410 /datum/supply_pack/gun/saiga name = "Saiga-410 \"Saiga\" shotgun assault crate" - desc = "Содержит Saiga-410 и дополнительные пустые обоймы." + desc = "Содержит штурмовой дробовик Saiga-410 и дополнительные пустые обоймы среднего размера." cost = 10850 contains = list(/obj/item/storage/guncase/saiga) crate_name = "auto shotgun crate" diff --git a/mod_celadon/weapons/code/guncases.dm b/mod_celadon/weapons/code/guncases.dm index f768749e8830..de03c7a4c948 100644 --- a/mod_celadon/weapons/code/guncases.dm +++ b/mod_celadon/weapons/code/guncases.dm @@ -1,42 +1,41 @@ /obj/item/storage/guncase/g36 /obj/item/storage/guncase/g36/PopulateContents() - new /obj/item/gun/ballistic/automatic/assault/g36(src) + new /obj/item/gun/ballistic/automatic/assault/g36/no_mag(src) new /obj/item/ammo_box/magazine/g36/empty(src) new /obj/item/ammo_box/magazine/g36/empty(src) /obj/item/storage/guncase/g36sh /obj/item/storage/guncase/g36sh/PopulateContents() - new /obj/item/gun/ballistic/automatic/assault/g36sh(src) + new /obj/item/gun/ballistic/automatic/assault/g36sh/no_mag(src) new /obj/item/ammo_box/magazine/g36/sh/empty(src) new /obj/item/ammo_box/magazine/g36/sh/empty(src) /obj/item/storage/guncase/morita1 /obj/item/storage/guncase/morita1/PopulateContents() - new /obj/item/gun/ballistic/automatic/assault/morita1(src) + new /obj/item/gun/ballistic/automatic/assault/morita1/no_mag(src) new /obj/item/ammo_box/magazine/morita1/empty(src) new /obj/item/ammo_box/magazine/morita1/empty(src) /obj/item/storage/guncase/morita1_forest /obj/item/storage/guncase/morita1_forest/PopulateContents() - new /obj/item/gun/ballistic/automatic/assault/morita1/forest(src) - new /obj/item/ammo_box/magazine/morita1/drum/empty(src) + new /obj/item/gun/ballistic/automatic/assault/morita1/forest/no_mag(src) + new /obj/item/ammo_box/magazine/morita1/empty(src) new /obj/item/ammo_box/magazine/morita1/empty(src) /obj/item/storage/guncase/morita1_desert /obj/item/storage/guncase/morita1_desert/PopulateContents() - new /obj/item/gun/ballistic/automatic/assault/morita1/desert(src) - new /obj/item/ammo_box/magazine/morita1/drum/empty(src) + new /obj/item/gun/ballistic/automatic/assault/morita1/desert/no_mag(src) + new /obj/item/ammo_box/magazine/morita1/empty(src) new /obj/item/ammo_box/magazine/morita1/empty(src) /obj/item/storage/guncase/morita1_swamp /obj/item/storage/guncase/morita1_swamp/PopulateContents() - new /obj/item/gun/ballistic/automatic/assault/morita1/swamp(src) - new /obj/item/ammo_box/magazine/morita1/drum/empty(src) + new /obj/item/gun/ballistic/automatic/assault/morita1/swamp/no_mag(src) + new /obj/item/ammo_box/magazine/morita1/empty(src) new /obj/item/ammo_box/magazine/morita1/empty(src) /obj/item/storage/guncase/saiga /obj/item/storage/guncase/saiga/PopulateContents() - new /obj/item/gun/ballistic/automatic/assault/saiga(src) - new /obj/item/ammo_box/magazine/saiga/drum/empty(src) + new /obj/item/gun/ballistic/automatic/assault/saiga/no_mag(src) + new /obj/item/ammo_box/magazine/saiga/medium/empty(src) new /obj/item/ammo_box/magazine/saiga/medium/empty(src) - new /obj/item/ammo_box/magazine/saiga/empty(src) 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 494b189bfbd5..4ed43ffa34f5 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 @@ -4,37 +4,61 @@ //Коробки 5.56 , плюс стандартная коробка так как ее нету в основном коде -/obj/item/ammo_box/a556_box +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_45 + ammo_type = /obj/item/ammo_casing/a556_45 + max_ammo = 15 + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_45/a856 + ammo_type = /obj/item/ammo_casing/a556_45/a856 + max_ammo = 15 + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_45/m903 + ammo_type = /obj/item/ammo_casing/a556_45/m903 + max_ammo = 15 + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_45/surplus + ammo_type = /obj/item/ammo_casing/a556_45/surplus + max_ammo = 15 + +/obj/item/storage/box/ammo/a556_box name = "ammo box (5.56x45mm)" desc = "A box of standard 5.56x45mm ammo." icon = 'mod_celadon/_storge_icons/icons/ammo/ammo.dmi' icon_state = "a556box_856" - ammo_type = /obj/item/ammo_casing/a556_45 - max_ammo = 50 +/obj/item/storage/box/ammo/a556_box/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_45 = 4) + generate_items_inside(items_inside,src) -/obj/item/ammo_box/a556_box/a856 +/obj/item/storage/box/ammo/a556_box/a856 name = "A856 ammo box (5.56x45mm)" desc = "A box of standard 5.56x45mm ammo." icon = 'mod_celadon/_storge_icons/icons/ammo/ammo.dmi' icon_state = "a556box" - ammo_type = /obj/item/ammo_casing/a556_45/a856 - max_ammo = 50 +/obj/item/storage/box/ammo/a556_box/a856/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_45/a856 = 4) + generate_items_inside(items_inside,src) -/obj/item/ammo_box/a556_box/m903 +/obj/item/storage/box/ammo/a556_box/m903 name = "M903 ammo box (5.56x45mm)" desc = "A box of armour-piercing 5.56x45mm ammo." icon = 'mod_celadon/_storge_icons/icons/ammo/ammo.dmi' icon_state = "a556_ap" - ammo_type = /obj/item/ammo_casing/a556_45/m903 - max_ammo = 50 +/obj/item/storage/box/ammo/a556_box/m903/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_45/m903 = 4) + generate_items_inside(items_inside,src) -/obj/item/ammo_box/a556_box/surplus +/obj/item/storage/box/ammo/a556_box/surplus name = "surplus ammo box (5.56x45mm)" desc = "A box of standard 5.56x45mm ammo." icon = 'mod_celadon/_storge_icons/icons/ammo/ammo.dmi' icon_state = "a556box_surplus" - ammo_type = /obj/item/ammo_casing/a556_45/surplus - max_ammo = 50 +/obj/item/storage/box/ammo/a556_box/surplus/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_45/surplus = 4) + generate_items_inside(items_inside,src) // // .308 @@ -42,80 +66,140 @@ //коробки патроны 308 калибра - на данный момент эндгейм патроны , огромный урон , огромное пробитие , высокая цена -/obj/item/ammo_box/a308 +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a308 + ammo_type = /obj/item/ammo_casing/a308 + max_ammo = 10 + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/a308_sp + ammo_type = /obj/item/ammo_casing/a308/a308_sp + max_ammo = 10 + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/a308_brak + ammo_type = /obj/item/ammo_casing/a308/a308_brak + max_ammo = 10 + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/a308_ap + ammo_type = /obj/item/ammo_casing/a308/a308_ap + max_ammo = 10 + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/a308_rubber + ammo_type = /obj/item/ammo_casing/a308/a308_rubber + max_ammo = 10 + +/obj/item/storage/box/ammo/a308 name = "Коробка патронов .308" desc = "Коробка стандартных патронов .308 . Заводского качества, еще в смазке." icon = 'mod_celadon/_storge_icons/icons/ammo/ammo.dmi' icon_state = "308_fmj" - ammo_type = /obj/item/ammo_casing/a308 - max_ammo = 30 +/obj/item/storage/box/ammo/a308/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a308 = 4) + generate_items_inside(items_inside,src) //Пули против мяса , минусовое пробитие , не должно пробивать даже минимальную броню , но огромный урон здоровью -/obj/item/ammo_box/a308/a308_sp +/obj/item/storage/box/ammo/a308/a308_sp name = "Коробка патронов .308(Охотничий)" desc = "Пуля с мягкой оболочкой , эффективна против крупной дичи , но практически бесполезна даже против базовой брони" icon_state = "308_sp" - ammo_type = /obj/item/ammo_casing/a308/a308_sp +/obj/item/storage/box/ammo/a308/a308_sp/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/a308_sp = 4) + generate_items_inside(items_inside,src) //Тупое название сурплус , будет брак или некачественное исполнение. Снижен урон , минимум пробития - не для продажи -/obj/item/ammo_box/a308/a308_brak +/obj/item/storage/box/ammo/a308/a308_brak name = "Коробка бракованных патронов .308" desc = "Не слишком качественные патроны калибра .308 , хуже заводских но все еще годны." icon_state = "a308_brak" - ammo_type = /obj/item/ammo_casing/a308/a308_brak - max_ammo = 50 +/obj/item/storage/box/ammo/a308/a308_brak/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/a308_brak = 4) + generate_items_inside(items_inside,src) + //Бронебойки , должны пробивать любую броню , но урон снижен -/obj/item/ammo_box/a308/a308_ap +/obj/item/storage/box/ammo/a308/a308_ap name = "Коробка патронов .308(Бронебойный)" desc = "Бронебойные патроны с вольфрамовым наконечником , хороши против брони но наносят не так много повреждений." icon_state = "308_ap" - ammo_type = /obj/item/ammo_casing/a308/a308_ap - +/obj/item/storage/box/ammo/a308/a308_ap/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/a308_ap = 4) + generate_items_inside(items_inside,src) //Резина , минимум урона здоровью , средне стамине -/obj/item/ammo_box/a308/a308_rubber +/obj/item/storage/box/ammo/a308/a308_rubber name = "Коробка патронов .308(Резина)" desc = "Патроны с резиновой пулей , не смертельны но все еще наносят травмы." icon_state = "308_rub" - ammo_type = /obj/item/ammo_casing/a308/a308_rubber - +/obj/item/storage/box/ammo/a308/a308_rub/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/a308_rubber = 4) + generate_items_inside(items_inside,src) // // 8x58 // //Стандартные безгильзовые патроны калибра 8x58 -/obj/item/ammo_box/a858_ammo_box + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/caseless/a858 + ammo_type = /obj/item/ammo_casing/caseless/a858 + max_ammo = 10 + +/obj/item/storage/box/ammo/a858_ammo_box name = "Ammo box (8x58mm Caseless)" desc = "A box of standard 8x58mm ammo." icon = 'mod_celadon/_storge_icons/icons/ammo/ammo.dmi' icon_state = "a858box" - ammo_type = /obj/item/ammo_casing/caseless/a858 - max_ammo = 50 +/obj/item/storage/box/ammo/a858_ammo_box/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/caseless/a858 = 4) + generate_items_inside(items_inside,src) // // 410x76mm // -/obj/item/ammo_box/a410_ammo_box +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a410 + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_bullet.dmi' + ammo_type = /obj/item/ammo_casing/a410 + max_ammo = 15 + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a410/slug + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_bullet.dmi' + ammo_type = /obj/item/ammo_casing/a410/a410_slug + max_ammo = 15 + +/obj/item/ammo_box/magazine/ammo_stack/prefilled/a410/flechette + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_bullet.dmi' + ammo_type = /obj/item/ammo_casing/a410/a410_flechette + max_ammo = 15 + +/obj/item/storage/box/ammo/a410_ammo_box name = "Ammo box (410x76mm buckshot)" - desc = "Дробь он же бакшот 8 металлических шаров, сняражённых в патрон, урон большой по целям в малой броне и без брони, при средних и больших показателях брони урон ниже. В коробке 75 пуль." + desc = "A box of buckshot 410x76mm ammo." icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_ammo.dmi' icon_state = "410box_buckshot" - ammo_type = /obj/item/ammo_casing/a410 - max_ammo = 75 +/obj/item/storage/box/ammo/a410_ammo_box/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a410 = 4) + generate_items_inside(items_inside,src) -/obj/item/ammo_box/a410_slug_ammo_box +/obj/item/storage/box/ammo/a410_ammo_box/slug name = "Ammo box (410x76mm slug)" - desc = "Жакан - пулевой патрон - slug, повышенный урон по не бронированным целям и немного пониженный по целям в броне. В коробке 65 пуль." + desc = "A box of slug 410x76mm ammo." icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_ammo.dmi' icon_state = "410box_slug" - ammo_type = /obj/item/ammo_casing/a410/a410_slug - max_ammo = 65 +/obj/item/storage/box/ammo/a410_ammo_box/slug/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a410/slug = 4) + generate_items_inside(items_inside,src) -/obj/item/ammo_box/a410_flechette_ammo_box +/obj/item/storage/box/ammo/a410_ammo_box/flechette name = "Ammo box (410x76mm flechette)" - desc = "Флешшет - дротик с повышенной пробиваемостью из-за своей формы, но меньшим уроном, чем пулевой патрон. В коробке 55 пуль." + desc = "A box of flechette 410x76mm ammo." icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_ammo.dmi' icon_state = "410box_flechette" - ammo_type = /obj/item/ammo_casing/a410/a410_flechette - max_ammo = 55 +/obj/item/storage/box/ammo/a410_ammo_box/flechette/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/a410/flechette = 4) + generate_items_inside(items_inside,src) diff --git a/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/assault.dm b/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/assault.dm index f4a7be971cd8..7a7d2c5ce820 100644 --- a/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/assault.dm +++ b/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/assault.dm @@ -24,7 +24,7 @@ ) //Прочее var/obj/item/ammo_box/magazine/g36/sh/alternate_magazine - +NO_MAG_GUN_HELPER(automatic/assault/g36sh) /obj/item/gun/ballistic/automatic/assault/g36sh/Initialize() . = ..() if (!alternate_magazine) @@ -32,7 +32,7 @@ // spawnwithmagazine = FALSE default_ammo_type = /obj/item/ammo_box/magazine/g36 allowed_ammo_types = list( - /obj/item/ammo_box/magazine/g36, + /obj/item/ammo_box/magazine/g36, /obj/item/ammo_box/magazine/g36/sh, /obj/item/ammo_box/magazine/g36/drum ) /obj/item/gun/ballistic/automatic/assault/g36sh/inteq @@ -44,7 +44,7 @@ empty_indicator = TRUE empty_alarm = TRUE zoomable = TRUE - +NO_MAG_GUN_HELPER(automatic/assault/g36sh/inteq) // /obj/item/gun/ballistic/automatic/assault/g36sh/no_mag // spawnwithmagazine = FALSE @@ -64,10 +64,10 @@ unique_mag_sprites_for_variants = TRUE default_ammo_type = /obj/item/ammo_box/magazine/g36 allowed_ammo_types = list( - /obj/item/ammo_box/magazine/g36, + /obj/item/ammo_box/magazine/g36, /obj/item/ammo_box/magazine/g36/sh, /obj/item/ammo_box/magazine/g36/drum ) var/obj/item/ammo_box/magazine/g36/alternate_magazine - +NO_MAG_GUN_HELPER(automatic/assault/g36) /obj/item/gun/ballistic/automatic/assault/g36/Initialize() . = ..() if (!alternate_magazine) @@ -90,7 +90,7 @@ empty_indicator = TRUE empty_alarm = TRUE zoomable = TRUE - +NO_MAG_GUN_HELPER(automatic/assault/g36/inteq) /obj/item/gun/ballistic/automatic/assault/morita1 name = "\improper Morita MK.I" desc = "Стандартная пехотная автоматическая винтовка под калибр .308. Широко применяется армейскими корпусами в Союзе Человечества. Популярность в гражданских кругах заслужила после сьемок в фильме Starboat Troopes." @@ -110,9 +110,9 @@ unique_mag_sprites_for_variants = TRUE default_ammo_type = /obj/item/ammo_box/magazine/morita1 allowed_ammo_types = list( - /obj/item/ammo_box/magazine/morita1, + /obj/item/ammo_box/magazine/morita1, /obj/item/ammo_box/magazine/morita1/small, /obj/item/ammo_box/magazine/morita1/drum ) - +NO_MAG_GUN_HELPER(automatic/assault/morita1) // /obj/item/gun/ballistic/automatic/assault/morita1/no_mag // spawnwithmagazine = FALSE @@ -124,13 +124,13 @@ // /obj/item/gun/ballistic/automatic/assault/morita1/desert/no_mag // spawnwithmagazine = FALSE - +NO_MAG_GUN_HELPER(automatic/assault/morita1/desert) /obj/item/gun/ballistic/automatic/assault/morita1/forest name = "\improper Morita MK.I(forest)" desc = "Стандартная пехотная автоматическая винтовка под калибр .308. Широко применяется армейскими корпусами в Союзе Человечества. Популярность в гражданских кругах заслужила после сьемок в фильме Starboat Troopes./Модификация с лесным камуфляжем" icon_state = "morita1_forest" item_state = "morita1_forest" - +NO_MAG_GUN_HELPER(automatic/assault/morita1/forest) // /obj/item/gun/ballistic/automatic/assault/morita1/forest/no_mag // spawnwithmagazine = FALSE @@ -139,7 +139,7 @@ desc = "Стандартная пехотная автоматическая винтовка под калибр .308. Широко применяется армейскими корпусами в Союзе Человечества. Популярность в гражданских кругах заслужила после сьемок в фильме Starboat Troopes./Модификация с болотным камуфляжем" icon_state = "morita1_swamp" item_state = "morita1_swamp" - +NO_MAG_GUN_HELPER(automatic/assault/morita1/swamp) // /obj/item/gun/ballistic/automatic/assault/morita1/swamp/no_mag // spawnwithmagazine = FALSE @@ -178,7 +178,7 @@ recoil = 0 recoil_unwielded = 4 wield_slowdown = 0.75 - +NO_MAG_GUN_HELPER(automatic/marksman/svd) /obj/item/ammo_box/magazine/svd_rounds name = "\improper SVD magazine (7.62x54mmR)" desc = "A large caliber magazine for the SVD sniper rifle." diff --git a/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/pistol.dm b/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/pistol.dm index ca28de91d10d..41f29dba36b9 100644 --- a/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/pistol.dm @@ -17,7 +17,7 @@ eject_sound = 'sound/weapons/gun/pistol/candor_unload.ogg' //На будущее заменить eject_empty_sound = 'sound/weapons/gun/pistol/candor_unload.ogg' //На будущее заменить recoil = -2 - +NO_MAG_GUN_HELPER(automatic/pistol/usp45) /obj/item/gun/ballistic/automatic/pistol/usp45/Initialize() return ..() @@ -39,6 +39,6 @@ load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'//На будущее заменить eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'//На будущее заменить eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'//На будущее заменить - +NO_MAG_GUN_HELPER(automatic/pistol/glock) // /obj/item/gun/ballistic/automatic/pistol/glock/no_mag // spawnwithmagazine = FALSE diff --git a/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/shotgun.dm b/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/shotgun.dm index b7f1d457b346..4be53e4f026e 100644 --- a/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -13,7 +13,7 @@ default_ammo_type = /obj/item/ammo_box/magazine/saiga allowed_ammo_types = list( - /obj/item/ammo_box/magazine/zip_ammo_9mm, + /obj/item/ammo_box/magazine/saiga, /obj/item/ammo_box/magazine/saiga/medium, /obj/item/ammo_box/magazine/saiga/drum ) fire_sound = 'sound/weapons/gun/shotgun/bulldog.ogg' @@ -49,7 +49,7 @@ recoil_unwielded = 4 wield_slowdown = 0.6 wield_delay = 0.65 SECONDS - +NO_MAG_GUN_HELPER(automatic/assault/saiga) /obj/item/gun/ballistic/automatic/assault/saiga/Initialize() . = ..() diff --git a/mod_celadon/weapons/code/modules/research/all_nodes.dm b/mod_celadon/weapons/code/modules/research/all_nodes.dm index bf67522a0ff7..6b79df452797 100644 --- a/mod_celadon/weapons/code/modules/research/all_nodes.dm +++ b/mod_celadon/weapons/code/modules/research/all_nodes.dm @@ -4,7 +4,7 @@ id = "a556surp" build_type = PROTOLATHE materials = list(/datum/material/iron = 35000, /datum/material/titanium = 3000) - build_path = /obj/item/ammo_box/a556_box/surplus + build_path = /obj/item/storage/box/ammo/a556_box/surplus category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY @@ -14,6 +14,6 @@ id = "a308_brak" build_type = PROTOLATHE materials = list(/datum/material/iron = 45000, /datum/material/titanium = 4000) - build_path = /obj/item/ammo_box/a308/a308_brak + build_path = /obj/item/storage/box/ammo/a308/a308_brak category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY diff --git a/mod_celadon/weapons/code/pistolcases.dm b/mod_celadon/weapons/code/pistolcases.dm index 19bbd7010a06..9019e0790aaa 100644 --- a/mod_celadon/weapons/code/pistolcases.dm +++ b/mod_celadon/weapons/code/pistolcases.dm @@ -1,11 +1,11 @@ /obj/item/storage/pistolcase/glock /obj/item/storage/pistolcase/glock/PopulateContents() - new /obj/item/gun/ballistic/automatic/pistol/glock(src) + 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(src) + 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)