M5 standardized

code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm

@@ -162,8 +162,7 @@
 		list("Incinerator Fuel Tank Pouch", 1.25, /obj/item/storage/pouch/flamertank, VENDOR_ITEM_REGULAR),
 
 		list("MASK", -1, null, null, null),
-		list("M5 Standalone Gas Mask", floor(scale * 15), /obj/item/clothing/mask/gas/m5, VENDOR_ITEM_REGULAR),
-		list("M5 Integrated Gas Mask", floor(scale * 10), /obj/item/prop/helmetgarb/helmet_gasmask, VENDOR_ITEM_REGULAR),
+		list("M5 Gas Mask", floor(scale * 15), /obj/item/clothing/mask/gas/m5, VENDOR_ITEM_REGULAR),
 		list("Tactical Wrap", floor(scale * 10), /obj/item/clothing/mask/rebreather/scarf/tacticalmask, VENDOR_ITEM_REGULAR),
 		list("Heat Absorbent Coif", floor(scale * 10), /obj/item/clothing/mask/rebreather/scarf, VENDOR_ITEM_REGULAR),
 		list("Rebreather", floor(scale * 10), /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
@@ -316,7 +315,7 @@
 		list("Sling Pouch", round(scale * 1.25), /obj/item/storage/pouch/sling, VENDOR_ITEM_REGULAR),
 
 		list("MASK", -1, null, null, null),
-		list("M5 Standalone Gas Mask", round(scale * 15), /obj/item/clothing/mask/gas/m5, VENDOR_ITEM_REGULAR),
+		list("M5 Gas Mask", round(scale * 15), /obj/item/clothing/mask/gas/m5, VENDOR_ITEM_REGULAR),
 		list("Heat Absorbent Coif", round(scale * 10), /obj/item/clothing/mask/rebreather/scarf, VENDOR_ITEM_REGULAR),
 		list("Rebreather", round(scale * 10), /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
 

code/game/machinery/vending/vendor_types/wo_vendors.dm

@@ -97,7 +97,6 @@
 		list("M1A1 Ballistic goggles", floor(scale * 5), /obj/item/clothing/glasses/mgoggles/v2, VENDOR_ITEM_REGULAR),
 		list("Prescription ballistic goggles", floor(scale * 5), /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR),
 		list("Marine RPG glasses", floor(scale * 5), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR),
-		list("M5 Integrated Gas Mask", floor(scale * 5), /obj/item/prop/helmetgarb/helmet_gasmask, VENDOR_ITEM_REGULAR),
 		list("M10 Helmet Netting", floor(scale * 5), /obj/item/prop/helmetgarb/netting, VENDOR_ITEM_REGULAR),
 		list("M10 Helmet Rain Cover", floor(scale * 5), /obj/item/prop/helmetgarb/raincover, VENDOR_ITEM_REGULAR),
 		list("Firearm Lubricant", floor(scale * 10), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR),

code/game/objects/items/props/helmetgarb.dm

@@ -502,36 +502,6 @@
 	desc = "The complimentary, but sold separate face shield associated with the RC6 riot helmet."
 	icon_state = "helmet_riot_shield"
 
-
-/obj/item/prop/helmetgarb/helmet_gasmask
-	name = "\improper M5 integrated gasmask"
-	desc = "The standard service gas mask of the USCM as part of a modernization program meant to replace the need for MOPP gear. While the program failed, these rarely do."
-	icon_state = "helmet_gasmask"
-
-/obj/item/prop/helmetgarb/helmet_gasmask/on_enter_storage(obj/item/storage/internal/helmet_internal_inventory)
-	..()
-	if(!istype(helmet_internal_inventory))
-		return
-	var/obj/item/clothing/head/helmet/helmet_item = helmet_internal_inventory.master_object
-
-	if(!istype(helmet_item))
-		return
-
-	helmet_item.flags_inventory |= BLOCKGASEFFECT
-	helmet_item.flags_inv_hide |= HIDEFACE
-
-/obj/item/prop/helmetgarb/helmet_gasmask/on_exit_storage(obj/item/storage/internal/helmet_internal_inventory)
-	..()
-	if(!istype(helmet_internal_inventory))
-		return
-	var/obj/item/clothing/head/helmet/helmet_item = helmet_internal_inventory.master_object
-
-	if(!istype(helmet_item))
-		return
-
-	helmet_item.flags_inventory &= ~(BLOCKGASEFFECT)
-	helmet_item.flags_inv_hide &= ~(HIDEFACE)
-
 /obj/item/prop/helmetgarb/helmet_gasmask/upp
 	name = "\improper PMK-63N integrated gasmask"
 	desc = "The frontline variant of the PMK-63 produced to be compatible with in service helmets."

code/modules/clothing/head/helmet.dm

@@ -262,6 +262,9 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	/obj/item/clothing/glasses/eyepatch = "eyepatch",
 	/obj/item/clothing/glasses/regular/hipster = "persc-glasses",
 
+	//GASMASK
+	/obj/item/clothing/mask/gas/m5 = HELMET_GARB_RELAY_ICON_STATE,
+
 	// WALKMAN AND CASSETTES
 	/obj/item/device/walkman = HELMET_GARB_RELAY_ICON_STATE,
 	/obj/item/device/cassette_tape/pop1 = "cassette_blue",

code/modules/clothing/masks/gasmask.dm

@@ -32,10 +32,35 @@
 	item_state = "kutjevo_respirator"
 
 /obj/item/clothing/mask/gas/m5
-	name = "\improper M5 standalone gasmask"
-	desc = "The standard service gas mask of the USCM as part of a modernization program meant to replace the need for MOPP gear. This one is the alternative variant meant for Marines not in combat kit."
-	icon_state = "m5_gasmask"
-	item_state = "m5_gasmask"
+	name = "\improper M5 gasmask"
+	desc = "The standard service gas mask of the USCM as part of a modernization program meant to replace the need for MOPP gear."
+	icon_state = "m5"
+	item_state = "m5"
+	flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB
+
+/obj/item/clothing/mask/gas/m5/on_enter_storage(obj/item/storage/internal/helmet_internal_inventory)
+	..()
+	if(!istype(helmet_internal_inventory))
+		return
+	var/obj/item/clothing/head/helmet/helmet_item = helmet_internal_inventory.master_object
+
+	if(!istype(helmet_item))
+		return
+
+	helmet_item.flags_inventory |= BLOCKGASEFFECT
+	helmet_item.flags_inv_hide |= HIDEFACE
+
+/obj/item/clothing/mask/gas/m5/on_exit_storage(obj/item/storage/internal/helmet_internal_inventory)
+	..()
+	if(!istype(helmet_internal_inventory))
+		return
+	var/obj/item/clothing/head/helmet/helmet_item = helmet_internal_inventory.master_object
+
+	if(!istype(helmet_item))
+		return
+
+	helmet_item.flags_inventory &= ~(BLOCKGASEFFECT)
+	helmet_item.flags_inv_hide &= ~(HIDEFACE)
 
 /obj/item/clothing/mask/gas/upp
 	name = "\improper PMK-63 gasmask"