Balaclavas Aren't Gas Masks (#3609)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## 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:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

_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,

_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,

_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,

_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,

_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,

_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,

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

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

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"

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)
+	. = ..()
+	. += "<span class='notice'>Alt-click [src] to adjust it.</span>"
+
 /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."

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"

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"

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

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

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

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

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