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

Adds Eoehoma laser weapons to the outpost cargo. #2927

Closed
wants to merge 4 commits into from
Closed

Adds Eoehoma laser weapons to the outpost cargo. #2927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
825511a
laserssss
Gristlebee Apr 21, 2024
93cf6d8
Slightly more expensive e-40
Gristlebee Apr 21, 2024
5ecb86e
Atomizing
Gristlebee Apr 21, 2024
d7ff63c
hnnng, typo in the e-11 crate
Gristlebee Apr 21, 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
6 changes: 6 additions & 0 deletions code/modules/cargo/packs/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,12 @@
contains = list(/obj/item/ammo_box/magazine/p16)
cost = 1000

/datum/supply_pack/ammo/e40_ammo
name = "E-40 Eoehoma .299 Caseless Magazine Crate"
desc = "Contains a Eoehoma .299 caseless magazine for the E-40 hybrid rifle, containing thirty rounds."
contains = list(/obj/item/ammo_box/magazine/e40)
cost = 1000

/datum/supply_pack/ammo/a850r_ammo
name = "8x50mmR En Bloc Clip Crate"
desc = "Contains a 8x50mmR en bloc clip for rifles like the illestren rifle, containing five rounds."
Expand Down
29 changes: 29 additions & 0 deletions code/modules/cargo/packs/gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@
contains = list(/obj/item/gun/energy/laser)
crate_name = "laser crate"

/datum/supply_pack/gun/e10
name = "E-10 Laser Pistol Crate"
desc = "Contains an antiquated, but still lethal Eoehoma E-10 laser pistol."
cost = 750
contains = list(/obj/item/gun/energy/laser/e10)
crate_name = "laser pistol crate"

/datum/supply_pack/gun/mini_energy
name = "Mini Energy Gun Crate"
desc = "Contains a small, versatile energy gun, capable of firing both nonlethal and lethal blasts, but with a limited power cell."
Expand All @@ -75,6 +82,14 @@
crate_name = "energy gun crate"
crate_type = /obj/structure/closet/crate/secure/plasma

/datum/supply_pack/gun/e11
name = "E-11 Clearance Crate"
desc = "Contains an antiquated Eoehoma E-11 energy gun, capable of firing both nonlethal and lethal blasts of light. The price has been repeatedly marked down, but it's still likely not worth the cost."
cost = 500
contains = list(/obj/item/gun/energy/e_gun/e11)
crate_name = "E-11 energy gun crate"
crate_type = /obj/structure/closet/crate/secure/plasma

/datum/supply_pack/gun/ion
name = "Ion Rifle Crate"
desc = "Contains a single Mk.I Ion Projector, a special anti-tank rifle designed to disable electronic threats at range."
Expand All @@ -97,6 +112,13 @@
contains = list(/obj/item/gun/energy/kalix)
crate_name = "beam rifle crate"

/datum/supply_pack/gun/e50
name = "E-50 Energy Emitter Crate"
desc = "Contains an Eoehoma E-50 energy emitter gun. Despite it's extreme age, this laser cannon can put out some exceptional hurt."
cost = 6000
contains = list(/obj/item/gun/energy/laser/e50)
crate_name = "E-50 energy emitter crate"

/*
Shotguns
*/
Expand Down Expand Up @@ -160,3 +182,10 @@
cost = 5000
contains = list(/obj/item/gun/ballistic/automatic/assault/skm)
crate_name = "auto rifle crate"

/datum/supply_pack/gun/e40
name = "E-40 Hybrid Assault Rifle Crate"
desc = "Contains an antiquated dual mode automatic rifle capable of firing both ballistic rounds and lasers. Chambered in .299 Eoehoma caseless."
cost = 8500
contains = list(/obj/item/gun/ballistic/automatic/assault/e40)
crate_name = "hybrid auto rifle crate"
Loading