## About The Pull Request
Adds 3 new masks:
* Kitsune mask
* Facescarf
* Rebellion mask
All masks (and facescarf) are recolorable. And also thanks to Kovac for
the scarf sprites
## Why It's Good For The Game
Cool masks for make character style more unique. All are recolourable.

![2024-01-28_12-20-48](https://github.com/tgstation/tgstation/assets/106491639/49b532f7-ccfe-4556-a54f-a4884a9fda77)

## Changelog
🆑
add: 3 new masks for your characters (thanks to Kovac for the scarf
sprites)
/🆑

---------

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
This commit is contained in:
NeonNik2245
2024-02-12 00:53:40 +01:00
committed by GitHub
co-authored by tattle
parent 9f8d168697
commit 6eb041c6b6
11 changed files with 153 additions and 1 deletions
@@ -150,6 +150,43 @@
icon_file = 'icons/mob/inhands/clothing/masks_righthand.dmi'
json_config = 'code/datums/greyscale/json_configs/bandanaskull_inhands.json'
/datum/greyscale_config/facescarf
name = "Facescarf"
icon_file = 'icons/obj/clothing/masks.dmi'
json_config = 'code/datums/greyscale/json_configs/facescarf.json'
/datum/greyscale_config/facescarf/worn
name = "Facescarf (Worn)"
icon_file = 'icons/mob/clothing/mask.dmi'
/datum/greyscale_config/facescarf/inhands_left
name = "Facescarf (Held, Left)"
icon_file = 'icons/mob/inhands/clothing/masks_lefthand.dmi'
json_config = 'code/datums/greyscale/json_configs/facescarf_inhands.json'
/datum/greyscale_config/facescarf/inhands_right
name = "Facescarf (Held, Right)"
icon_file = 'icons/mob/inhands/clothing/masks_righthand.dmi'
json_config = 'code/datums/greyscale/json_configs/facescarf_inhands.json'
/datum/greyscale_config/kitsune
name = "Kitsune mask"
icon_file = 'icons/obj/clothing/masks.dmi'
json_config = 'code/datums/greyscale/json_configs/kitsune.json'
/datum/greyscale_config/kitsune/worn
name = "Kitsune mask (Worn)"
icon_file = 'icons/mob/clothing/mask.dmi'
/datum/greyscale_config/rebellion_mask
name = "Rebellion mask"
icon_file = 'icons/obj/clothing/masks.dmi'
json_config = 'code/datums/greyscale/json_configs/rebellion_mask.json'
/datum/greyscale_config/rebellion_mask/worn
name = "Rebellion mask (Worn)"
icon_file = 'icons/mob/clothing/mask.dmi'
//
// NECK
//
@@ -0,0 +1,18 @@
{
"facescarf": [
{
"type": "icon_state",
"icon_state": "facescarf",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"facescarf_up": [
{
"type": "icon_state",
"icon_state": "facescarf_up",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
@@ -0,0 +1,10 @@
{
"greyscale_facescarf": [
{
"type": "icon_state",
"icon_state": "greyscale_bandana",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
@@ -0,0 +1,16 @@
{
"kitsune": [
{
"type": "icon_state",
"icon_state": "kitsune_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "kitsune_stripe",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
]
}
@@ -0,0 +1,10 @@
{
"rebellion_mask": [
{
"type": "icon_state",
"icon_state": "rebellion_mask",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
@@ -787,7 +787,8 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
new /datum/stack_recipe("mannequin", /obj/structure/mannequin/plastic, 25, time = 5 SECONDS, one_per_turf = TRUE, check_density = FALSE, category = CAT_ENTERTAINMENT), \
new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2, check_density = FALSE, category = CAT_EQUIPMENT), \
new /datum/stack_recipe("warning cone", /obj/item/clothing/head/cone, 2, check_density = FALSE, category = CAT_EQUIPMENT), \
new /datum/stack_recipe("blank wall sign", /obj/item/sign, 1, check_density = FALSE, category = CAT_FURNITURE)))
new /datum/stack_recipe("blank wall sign", /obj/item/sign, 1, check_density = FALSE, category = CAT_FURNITURE), \
new /datum/stack_recipe("rebellion mask", /obj/item/clothing/mask/rebellion, 1, check_density = FALSE, category = CAT_CLOTHING)))
/obj/item/stack/sheet/plastic
name = "plastic"
+31
View File
@@ -200,3 +200,34 @@
desc = "A fine black bandana with nanotech lining and a skull emblem."
greyscale_colors = "#2e2e2e#C6C6C6"
flags_1 = NONE
/obj/item/clothing/mask/facescarf
name = "facescarf"
desc = "Cover your face like in the cowboy movies. It also has breathtube so you can wear it everywhere!"
actions_types = /datum/action/item_action/adjust
icon_state = "facescarf"
inhand_icon_state = "greyscale_facescarf"
alternate_worn_layer = BACK_LAYER
clothing_flags = BLOCK_GAS_SMOKE_EFFECT|MASKINTERNALS
flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT
w_class = WEIGHT_CLASS_SMALL
visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
visor_flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT
flags_cover = MASKCOVERSMOUTH
visor_flags_cover = MASKCOVERSMOUTH
custom_price = PAYCHECK_CREW
greyscale_colors = "#eeeeee"
greyscale_config = /datum/greyscale_config/facescarf
greyscale_config_worn = /datum/greyscale_config/facescarf/worn
greyscale_config_inhand_left = /datum/greyscale_config/facescarf/inhands_left
greyscale_config_inhand_right = /datum/greyscale_config/facescarf/inhands_right
flags_1 = IS_PLAYER_COLORABLE_1
/obj/item/clothing/mask/facescarf/AltClick(mob/user)
..()
if(user.can_perform_action(src, NEED_DEXTERITY))
adjustmask(user)
/obj/item/clothing/mask/facescarf/examine(mob/user)
. = ..()
. += span_notice("Alt-click [src] to adjust it.")
+26
View File
@@ -39,3 +39,29 @@
icon_state = "scarecrow_sack"
inhand_icon_state = null
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
/obj/item/clothing/mask/kitsune
name = "kitsune mask"
desc = "Porcelain mask made in the style of the Sol-3 region. It is painted to look like a kitsune."
icon_state = "kitsune"
inhand_icon_state = null
w_class = WEIGHT_CLASS_SMALL
flags_inv = HIDEFACE|HIDEFACIALHAIR
custom_price = PAYCHECK_CREW
greyscale_colors = "#EEEEEE#AA0000"
greyscale_config = /datum/greyscale_config/kitsune
greyscale_config_worn = /datum/greyscale_config/kitsune/worn
flags_1 = IS_PLAYER_COLORABLE_1
/obj/item/clothing/mask/rebellion
name = "rebellion mask"
desc = "Mask that is usually used during rebellions by insurgents. It covers the entire face and makes you unrecognizable."
icon_state = "rebellion_mask"
inhand_icon_state = null
w_class = WEIGHT_CLASS_SMALL
flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT
custom_price = PAYCHECK_CREW
greyscale_colors = "#EEEEEE"
greyscale_config = /datum/greyscale_config/rebellion_mask
greyscale_config_worn = /datum/greyscale_config/rebellion_mask/worn
flags_1 = IS_PLAYER_COLORABLE_1
+3
View File
@@ -18,6 +18,7 @@
/obj/item/clothing/mask/bandana = 3,
/obj/item/clothing/mask/bandana/striped = 3,
/obj/item/clothing/mask/bandana/skull = 3,
/obj/item/clothing/mask/facescarf = 3,
/obj/item/clothing/neck/scarf = 6,
/obj/item/clothing/neck/large_scarf = 6,
/obj/item/clothing/neck/large_scarf/red = 6,
@@ -161,6 +162,8 @@
/obj/item/clothing/suit/hooded/ethereal_raincoat = 3,
/obj/item/clothing/under/ethereal_tunic = 3,
/obj/item/clothing/mask/kitsune = 3,
/obj/item/clothing/mask/rebellion = 6,
/obj/item/clothing/suit/costume/wellworn_shirt/graphic/ian = 1,
/obj/item/clothing/suit/costume/irs = 20,
/obj/item/clothing/head/costume/irs = 20,
Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 38 KiB