From 1a71631c673e455947e6d5f3de550aa10c699d18 Mon Sep 17 00:00:00 2001 From: generalthrax <139387950+generalthrax@users.noreply.github.com> Date: Fri, 18 Oct 2024 03:56:01 -0500 Subject: [PATCH] E40 Changes (.299 cargo and firerate) (#3502) ## About The Pull Request Brings up the E40 ballistic mode firerate by a fair amount to compensate for the significantly lower damage. Experimenting, mostly. Takes the .299 Caseless box out of the black market and adds it to cargo. Fixes a typo that said it held 75 rounds when it actually held 120. You're gonna need that ammo, it guzzles. ## Why It's Good For The Game E40 is a Big, Big purchase if you don't already have it and the Raleigh starts with the rifle and needs to Gamble in order to get more ammo. Should make it the legendary, expensive weapon it is And make both components Actually Usable. ## Changelog :cl: balance: E40 hybrid rifle ballistic mode now shoots faster balance: .299 Caseless taken out of the black market, added to cargo fix: .299 Caseless now correctly states it holds 120 rounds /:cl: --------- Signed-off-by: generalthrax <139387950+generalthrax@users.noreply.github.com> --- .../cargo/blackmarket/blackmarket_items/ammo.dm | 11 ----------- .../cargo/blackmarket/blackmarket_items/weapons.dm | 2 +- code/modules/cargo/packs/ammo.dm | 6 ++++++ code/modules/projectiles/guns/ballistic/assault.dm | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm index 434a80c6416d..0dad1cd32c7c 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm @@ -57,17 +57,6 @@ stock = 6 availability_prob = 0 -/datum/blackmarket_item/ammo/c299 - name = "Eoehoma .299 Caseless Ammo Box" - desc = "This ammunition for the E-40 Hybrid Rifle is probably worth more than the people you're shooting it at." - item = /obj/item/storage/box/ammo/c299 - - price_min = 300 - price_max = 700 - stock_min = 4 - stock_max = 8 - availability_prob = 0 - /datum/blackmarket_item/ammo/saber_mag name = "Saber 9mm SMG Magazines" desc = "Magazines for use in the Saber 9mm SMG. No, they don't work as swords." diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm index 740ee2c5341b..21a0786d9812 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm @@ -129,7 +129,7 @@ name = "E-40 Hybrid Assault Rifle" desc = "A dual mode hybrid assault rifle made by the now defunct Eoehoma Firearms. Capable of firing both bullets AND lasers, for the discerning dealer in death. Chambered in Eoehoma .299 Caseless." item = /obj/item/gun/ballistic/automatic/assault/e40 - pair_item = list(/datum/blackmarket_item/ammo/e40_mag, /datum/blackmarket_item/ammo/c299) + pair_item = list(/datum/blackmarket_item/ammo/e40_mag) price_min = 7000 price_max = 10000 diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 716cb51d1e97..4cd6814189a3 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -424,6 +424,12 @@ contains = list(/obj/item/storage/box/ammo/a44roum_hp) cost = 500 +/datum/supply_pack/ammo/c299 + name = ".299 Eoehoma Caseless Ammo Box Crate" + desc = "Contains a 120-round box of .299 Caseless ammo from the defunct Eoehoma. Used for the E-40 Hybrid Rifle." + contains = list(/obj/item/storage/box/ammo/c299) + cost = 250 + /datum/supply_pack/ammo/c22lr name = ".22 LR Ammo Box Crate" desc = "Contains a 60-round ammo box for refilling .22 LR weapons." diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm index 42cb637a557f..4570be971fda 100644 --- a/code/modules/projectiles/guns/ballistic/assault.dm +++ b/code/modules/projectiles/guns/ballistic/assault.dm @@ -154,7 +154,7 @@ var/obj/item/gun/energy/laser/e40_laser_secondary/secondary fire_select_icon_state_prefix = "e40_" - fire_delay = 0.18 SECONDS + fire_delay = 0.1 SECONDS recoil_unwielded = 3 gun_firenames = list(FIREMODE_FULLAUTO = "full auto ballistic", FIREMODE_OTHER = "full auto laser")