diff --git a/1Item_list.dmm b/1Item_list.dmm
index 83d51ec257..327b5e4305 100644
--- a/1Item_list.dmm
+++ b/1Item_list.dmm
@@ -58835,7 +58835,7 @@
 	},
 /area/survivalpod)
 "rlD" = (
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /turf/simulated/fitness{
 	icon_state = "vault"
 	},
diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm
index eb7d350c5f..4aa20aedfe 100644
--- a/code/datums/supplypacks/medical.dm
+++ b/code/datums/supplypacks/medical.dm
@@ -310,7 +310,7 @@
 			/obj/item/clothing/head/bio_hood/virology = 2,
 			/obj/item/clothing/suit/bio_suit/cmo,
 			/obj/item/clothing/head/bio_hood/cmo,
-			/obj/item/clothing/mask/gas = 5,
+			/obj/item/clothing/mask/gas/clear = 5, //ChompEdit: Proper implementation of clear gas masks
 			/obj/item/weapon/tank/oxygen = 5,
 			/obj/item/weapon/storage/box/masks,
 			/obj/item/weapon/storage/box/gloves
diff --git a/code/datums/supplypacks/medical_vr.dm b/code/datums/supplypacks/medical_vr.dm
index 4f2dc7e8fe..c2590a4537 100644
--- a/code/datums/supplypacks/medical_vr.dm
+++ b/code/datums/supplypacks/medical_vr.dm
@@ -10,7 +10,7 @@
 			/obj/item/clothing/suit/bio_suit/cmo,
 			/obj/item/clothing/head/bio_hood/cmo,
 			/obj/item/clothing/shoes/white = 7,
-			/obj/item/clothing/mask/gas = 7,
+			/obj/item/clothing/mask/gas/clear = 7, //ChompEdit: Proper implementation of clear gas masks
 			/obj/item/weapon/tank/oxygen = 7,
 			/obj/item/weapon/storage/box/masks,
 			/obj/item/weapon/storage/box/gloves
@@ -22,7 +22,7 @@
 	contains = list(
 			/obj/item/clothing/suit/bio_suit/virology = 3,
 			/obj/item/clothing/head/bio_hood/virology = 3,
-			/obj/item/clothing/mask/gas = 3,
+			/obj/item/clothing/mask/gas/clear = 3, //ChompEdit: Proper implementation of clear gas masks
 			/obj/item/weapon/tank/oxygen = 3,
 			/obj/item/weapon/storage/box/masks,
 			/obj/item/weapon/storage/box/gloves
@@ -50,4 +50,4 @@
 	cost = 90
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Compact Defibrillator crate"
-	access = access_medical_equip
\ No newline at end of file
+	access = access_medical_equip
diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm
index fc8d9b373b..e8addb3d54 100644
--- a/code/datums/supplypacks/security.dm
+++ b/code/datums/supplypacks/security.dm
@@ -666,7 +666,7 @@
 			/obj/item/clothing/under/rank/security = 3,
 			/obj/item/clothing/suit/bio_suit/security = 3,
 			/obj/item/clothing/shoes/white = 3,
-			/obj/item/clothing/mask/gas = 3,
+			/obj/item/clothing/mask/gas/clear = 3, //Chompedit: implementation of clear gas masks
 			/obj/item/weapon/tank/oxygen = 3,
 			/obj/item/clothing/gloves/sterile/latex,
 			/obj/item/weapon/storage/box/gloves
diff --git a/code/datums/supplypacks/security_vr.dm b/code/datums/supplypacks/security_vr.dm
index bbb28e08fb..31d8426730 100644
--- a/code/datums/supplypacks/security_vr.dm
+++ b/code/datums/supplypacks/security_vr.dm
@@ -27,7 +27,7 @@
 			/obj/item/clothing/under/rank/security = 3,
 			/obj/item/clothing/suit/bio_suit/security = 3,
 			/obj/item/clothing/shoes/white = 3,
-			/obj/item/clothing/mask/gas = 3,
+			/obj/item/clothing/mask/gas/clear = 3, //Chompedit: Implementation of clear gas masks
 			/obj/item/weapon/tank/oxygen = 3,
 			/obj/item/clothing/gloves/sterile/latex,
 			/obj/item/weapon/storage/box/gloves
diff --git a/code/game/objects/random/maintenance.dm b/code/game/objects/random/maintenance.dm
index 56366d7cdd..1014061866 100644
--- a/code/game/objects/random/maintenance.dm
+++ b/code/game/objects/random/maintenance.dm
@@ -39,6 +39,7 @@ something, make sure it's not in one of the other lists.*/
 				prob(2);/obj/item/weapon/cell/super,
 				prob(5);/obj/random/cigarettes,
 				prob(3);/obj/item/clothing/mask/gas,
+				prob(3);/obj/item/clothing/mask/gas/clear, //ChompAdd: Proper implementation of clear gasmasks
 				prob(2);/obj/item/clothing/mask/gas/half,
 				prob(4);/obj/item/clothing/mask/breath,
 				prob(2);/obj/item/weapon/reagent_containers/glass/rag,
diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
index 3643373c5d..2bfd233282 100644
--- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
@@ -10,7 +10,7 @@
 		/obj/item/clothing/suit/bio_suit/general = 2, // CHOMP Block Edit Start
 		/obj/item/clothing/head/bio_hood/general = 2,
 		/obj/item/weapon/tank/oxygen = 2,
-		/obj/item/clothing/mask/gas = 2) // CHOMP Block Edit End
+		/obj/item/clothing/mask/gas/clear = 2) // CHOMP Block Edit End //CHOMPEdit: Clear gas mask implementation
 
 
 /obj/structure/closet/l3closet/virology
