helmet update (#14003)

tgstation · Sep 23, 2023 · b002a17 · b002a17
1 parent 6de8019
commit b002a17
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/code/modules/clothing/modular_armor/attachments/storage.dm b/code/modules/clothing/modular_armor/attachments/storage.dm
@@ -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,
 	)
diff --git a/code/modules/clothing/modular_armor/modular.dm b/code/modules/clothing/modular_armor/modular.dm
@@ -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

diff --git a/icons/mob/modular/modular_helmet_storage.dmi b/icons/mob/modular/modular_helmet_storage.dmi