Skip to content

Commit

Permalink
Restricts contents of custom loadout weapon boxes (#6303)
Browse files Browse the repository at this point in the history
# About the pull request

Adds a can_hold list to the Type 73 storing case, D18-storing boxx, and
the M8 cartridge bayonet packaging.

# Explain why it's good for the game

Prevents any unintended use of these items, such as storing 3 medium
sized items inside of a single medium size slot within a satchel.

Fixing oversights is good.

# Testing Photographs and Procedure

<details>
<summary>Screenshots & Videos</summary>

https://streamable.com/8rh75b

</details>


# Changelog
:cl:
fix: Fixed some oversights with custom loadout provided weapon boxes
/:cl:
  • Loading branch information
doganesi authored May 19, 2024
1 parent 4f2a373 commit f6bfe15
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion code/game/objects/items/storage/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
w_class = SIZE_SMALL
max_w_class = SIZE_TINY
storage_slots = 2
can_hold = list(/obj/item/weapon/gun/pistol/clfpistol, /obj/item/ammo_magazine/pistol/clfpistol)

/obj/item/storage/box/clf/fill_preset_inventory()
new /obj/item/weapon/gun/pistol/clfpistol(src)
Expand All @@ -132,6 +133,7 @@
w_class = SIZE_MEDIUM
max_w_class = SIZE_MEDIUM
storage_slots = 3
can_hold = list(/obj/item/weapon/gun/pistol/t73, /obj/item/ammo_magazine/pistol/t73)

/obj/item/storage/box/upp/fill_preset_inventory()
new /obj/item/weapon/gun/pistol/t73(src)
Expand All @@ -142,11 +144,11 @@
name = "M8 cartridge bayonet packaging"
desc = "Contains one M8 Cartridge Bayonet and two sister CO2 cartridges. Thanks for being a dedicated Boots magazine subscriber!"
icon_state = "co2_box"
can_hold = list(/obj/item/attachable/bayonet/co2, /obj/item/co2_cartridge)
foldable = TRUE
storage_slots = 3
w_class = SIZE_SMALL
max_w_class = SIZE_SMALL
can_hold = list(/obj/item/attachable/bayonet/co2, /obj/item/co2_cartridge)

/obj/item/storage/box/co2_knife/fill_preset_inventory()
new /obj/item/attachable/bayonet/co2(src)
Expand Down

0 comments on commit f6bfe15

Please sign in to comment.