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

candle adds the half mask respirator #307

Merged
merged 4 commits into from
Dec 28, 2024
Merged

candle adds the half mask respirator #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62b3a9e
test
CandleJaxx Dec 27, 2024
6a3ea97
wawaw
CandleJaxx Dec 27, 2024
f83977e
real
Paxilmaniac Dec 28, 2024
17e0f4b
moves it to the right file
Paxilmaniac Dec 28, 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
4 changes: 4 additions & 0 deletions modular_doppler/loadout_categories/categories/masks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,7 @@
/datum/loadout_item/mask/kitsune
name = "Kitsune Mask"
item_path = /obj/item/clothing/mask/kitsune

/datum/loadout_item/mask/respirator
name = "Half-Mask Respirator"
item_path = /obj/item/clothing/mask/gas/respirator
12 changes: 12 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/greyscale_configs_face.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,15 @@
name = "Neck Gaiter (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/face.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/face/gaiter_worn.json'

// RESPIRATOR

/datum/greyscale_config/respirator
name = "Half-Mask Respirator"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/face.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/face/respirator.json'

/datum/greyscale_config/respirator/worn
name = "Half-Mask Respirator (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/face.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/face/respirator_worn.json'
Binary file modified modular_doppler/modular_cosmetics/GAGS/icons/mob/face.dmi
View file
Open in desktop
Paxilmaniac marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/GAGS/icons/obj/face.dmi
View file
Open in desktop
Paxilmaniac marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
10 changes: 10 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/json_configs/face/respirator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"respirator": [
{
"type": "icon_state",
"icon_state": "respirator",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
10 changes: 10 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/json_configs/face/respirator_worn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"respirator": [
{
"type": "icon_state",
"icon_state": "respirator_worn",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
22 changes: 22 additions & 0 deletions modular_doppler/modular_cosmetics/code/face/masks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,25 @@
return FALSE
if (prob(hit_reflect_chance))
return TRUE

/obj/item/clothing/mask/gas/respirator
name = "half mask respirator"
desc = "A half mask respirator that's really just a standard gas mask with the glass taken off."
icon_state = "respirator"
icon = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/face.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/face.dmi'
supported_bodyshapes = null
bodyshape_icon_files = null
inhand_icon_state = "sechailer"
greyscale_config = /datum/greyscale_config/respirator
greyscale_config_worn = /datum/greyscale_config/respirator/worn
greyscale_colors = "#666666"
clothing_flags = BLOCK_GAS_SMOKE_EFFECT|MASKINTERNALS
w_class = WEIGHT_CLASS_SMALL
flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT
visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
visor_flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT
flags_cover = MASKCOVERSMOUTH
visor_flags_cover = MASKCOVERSMOUTH
flags_1 = IS_PLAYER_COLORABLE_1
interaction_flags_click = NEED_DEXTERITY|ALLOW_RESTING
Loading