diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm index c283c0d21584..c91ffb9aeac2 100644 --- a/_maps/shuttles/independent/independent_beluga.dmm +++ b/_maps/shuttles/independent/independent_beluga.dmm @@ -4927,7 +4927,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 70f32bfb60f2..93ba828ddc54 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 c6f9e34a653d..fefd527423a5 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 79ec309513f8..0b3df47403a9 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -1866,7 +1866,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, @@ -7567,7 +7567,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, @@ -7621,7 +7621,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, @@ -7821,7 +7821,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" diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index 00b25f936eab..171aaf49ae15 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, /turf/open/floor/plasteel/dark, /area/ship/security) "ey" = ( @@ -4412,7 +4412,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 9ea8b60d9b89..b2f19749daa2 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 29d2cd22dbbd..1b2d0e005f7c 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -171,7 +171,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 6371b5c14f12..cca9c0e5358b 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 401f82795f68..838eff82a448 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 6bb58bb2b4e5..ea48506958d0 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -1,16 +1,34 @@ /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 /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 78bbc032e861..a6d97c6f0d80 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -66,17 +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 - -/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 b685e0e4b8bb..4dc44ae20914 100644 --- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm +++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm @@ -49,7 +49,7 @@ if(prob(30)) mask = pickweight(list( /obj/item/clothing/mask/gas/frontiersmen = 5, - /obj/item/clothing/mask/gas/sechailer/balaclava = 5, + /obj/item/clothing/mask/balaclava = 5, /obj/item/clothing/mask/breath = 5, /obj/item/clothing/mask/whistle = 3)) @@ -231,7 +231,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 @@ -244,7 +244,7 @@ name = "ERT - Frontiersman Sentry (Shredder 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 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 9fd796d04516..eb3a603e9918 100644 --- a/code/modules/clothing/outfits/ert/inteq_ert.dm +++ b/code/modules/clothing/outfits/ert/inteq_ert.dm @@ -4,7 +4,7 @@ jobtype = /datum/job/officer job_icon = "securityofficer" - 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/space/hardsuit/syndi/inteq diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm index c37dab500091..3d19b9a3c76e 100644 --- a/code/modules/clothing/outfits/ert/syndicate_ert.dm +++ b/code/modules/clothing/outfits/ert/syndicate_ert.dm @@ -9,7 +9,7 @@ ears = /obj/item/radio/headset/syndicate/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/operator back = /obj/item/storage/backpack/security belt = /obj/item/storage/belt/military/c20r 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 0baead0a39b1..d0e6c8dca3a4 100644 Binary files a/icons/mob/clothing/faction/ngr/mask.dmi and b/icons/mob/clothing/faction/ngr/mask.dmi differ diff --git a/icons/obj/clothing/faction/ngr/mask.dmi b/icons/obj/clothing/faction/ngr/mask.dmi index c867f6f569d7..a276f37437bc 100644 Binary files a/icons/obj/clothing/faction/ngr/mask.dmi and b/icons/obj/clothing/faction/ngr/mask.dmi differ