@@ -19,7 +19,7 @@
 	starts_with = list(
 		/obj/item/clothing/suit/bio_suit/virology = 2, // CHOMP Block Edit Start
 		/obj/item/clothing/head/bio_hood/virology = 2,
-		/obj/item/clothing/mask/gas = 2,
+		/obj/item/clothing/mask/gas/clear = 2, //CHOMPEdit: Clear gas mask implementation
 		/obj/item/weapon/tank/oxygen = 2) // CHOMP Block Edit End
 
 
@@ -29,7 +29,7 @@
 	starts_with = list(
 		/obj/item/clothing/suit/bio_suit/security = 2, // CHOMP Block Edit Start
 		/obj/item/clothing/head/bio_hood/security = 2,
-		/obj/item/clothing/mask/gas = 2,
+		/obj/item/clothing/mask/gas/clear = 2, //CHOMPEdit: Clear gas mask implementation
 		/obj/item/weapon/tank/oxygen = 2) // CHOMP Block Edit End
 
 /obj/structure/closet/l3closet/janitor
@@ -38,7 +38,7 @@
 	starts_with = list(
 		/obj/item/clothing/suit/bio_suit/janitor = 2,
 		/obj/item/clothing/head/bio_hood/janitor = 2,
-		/obj/item/clothing/mask/gas = 2,
+		/obj/item/clothing/mask/gas/clear = 2, //CHOMPEdit: Clear gas mask implementation
 		/obj/item/weapon/tank/emergency/oxygen/engi = 2)
 
 
@@ -48,7 +48,7 @@
 	starts_with = list(
 		/obj/item/clothing/suit/bio_suit/scientist = 2, // CHOMP Block Edit Start
 		/obj/item/clothing/head/bio_hood/scientist = 2,
-		/obj/item/clothing/mask/gas = 2,
+		/obj/item/clothing/mask/gas/clear = 2, //CHOMPEdit: Clear gas mask implementation
 		/obj/item/weapon/tank/oxygen = 2, // CHOMP Block Edit End
 		/obj/item/weapon/storage/bag/xeno = 1)
 
@@ -57,7 +57,7 @@
 		/obj/item/clothing/suit/bio_suit/scientist = 2, // CHOMP Block Edit Start
 		/obj/item/clothing/head/bio_hood/scientist = 2,
 		/obj/item/weapon/storage/bag/xeno = 2,
-		/obj/item/clothing/mask/gas = 2,
+		/obj/item/clothing/mask/gas/clear = 2, //CHOMPEdit: Clear gas mask implementation
 		/obj/item/weapon/tank/oxygen = 2,
 		/obj/item/weapon/storage/bag/xeno = 2) // CHOMP Block Edit End
 
