Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Balaclavas Aren't Gas Masks #3609

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+63 −46
Open

Balaclavas Aren't Gas Masks #3609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd24749
balaclavas aren't gas masks
Apogee-dev Oct 20, 2024
a387647
grammar
Apogee-dev Oct 20, 2024
04cb304
screw it refactor again
Apogee-dev Oct 20, 2024
e7d3110
borrowed adjust code from breathmask
Apogee-dev Oct 21, 2024
880982b
doesnt layer under hair when up
Apogee-dev Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_beluga.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions _maps/shuttles/inteq/inteq_colossus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/inteq/inteq_hound.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/inteq/inteq_talos.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/inteq/inteq_valor.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/inteq/inteq_vaquero.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions code/modules/clothing/factions/clip.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/factions/ngr.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
22 changes: 20 additions & 2 deletions code/modules/clothing/masks/boxing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
. = ..()
. += "<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."
Expand Down
5 changes: 5 additions & 0 deletions code/modules/clothing/masks/breath.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
14 changes: 0 additions & 14 deletions code/modules/clothing/masks/hailer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions code/modules/clothing/outfits/ert/frontiersmen_ert.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/ert/inteq_ert.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/ert/syndicate_ert.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/outfits/factions/inteq.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Binary file modified icons/mob/clothing/faction/ngr/mask.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/faction/ngr/mask.dmi
View file
Open in desktop
Binary file not shown.
Loading