diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index a5e0c2f51ba..79544fb36c7 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -33,4 +33,8 @@ /datum/gear/mask/papermask display_name = "paper mask" - path = /obj/item/clothing/mask/paper \ No newline at end of file + path = /obj/item/clothing/mask/paper + +/datum/gear/mask/emotionalmask + display_name = "emotional mask" + path = /obj/item/clothing/mask/emotions diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 09c463ad026..7ea8bdf90b1 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -338,4 +338,26 @@ src.icon_state = "doublemask" if("mark") src.icon_state = "markmask" - return \ No newline at end of file + return + +/obj/item/clothing/mask/emotions + name = "emotional mask" + desc = "Express your happiness or hide your sorrows with this modular cutout. Draw your current emotions onto it with a pen!" + w_class = ITEMSIZE_SMALL + body_parts_covered = FACE + icon_state = "joy" + +/obj/item/clothing/mask/emotions/attackby(obj/item/I as obj, mob/living/user as mob, proximity) + if(!proximity) return + if(istype(I, /obj/item/weapon/pen)) + var/drawtype = tgui_alert(user, "Choose what emotions you'd like to display.", list("joy","pensive","angry","flushed")) + switch(drawtype) + if("joy") + src.icon_state = "joy" + if("pensive") + src.icon_state = "pensive" + if("angry") + src.icon_state = "angry" + if("flushed") + src.icon_state = "flushed" + return diff --git a/icons/inventory/face/item.dmi b/icons/inventory/face/item.dmi index 5bde3b32d46..6dc5d7e9b01 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 76c4495a13a..0a61a2f46fc 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 fd1af6e950b..1edfe2de496 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 0da9be64ed3..6bc396101b0 100644 Binary files a/icons/inventory/face/mob_vr.dmi and b/icons/inventory/face/mob_vr.dmi differ