Merge pull request #307 from CandleJaxx/froibk

candle adds the half mask respirator
DopplerShift13 · Dec 28, 2024 · ad97345 · ad97345
2 parents 23d7996 + 17e0f4b
commit ad97345
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 0 deletions.
diff --git a/modular_doppler/loadout_categories/categories/masks.dm b/modular_doppler/loadout_categories/categories/masks.dm
@@ -87,3 +87,7 @@
 /datum/loadout_item/mask/kitsune
 	name = "Kitsune Mask"
 	item_path = /obj/item/clothing/mask/kitsune
+
+/datum/loadout_item/mask/respirator
+	name = "Half-Mask Respirator"
+	item_path = /obj/item/clothing/mask/gas/respirator
diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_face.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_face.dm
@@ -20,3 +20,15 @@
 	name = "Neck Gaiter (Worn)"
 	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/face.dmi'
 	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/face/gaiter_worn.json'
+
+// RESPIRATOR
+
+/datum/greyscale_config/respirator
+	name = "Half-Mask Respirator"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/face.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/face/respirator.json'
+
+/datum/greyscale_config/respirator/worn
+	name = "Half-Mask Respirator (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/face.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/face/respirator_worn.json'
diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/face.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/face.dmi
diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/obj/face.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/obj/face.dmi
diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/face/respirator.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/face/respirator.json
@@ -0,0 +1,10 @@
+{
+	"respirator": [
+		{
+			"type": "icon_state",
+			"icon_state": "respirator",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/face/respirator_worn.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/face/respirator_worn.json
@@ -0,0 +1,10 @@
+{
+	"respirator": [
+		{
+			"type": "icon_state",
+			"icon_state": "respirator_worn",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/modular_doppler/modular_cosmetics/code/face/masks.dm b/modular_doppler/modular_cosmetics/code/face/masks.dm
@@ -51,3 +51,25 @@
 		return FALSE
 	if (prob(hit_reflect_chance))
 		return TRUE
+
+/obj/item/clothing/mask/gas/respirator
+	name = "half mask respirator"
+	desc = "A half mask respirator that's really just a standard gas mask with the glass taken off."
+	icon_state = "respirator"
+	icon = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/face.dmi'
+	worn_icon = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/face.dmi'
+	supported_bodyshapes = null
+	bodyshape_icon_files = null
+	inhand_icon_state = "sechailer"
+	greyscale_config = /datum/greyscale_config/respirator
+	greyscale_config_worn = /datum/greyscale_config/respirator/worn
+	greyscale_colors = "#666666"
+	clothing_flags = BLOCK_GAS_SMOKE_EFFECT|MASKINTERNALS
+	w_class = WEIGHT_CLASS_SMALL
+	flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT
+	visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+	visor_flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT
+	flags_cover = MASKCOVERSMOUTH
+	visor_flags_cover = MASKCOVERSMOUTH
+	flags_1 = IS_PLAYER_COLORABLE_1
+	interaction_flags_click = NEED_DEXTERITY|ALLOW_RESTING