From bd2474924a06790e3cc9f8e591020515518e90da Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Sun, 20 Oct 2024 16:36:01 -0700 Subject: [PATCH 1/5] balaclavas aren't gas masks --- .../shuttles/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/ngr.dm | 4 ++-- code/modules/clothing/masks/boxing.dm | 2 +- code/modules/clothing/masks/breath.dm | 12 ++++++++++++ code/modules/clothing/masks/hailer.dm | 14 -------------- .../clothing/outfits/ert/frontiersmen_ert.dm | 6 +++--- code/modules/clothing/outfits/ert/inteq_ert.dm | 2 +- .../clothing/outfits/ert/syndicate_ert.dm | 2 +- code/modules/clothing/outfits/factions/inteq.dm | 8 ++++---- icons/mob/clothing/faction/ngr/mask.dmi | Bin 472 -> 515 bytes icons/obj/clothing/faction/ngr/mask.dmi | Bin 361 -> 451 bytes 17 files changed, 42 insertions(+), 44 deletions(-) diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm index c283c0d21584..0882dbf0e249 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/breath/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..c7f9e25ecbd8 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/breath/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/breath/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/breath/balaclava/inteq, +/obj/item/clothing/mask/breath/balaclava/inteq, +/obj/item/clothing/mask/breath/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..3a4af6a327e3 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/breath/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..433fe582c43e 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/breath/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/breath/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/breath/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/breath/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..0ff1bfb239c7 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/breath/balaclava/inteq, +/obj/item/clothing/mask/breath/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/breath/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..676049ac06b1 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/breath/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/breath/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/breath/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..951479fb7a40 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/breath/balaclava internal_type = /obj/item/tank/internals/emergency_oxygen/double /obj/item/storage/box/survival/frontier diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm index 401f82795f68..0e7aae78ce05 100644 --- a/code/modules/clothing/factions/ngr.dm +++ b/code/modules/clothing/factions/ngr.dm @@ -219,7 +219,7 @@ //Masks// ///////// -/obj/item/clothing/mask/gas/sechailer/balaclava/ngr +/obj/item/clothing/mask/breath/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." icon_state = "ngr_balaclava" @@ -227,7 +227,7 @@ 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..78102caf12d0 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -1,6 +1,6 @@ /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 diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 8ff4e6bcb0d9..c67f480b0219 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -36,3 +36,15 @@ permeability_coefficient = 0.01 equip_delay_other = 10 +/obj/item/clothing/mask/breath/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" + alternate_worn_layer = BODY_LAYER + flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR + +/obj/item/clothing/mask/breath/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/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..93add9258cee 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/breath/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/breath/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/breath/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..f727ade2cd53 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/breath/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..e33dab62dccf 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/breath/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..aa5e9d48de86 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/breath/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/breath/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/breath/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/breath/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 0baead0a39b192dcd5716fb804cc289ee799b1ed..d0e6c8dca3a48ada7e0fd0618a9c41337df9d577 100644 GIT binary patch delta 412 zcmV;N0b~By1A_!giBL{Q4GJ0x0000DNk~Le0001h0001h0s{a50KQO(SO5S33{Xr| zMZmzoGc`INASO>wP`iyWE&u=k0d!JMQvg8b*k%9#0EdxHa(_sg>iE(EqBOwVf=9iw zf~%hk*s}m|Pe`@o^!&B}009z7L_t(og=1hCW`Ge0!C(PQgbPYLvVbY3|NkKTr3?;W z4UADx1^a(M==nDw^ve1Mu!g@`PzCA<5Ly#zwpJX3-ns&+KxzVn77c*XDl~(-%~i`Yr`NkQ`RyF zz5W$c!Bhwx235e=zzLzJMnVLZHb8Ykvpxxwt)8Q|y6%O%Cdz`(%k>ERLtq!U1xg&9Z+Y|G*XQv3lvA+84w956Pul2=gk z_YVNFBfp=#1e9Vd3GxeOaCmkj4aljT=v7qT;k|WJ)9U%$H*^{9Z_ql++p3fWlzQjs z;usRq`gZz7&cg;gE~&l(mfS~Pv8?=df34=0qvd?2x&OQ5o;+?5naT2QgU2V`ryute zyo>14nR}&U$DsyJlM|{*uS>gSw`>=cE?K)FP+HFEZo*=b{1s^Gt#jic^XZw~E${oqIKLYeii_iiyU{&20R{Pw?I_qYRW=eT?K9y%2n zcjBlF*XBJFUj0~@URfv-Q2*!gBo$9JlTVVXpV#_dVd~Y%nXMC{Xn3u5(;~@vCtsx; z_{oyx+;HK*rThFA`hIL5>I|M7WdO0+e$*YPEM#Kkl78+wNu~Z2?>Ze(iOO{EPN3fz NJYD@<);T3K0RZVWoMZq1 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 From a387647ad63e8bdea13dda3e568d49cac3f6559f Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Sun, 20 Oct 2024 16:37:48 -0700 Subject: [PATCH 2/5] grammar --- code/modules/clothing/factions/ngr.dm | 2 +- code/modules/clothing/masks/breath.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm index 0e7aae78ce05..2a3f65faf2c2 100644 --- a/code/modules/clothing/factions/ngr.dm +++ b/code/modules/clothing/factions/ngr.dm @@ -221,7 +221,7 @@ /obj/item/clothing/mask/breath/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' diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index c67f480b0219..6a4ce5e60bce 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -38,13 +38,13 @@ /obj/item/clothing/mask/breath/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!" + 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 /obj/item/clothing/mask/breath/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." + 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" From 04cb30485218e39b14d19e9e3e09b2807710f16c Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Sun, 20 Oct 2024 16:59:00 -0700 Subject: [PATCH 3/5] screw it refactor again --- _maps/shuttles/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 | 2 +- code/modules/clothing/masks/boxing.dm | 10 +++++++++- code/modules/clothing/masks/breath.dm | 11 ++--------- code/modules/clothing/outfits/ert/frontiersmen_ert.dm | 6 +++--- code/modules/clothing/outfits/ert/inteq_ert.dm | 2 +- code/modules/clothing/outfits/ert/syndicate_ert.dm | 2 +- code/modules/clothing/outfits/factions/inteq.dm | 8 ++++---- 15 files changed, 47 insertions(+), 38 deletions(-) diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm index 0882dbf0e249..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/breath/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 c7f9e25ecbd8..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/breath/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/breath/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/breath/balaclava/inteq, -/obj/item/clothing/mask/breath/balaclava/inteq, -/obj/item/clothing/mask/breath/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 3a4af6a327e3..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/breath/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 433fe582c43e..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/breath/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/breath/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/breath/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/breath/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 0ff1bfb239c7..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/breath/balaclava/inteq, -/obj/item/clothing/mask/breath/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/breath/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 676049ac06b1..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/breath/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/breath/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/breath/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 951479fb7a40..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/breath/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 2a3f65faf2c2..838eff82a448 100644 --- a/code/modules/clothing/factions/ngr.dm +++ b/code/modules/clothing/factions/ngr.dm @@ -219,7 +219,7 @@ //Masks// ///////// -/obj/item/clothing/mask/breath/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 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" diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 78102caf12d0..d844c29ec624 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -3,10 +3,18 @@ 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 + alternate_worn_layer = BODY_LAYER /obj/item/clothing/mask/balaclava/attack_self(mob/user) adjustmask(user) diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 6a4ce5e60bce..ea6719e1fb63 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -36,15 +36,8 @@ permeability_coefficient = 0.01 equip_delay_other = 10 -/obj/item/clothing/mask/breath/balaclava - 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 - -/obj/item/clothing/mask/breath/balaclava/inteq +/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/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm index 93add9258cee..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/breath/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/breath/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/breath/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 f727ade2cd53..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/breath/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 e33dab62dccf..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/breath/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 aa5e9d48de86..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/breath/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/breath/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/breath/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/breath/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 From e7d31102364e9e87118c53c4026612c2e3b8a463 Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Sun, 20 Oct 2024 17:04:07 -0700 Subject: [PATCH 4/5] borrowed adjust code from breathmask --- code/modules/clothing/masks/boxing.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index d844c29ec624..6f8f0553a2db 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -19,6 +19,17 @@ /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." From 880982b9c802dc61c2f87339e718647bfde87d98 Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Sun, 20 Oct 2024 17:07:33 -0700 Subject: [PATCH 5/5] doesnt layer under hair when up --- code/modules/clothing/masks/boxing.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 6f8f0553a2db..ea48506958d0 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -14,7 +14,6 @@ flags_cover = MASKCOVERSMOUTH visor_flags_cover = MASKCOVERSMOUTH resistance_flags = NONE - alternate_worn_layer = BODY_LAYER /obj/item/clothing/mask/balaclava/attack_self(mob/user) adjustmask(user)