Skip to content

Minor fixes #8

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 2 commits into from
Jun 18, 2025
Merged

Minor fixes #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
963b435
adresses remaining issues
uuuuhuuuu Jun 18, 2025
de3ecd0
adresses remaining issues
uuuuhuuuu Jun 18, 2025
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
4 changes: 2 additions & 2 deletions code/datums/supply_packs/explosives.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 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 @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
3 changes: 2 additions & 1 deletion code/game/objects/items/storage/large_holster.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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()
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()

Expand Down
Loading