From bb897391727852fcd77965efe3ac487e9632f798 Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Wed, 23 Oct 2024 08:26:37 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B1=D0=B0=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D1=81=20R76=20(#553)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Ребаланс и возвращение R76 * Ребаланс и возвращение R76 * Merge branch 'R76' of https://github.com/Istrelok2107/RuTGMC-Reborn into R76 * Update marine_vending.dm Signed-off-by: Kirill <83533775+Tatarla@users.noreply.github.com> --------- Signed-off-by: Kirill <83533775+Tatarla@users.noreply.github.com> Co-authored-by: Kirill <83533775+Tatarla@users.noreply.github.com> --- .../projectiles/ammo_datums/bullet/revolver.dm | 10 +++++----- code/modules/projectiles/guns/revolvers.dm | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/modules/projectiles/ammo_datums/bullet/revolver.dm b/code/modules/projectiles/ammo_datums/bullet/revolver.dm index 8edae9c2e76..a59c9acb178 100644 --- a/code/modules/projectiles/ammo_datums/bullet/revolver.dm +++ b/code/modules/projectiles/ammo_datums/bullet/revolver.dm @@ -100,14 +100,14 @@ additional_xeno_penetration = 17.5 /datum/ammo/bullet/revolver/t76 - name = "magnum bullet" + name = "magnum 12.7 bullet" handful_amount = 5 - damage = 100 - penetration = 40 - additional_xeno_penetration = 0 + damage = 130 + penetration = 30 + additional_xeno_penetration = 15 /datum/ammo/bullet/revolver/t76/on_hit_mob(mob/M, obj/projectile/P) - staggerstun(M, P, weaken = 2 SECONDS, knockback = 1) + staggerstun(M, P, weaken = 2 SECONDS, stagger = 0.5, slowdown = 1) /datum/ammo/bullet/revolver/highimpact name = "high-impact revolver bullet" diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm index 73894a7dbe9..93047a251ef 100644 --- a/code/modules/projectiles/guns/revolvers.dm +++ b/code/modules/projectiles/guns/revolvers.dm @@ -350,18 +350,18 @@ /obj/item/attachable/scope/standard_magnum, ) attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19,"rail_x" = 15, "rail_y" = 23, "under_x" = 22, "under_y" = 15, "stock_x" = 10, "stock_y" = 18) - windup_delay = 0.5 SECONDS - aim_slowdown = 0.1 + windup_delay = 0.9 SECONDS + aim_slowdown = 0.2 windup_sound = 'sound/weapons/guns/fire/t76_start.ogg' fire_sound = 'sound/weapons/guns/fire/tgmc/kinetic/gun_r76.ogg' - fire_delay = 0.75 SECONDS - akimbo_additional_delay = 0.6 + fire_delay = 1.25 SECONDS + akimbo_additional_delay = 1 accuracy_mult_unwielded = 0.85 accuracy_mult = 1 - scatter_unwielded = 5 - scatter = 2 - recoil = 2 - recoil_unwielded = 3 + scatter_unwielded = 6 + scatter = 3 + recoil = 3 + recoil_unwielded = 6 starting_attachment_types = list(/obj/item/attachable/stock/t76)