@@ -68,5 +68,5 @@
 	starts_with = list(
 		/obj/item/clothing/suit/bio_suit/general = 3,
 		/obj/item/clothing/head/bio_hood/general = 3,
-		/obj/item/clothing/mask/gas = 3, // CHOMP Block Edit Start
+		/obj/item/clothing/mask/gas/clear = 3, // CHOMP Block Edit Start //CHOMPEdit: Clear gas mask implementation
 		/obj/item/weapon/tank/oxygen = 3) // CHOMP Block Edit End
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
index 5eec312418..30a0b928d6 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
@@ -35,7 +35,7 @@
 /obj/structure/closet/secure_closet/hydroponics/sci/Initialize()
 	starts_with += /obj/item/clothing/head/bio_hood/scientist
 	starts_with += /obj/item/clothing/suit/bio_suit/scientist
-	starts_with += /obj/item/clothing/mask/gas					// VOREStation Edit: Gasmasks we use are different
+	starts_with += /obj/item/clothing/mask/gas/clear			// VOREStation Edit: Gasmasks we use are different //Chompedit: not anymore!
 
 	if(prob(1))
 		starts_with += /obj/item/weapon/chainsaw
diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm
index a43a15afbe..31049b51ec 100644
--- a/code/game/objects/structures/loot_piles.dm
+++ b/code/game/objects/structures/loot_piles.dm
@@ -142,6 +142,7 @@ Loot piles can be depleted, if loot_depleted is turned on.  Note that players wh
 		/obj/item/weapon/cell,
 		/obj/item/weapon/cell/device,
 		/obj/item/clothing/mask/gas,
+		/obj/item/clothing/mask/gas/clear, //Chompadd: Proper Implementation of clear gasmasks
 		/obj/item/clothing/mask/gas/half,
 		/obj/item/clothing/mask/breath,
 		/obj/item/weapon/reagent_containers/glass/rag,
diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm
index 2d786724d8..eee0a57719 100644
--- a/code/game/objects/structures/trash_pile_vr.dm
+++ b/code/game/objects/structures/trash_pile_vr.dm
@@ -203,6 +203,7 @@
 					prob(3);/obj/item/clothing/gloves/botanic_leather,
 					prob(3);/obj/item/clothing/head/hardhat/red,
 					prob(3);/obj/item/clothing/mask/gas,
+					prob(3);/obj/item/clothing/mask/gas/clear, //Chompadd: Proper implementation of clear gas masks
 					prob(3);/obj/item/clothing/suit/storage/apron,
 					prob(3);/obj/item/clothing/suit/storage/toggle/bomber,
 					prob(3);/obj/item/clothing/suit/storage/toggle/brown_jacket,
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 0e52b8674c..65f909805b 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -264,7 +264,7 @@
 
 /obj/item/clothing/mask/chameleon
 	name = "gas mask"
-	icon_state = "gas_old"
+	icon_state = "gas_alt" //Chompedit: file change
 	desc = "It looks like a plain gask mask, but on closer inspection, it seems to have a small dial inside."
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
@@ -277,7 +277,7 @@
 /obj/item/clothing/mask/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
 	name = "gas mask"
 	desc = "It's a gas mask."
-	icon_state = "gas_old"
+	icon_state = "gas_alt" //ChompEdit: file change
 	update_icon()
 	update_clothing_icon()
 
diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm
index 32cfb9cffc..a81107eb1b 100644
--- a/code/modules/clothing/clothing_vr.dm
+++ b/code/modules/clothing/clothing_vr.dm
@@ -134,7 +134,7 @@
 //Mask
 /obj/item/clothing/mask
 	name = "mask"
-	icon = 'icons/inventory/face/item_vr.dmi' // This is intentional because of our custom species.
+	icon = 'modular_chomp/icons/inventory/face/item.dmi' // This is intentional because of our custom species. //Chompedit: this file also goes to modular_chomp
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_masks.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_masks.dmi',
@@ -142,23 +142,26 @@
 	body_parts_covered = HEAD
 	slot_flags = SLOT_MASK
 	body_parts_covered = FACE|EYES
