diff --git a/code/datums/supply_packs/explosives.dm b/code/datums/supply_packs/explosives.dm index 0d6d6deaffc5..f459920d5f12 100644 --- a/code/datums/supply_packs/explosives.dm +++ b/code/datums/supply_packs/explosives.dm @@ -68,7 +68,7 @@ group = "Explosives" /datum/supply_packs/brute_rockets - name = "BRUTE rocket crate (x6)" + name = "M6H-BRUTE Breaching Rocket Crate (x6)" contains = list( /obj/item/ammo_magazine/rocket/brute, /obj/item/ammo_magazine/rocket/brute, @@ -79,7 +79,7 @@ ) cost = 30 containertype = /obj/structure/closet/crate/explosives - containername = "\improper BRUTE rocket crate (WARNING)" + containername = "\improper M6H-BRUTE Breaching Rocket Crate (WARNING)" group = "Explosives" /datum/supply_packs/explosives_incendiary diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index 2281b41151b8..edc97f35a3d2 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -60,7 +60,7 @@ list("M40 MFHS Metal Foam Grenade", floor(scale * 6), /obj/item/explosive/grenade/metal_foam, VENDOR_ITEM_REGULAR), list("Plastic Explosives", floor(scale * 3), /obj/item/explosive/plastic, VENDOR_ITEM_REGULAR), list("Breaching Charge", floor(scale * 2), /obj/item/explosive/plastic/breaching_charge, VENDOR_ITEM_REGULAR), - list("M5510 Laser-Guided Rocket", floor(scale), /obj/item/ammo_magazine/rocket/brute, VENDOR_ITEM_REGULAR), + list("M6H-BRUTE Breaching Rocket", floor(scale * 3), /obj/item/ammo_magazine/rocket/brute, VENDOR_ITEM_REGULAR), list("WEBBINGS", -1, null, null), list("Black Webbing Vest", floor(scale * 2), /obj/item/clothing/accessory/storage/black_vest, VENDOR_ITEM_REGULAR), @@ -298,7 +298,6 @@ list("M41A MK1 AP Magazine (10x24mm)", floor(scale * 2), /obj/item/ammo_magazine/rifle/m41aMK1/ap, 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("XM51 Magazine (16g)", floor(scale * 3), /obj/item/ammo_magazine/rifle/xm51, VENDOR_ITEM_REGULAR), list("MAGAZINE BOXES", -1, null, null), list("Magazine Box (M10 x 22)", 0, /obj/item/ammo_box/magazine/m10, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm index 5bf0583faae7..3e7367597788 100644 --- a/code/game/objects/items/storage/large_holster.dm +++ b/code/game/objects/items/storage/large_holster.dm @@ -471,7 +471,7 @@ /obj/item/storage/belt/gun/brutepack flags_equip_slot = SLOT_BACK //yes we are belt subtype that is worn on back storage_slots = 7 - max_w_class = 10 + max_w_class = SIZE_MEDIUM name = "\improper M271A2 Pattern Launcher Rig" desc = "A special-issue harness designed to allow the user to freely and securely holster a M6H-BRUTE launcher system on their back without impeding movement, while also having several other integrated storage packs for additional ammo and equipment." icon = 'icons/obj/items/clothing/backpack/backpacks_by_faction/UA.dmi' @@ -484,6 +484,7 @@ /obj/item/ammo_magazine, /obj/item/weapon/gun/launcher/rocket/brute, ) + bypass_w_limit = list(/obj/item/weapon/gun/launcher/rocket/brute) /obj/item/storage/belt/gun/brutepack/update_icon() . = ..() diff --git a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm index 48dfbcf90fd3..a1b80e79e366 100644 --- a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm +++ b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm @@ -431,7 +431,7 @@ /obj/item/weapon/gun/launcher/rocket/brute/retrieve_to_slot(mob/living/carbon/human/user, retrieval_slot, check_loc, silent) if(retrieval_slot == WEAR_J_STORE) //If we are using a magharness... - if(..(user, WEAR_IN_BACK, check_loc, silent)) //...first try to put it onto the Broiler. + if(..(user, WEAR_IN_BACK, check_loc, silent)) //...first try to put it into the bag return TRUE return ..()