Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eoehoma Caseless is now available on the black market (Plus the E-40 is very slightly cheaper) #3318

Merged
merged 6 commits into from
Sep 4, 2024
Merged

Eoehoma Caseless is now available on the black market (Plus the E-40 is very slightly cheaper) #3318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a0498cb
its eoeover
generalthrax Aug 28, 2024
12ee81e
money
generalthrax Aug 28, 2024
8d4907c
whoops
generalthrax Aug 29, 2024
48e7dd2
a
generalthrax Aug 29, 2024
47ff91d
FUCK YOU CLOUDBREAK
generalthrax Aug 29, 2024
b163593
AG
generalthrax Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,17 @@
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/ammo_box/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
4 changes: 2 additions & 2 deletions code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@
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)
pair_item = list(/datum/blackmarket_item/ammo/e40_mag, /datum/blackmarket_item/ammo/c299)

price_min = 7000
price_max = 15000
price_max = 10000
stock_max = 2
availability_prob = 10
spawn_weighting = FALSE
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/ammunition/ballistic/rifle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
bullet_per_box = 20

/obj/item/ammo_casing/caseless/c299
name = ".229 Eoehoma caseless bullet casing"
desc = "A .229 Eoehoma caseless bullet casing."
name = ".299 Eoehoma caseless bullet casing"
desc = "A .299 Eoehoma caseless bullet casing."
icon_state = "caseless"
caliber = ".299 caseless"
projectile_type = /obj/projectile/bullet/c299
Expand Down
8 changes: 8 additions & 0 deletions code/modules/projectiles/boxes_magazines/ammo_boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,3 +519,11 @@
icon_state = "a44roum-hp"
ammo_type = /obj/item/ammo_casing/a44roum/hp
max_ammo = 50

/obj/item/ammo_box/c299
name = "ammo box (.299 Eoehoma caseless)"
desc = "A box of .299 Eoehoma caseless, for use with the E-40 hybrid assault rifle."
icon_state = "299box"
ammo_type = /obj/item/ammo_casing/caseless/c299
max_ammo = 120
w_class = WEIGHT_CLASS_NORMAL // This is a lot of ammo
2 changes: 1 addition & 1 deletion code/modules/projectiles/boxes_magazines/external/rifle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
multiple_sprites = AMMO_BOX_FULL_EMPTY

/obj/item/ammo_box/magazine/e40
name = "E-40 magazine (.229 Eoehoma caseless)"
name = "E-40 magazine (.299 Eoehoma caseless)"
icon_state = "e40_mag-1"
base_icon_state = "e40_mag"
ammo_type = /obj/item/ammo_casing/caseless/c299
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/ballistic/assault.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@

/obj/item/gun/ballistic/automatic/assault/e40
name = "\improper E-40 Hybrid Rifle"
desc = "A Hybrid Assault Rifle, best known for being having a dual ballistic/laser system along with an advanced ammo counter. Once an icon for bounty hunters, age has broken most down, so these end up in collector's hands or as shoddy Frontiersmen laser SMG conversions when in their inheritted stockpiles. But if one were to find one in working condition, it would be just as formidable as back then. Chambered in .229 Eoehoma caseless, and uses energy for lasers."
desc = "A Hybrid Assault Rifle, best known for being having a dual ballistic/laser system along with an advanced ammo counter. Once an icon for bounty hunters, age has broken most down, so these end up in collector's hands or as shoddy Frontiersmen laser SMG conversions when in their inheritted stockpiles. But if one were to find one in working condition, it would be just as formidable as back then. Chambered in .299 Eoehoma caseless, and uses energy for lasers."
icon = 'icons/obj/guns/manufacturer/eoehoma/48x32.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/eoehoma/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/eoehoma/righthand.dmi'
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile/bullets/rifle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
// .299 Eoehoma Caseless (E-40)

/obj/projectile/bullet/c299
name = ".229 Eoehoma caseless bullet"
name = ".299 Eoehoma caseless bullet"
damage = 20
armour_penetration = 10

Expand Down
Loading