+	//Chompedit Start: Moving over to the modularity folder because virgo changed the name of upstream icons in their modular files. Epic.
 	item_icons = list(
-		slot_wear_mask_str = 'icons/inventory/face/mob_vr.dmi'
+		slot_wear_mask_str = 'modular_chomp/icons/inventory/face/mob.dmi'
 		)
 	sprite_sheets = list(
-		SPECIES_TESHARI		= 'icons/inventory/face/mob_teshari.dmi',
-		SPECIES_VOX 		= 'icons/inventory/face/mob_vox.dmi',
-		SPECIES_TAJ 		= 'icons/inventory/face/mob_tajaran.dmi',
-		SPECIES_UNATHI 		= 'icons/inventory/face/mob_unathi.dmi',
-		SPECIES_SERGAL 		= 'icons/inventory/face/mob_vr_sergal.dmi',
-		SPECIES_NEVREAN 	= 'icons/inventory/face/mob_vr_nevrean.dmi',
-		SPECIES_ZORREN_HIGH	= 'icons/inventory/face/mob_vr_fox.dmi',
-		SPECIES_ZORREN_FLAT = 'icons/inventory/face/mob_vr_fennec.dmi',
-		SPECIES_AKULA 		= 'icons/inventory/face/mob_vr_akula.dmi',
-		SPECIES_VULPKANIN 	= 'icons/inventory/face/mob_vr_vulpkanin.dmi',
-		SPECIES_XENOCHIMERA	= 'icons/inventory/face/mob_vr_tajaran.dmi',
-		SPECIES_WEREBEAST	= 'icons/inventory/face/mob_vr_werebeast.dmi'
+		SPECIES_TESHARI		= 'modular_chomp/icons/inventory/face/mob_teshari.dmi',
+		SPECIES_VOX 		= 'modular_chomp/icons/inventory/face/mob_vox.dmi',
+		SPECIES_TAJ 		= 'modular_chomp/icons/inventory/face/mob_tajaran.dmi',
+		SPECIES_UNATHI 		= 'modular_chomp/icons/inventory/face/mob_unathi.dmi',
+		SPECIES_SERGAL 		= 'modular_chomp/icons/inventory/face/mob_sergal.dmi',
+		SPECIES_NEVREAN 	= 'modular_chomp/icons/inventory/face/mob_nevrean.dmi',
+		SPECIES_ZORREN_HIGH	= 'modular_chomp/icons/inventory/face/mob_fox.dmi',
+		SPECIES_ZORREN_FLAT = 'modular_chomp/icons/inventory/face/mob_fennec.dmi',
+		SPECIES_AKULA 		= 'modular_chomp/icons/inventory/face/mob_akula.dmi',
+		SPECIES_VULPKANIN 	= 'modular_chomp/icons/inventory/face/mob_vulpkanin.dmi',
+		SPECIES_XENOCHIMERA	= 'modular_chomp/icons/inventory/face/mob_tajaran.dmi',
+		SPECIES_WEREBEAST	= 'modular_chomp/icons/inventory/face/mob_werebeast.dmi'
 		)
+	//Chompedit End.
+
 //"Spider" 		= 'icons/inventory/mask/mob_spider.dmi' Add this later when they have custom mask sprites and everything.
 
 //Switch to taur sprites if a taur equips
diff --git a/code/modules/clothing/masks/gasmask_vr.dm b/code/modules/clothing/masks/gasmask_vr.dm
index a569b615bf..e47fea2048 100644
--- a/code/modules/clothing/masks/gasmask_vr.dm
+++ b/code/modules/clothing/masks/gasmask_vr.dm
@@ -1,3 +1,4 @@
+/* ChompRemoval: Oops that's a glogged implementation (intentional). Im going to properly implement obj/clothing/mask/gas/clear instead.
 // Our clear gas masks don't hide faces, but changing the var on mask/gas would require un-chaging it on all children. This is nicer.
 /obj/item/clothing/mask/gas/New()
 	if(type == /obj/item/clothing/mask/gas)
@@ -9,7 +10,7 @@
 	icon = 'icons/inventory/face/item.dmi'
 	icon_override = 'icons/inventory/face/mob.dmi'
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
-
+*/
 /obj/item/clothing/mask/gas/imperial
 	name = "imperial soldier facemask"
 	desc = "A close-fitting tactical mask that can be connected to an air supply."
@@ -22,4 +23,4 @@
 /obj/item/clothing/mask/gas/plaguedoctor
 	sprite_sheets = list(
 		SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi'
-		)
\ No newline at end of file
+		)
diff --git a/maps/offmap_vr/om_ships/abductor.dmm b/maps/offmap_vr/om_ships/abductor.dmm
index 5083af6250..1f97160ac4 100644
--- a/maps/offmap_vr/om_ships/abductor.dmm
+++ b/maps/offmap_vr/om_ships/abductor.dmm
@@ -88,7 +88,7 @@
 /obj/item/weapon/grenade/flashbang/clusterbang,
 /obj/item/weapon/grenade/flashbang/clusterbang,
 /obj/item/weapon/storage/box/metalfoam,
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /obj/item/clothing/mask/gas,
 /obj/structure/closet/alien,
 /turf/simulated/shuttle/floor/alienplating,
