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.

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

Helmet storage items update #14003

Merged
merged 1 commit into from
Sep 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions code/modules/clothing/modular_armor/attachments/storage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -394,13 +394,21 @@
flags_attach_features = NONE

/obj/item/storage/internal/marinehelmet
max_storage_space = 2
max_storage_space = 3
storage_slots = 2
max_w_class = WEIGHT_CLASS_TINY
bypass_w_limit = list(
/obj/item/clothing/glasses,
/obj/item/reagent_containers/food/snacks,
/obj/item/stack/medical/heal_pack/gauze,
/obj/item/stack/medical/heal_pack/ointment,
/obj/item/ammo_magazine/handful,
)
cant_hold = list(
/obj/item/stack,
/obj/item/stack/sheet,
/obj/item/stack/catwalk,
/obj/item/stack/rods,
/obj/item/stack/sandbags_empty,
/obj/item/stack/tile,
/obj/item/stack/cable_coil,
)
5 changes: 4 additions & 1 deletion code/modules/clothing/modular_armor/modular.dm
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,10 @@
var/obj/item/armor_module/storage/storage_module = attachments_by_slot[ATTACHMENT_SLOT_STORAGE]
if(storage_module.show_storage)
for(var/obj/item/stored AS in storage_module.storage.contents)
standing.overlays += mutable_appearance(storage_module.show_storage_icon, icon_state = initial(stored.icon_state))
if(istype(stored, /obj/item/ammo_magazine/handful))
standing.overlays += mutable_appearance(storage_module.show_storage_icon, icon_state = stored.icon_state, layer = COLLAR_LAYER)
else
standing.overlays += mutable_appearance(storage_module.show_storage_icon, icon_state = initial(stored.icon_state), layer = COLLAR_LAYER)
if(attachments_by_slot[ATTACHMENT_SLOT_VISOR])
return standing
standing.pixel_x = visorless_offset_x
Expand Down
Binary file modified icons/mob/modular/modular_helmet_storage.dmi
Binary file not shown.
Loading