From dd76d1fb0a210ca833c9d07203afd1b072cdb4f2 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Sun, 8 Jun 2025 16:02:40 +0200 Subject: [PATCH] removes xm51 from marine supply --- code/datums/ASRS.dm | 8 ------- code/datums/supply_packs/ammo.dm | 21 ------------------- code/datums/supply_packs/weapons.dm | 11 ---------- code/datums/tutorial/marine/reqs_line.dm | 1 - .../vending/vendor_types/requisitions.dm | 3 --- .../vendor_types/squad_prep/squad_prep.dm | 1 - 6 files changed, 45 deletions(-) diff --git a/code/datums/ASRS.dm b/code/datums/ASRS.dm index 92bc922e2416..d5492ce98c9d 100644 --- a/code/datums/ASRS.dm +++ b/code/datums/ASRS.dm @@ -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 diff --git a/code/datums/supply_packs/ammo.dm b/code/datums/supply_packs/ammo.dm index 36abd1fc8786..38878a3e9947 100644 --- a/code/datums/supply_packs/ammo.dm +++ b/code/datums/supply_packs/ammo.dm @@ -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 @@ -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 ---------------- diff --git a/code/datums/supply_packs/weapons.dm b/code/datums/supply_packs/weapons.dm index c25bf8696196..c9a1a4a34dd8 100644 --- a/code/datums/supply_packs/weapons.dm +++ b/code/datums/supply_packs/weapons.dm @@ -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( diff --git a/code/datums/tutorial/marine/reqs_line.dm b/code/datums/tutorial/marine/reqs_line.dm index 9afd29a1e441..2268c5e8c1f1 100644 --- a/code/datums/tutorial/marine/reqs_line.dm +++ b/code/datums/tutorial/marine/reqs_line.dm @@ -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"), diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index 40942d0cbd96..c3161655002d 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -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), @@ -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), @@ -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), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 165e1523d73f..87ef25ebab2c 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -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),