diff --git a/maps/southern_cross/overmap/planets/thor/thor.dmm b/maps/southern_cross/overmap/planets/thor/thor.dmm
index 81127b8fb3..f4eccce9d1 100644
--- a/maps/southern_cross/overmap/planets/thor/thor.dmm
+++ b/maps/southern_cross/overmap/planets/thor/thor.dmm
@@ -2371,14 +2371,15 @@
 /area/surface/outside/thor/pool)
 "xP" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/item/clothing/mask/gas/wwii,
-/obj/item/clothing/mask/gas/wwii,
-/obj/item/clothing/mask/gas/wwii,
-/obj/item/clothing/mask/gas/wwii,
 /obj/item/weapon/tank/emergency/oxygen/engi,
 /obj/item/weapon/tank/emergency/oxygen/engi,
 /obj/item/weapon/tank/emergency/oxygen/engi,
 /obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
 /turf/simulated/floor/tiled/asteroid_steel/outdoors/thor,
 /area/surface/outside/thor/landingpad)
 "xT" = (
diff --git a/maps/submaps/admin_use_vr/guttersite.dmm b/maps/submaps/admin_use_vr/guttersite.dmm
index 2b309d7caf..e54fae1a6f 100644
--- a/maps/submaps/admin_use_vr/guttersite.dmm
+++ b/maps/submaps/admin_use_vr/guttersite.dmm
@@ -5525,7 +5525,7 @@
 /turf/simulated/floor/carpet/gaycarpet,
 /area/tether_away/guttersite/unexplored)
 "na" = (
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /turf/simulated/floor/carpet/gaycarpet,
 /area/tether_away/guttersite/unexplored)
 "nb" = (
diff --git a/maps/submaps/depreciated_vr/mercbase.dmm b/maps/submaps/depreciated_vr/mercbase.dmm
index 77457998ec..a9551748a7 100644
--- a/maps/submaps/depreciated_vr/mercbase.dmm
+++ b/maps/submaps/depreciated_vr/mercbase.dmm
@@ -1689,10 +1689,10 @@
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
 	},
-/obj/item/clothing/mask/gas/wwii,
-/obj/item/clothing/mask/gas/wwii,
-/obj/item/clothing/mask/gas/wwii,
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
 /turf/unsimulated/floor{
 	dir = 2;
 	icon_state = "dark"
@@ -3661,7 +3661,7 @@
 /area/shuttle/mercenary)
 "fZ" = (
 /obj/structure/closet/syndicate,
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube1";
@@ -3678,7 +3678,7 @@
 /area/shuttle/mercenary)
 "ga" = (
 /obj/structure/closet/syndicate,
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /obj/item/clothing/head/helmet,
 /obj/item/clothing/shoes/boots/jackboots,
 /obj/item/clothing/suit/armor/vest,
@@ -3921,7 +3921,7 @@
 	syndie = 1
 	},
 /obj/structure/closet/syndicate,
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube1";
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 91e9a59443..27817f4c52 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -16425,7 +16425,7 @@
 /obj/structure/table/rack,
 /obj/item/clothing/suit/fire/firefighter,
 /obj/item/weapon/tank/oxygen/red,
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /obj/item/clothing/head/hardhat/red,
 /turf/simulated/floor/plating,
 /area/maintenance/lower/research)
