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

Jump to bottom

Adds UA 45-F, UA 60-FP, M2C, M56D ammo to req #5816

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Adds UA 45-F, UA 60-FP, M2C, M56D ammo to req #5816

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfb5dd8
Adds UA 45-F, UA 60-FP, M2C, M56D ammo to req
Vicacrov Feb 26, 2024
40d2f68
Maths
Vicacrov Feb 26, 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
64 changes: 54 additions & 10 deletions code/datums/supply_packs/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,15 +346,15 @@

//------------------------Sentries Ammo----------------

/datum/supply_packs/ammo_sentry
name = "UA 571-C sentry ammunition (x2)"
/datum/supply_packs/ammo_sentry_shotgun
name = "UA 12-G sentry shotgun ammunition (x2)"
contains = list(
/obj/item/ammo_magazine/sentry,
/obj/item/ammo_magazine/sentry,
/obj/item/ammo_magazine/sentry/shotgun,
/obj/item/ammo_magazine/sentry/shotgun,
)
cost = 40
containertype = /obj/structure/closet/crate/ammo
containername = "\improper sentry ammo crate"
containername = "\improper sentry shotgun ammo crate"
group = "Ammo"

/datum/supply_packs/ammo_sentry_flamer
Expand All @@ -368,15 +368,37 @@
containername = "\improper sentry flamer ammo crate"
group = "Ammo"

/datum/supply_packs/ammo_sentry_shotgun
name = "UA 12-G sentry shotgun ammunition (x2)"
/datum/supply_packs/ammo_mini_sentry_flamer
name = "UA 45-F mini sentry flamer ammunition (x2)"
contains = list(
/obj/item/ammo_magazine/sentry/shotgun,
/obj/item/ammo_magazine/sentry/shotgun,
/obj/item/ammo_magazine/sentry_flamer/mini,
/obj/item/ammo_magazine/sentry_flamer/mini,
)
cost = 40
containertype = /obj/structure/closet/crate/ammo
containername = "\improper sentry shotgun ammo crate"
containername = "\improper mini sentry flamer ammo crate"
group = "Ammo"

/datum/supply_packs/ammo_glob_sentry_flamer
name = "UA 60-FP sentry plasma incinerator tank (x2)"
contains = list(
/obj/item/ammo_magazine/sentry_flamer/glob,
/obj/item/ammo_magazine/sentry_flamer/glob,
)
cost = 40
containertype = /obj/structure/closet/crate/ammo
containername = "\improper sentry plasma incinerator ammo crate"
group = "Ammo"

/datum/supply_packs/ammo_sentry
name = "UA 571-C sentry ammunition (x2)"
contains = list(
/obj/item/ammo_magazine/sentry,
/obj/item/ammo_magazine/sentry,
)
cost = 40
containertype = /obj/structure/closet/crate/ammo
containername = "\improper sentry ammo crate"
group = "Ammo"

//------------------------M240 flamer tanks----------------
Expand Down Expand Up @@ -419,6 +441,28 @@
containertype = /obj/structure/closet/crate/ammo/alt/flame
group = "Ammo"

//------------------------Mounted guns ammo----------------
/datum/supply_packs/ammo_m2c
name = "M2C ammunition crate (x2)"
contains = list(
/obj/item/ammo_magazine/m2c,
/obj/item/ammo_magazine/m2c,
)
cost = 25
containertype = /obj/structure/closet/crate/ammo
containername = "\improper m2c ammunition crate"
group = "Ammo"

/datum/supply_packs/ammo_m56d
name = "M56D drum magazine crate (x1)"
contains = list(
/obj/item/ammo_magazine/m56d,
)
cost = 25
containertype = /obj/structure/closet/crate/ammo
containername = "\improper m56d drum magazine crate"
group = "Ammo"

//This crate has a little bit of everything, mostly okay stuff, but it does have some really unique picks.
/datum/supply_packs/ammo_surplus
name = "Surplus ammo crate (various USCM magazines x10)"
Expand Down
Loading