Skip to content

Commit 285683b

Browse files
authored
Merge pull request #5 from cuberound/brute-chances
xm 51 removal
2 parents f0912b9 + dd76d1f commit 285683b

File tree

6 files changed

+0
-45
lines changed

6 files changed

+0
-45
lines changed

code/datums/ASRS.dm

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,6 @@
7070
reference_package = /datum/supply_packs/ammo_shell_box_flechette
7171
cost = ASRS_VERY_LOW_WEIGHT
7272

73-
/datum/supply_packs_asrs/ammo_shell_box_breaching
74-
reference_package = /datum/supply_packs/ammo_shell_box_breaching
75-
cost = ASRS_VERY_LOW_WEIGHT
76-
77-
/datum/supply_packs_asrs/ammo_xm51
78-
reference_package = /datum/supply_packs/ammo_xm51
79-
cost = ASRS_VERY_LOW_WEIGHT
80-
8173
/datum/supply_packs_asrs/ammo_smartgun
8274
reference_package = /datum/supply_packs/ammo_smartgun
8375

code/datums/supply_packs/ammo.dm

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -240,16 +240,6 @@
240240
containername = "\improper shotgun flechette crate"
241241
group = "Ammo"
242242

243-
/datum/supply_packs/ammo_shell_box_breaching
244-
name = "Shell box (16g) (120x breaching shells)"
245-
contains = list(
246-
/obj/item/ammo_box/magazine/shotgun/light/breaching,
247-
)
248-
cost = 40
249-
containertype = /obj/structure/closet/crate/ammo
250-
containername = "\improper shotgun breaching crate"
251-
group = "Ammo"
252-
253243
//------------------------For 88M4 ----------------
254244

255245
/datum/supply_packs/ammo_mod88_mag_box_ap
@@ -306,17 +296,6 @@
306296
containername = "\improper M41AE2 HPR holo-target magazines crate"
307297
group = "Ammo"
308298

309-
/datum/supply_packs/ammo_xm51
310-
contains = list(
311-
/obj/item/ammo_magazine/rifle/xm51,
312-
/obj/item/ammo_magazine/rifle/xm51,
313-
/obj/item/ammo_magazine/shotgun/light/breaching,
314-
)
315-
name = "XM51 Ammo (2x mags) (1x small breaching shell box)"
316-
cost = 20
317-
containertype = /obj/structure/closet/crate/ammo
318-
containername = "\improper XM51 ammo crate"
319-
group = "Ammo"
320299

321300
//------------------------For M10 Auto Pistol ----------------
322301

code/datums/supply_packs/weapons.dm

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,6 @@
7070
containername = "MOU-53 Break Action Shotgun Crate"
7171
group = "Weapons"
7272