@@ -19427,7 +19427,7 @@
 /obj/random/action_figure,
 /obj/random/action_figure,
 /obj/structure/closet/wardrobe/grey{
-	starts_with = list(/obj/structure/barricade/cutout/viva, /obj/item/clothing/under/color/grey = 3, /obj/item/clothing/shoes/black = 3, /obj/item/clothing/head/soft/grey = 3, /obj/item/clothing/mask/gas/wwii = 3, /obj/item/weapon/storage/toolbox/mechanical = 3, /obj/item/clothing/gloves/fyellow = 3, /obj/item/weapon/card/id/gold/captain/spare/fakespare = 3, /obj/item/weapon/soap/syndie = 3, /obj/item/weapon/storage/box/mousetraps = 3)
+	starts_with = list(/obj/structure/barricade/cutout/viva, /obj/item/clothing/under/color/grey = 3, /obj/item/clothing/shoes/black = 3, /obj/item/clothing/head/soft/grey = 3, /obj/item/clothing/mask/gas = 3, /obj/item/weapon/storage/toolbox/mechanical = 3, /obj/item/clothing/gloves/fyellow = 3, /obj/item/weapon/card/id/gold/captain/spare/fakespare = 3, /obj/item/weapon/soap/syndie = 3, /obj/item/weapon/storage/box/mousetraps = 3)
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/atmos)
@@ -21071,7 +21071,7 @@
 /obj/structure/table/rack,
 /obj/item/clothing/suit/fire/firefighter,
 /obj/item/weapon/tank/oxygen/red,
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /obj/item/clothing/head/hardhat/red,
 /turf/simulated/floor/plating,
 /area/maintenance/lower/research)
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 41089c2585..f99ff964f1 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -18413,7 +18413,7 @@
 /area/rnd/research/testingrange)
 "aFx" = (
 /obj/item/clothing/under/color/grey,
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /obj/item/weapon/storage/belt/utility/full,
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/shuttle_pad)
diff --git a/maps/tether_better/tether-01-surface1.dmm b/maps/tether_better/tether-01-surface1.dmm
index 9926d45ca3..316a3eddd4 100644
--- a/maps/tether_better/tether-01-surface1.dmm
+++ b/maps/tether_better/tether-01-surface1.dmm
@@ -17030,7 +17030,7 @@
 /obj/structure/table/rack,
 /obj/item/clothing/suit/fire/firefighter,
 /obj/item/weapon/tank/oxygen/red,
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /obj/item/clothing/head/hardhat/red,
 /turf/simulated/floor/plating,
 /area/maintenance/lower/research)
@@ -20123,7 +20123,7 @@
 /obj/random/action_figure,
 /obj/random/action_figure,
 /obj/structure/closet/wardrobe/grey{
-	starts_with = list(/obj/structure/barricade/cutout/viva, /obj/item/clothing/under/color/grey = 3, /obj/item/clothing/shoes/black = 3, /obj/item/clothing/head/soft/grey = 3, /obj/item/clothing/mask/gas/wwii = 3, /obj/item/weapon/storage/toolbox/mechanical = 3, /obj/item/clothing/gloves/fyellow = 3, /obj/item/weapon/card/id/gold/captain/spare/fakespare = 3, /obj/item/weapon/soap/syndie = 3, /obj/item/weapon/storage/box/mousetraps = 3)
+	starts_with = list(/obj/structure/barricade/cutout/viva, /obj/item/clothing/under/color/grey = 3, /obj/item/clothing/shoes/black = 3, /obj/item/clothing/head/soft/grey = 3, /obj/item/clothing/mask/gas = 3, /obj/item/weapon/storage/toolbox/mechanical = 3, /obj/item/clothing/gloves/fyellow = 3, /obj/item/weapon/card/id/gold/captain/spare/fakespare = 3, /obj/item/weapon/soap/syndie = 3, /obj/item/weapon/storage/box/mousetraps = 3)
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/atmos)
@@ -21720,7 +21720,7 @@
 /obj/structure/table/rack,
 /obj/item/clothing/suit/fire/firefighter,
 /obj/item/weapon/tank/oxygen/red,
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /obj/item/clothing/head/hardhat/red,
 /turf/simulated/floor/plating,
 /area/maintenance/lower/research)
