Adds Face Masks - A Gas Mask Variation (#11516)

code/game/objects/structures/crates_lockers/closets/l3closet.dm

@@ -11,8 +11,9 @@
 	icon_opened = "bio_generalopen"
 
 /obj/structure/closet/l3closet/general/fill()
-	new /obj/item/clothing/suit/bio_suit/general( src )
-	new /obj/item/clothing/head/bio_hood/general( src )
+	new /obj/item/clothing/suit/bio_suit/general(src)
+	new /obj/item/clothing/head/bio_hood/general(src)
+	new /obj/item/clothing/mask/gas/half(src)
 
 
 /obj/structure/closet/l3closet/virology
@@ -21,9 +22,9 @@
 	icon_opened = "bio_virologyopen"
 
 /obj/structure/closet/l3closet/virology/fill()
-	new /obj/item/clothing/suit/bio_suit/virology( src )
-	new /obj/item/clothing/head/bio_hood/virology( src )
-	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/clothing/suit/bio_suit/virology(src)
+	new /obj/item/clothing/head/bio_hood/virology(src)
+	new /obj/item/clothing/mask/gas/half(src)
 	new /obj/item/tank/oxygen(src)
 
 
@@ -33,8 +34,9 @@
 	icon_opened = "bio_securityopen"
 
 /obj/structure/closet/l3closet/security/fill()
-	new /obj/item/clothing/suit/bio_suit/security( src )
-	new /obj/item/clothing/head/bio_hood/security( src )
+	new /obj/item/clothing/suit/bio_suit/security(src)
+	new /obj/item/clothing/head/bio_hood/security(src)
+	new /obj/item/clothing/mask/gas/half(src)
 
 
 /obj/structure/closet/l3closet/janitor
@@ -43,8 +45,8 @@
 	icon_opened = "bio_janitoropen"
 
 /obj/structure/closet/l3closet/janitor/fill()
-	new /obj/item/clothing/suit/bio_suit/janitor( src )
-	new /obj/item/clothing/head/bio_hood/janitor( src )
+	new /obj/item/clothing/suit/bio_suit/janitor(src)
+	new /obj/item/clothing/head/bio_hood/janitor(src)
 
 
 /obj/structure/closet/l3closet/scientist
@@ -53,5 +55,6 @@
 	icon_opened = "bio_scientistopen"
 
 /obj/structure/closet/l3closet/scientist/fill()
-	new /obj/item/clothing/suit/bio_suit/scientist( src )
-	new /obj/item/clothing/head/bio_hood/scientist( src )
+	new /obj/item/clothing/suit/bio_suit/scientist(src)
+	new /obj/item/clothing/head/bio_hood/scientist(src)
+	new /obj/item/clothing/mask/gas/half(src)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -31,6 +31,7 @@
 	new /obj/item/storage/toolbox/mechanical(src)
 	new /obj/item/clothing/suit/storage/hazardvest(src)
 	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/mask/gas/half(src)
 	new /obj/item/device/multitool(src)
 	new /obj/item/device/flash(src)
 	new /obj/item/taperoll/engineering(src)
@@ -129,6 +130,7 @@
 	new /obj/item/device/radio/headset/headset_eng/alt(src)
 	new /obj/item/clothing/suit/storage/hazardvest(src)
 	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/mask/gas/half(src)
 	new /obj/item/taperoll/engineering(src)
 	new /obj/item/clothing/accessory/storage/overalls/engineer(src)
 
@@ -159,6 +161,7 @@
 	new /obj/item/device/radio/headset/headset_eng/alt(src)
 	new /obj/item/clothing/suit/storage/hazardvest/blue/atmos(src)
 	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/mask/gas/half(src)
 	new /obj/item/taperoll/engineering(src)
 	new /obj/item/clothing/accessory/storage/overalls/engineer(src)
 	new /obj/item/rfd/piping(src)

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -54,6 +54,7 @@
 	new /obj/item/wirecutters/clippers(src)
 	new /obj/item/reagent_containers/spray/plantbgone(src)
 	new /obj/item/clothing/mask/gas/alt(src)
+	new /obj/item/clothing/mask/gas/half(src)
 	new /obj/item/watertank(src)
 	new /obj/item/storage/belt/hydro(src)
 	new /obj/item/clothing/gloves/botanic_leather(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -121,6 +121,7 @@
 	new /obj/item/roller(src)
 	new /obj/item/crowbar/red(src)
 	new /obj/item/clothing/mask/gas/alt(src)
+	new /obj/item/clothing/mask/gas/half(src)
 
 /obj/structure/closet/secure_closet/CMO
 	name = "chief medical officer's locker"

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -326,6 +326,7 @@
 	new /obj/item/clothing/suit/storage/security/officer(src)
 	new /obj/item/clothing/accessory/badge/officer(src)
 	new /obj/item/clothing/mask/gas/alt(src)
+	new /obj/item/clothing/mask/gas/half(src)
 	//Tools
 	new /obj/item/device/radio/headset/headset_sec(src)
 	new /obj/item/device/radio/headset/headset_sec/alt(src)

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -44,6 +44,7 @@
 			new /obj/item/clothing/mask/gas/alt(src)
 			new /obj/item/tank/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/gas/alt(src)
+			new /obj/item/clothing/mask/gas/half(src)
 			new /obj/item/device/oxycandle(src)
 			new /obj/item/device/oxycandle(src)
 			new /obj/item/airbubble(src)
@@ -61,6 +62,8 @@
 			new /obj/item/storage/toolbox/emergency(src)
 			new /obj/item/tank/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/clothing/mask/gas/alt(src)
+			new /obj/item/clothing/mask/gas/half(src)
 			new /obj/item/storage/firstaid/o2(src)
 			new /obj/item/clothing/suit/space/emergency(src)
 			new /obj/item/clothing/suit/space/emergency(src)

code/game/objects/structures/trash_pile.dm

@@ -155,6 +155,7 @@
 		/obj/item/clothing/gloves/latex = 2,
 		/obj/item/clothing/head/welding = 2,
 		/obj/item/clothing/mask/gas/alt = 2,
+		/obj/item/clothing/mask/gas/half = 2,
 		/obj/item/clothing/shoes/galoshes = 2,
 		/obj/item/clothing/under/pants/camo = 2,
 		/obj/item/clothing/under/syndicate/tacticool = 2,

code/modules/clothing/masks/gasmask.dm

@@ -35,6 +35,17 @@
 	item_state = "gas_alt_alt"
 	icon_state = "gas_alt_alt"
 
+/obj/item/clothing/mask/gas/half
+	name = "face mask"
+	desc = "A respirator that covers the mouth and nose. It can be connected to an air supply. Filters harmful gases from the air."
+	item_state = "halfgas"
+	icon_state = "halfgas"
+	w_class = ITEMSIZE_SMALL
+	flags_inv = null
+	body_parts_covered = FACE
+	down_body_parts_covered = null
+	adjustable = TRUE
+
 /obj/item/clothing/mask/gas/old
 	desc = "A face-covering mask that can be connected to an air supply. Seems to be an old, outdated design."
 	filtered_gases = list(GAS_N2O)
@@ -112,7 +123,7 @@
 
 /obj/item/clothing/mask/gas/tactical
 	name = "tactical mask"
-	desc = "A compact carbon-fiber respirator covering the mouth and nose to protect against the inhalation of smoke and other harmful gasses. "
+	desc = "A compact carbon-fiber respirator covering the mouth and nose to protect against the inhalation of smoke and other harmful gasses."
 	icon_state = "fullgas"
 	item_state = "fullgas"
 	w_class = ITEMSIZE_SMALL
@@ -121,4 +132,4 @@
 		bullet = ARMOR_BALLISTIC_SMALL,
 		laser = ARMOR_LASER_MINOR,
 		bio = ARMOR_BIO_STRONG
-	)
+	)

