[MIRROR] riot helmets can attach visors, visors don't incorrectly sho…

…w in storage (#2320) Co-authored-by: Spookerton <[email protected]> Co-authored-by: UEDCommander <[email protected]>
SierraBay · Jun 21, 2024 · c3618e1 · c3618e1
1 parent d5cfabd
commit c3618e1
Show file tree

Hide file tree

Showing 3 changed files with 3,580 additions and 3,575 deletions.
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
@@ -101,7 +101,7 @@
 	name = "riot helmet"
 	desc = "It's a helmet specifically designed to protect against close range attacks."
 	icon_state = "helmet_riot"
-	valid_accessory_slots = null
+	valid_accessory_slots = list(ACCESSORY_SLOT_HELMET_VISOR)
 	body_parts_covered = HEAD|FACE|EYES //face shield
 	armor = list(
 		melee = ARMOR_MELEE_VERY_HIGH,

diff --git a/code/modules/clothing/under/accessories/goggle_mods.dm b/code/modules/clothing/under/accessories/goggle_mods.dm
@@ -22,16 +22,21 @@
 /obj/item/clothing/accessory/glassesmod/proc/process_hud(mob/M)
 	return
 
+/obj/item/clothing/accessory/glassesmod/get_mob_overlay(mob/user_mob, slot)
+	if (slot == "slot_s_store")
+		return null
+	return ..()
+
 /obj/item/clothing/accessory/glassesmod/activate()
-	. = ..()
+	..()
 	parent.CutOverlays(inv_overlay)
 	inv_overlay = null
 	inv_overlay = get_inv_overlay()
 	parent.AddOverlays(inv_overlay)
 	parent.update_vision()
 
 /obj/item/clothing/accessory/glassesmod/deactivate()
-	. = ..()
+	..()
 	parent.CutOverlays(inv_overlay)
 	inv_overlay = null
 	inv_overlay = get_inv_overlay()