diff --git a/maps/tether_better/tether-03-surface3.dmm b/maps/tether_better/tether-03-surface3.dmm
index e2b99b5150..0313a6117e 100644
--- a/maps/tether_better/tether-03-surface3.dmm
+++ b/maps/tether_better/tether-03-surface3.dmm
@@ -19292,7 +19292,7 @@
 /area/rnd/research/testingrange)
 "aFx" = (
 /obj/item/clothing/under/color/grey,
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /obj/item/weapon/storage/belt/utility/full,
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/shuttle_pad)
diff --git a/maps/yw/submaps/space/guttersite.dmm b/maps/yw/submaps/space/guttersite.dmm
index 79d7f80024..0c8d251062 100644
--- a/maps/yw/submaps/space/guttersite.dmm
+++ b/maps/yw/submaps/space/guttersite.dmm
@@ -5525,7 +5525,7 @@
 /turf/simulated/floor/carpet/gaycarpet,
 /area/tether_away/guttersite/unexplored)
 "na" = (
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /turf/simulated/floor/carpet/gaycarpet,
 /area/tether_away/guttersite/unexplored)
 "nb" = (
diff --git a/modular_chomp/code/modules/client/preference_setup/loadout/loadout_mask.dm b/modular_chomp/code/modules/client/preference_setup/loadout/loadout_mask.dm
new file mode 100644
index 0000000000..05026508e5
--- /dev/null
+++ b/modular_chomp/code/modules/client/preference_setup/loadout/loadout_mask.dm
@@ -0,0 +1,11 @@
+/datum/gear/mask/gas //Greytide Worldwide
+	display_name = "Gas Mask"
+	description = "A dangerous gas filtering gas mask. Also conseals your face. Assistant's favorite."
+	path = /obj/item/clothing/mask/gas
+	cost = 3 //Plague Doctor's costs 3 due to mechanical advantage, so I'll use that here
+
+/datum/gear/mask/gas_clear
+	display_name = "Gas Mask, Clear"
+	description = "A dangerous gas filtering gas mask. Doesn't conseal your face."
+	path = /obj/item/clothing/mask/gas/clear
+	cost = 3
diff --git a/modular_chomp/code/modules/living/carbon/human/ai_controlled/ai_controlled.dm b/modular_chomp/code/modules/living/carbon/human/ai_controlled/ai_controlled.dm
index 75128033ed..4e27543c22 100644
--- a/modular_chomp/code/modules/living/carbon/human/ai_controlled/ai_controlled.dm
+++ b/modular_chomp/code/modules/living/carbon/human/ai_controlled/ai_controlled.dm
@@ -5,22 +5,33 @@
 		prob(20); /obj/item/weapon/storage/toolbox/emergency,
 		prob(50); /obj/item/weapon/melee/baton/cattleprod,
 	)
-	if(prob(25))
-		to_wear_mask = /obj/item/clothing/mask/gas/wwii
+	if(prob(50))
+		to_wear_mask = /obj/item/clothing/mask/gas
 	else
 		to_wear_mask = null
+	if(prob(5))
+		to_wear_helmet = /obj/item/clothing/head/cone //Hehe funny cone
+	else
+		to_wear_helmet = null
+	if(prob(70))
+		to_wear_gloves = pick(
+			prob(20); /obj/item/clothing/gloves/fyellow,
+			prob(1); /obj/item/clothing/gloves/yellow //Sometimes they get real glubs
+		)
+	else
+		to_wear_gloves = null
 	..()
 
 /mob/living/carbon/human/ai_controlled/greytide
 	name = "John Greytide" //theyll get a normal name on spawn
-	to_wear_helmet = null
+	//to_wear_helmet = null
 	to_wear_glasses = null
 	//to_wear_mask =
 	to_wear_l_radio = /obj/item/device/radio/headset
 	to_wear_r_radio = null
 	to_wear_uniform = /obj/item/clothing/under/color/grey
 	to_wear_suit = null
-	to_wear_gloves = /obj/item/clothing/gloves/fyellow
+	//to_wear_gloves = /obj/item/clothing/gloves/fyellow
 	to_wear_shoes = /obj/item/clothing/shoes/black
 	to_wear_belt = /obj/item/weapon/storage/belt/utility/full
 	to_wear_l_pocket = /obj/item/weapon/soap
