diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index 79544fb36c..7336f5e4f7 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -38,3 +38,16 @@ /datum/gear/mask/emotionalmask display_name = "emotional mask" path = /obj/item/clothing/mask/emotions + +/datum/gear/mask/gaiter + display_name = "neck gaiter selection" + path = /obj/item/clothing/mask/gaiter + cost = 1 + +/datum/gear/mask/gaiter/New() + ..() + var/list/gaiters = list() + for(var/gaiter in typesof(/obj/item/clothing/mask/gaiter)) + var/obj/item/clothing/mask/gaiter_type = gaiter + gaiters[initial(gaiter_type.name)] = gaiter_type + gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc)) \ No newline at end of file diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index c24c56bfb4..5b94f94741 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -361,3 +361,30 @@ if("flushed") src.icon_state = "flushed" return + +//Gaiter scarves +/obj/item/clothing/mask/gaiter + name = "red neck gaiter" + desc = "A slightly worn neck gaiter, it's loose enough to be worn comfortably like a scarf. Commonly used by outdoorsmen and mercenaries, both to keep warm and keep debris away from the face." + icon_state = "gaiter_red" + +/obj/item/clothing/mask/gaiter/attack_self(mob/user as mob) + if(src.icon_state == initial(icon_state)) + src.icon_state = "[icon_state]_up" + to_chat(user, "You pull the gaiter up over your nose.") + else + src.icon_state = initial(icon_state) + to_chat(user, "You tug the gaiter down around your neck.") + update_clothing_icon() //so our mob-overlays update + +/obj/item/clothing/mask/gaiter/tan + name = "tan neck gaiter" + icon_state = "gaiter_tan" + +/obj/item/clothing/mask/gaiter/gray + name = "gray neck gaiter" + icon_state = "gaiter_gray" + +/obj/item/clothing/mask/gaiter/green + name = "green neck gaiter" + icon_state = "gaiter_green" \ No newline at end of file diff --git a/icons/inventory/face/item.dmi b/icons/inventory/face/item.dmi index 6dc5d7e9b0..60cb749378 100644 Binary files a/icons/inventory/face/item.dmi and b/icons/inventory/face/item.dmi differ diff --git a/icons/inventory/face/item_vr.dmi b/icons/inventory/face/item_vr.dmi index 0a61a2f46f..c923555fe7 100644 Binary files a/icons/inventory/face/item_vr.dmi and b/icons/inventory/face/item_vr.dmi differ diff --git a/icons/inventory/face/mob.dmi b/icons/inventory/face/mob.dmi index 1edfe2de49..7c9363956c 100644 Binary files a/icons/inventory/face/mob.dmi and b/icons/inventory/face/mob.dmi differ diff --git a/icons/inventory/face/mob_vr.dmi b/icons/inventory/face/mob_vr.dmi index 6bc396101b..fbac00cd0d 100644 Binary files a/icons/inventory/face/mob_vr.dmi and b/icons/inventory/face/mob_vr.dmi differ