Skip to content
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

Jump to bottom

Restricts contents of custom loadout weapon boxes #6303

Merged
merged 5 commits into from
May 19, 2024
Merged

Restricts contents of custom loadout weapon boxes #6303

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5050224
literally 1984 soul killer
doganesi May 17, 2024
179b0e6
undo
doganesi May 17, 2024
5607056
the soul killer
doganesi May 17, 2024
7593037
oops
doganesi May 18, 2024
edcce1e
Merge branch 'master' into boxfix
doganesi May 18, 2024
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: 3 additions & 1 deletion code/game/objects/items/storage/misc.dm
View file
Open in desktop
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)
Drulikar marked this conversation as resolved.
Show resolved Hide resolved

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