diff --git a/modular_chomp/icons/inventory/face/item.dmi b/modular_chomp/icons/inventory/face/item.dmi
new file mode 100644
index 0000000000..226c47b3b6
Binary files /dev/null and b/modular_chomp/icons/inventory/face/item.dmi differ
diff --git a/modular_chomp/icons/inventory/face/mob.dmi b/modular_chomp/icons/inventory/face/mob.dmi
new file mode 100644
index 0000000000..3fa10ad2a0
Binary files /dev/null and b/modular_chomp/icons/inventory/face/mob.dmi differ
diff --git a/modular_chomp/icons/inventory/face/mob_akula.dmi b/modular_chomp/icons/inventory/face/mob_akula.dmi
new file mode 100644
index 0000000000..ca3f08bf40
Binary files /dev/null and b/modular_chomp/icons/inventory/face/mob_akula.dmi differ
diff --git a/modular_chomp/icons/inventory/face/mob_fennec.dmi b/modular_chomp/icons/inventory/face/mob_fennec.dmi
new file mode 100644
index 0000000000..4394f6adbe
Binary files /dev/null and b/modular_chomp/icons/inventory/face/mob_fennec.dmi differ
diff --git a/modular_chomp/icons/inventory/face/mob_fox.dmi b/modular_chomp/icons/inventory/face/mob_fox.dmi
new file mode 100644
index 0000000000..dd29544d68
Binary files /dev/null and b/modular_chomp/icons/inventory/face/mob_fox.dmi differ
diff --git a/modular_chomp/icons/inventory/face/mob_nevrean.dmi b/modular_chomp/icons/inventory/face/mob_nevrean.dmi
new file mode 100644
index 0000000000..572d4017c1
Binary files /dev/null and b/modular_chomp/icons/inventory/face/mob_nevrean.dmi differ
diff --git a/modular_chomp/icons/inventory/face/mob_sergal.dmi b/modular_chomp/icons/inventory/face/mob_sergal.dmi
new file mode 100644
index 0000000000..1469d0f8e5
Binary files /dev/null and b/modular_chomp/icons/inventory/face/mob_sergal.dmi differ
diff --git a/modular_chomp/icons/inventory/face/mob_tajaran.dmi b/modular_chomp/icons/inventory/face/mob_tajaran.dmi
new file mode 100644
index 0000000000..a15685ca68
Binary files /dev/null and b/modular_chomp/icons/inventory/face/mob_tajaran.dmi differ
diff --git a/modular_chomp/icons/inventory/face/mob_teshari.dmi b/modular_chomp/icons/inventory/face/mob_teshari.dmi
index 1d0ed1d89b..74ac4de05e 100644
Binary files a/modular_chomp/icons/inventory/face/mob_teshari.dmi and b/modular_chomp/icons/inventory/face/mob_teshari.dmi differ
diff --git a/modular_chomp/icons/inventory/face/mob_unathi.dmi b/modular_chomp/icons/inventory/face/mob_unathi.dmi
new file mode 100644
index 0000000000..d2140d8897
Binary files /dev/null and b/modular_chomp/icons/inventory/face/mob_unathi.dmi differ
diff --git a/modular_chomp/icons/inventory/face/mob_vox.dmi b/modular_chomp/icons/inventory/face/mob_vox.dmi
new file mode 100644
index 0000000000..de6101e2a7
Binary files /dev/null and b/modular_chomp/icons/inventory/face/mob_vox.dmi differ
diff --git a/modular_chomp/icons/inventory/face/mob_vulpkanin.dmi b/modular_chomp/icons/inventory/face/mob_vulpkanin.dmi
new file mode 100644
index 0000000000..bca9920de6
Binary files /dev/null and b/modular_chomp/icons/inventory/face/mob_vulpkanin.dmi differ
diff --git a/modular_chomp/icons/inventory/face/mob_werebeast.dmi b/modular_chomp/icons/inventory/face/mob_werebeast.dmi
new file mode 100644
index 0000000000..e55bc580c6
Binary files /dev/null and b/modular_chomp/icons/inventory/face/mob_werebeast.dmi differ
diff --git a/modular_chomp/maps/overmap/space_pois/asteroid4_60x60.dmm b/modular_chomp/maps/overmap/space_pois/asteroid4_60x60.dmm
index 843e86a72d..b2253cfcc2 100644
--- a/modular_chomp/maps/overmap/space_pois/asteroid4_60x60.dmm
+++ b/modular_chomp/maps/overmap/space_pois/asteroid4_60x60.dmm
@@ -323,7 +323,7 @@
 /area/submap/asteroid4)
 "wi" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/mask/gas/wwii,
+/obj/item/clothing/mask/gas,
 /turf/simulated/floor/tiled/white,
 /area/submap/asteroid4)
 "wy" = (
diff --git a/vorestation.dme b/vorestation.dme
index 24eb569088..5e0dd4695c 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4736,6 +4736,7 @@
 #include "modular_chomp\code\modules\client\preference_setup\loadout\gear_tweaks.dm"
 #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_general.dm"
 #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_gloves_ch.dm"
+#include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_mask.dm"
 #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_shoes.dm"
 #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_suit.dm"
 #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_xeno.dm"