html/changelogs/wickedcybs_halfmask.yml

@@ -0,0 +1,7 @@
+author: WickedCybs
+
+delete-after: True
+
+changes:
+  - rscadd: "Added a new gas mask variant, the face mask. It filters airborne contaminants but does not protect the eyes!"
+  - maptweak: "Face masks have been mapped to various locations. Research, medical, engineering and security can expect to see them in their departments. Off-station antags and beacon teams have them available as well."

maps/aurora/aurora-1_centcomm.dmm

@@ -215,6 +215,10 @@
 	pixel_x = -8;
 	pixel_y = -2
 	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = 7;
+	pixel_y = -4
+	},
 /turf/simulated/floor/tiled,
 /area/shuttle/skipjack)
 "aaJ" = (
@@ -5939,7 +5943,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/steel,
 /obj/item/clothing/suit/space/void/engineering,
-/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/gas/half,
 /obj/item/clothing/head/helmet/space/void/engineering,
 /turf/simulated/floor/tiled,
 /area/shuttle/skipjack)
@@ -8626,7 +8630,7 @@
 /obj/item/tank/oxygen/red,
 /obj/item/clothing/shoes/magboots,
 /obj/item/clothing/suit/space/syndicate/black/red,
-/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/gas/half,
 /obj/item/clothing/head/helmet/space/syndicate/black/red,
 /obj/structure/window/reinforced/crescent{
 	dir = 8
@@ -25284,6 +25288,10 @@
 /obj/item/storage/belt/security/tactical,
 /obj/item/storage/belt/security/tactical,
 /obj/item/storage/belt/security/tactical,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
 /obj/item/clothing/mask/gas/tactical,
 /obj/item/clothing/mask/gas/tactical,
 /obj/item/clothing/mask/gas/tactical,
@@ -27823,7 +27831,7 @@
 /obj/item/tank/oxygen/red,
 /obj/item/clothing/shoes/magboots,
 /obj/item/clothing/suit/space/syndicate/black/red,
-/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/gas/half,
 /obj/item/clothing/head/helmet/space/syndicate/black/red,
 /obj/structure/window/reinforced/crescent{
 	dir = 8
@@ -36037,6 +36045,10 @@
 	name = "adjusted light fixture";
 	pixel_x = -16
 	},
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
 /obj/item/clothing/mask/gas/alt,
 /obj/item/clothing/mask/gas/alt,
 /obj/item/clothing/mask/gas/alt,
@@ -39205,6 +39217,10 @@
 /area/antag/mercenary)
 "vKj" = (
 /obj/structure/table/rack,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
 /obj/item/clothing/mask/gas/tactical,
 /obj/item/clothing/mask/gas/tactical,
 /obj/item/clothing/mask/gas/tactical,
@@ -39498,6 +39514,22 @@
 	pixel_x = 6;
 	pixel_y = -1
 	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -1;
+	pixel_y = -6
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -1;
+	pixel_y = -6
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -1;
+	pixel_y = -6
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -1;
+	pixel_y = -6
+	},
 /obj/structure/table/reinforced/steel,
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
@@ -40036,6 +40068,26 @@
 	name = "railing"
 	},
 /obj/structure/table/rack,
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -1;
+	pixel_y = 2
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -1;
+	pixel_y = 2
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -1;
+	pixel_y = 2
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -1;
+	pixel_y = 2
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -1;
+	pixel_y = 2
+	},
 /obj/item/clothing/mask/gas/tactical{
 	layer = 2.99;
 	pixel_x = -1;
@@ -42482,6 +42534,30 @@
 	pixel_x = -7;
 	pixel_y = 4
 	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -7;
+	pixel_y = -4
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -7;
+	pixel_y = -4
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -7;
+	pixel_y = -4
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -7;
+	pixel_y = -4
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -7;
+	pixel_y = -4
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -7;
+	pixel_y = -4
+	},
 /turf/unsimulated/floor,
 /area/centcom/legion/hangar5)
 "xwI" = (

maps/aurora/aurora-3_sublevel.dmm

@@ -2135,7 +2135,7 @@
 "aff" = (
 /obj/structure/table/rack,
 /obj/item/clothing/glasses/science,
-/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/gas/half,
 /obj/item/clothing/gloves/latex/nitrile,
 /obj/item/clothing/suit/bio_suit/anomaly,
 /obj/item/clothing/head/bio_hood/anomaly,
@@ -5220,7 +5220,10 @@
 	},
 /obj/structure/table/rack,
 /obj/item/clothing/glasses/science,
-/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -6;
+	pixel_y = -4
+	},
 /obj/item/clothing/gloves/latex/nitrile,
 /obj/item/clothing/suit/bio_suit/anomaly,
 /obj/item/clothing/head/bio_hood/anomaly,
