From 6a87cb7667a9be45950b619c01eab3585f16459b Mon Sep 17 00:00:00 2001 From: Mirag1993 <145050764+Mirag1993@users.noreply.github.com> Date: Sun, 19 May 2024 01:22:07 +0300 Subject: [PATCH] Fix revolvers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлена проверка заряжаемых патронов на калибр. Запрещаем заряжать в револьверы гранатометные патроны. --- code/modules/projectiles/guns/ballistic/revolver.dm | 5 +++++ mod_celadon/fixes/README.md | 1 + mod_celadon/fixes/_fixes.dm | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index dea8c12e5a2e..b08e156927fa 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -139,6 +139,11 @@ /obj/item/gun/ballistic/revolver/proc/insert_casing(mob/living/user, obj/item/ammo_casing/casing_to_insert, allow_ejection) if(!casing_to_insert) return FALSE +// [CELADON-ADD] - CELADON FIXES + if(casing_to_insert.caliber != magazine.caliber) + to_chat(user, "Этот патрон [casing_to_insert] не подходит для [src].") + return FALSE +// [/CELADON-ADD] var/list/rounds = magazine.ammo_list() var/obj/item/ammo_casing/slot = rounds[gate_offset+1] //byond arrays start at 1, so we add 1 to get the correct index var/doafter_time = 0.4 SECONDS diff --git a/mod_celadon/fixes/README.md b/mod_celadon/fixes/README.md index f8a5a8da0637..ec9b690586f1 100644 --- a/mod_celadon/fixes/README.md +++ b/mod_celadon/fixes/README.md @@ -49,6 +49,7 @@ ID мода: CELADON_FIXES - EDIT: `tgui\packages\tgui\interfaces\HelmConsole.js`: `estThrust * 500`-> `estThrust * 1600` - EDIT: `tgui\packages\tgui\interfaces\HelmConsole.js`: ` format={(value) => value.toFixed(1)}` -> ` format={(value) => value.toFixed(2)}` +- ADD: `code\modules\projectiles\guns\ballistic\revolver.dm` : `/obj/item/gun/ballistic/revolver/proc/insert_casing` -> `проверка на калибр`