Skip to content

Commit

Permalink
its eoeover
Browse files Browse the repository at this point in the history
  • Loading branch information
generalthrax committed Aug 28, 2024
1 parent 6c69d00 commit a0498cb
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 5 deletions.
12 changes: 12 additions & 0 deletions code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,24 @@
name = "Eoehoma .299 Caseless Magazine"
desc = "A 30 round magazine for the E-40 Hybrid Rifle."
item = /obj/item/ammo_box/magazine/e40
pair_item = /datum/blackmarket_item/ammo/c299

price_min = 750
price_max = 1250
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 = 250
price_max = 500
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/projectiles/ammunition/ballistic/rifle.dm
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
7 changes: 7 additions & 0 deletions code/modules/projectiles/boxes_magazines/ammo_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -519,3 +519,10 @@
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 = "229box"
ammo_type = /obj/item/ammo_casing/caseless/c299
max_ammo = 120
2 changes: 1 addition & 1 deletion code/modules/projectiles/boxes_magazines/external/rifle.dm
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
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
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

0 comments on commit a0498cb

Please sign in to comment.