@@ -5272,7 +5275,10 @@
 	},
 /obj/structure/table/rack,
 /obj/item/clothing/glasses/science,
-/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -6;
+	pixel_y = -4
+	},
 /obj/item/clothing/gloves/latex/nitrile,
 /obj/item/clothing/suit/bio_suit/anomaly,
 /obj/item/clothing/head/bio_hood/anomaly,
@@ -10631,7 +10637,10 @@
 	},
 /obj/structure/table/rack,
 /obj/item/clothing/glasses/science,
-/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -6;
+	pixel_y = -4
+	},
 /obj/item/clothing/gloves/latex/nitrile,
 /obj/item/clothing/suit/bio_suit/anomaly,
 /obj/item/clothing/head/bio_hood/anomaly,
@@ -22372,7 +22381,7 @@
 /obj/item/clothing/shoes/medical{
 	pixel_x = 4;
 	pixel_y = -8
-},
+	},
 /turf/simulated/floor/tiled,
 /area/medical/medbay4)
 "aVi" = (

maps/aurora/aurora-4_mainlevel.dmm

@@ -7670,6 +7670,22 @@
 /area/maintenance/engineering)
 "apb" = (
 /obj/structure/table/rack,
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -6;
+	pixel_y = -4
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -6;
+	pixel_y = -4
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -6;
+	pixel_y = -4
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -6;
+	pixel_y = -4
+	},
 /obj/item/clothing/mask/gas/alt{
 	pixel_x = -3;
 	pixel_y = 3
@@ -13333,6 +13349,8 @@
 /area/security/brig)
 "ayo" = (
 /obj/structure/closet/secure_closet/scientist,
+/obj/item/clothing/mask/gas/half,
+/obj/item/clothing/mask/gas/half,
 /obj/item/clothing/gloves/latex/nitrile/tajara,
 /obj/item/clothing/gloves/latex/nitrile/tajara,
 /obj/item/clothing/gloves/latex/nitrile/unathi,
@@ -44810,6 +44828,7 @@
 "bCv" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/closet/secure_closet/RD,
+/obj/item/clothing/mask/gas/half,
 /obj/item/clothing/gloves/latex/nitrile/tajara,
 /obj/item/clothing/gloves/latex/nitrile/unathi,
 /turf/simulated/floor/tiled/white,

maps/aurora/aurora-5_interstitial.dmm

@@ -3559,6 +3559,14 @@
 "je" = (
 /obj/structure/table/steel,
 /obj/item/device/flashlight/heavy,
+/obj/item/clothing/mask/gas/half{
+	pixel_x = 6;
+	pixel_y = 9
+	},
+/obj/item/clothing/mask/gas/half{
+	pixel_x = -6;
+	pixel_y = 9
+	},
 /turf/simulated/floor/plating,
 /area/bridge/aibunker)
 "jf" = (

maps/aurora/aurora-6_surface.dmm

@@ -5296,6 +5296,7 @@
 /obj/item/tank/oxygen,
 /obj/item/clothing/suit/space,
 /obj/item/clothing/mask/gas/alt,
+/obj/item/clothing/mask/gas/half,
 /obj/item/clothing/head/helmet/space,
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/research)