73-
/datum/supply_packs/xm51
74-
name = "XM51 Breaching Scattergun Crate (x2)"
75-
contains = list(
76-
/obj/item/storage/box/guncase/xm51,
77-
/obj/item/storage/box/guncase/xm51,
78-
)
79-
cost = 30
80-
containertype = /obj/structure/closet/crate/weapon
81-
containername = "XM51 Breaching Scattergun Crate"
82-
group = "Weapons"
83-
8473
/datum/supply_packs/smartpistol
8574
name = "SU-6 Smart Pistol Crate (x2)"
8675
contains = list(

code/datums/tutorial/marine/reqs_line.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
/obj/item/storage/box/guncase/m2c = list("M2C"),
8484
/obj/item/storage/box/guncase/flamer = list("Flamer", "Flamer kit", "Incinerator"),
8585
/obj/item/storage/box/guncase/m79 = list("GL", "Grenade launcher", "M79", "M79 Grenade launcher"),
86-
/obj/item/storage/box/guncase/xm51 = list("XM51", "Breaching Shotty", "Breaching Shotgun", "Breaching Scattergun"),
8786
/obj/item/clothing/accessory/storage/black_vest = list("Black webbing", "Black webbing vest"),
8887
/obj/item/clothing/accessory/storage/black_vest/brown_vest = list("Brown webbing", "Brown webbing vest"),
8988
/obj/item/clothing/accessory/storage/webbing = list("Webbing", "Normal webbing", "Web"),

code/game/machinery/vending/vendor_types/requisitions.dm

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
list("M2C Heavy Machine Gun", floor(scale * 2), /obj/item/storage/box/guncase/m2c, VENDOR_ITEM_REGULAR),
4343
list("M240 Incinerator Unit", floor(scale * 2), /obj/item/storage/box/guncase/flamer, VENDOR_ITEM_REGULAR),
4444
list("M79 Grenade Launcher", floor(scale * 3), /obj/item/storage/box/guncase/m79, VENDOR_ITEM_REGULAR),
45-
list("XM51 Breaching Scattergun", floor(scale * 3), /obj/item/storage/box/guncase/xm51, VENDOR_ITEM_REGULAR),
4645

4746
list("EXPLOSIVES", -1, null, null),
4847
list("M15 Fragmentation Grenade", floor(scale * 2), /obj/item/explosive/grenade/high_explosive/m15, VENDOR_ITEM_REGULAR),
@@ -260,7 +259,6 @@
260259
list("Box Of Buckshot Shells", floor(scale * 56), /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
261260
list("Box Of Flechette Shells", floor(scale * 56), /obj/item/ammo_magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
262261
list("Box Of Shotgun Slugs", floor(scale * 56), /obj/item/ammo_magazine/shotgun/slugs, VENDOR_ITEM_REGULAR),
263-
list("Box Of Breaching Slugs", floor(scale * 4), /obj/item/ammo_magazine/shotgun/light/breaching, VENDOR_ITEM_REGULAR),
264262
list("M4RA Magazine (10x24mm)", floor(scale * 60), /obj/item/ammo_magazine/rifle/m4ra, VENDOR_ITEM_REGULAR),
265263
list("M41A MK2 Magazine (10x24mm)", floor(scale * 100), /obj/item/ammo_magazine/rifle, VENDOR_ITEM_REGULAR),
266264
list("M39 HV Magazine (10x20mm)", floor(scale * 100), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR),
@@ -325,7 +323,6 @@
325323
list("Shotgun Shell Box (Buckshot x 100)", 0, /obj/item/ammo_box/magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
326324
list("Shotgun Shell Box (Flechette x 100)", 0, /obj/item/ammo_box/magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
327325
list("Shotgun Shell Box (Slugs x 100)", 0, /obj/item/ammo_box/magazine/shotgun, VENDOR_ITEM_REGULAR),
328-
list("Shotgun Shell Box (16g) (Breaching x 120)", 0, /obj/item/ammo_box/magazine/shotgun/light/breaching, VENDOR_ITEM_REGULAR),
329326
list("Magazine Box (88 Mod 4 AP x 16)", 0, /obj/item/ammo_box/magazine/mod88, VENDOR_ITEM_REGULAR),
330327
list("Magazine Box (SU-6 x 16)", 0, /obj/item/ammo_box/magazine/su6, VENDOR_ITEM_REGULAR),
331328
list("Magazine Box (VP78 x 16)", 0, /obj/item/ammo_box/magazine/vp78, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@
301301
list("M240 Incinerator Tank", floor(scale * 3), /obj/item/ammo_magazine/flamer_tank, VENDOR_ITEM_REGULAR),
302302
list("M56D Drum Magazine", floor(scale * 2), /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR),
303303
list("M2C Box Magazine", floor(scale * 2), /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR),
304-
list("Box of Breaching Shells (16g)", floor(scale * 2), /obj/item/ammo_magazine/shotgun/light/breaching, VENDOR_ITEM_REGULAR),
305304
list("HIRR Baton Slugs", floor(scale * 6), /obj/item/explosive/grenade/slug/baton, VENDOR_ITEM_REGULAR),
306305
list("M74 AGM-S Star Shell", floor(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/starshell, VENDOR_ITEM_REGULAR),
307306
list("M74 AGM-H Hornet Shell", floor(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/hornet_shell, VENDOR_ITEM_REGULAR),

0 commit comments

Comments
 (0)