From b13893515027f0b6a5b436d972db12c2bc2d9085 Mon Sep 17 00:00:00 2001 From: Dahlon Date: Fri, 1 Nov 2024 18:50:59 +0000 Subject: [PATCH] attempt at balancing 10mm weapons more reverted some recoil on the SMG but shoots slower changed mag cap for 10mm weapons --- .../modules/projectiles/boxes_magazines/external/rifle.dm | 2 +- code/modules/projectiles/boxes_magazines/external/smg.dm | 2 +- code/modules/projectiles/guns/ballistic/smg.dm | 8 +++++--- .../guns/manufacturer/clip_lanchester/ballistics.dm | 4 ++-- .../guns/manufacturer/scarborough/ballistics.dm | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm index ad15e7ecea2a..25b54a985537 100644 --- a/code/modules/projectiles/boxes_magazines/external/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm @@ -5,7 +5,7 @@ base_icon_state = "75" ammo_type = /obj/item/ammo_casing/c10mm caliber = "10mm" - max_ammo = 10 + max_ammo = 8 /obj/item/ammo_box/magazine/m10mm_ringneck/rifle/update_icon_state() . = ..() diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm index fdd4ab2d2b45..40fc10f5729c 100644 --- a/code/modules/projectiles/boxes_magazines/external/smg.dm +++ b/code/modules/projectiles/boxes_magazines/external/smg.dm @@ -63,7 +63,7 @@ base_icon_state = "mongrel_mag" ammo_type = /obj/item/ammo_casing/c10mm caliber = "10mm" - max_ammo = 24 + max_ammo = 20 /obj/item/ammo_box/magazine/smgm10mm/update_icon_state() . = ..() diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm index 073b8c367178..0c3a01c18b5e 100644 --- a/code/modules/projectiles/guns/ballistic/smg.dm +++ b/code/modules/projectiles/guns/ballistic/smg.dm @@ -172,10 +172,12 @@ eject_empty_sound = 'sound/weapons/gun/smg/smg_unload.ogg' spread = 8 - spread_unwielded = 12 + spread_unwielded = 11 - recoil = 1 - recoil_unwielded = 6 + recoil = 0 + recoil_unwielded = 5 + + fire_delay = 0.55 SECONDS wield_delay = 0.4 SECONDS diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm index a244b188863a..becd57757fc9 100644 --- a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm @@ -21,7 +21,7 @@ load_empty_sound = 'sound/weapons/gun/pistol/candor_reload.ogg' eject_sound = 'sound/weapons/gun/pistol/candor_unload.ogg' eject_empty_sound = 'sound/weapons/gun/pistol/candor_unload.ogg' - recoil_unwielded = 3 + recoil_unwielded = 4 /obj/item/ammo_box/magazine/cm23 name = "CM-23 pistol magazine (10mm)" @@ -30,7 +30,7 @@ base_icon_state = "cm23_mag" ammo_type = /obj/item/ammo_casing/c10mm caliber = "10mm" - max_ammo = 10 + max_ammo = 8 /obj/item/ammo_box/magazine/cm23/update_icon_state() . = ..() diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm index c35982aabf17..59f7e1a0362b 100644 --- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm @@ -84,7 +84,7 @@ EMPTY_GUN_HELPER(automatic/pistol/ringneck/indie) base_icon_state = "ringneck_mag" ammo_type = /obj/item/ammo_casing/c10mm caliber = "10mm" - max_ammo = 10 + max_ammo = 8 multiple_sprites = AMMO_BOX_FULL_EMPTY /obj/item/ammo_box/magazine/m10mm_ringneck/empty