From 95eeeff1a9815d0240f005b33ae492bcdb31403f Mon Sep 17 00:00:00 2001
From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 10:43:59 -0700
Subject: [PATCH] Balaclavas Aren't Gas Masks (#3609)
## About The Pull Request
Addresses a longstanding pet peeve of mine. As originally implemented
military balaclavas were just better gas masks. Now they just function
as normal breath masks that can hide your identity, providing no passive
gas protection nor hailer functionality. Also rewrites the description
for the regular balaclava to no longer be a joke.
**This PR contains repaths, don't TM it alongside map PRs.**
## Why It's Good For The Game
actual gas masks should be useful enough to justify using them instead
of balaclavas when gas is about
## Changelog
:cl:
balance: Balaclavas and half masks are now just breath masks, not gas
masks
balance: Normal balaclavas can use internals too
fix: Balaclavas don't have a joke description anymore
iconadd: mask-up sprites for NGR balaclavas and masks
/:cl:
---
.../independent/independent_beluga.dmm | 2 +-
_maps/shuttles/inteq/inteq_colossus.dmm | 10 ++++----
_maps/shuttles/inteq/inteq_hound.dmm | 2 +-
_maps/shuttles/inteq/inteq_talos.dmm | 8 +++----
_maps/shuttles/inteq/inteq_valor.dmm | 6 ++---
_maps/shuttles/inteq/inteq_vaquero.dmm | 6 ++---
code/game/objects/items/storage/boxes.dm | 2 +-
code/modules/clothing/factions/clip.dm | 8 +++++++
code/modules/clothing/factions/ngr.dm | 6 ++---
code/modules/clothing/masks/boxing.dm | 22 ++++++++++++++++--
code/modules/clothing/masks/breath.dm | 5 ++++
code/modules/clothing/masks/hailer.dm | 15 ------------
.../clothing/outfits/ert/frontiersmen_ert.dm | 8 +++----
.../modules/clothing/outfits/ert/inteq_ert.dm | 4 ++--
.../clothing/outfits/ert/minutemen_ert.dm | 4 ++--
.../clothing/outfits/ert/syndicate_ert.dm | 10 ++++----
.../clothing/outfits/factions/inteq.dm | 8 +++----
icons/mob/clothing/faction/ngr/mask.dmi | Bin 1992 -> 756 bytes
icons/obj/clothing/faction/ngr/mask.dmi | Bin 361 -> 451 bytes
19 files changed, 71 insertions(+), 55 deletions(-)
diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
index f00d24b87a92..31ae19df87a7 100644
--- a/_maps/shuttles/independent/independent_beluga.dmm
+++ b/_maps/shuttles/independent/independent_beluga.dmm
@@ -4929,7 +4929,7 @@
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/clothing/under/syndicate/inteq/skirt,
/obj/item/clothing/under/syndicate/inteq,
/obj/item/clothing/head/beret/sec/inteq,
diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
index 605cd65164b2..a32a34785bd8 100644
--- a/_maps/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -732,7 +732,7 @@
/area/ship/security)
"hx" = (
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/security/webbing/inteq/alt,
@@ -2671,7 +2671,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/security/webbing/inteq/alt,
@@ -4304,9 +4304,9 @@
name = "equipment locker";
req_access_txt = "1"
},
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/security/webbing/inteq,
diff --git a/_maps/shuttles/inteq/inteq_hound.dmm b/_maps/shuttles/inteq/inteq_hound.dmm
index 0dc59dcb8d86..dc895da3b611 100644
--- a/_maps/shuttles/inteq/inteq_hound.dmm
+++ b/_maps/shuttles/inteq/inteq_hound.dmm
@@ -968,7 +968,7 @@
req_access_txt = "58"
},
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/military/assault,
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index 14dace1773e6..e4a0565c7371 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -1867,7 +1867,7 @@
/area/ship/hallway/central)
"ml" = (
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/military/assault,
@@ -7251,7 +7251,7 @@
/obj/item/clothing/head/hardhat/white,
/obj/item/clothing/head/beret/sec/inteq,
/obj/item/clothing/shoes/combat,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/clothing/gloves/combat,
/obj/item/megaphone/cargo{
name = "engineering megaphone"
@@ -7594,7 +7594,7 @@
name = "equipment locker";
req_access_txt = "1"
},
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/storage/box/handcuffs,
@@ -7648,7 +7648,7 @@
/area/ship/crew/canteen)
"Yz" = (
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/military/assault,
diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
index 817a61aeee30..a842020c3fd2 100644
--- a/_maps/shuttles/inteq/inteq_valor.dmm
+++ b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -517,8 +517,8 @@
pixel_x = -16;
pixel_y = 5
},
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/attachment/rail_light,
/obj/item/attachment/rail_light,
/obj/item/attachment/rail_light,
@@ -4415,7 +4415,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"Oc" = (
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/backpack/messenger/inteq,
diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
index 07450da9b767..02f73235e556 100644
--- a/_maps/shuttles/inteq/inteq_vaquero.dmm
+++ b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -914,7 +914,7 @@
req_access_txt = "20"
},
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/security/webbing/inteq/alt,
@@ -1968,7 +1968,7 @@
/area/ship/maintenance/starboard)
"DP" = (
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/security/webbing/inteq/alt,
@@ -2204,7 +2204,7 @@
/obj/item/clothing/head/helmet/swat/inteq,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/balaclava/inteq,
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/security/webbing/inteq/alt,
/obj/item/melee/baton/loaded,
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 31314b3d74ba..c5512e5fe47b 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -179,7 +179,7 @@
internal_type = /obj/item/tank/internals/emergency_oxygen/engi //clip actually cares about their personnel
/obj/item/storage/box/survival/clip/balaclava
- mask_type = /obj/item/clothing/mask/gas/sechailer/balaclava
+ mask_type = /obj/item/clothing/mask/balaclava
internal_type = /obj/item/tank/internals/emergency_oxygen/double
/obj/item/storage/box/survival/frontier
diff --git a/code/modules/clothing/factions/clip.dm b/code/modules/clothing/factions/clip.dm
index 031e000c78c1..43fb9c39179d 100644
--- a/code/modules/clothing/factions/clip.dm
+++ b/code/modules/clothing/factions/clip.dm
@@ -384,6 +384,14 @@
supports_variations = SNOUTED_VARIATION
+/obj/item/clothing/mask/balaclava/combat
+ name = "combat balaclava"
+ desc = "A surprisingly advanced balaclava. While it doesn't muffle your voice, it has a mouthpiece for internals. Comfy to boot!"
+ icon_state = "combat_balaclava"
+ item_state = "combat_balaclava"
+ alternate_worn_layer = BODY_LAYER
+ flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR
+
//gloves
/obj/item/clothing/gloves/color/latex/nitrile/clip
diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm
index f67e79a6f2e9..553d6a8b1015 100644
--- a/code/modules/clothing/factions/ngr.dm
+++ b/code/modules/clothing/factions/ngr.dm
@@ -219,15 +219,15 @@
//Masks//
/////////
-/obj/item/clothing/mask/gas/sechailer/balaclava/ngr
+/obj/item/clothing/mask/balaclava/ngr
name = "NGR combat balaclava"
- desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This version is commonly used by the soldiers of the New Gorlex Republic to protect against sandstorms."
+ desc = "A surprisingly advanced balaclava. While it doesn't muffle your voice, it has a mouthpiece for internals. Comfy to boot! This version is commonly used by the soldiers of the New Gorlex Republic to protect against sandstorms."
icon_state = "ngr_balaclava"
item_state = "ngr_balaclava"
icon = 'icons/obj/clothing/faction/ngr/mask.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/mask.dmi'
-/obj/item/clothing/mask/gas/syndicate/ngr
+/obj/item/clothing/mask/breath/ngr
name = "NGR face mask"
desc = "A face mask that covers the nose, mouth and neck of those who wear it. Favored by field medics over the balaclava due to lessened heat while wearing."
icon_state = "ngr_facemask"
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 2790359d0b7c..8882fbfa8cdf 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -1,17 +1,35 @@
/obj/item/clothing/mask/balaclava
name = "balaclava"
- desc = "LOADSAMONEY"
+ desc = "A stretchy fabric hood with eye holes meant for keeping the face warm in cold weather. Also useful for concealing one's identity."
icon_state = "balaclava"
item_state = "balaclava"
- flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+ clothing_flags = ALLOWINTERNALS
+ visor_flags = ALLOWINTERNALS
+ flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR
visor_flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
+ gas_transfer_coefficient = 0.1
+ permeability_coefficient = 0.5
actions_types = list(/datum/action/item_action/adjust)
+ flags_cover = MASKCOVERSMOUTH
+ visor_flags_cover = MASKCOVERSMOUTH
+ resistance_flags = NONE
supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION
/obj/item/clothing/mask/balaclava/attack_self(mob/user)
adjustmask(user)
+/obj/item/clothing/mask/balaclava/AltClick(mob/user)
+ ..()
+ if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+ return
+ else
+ adjustmask(user)
+
+/obj/item/clothing/mask/balaclava/examine(mob/user)
+ . = ..()
+ . += "Alt-click [src] to adjust it."
+
/obj/item/clothing/mask/infiltrator
name = "infiltrator balaclava"
desc = "It makes you feel safe in your anonymity, but for a stealth outfit you sure do look obvious that you're up to no good. It seems to have a built in heads-up display."
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 8ff4e6bcb0d9..ea6719e1fb63 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -36,3 +36,8 @@
permeability_coefficient = 0.01
equip_delay_other = 10
+/obj/item/clothing/mask/balaclava/inteq //inteq needs a faction clothing file badly but it's out of scope for this PR -apogee
+ name = "IRMG combat balaclava"
+ desc = "A surprisingly advanced balaclava. While it doesn't muffle your voice, it has a mouthpiece for internals. Comfy to boot! This one is a variataion commonly used by the IRMG to protect it's members idenites."
+ icon_state = "inteq_balaclava"
+ item_state = "inteq_balaclava"
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index db12fff06885..a6d97c6f0d80 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -66,18 +66,3 @@
icon_state = "whistle"
item_state = "whistle"
blown_sound = 'sound/misc/trenchwhistle.ogg'
-
-/obj/item/clothing/mask/gas/sechailer/balaclava
- name = "combat balaclava"
- desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot!"
- icon_state = "combat_balaclava"
- item_state = "combat_balaclava"
- strip_delay = 60
- alternate_worn_layer = BODY_LAYER
- flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR
- supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION
-
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq
- desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This one is a variataion commonly used by the IRMG to protect it's members idenites."
- icon_state = "inteq_balaclava"
- item_state = "inteq_balaclava"
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
index 8f1e0663ee31..ca623bbf38b2 100644
--- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -61,9 +61,9 @@
if(prob(50))
mask = pick_weight(list(
/obj/item/clothing/mask/gas/frontiersmen = 12,
- /obj/item/clothing/mask/gas/sechailer/balaclava = 10,
+ /obj/item/clothing/mask/balaclava = 10,
/obj/item/clothing/mask/breath = 7,
- /obj/item/clothing/mask/whistle/trench = 3))
+ /obj/item/clothing/mask/whistle = 3))
if(prob(90))
back = pick_weight(list(
@@ -230,7 +230,7 @@
name = "ERT - Frontiersman Medic (Shock Troop)"
head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier
- mask = /obj/item/clothing/mask/gas/syndicate/ngr
+ mask = /obj/item/clothing/mask/breath/ngr
suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
suit_store = /obj/item/gun/ballistic/automatic/pistol/mauler
belt = /obj/item/storage/belt/medical/webbing/frontiersmen/combat
@@ -274,7 +274,7 @@
name = "ERT - Frontiersman Sentry (SKM-24v LMG)"
head = /obj/item/clothing/head/helmet/marine/frontier
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+ mask = /obj/item/clothing/mask/balaclava
suit = /obj/item/clothing/suit/armor/vest/marine/frontier
suit_store = /obj/item/gun/ballistic/automatic/hmg/skm_lmg/drum_mag
gloves = /obj/item/clothing/gloves/combat
diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm
index 96555fcf692b..6513fe11dd47 100644
--- a/code/modules/clothing/outfits/ert/inteq_ert.dm
+++ b/code/modules/clothing/outfits/ert/inteq_ert.dm
@@ -7,7 +7,7 @@
wallet = null
head = /obj/item/clothing/head/helmet/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
suit = /obj/item/clothing/suit/armor/vest
@@ -119,7 +119,7 @@
gloves = /obj/item/clothing/gloves/color/white
shoes = /obj/item/clothing/shoes/combat
head = /obj/item/clothing/head/beret/sec/hos/inteq/honorable
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
ears = /obj/item/radio/headset/inteq/captain
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
r_pocket = /obj/item/restraints/handcuffs
diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
index 891ea1efe313..cec786d70789 100644
--- a/code/modules/clothing/outfits/ert/minutemen_ert.dm
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -128,7 +128,7 @@
name = "ERT - C-MM Military Police (Riot Control)"
suit = /obj/item/clothing/suit/armor/riot/clip
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+ mask = /obj/item/clothing/mask/balaclava/combat
glasses = /obj/item/clothing/glasses/sunglasses/big
gloves = /obj/item/clothing/gloves/combat
head = /obj/item/clothing/head/helmet/riot/clip
@@ -159,7 +159,7 @@
name = "ERT - C-MM Chief Military Police (Riot Control)"
suit = /obj/item/clothing/suit/armor/riot/clip
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+ mask = /obj/item/clothing/mask/balaclava/combat
glasses = /obj/item/clothing/glasses/sunglasses/big
gloves = /obj/item/clothing/gloves/tackler/combat
head = /obj/item/clothing/head/helmet/riot/clip
diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm
index 9f6dfc0aca33..8dd260c51af4 100644
--- a/code/modules/clothing/outfits/ert/syndicate_ert.dm
+++ b/code/modules/clothing/outfits/ert/syndicate_ert.dm
@@ -14,7 +14,7 @@
ears = /obj/item/radio/headset/headset_sec/alt
gloves = /obj/item/clothing/gloves/color/black
id = /obj/item/card/id/syndicate_command/crew_id
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+ mask = /obj/item/clothing/mask/balaclava
head = /obj/item/clothing/head/helmet/syndie
belt = /obj/item/storage/belt/military/hydra
glasses = /obj/item/clothing/glasses/hud/security
@@ -30,7 +30,7 @@
job_icon = "lieutenant"
head = /obj/item/clothing/head/HoS/beret/syndicate
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+ mask = /obj/item/clothing/mask/balaclava/combat
ears = /obj/item/radio/headset/syndicate/alt/leader
// inspector
@@ -69,7 +69,7 @@
id_assignment = "Serviceman"
head = /obj/item/clothing/head/helmet/ngr
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/ngr
+ mask = /obj/item/clothing/mask/balaclava/ngr
ears = /obj/item/radio/headset/headset_sec/alt
uniform = /obj/item/clothing/under/syndicate/ngr
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/ngr
@@ -92,7 +92,7 @@
id_assignment = "Field Medic"
head = /obj/item/clothing/head/ngr/surgical
- mask = /obj/item/clothing/mask/gas/syndicate/ngr
+ mask = /obj/item/clothing/mask/breath/ngr
belt = /obj/item/storage/belt/medical/webbing/paramedic
glasses = /obj/item/clothing/glasses/hud/health
gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
@@ -255,7 +255,7 @@
suit_store = /obj/item/gun/ballistic/automatic/smg/sidewinder
belt = /obj/item/storage/belt/security/webbing/hardliners/sidewinder
gloves = /obj/item/clothing/gloves/color/black
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+ mask = /obj/item/clothing/mask/balaclava/combat
head = /obj/item/clothing/head/helmet/hardliners
/datum/outfit/job/syndicate/ert/hardliner/engineer
diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm
index 51e1cf1fb29f..647e83d2e7c9 100644
--- a/code/modules/clothing/outfits/factions/inteq.dm
+++ b/code/modules/clothing/outfits/factions/inteq.dm
@@ -38,7 +38,7 @@
id = /obj/item/card/id/gold
head = /obj/item/clothing/head/beret/sec/hos/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
suit = /obj/item/clothing/suit/armor/hos/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
belt = /obj/item/storage/belt/security/webbing/inteq
@@ -89,7 +89,7 @@
ears = /obj/item/radio/headset/inteq
uniform = /obj/item/clothing/under/syndicate/inteq/artificer
head = /obj/item/clothing/head/hardhat/white
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/color/yellow
@@ -140,7 +140,7 @@
head = /obj/item/clothing/head/helmet/inteq
suit = /obj/item/clothing/suit/armor/vest/alt
belt = /obj/item/storage/belt/security/webbing/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
@@ -202,7 +202,7 @@
head = /obj/item/clothing/head/warden/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
belt = /obj/item/storage/belt/military/assault
suit = /obj/item/clothing/suit/armor/vest/security/warden/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
diff --git a/icons/mob/clothing/faction/ngr/mask.dmi b/icons/mob/clothing/faction/ngr/mask.dmi
index ef0c2bb56311c68fe5af75ee3e560efa047fa28b..298cf3ed830335a427e206aadd015b2b37749c97 100644
GIT binary patch
delta 629
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
I&47%50>BBXN&o-=
diff --git a/icons/obj/clothing/faction/ngr/mask.dmi b/icons/obj/clothing/faction/ngr/mask.dmi
index c867f6f569d72bd54a3a1b8a96531d1c63e50dd9..a276f37437bce33c6767c5dea44530fd675cdf8e 100644
GIT binary patch
delta 288
zcmV+*0pI@V0>cB47YaZG0{{R3SVwH_ks&JqhmlQkeymy23J
zbHVzNe+LLL=VZnnRz;+iv4_M<#<2(Ff*<>5OO!mUF)fk@9w~X4h-S%O`Y(My4~~E?
zFF^Avu0WR;s0>l4U#SNSfA>&<8|THn0kVG|`walErK<1pVXKvaMF3K{BSZl}P8cr$
meLnO{h%4;m!&bkR4-bvjDNpxeWIq4^002ov22Mn-LSTYbu63IL
delta 197
zcmV;$06PD}1L*>g7YZN*0{{R3P_tvVks&JqeUVLaf5fF)S;5uM1?(08-j*uI6C3<$
z0001gNklAd(3)FZ~`^N>6!EEvxtUz@ONakWMR1aE@9Jt$@;}$zER^>Bx
z4F9CXD-QCY$NrpH=D2K}nZr+JjzhI%{_8vdI7=4$l>}2100000NkvXXu0mjf!(>oW