Skip to content

xm 51 removal #5

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

Merged
thwompa merged 1 commit into from
Jun 8, 2025
Merged

xm 51 removal #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions code/datums/ASRS.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,6 @@
reference_package = /datum/supply_packs/ammo_shell_box_flechette
cost = ASRS_VERY_LOW_WEIGHT

/datum/supply_packs_asrs/ammo_shell_box_breaching
reference_package = /datum/supply_packs/ammo_shell_box_breaching
cost = ASRS_VERY_LOW_WEIGHT

/datum/supply_packs_asrs/ammo_xm51
reference_package = /datum/supply_packs/ammo_xm51
cost = ASRS_VERY_LOW_WEIGHT

/datum/supply_packs_asrs/ammo_smartgun
reference_package = /datum/supply_packs/ammo_smartgun

Expand Down
21 changes: 0 additions & 21 deletions code/datums/supply_packs/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,16 +240,6 @@
containername = "\improper shotgun flechette crate"
group = "Ammo"

/datum/supply_packs/ammo_shell_box_breaching
name = "Shell box (16g) (120x breaching shells)"
contains = list(
/obj/item/ammo_box/magazine/shotgun/light/breaching,
)
cost = 40
containertype = /obj/structure/closet/crate/ammo
containername = "\improper shotgun breaching crate"
group = "Ammo"

//------------------------For 88M4 ----------------

/datum/supply_packs/ammo_mod88_mag_box_ap
Expand Down Expand Up @@ -306,17 +296,6 @@
containername = "\improper M41AE2 HPR holo-target magazines crate"
group = "Ammo"

/datum/supply_packs/ammo_xm51
contains = list(
/obj/item/ammo_magazine/rifle/xm51,
/obj/item/ammo_magazine/rifle/xm51,
/obj/item/ammo_magazine/shotgun/light/breaching,
)
name = "XM51 Ammo (2x mags) (1x small breaching shell box)"
cost = 20
containertype = /obj/structure/closet/crate/ammo
containername = "\improper XM51 ammo crate"
group = "Ammo"

//------------------------For M10 Auto Pistol ----------------

Expand Down
11 changes: 0 additions & 11 deletions code/datums/supply_packs/weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,6 @@
containername = "MOU-53 Break Action Shotgun Crate"
group = "Weapons"

/datum/supply_packs/xm51
name = "XM51 Breaching Scattergun Crate (x2)"
contains = list(
/obj/item/storage/box/guncase/xm51,
/obj/item/storage/box/guncase/xm51,
)
cost = 30
containertype = /obj/structure/closet/crate/weapon
containername = "XM51 Breaching Scattergun Crate"
group = "Weapons"

/datum/supply_packs/smartpistol
name = "SU-6 Smart Pistol Crate (x2)"
contains = list(
Expand Down
1 change: 0 additions & 1 deletion code/datums/tutorial/marine/reqs_line.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
/obj/item/storage/box/guncase/m2c = list("M2C"),
/obj/item/storage/box/guncase/flamer = list("Flamer", "Flamer kit", "Incinerator"),
/obj/item/storage/box/guncase/m79 = list("GL", "Grenade launcher", "M79", "M79 Grenade launcher"),
/obj/item/storage/box/guncase/xm51 = list("XM51", "Breaching Shotty", "Breaching Shotgun", "Breaching Scattergun"),
/obj/item/clothing/accessory/storage/black_vest = list("Black webbing", "Black webbing vest"),
/obj/item/clothing/accessory/storage/black_vest/brown_vest = list("Brown webbing", "Brown webbing vest"),
/obj/item/clothing/accessory/storage/webbing = list("Webbing", "Normal webbing", "Web"),
Expand Down
3 changes: 0 additions & 3 deletions code/game/machinery/vending/vendor_types/requisitions.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
list("M2C Heavy Machine Gun", floor(scale * 2), /obj/item/storage/box/guncase/m2c, VENDOR_ITEM_REGULAR),
list("M240 Incinerator Unit", floor(scale * 2), /obj/item/storage/box/guncase/flamer, VENDOR_ITEM_REGULAR),
list("M79 Grenade Launcher", floor(scale * 3), /obj/item/storage/box/guncase/m79, VENDOR_ITEM_REGULAR),
list("XM51 Breaching Scattergun", floor(scale * 3), /obj/item/storage/box/guncase/xm51, VENDOR_ITEM_REGULAR),

list("EXPLOSIVES", -1, null, null),
list("M15 Fragmentation Grenade", floor(scale * 2), /obj/item/explosive/grenade/high_explosive/m15, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -259,7 +258,6 @@
list("Box Of Buckshot Shells", floor(scale * 56), /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
list("Box Of Flechette Shells", floor(scale * 56), /obj/item/ammo_magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
list("Box Of Shotgun Slugs", floor(scale * 56), /obj/item/ammo_magazine/shotgun/slugs, VENDOR_ITEM_REGULAR),
list("Box Of Breaching Slugs", floor(scale * 4), /obj/item/ammo_magazine/shotgun/light/breaching, VENDOR_ITEM_REGULAR),
list("M4RA Magazine (10x24mm)", floor(scale * 60), /obj/item/ammo_magazine/rifle/m4ra, VENDOR_ITEM_REGULAR),
list("M41A MK2 Magazine (10x24mm)", floor(scale * 100), /obj/item/ammo_magazine/rifle, VENDOR_ITEM_REGULAR),
list("M39 HV Magazine (10x20mm)", floor(scale * 100), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -324,7 +322,6 @@
list("Shotgun Shell Box (Buckshot x 100)", 0, /obj/item/ammo_box/magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (Flechette x 100)", 0, /obj/item/ammo_box/magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (Slugs x 100)", 0, /obj/item/ammo_box/magazine/shotgun, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (16g) (Breaching x 120)", 0, /obj/item/ammo_box/magazine/shotgun/light/breaching, VENDOR_ITEM_REGULAR),
list("Magazine Box (88 Mod 4 AP x 16)", 0, /obj/item/ammo_box/magazine/mod88, VENDOR_ITEM_REGULAR),
list("Magazine Box (SU-6 x 16)", 0, /obj/item/ammo_box/magazine/su6, VENDOR_ITEM_REGULAR),
list("Magazine Box (VP78 x 16)", 0, /obj/item/ammo_box/magazine/vp78, VENDOR_ITEM_REGULAR),
Expand Down
1 change: 0 additions & 1 deletion code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@
list("M240 Incinerator Tank", floor(scale * 3), /obj/item/ammo_magazine/flamer_tank, VENDOR_ITEM_REGULAR),
list("M56D Drum Magazine", floor(scale * 2), /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR),
list("M2C Box Magazine", floor(scale * 2), /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR),
list("Box of Breaching Shells (16g)", floor(scale * 2), /obj/item/ammo_magazine/shotgun/light/breaching, VENDOR_ITEM_REGULAR),
list("HIRR Baton Slugs", floor(scale * 6), /obj/item/explosive/grenade/slug/baton, VENDOR_ITEM_REGULAR),
list("M74 AGM-S Star Shell", floor(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/starshell, VENDOR_ITEM_REGULAR),
list("M74 AGM-H Hornet Shell", floor(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/hornet_shell, VENDOR_ITEM_REGULAR),
Expand Down
Loading