Skip to content

Commit

Permalink
E40 Changes (.299 cargo and firerate) (#3502)
Browse files Browse the repository at this point in the history
## 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 <[email protected]>
  • Loading branch information
generalthrax authored Oct 18, 2024
1 parent 18171b5 commit b601cc1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
11 changes: 0 additions & 11 deletions code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions code/modules/cargo/packs/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/ballistic/assault.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit b601cc1

Please sign in to comment.