From 675ff6ac950f9800476a4a8339c776227bb1e126 Mon Sep 17 00:00:00 2001 From: Bloop <13398309+vinylspiders@users.noreply.github.com> Date: Fri, 13 Oct 2023 21:50:52 -0400 Subject: [PATCH] [MODULAR] Fixes an oversight with paper masks + adds action button (#24326) * Fixes an oversight with paper masks + adds action button * Makes action button have a right click and a left click * Adds ability to hide strap * Hideable strap + cleaning up the crap --- .../master_files/icons/mob/clothing/mask.dmi | Bin 16214 -> 15627 bytes .../modules/clothing/masks/breath.dm | 2 +- .../modules/clothing/masks/paper.dm | 88 +++++++++++++++--- 3 files changed, 74 insertions(+), 16 deletions(-) diff --git a/modular_skyrat/master_files/icons/mob/clothing/mask.dmi b/modular_skyrat/master_files/icons/mob/clothing/mask.dmi index 07bef00e9c4a287096c3c6932b6898d41969cc66..8b52d28c7cb8945df79a1a205d8b42d10f9b5107 100644 GIT binary patch literal 15627 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 diff --git a/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm b/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm index a65f4a57416..57365317844 100644 --- a/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm +++ b/modular_skyrat/modules/customization/modules/clothing/masks/breath.dm @@ -38,7 +38,7 @@ to_chat(user, "You pull the balaclava up to cover your whole head.") open = 0 user.update_body_parts() - user.update_inv_ears(0) + user.update_inv_ears() user.update_worn_mask() //Updates mob icons /obj/item/clothing/mask/balaclavaadjust/attack_self(mob/user) diff --git a/modular_skyrat/modules/customization/modules/clothing/masks/paper.dm b/modular_skyrat/modules/customization/modules/clothing/masks/paper.dm index 97b52485b4b..0465255fb56 100644 --- a/modular_skyrat/modules/customization/modules/clothing/masks/paper.dm +++ b/modular_skyrat/modules/customization/modules/clothing/masks/paper.dm @@ -1,3 +1,17 @@ +/datum/action/item_action/adjust/papermask + name = "Adjust paper mask" + desc = "LMB: Change mask face. RMB: Adjust mask." + +/datum/action/item_action/adjust/papermask/Trigger(trigger_flags) + . = ..() + if(!.) + return + var/obj/item/clothing/mask/paper/paper_mask = target + if(trigger_flags & TRIGGER_SECONDARY_ACTION) + paper_mask.adjust_mask(usr) + else + paper_mask.reskin_obj(usr) + /obj/item/clothing/mask/paper name = "paper mask" desc = "It's true. Once you wear a mask for so long, you forget about who you are. Wonder if that happens with shitty paper ones." @@ -7,8 +21,7 @@ clothing_flags = MASKINTERNALS flags_inv = HIDEFACIALHAIR|HIDESNOUT w_class = WEIGHT_CLASS_SMALL - /// Whether or not the mask is currently being layered over (or under!) hair. - var/wear_over_hair = TRUE + actions_types = list(/datum/action/item_action/adjust/papermask) unique_reskin = list( "Blank" = "mask_paper", "Neutral" = "mask_neutral", @@ -37,40 +50,85 @@ "Sad" = "mask_sad", ) + /// Whether or not the mask is currently being layered over (or under!) hair. FALSE/null means the mask is layered over the hair (this is how it starts off). + var/wear_hair_over + /// Whether or not the strap is currently hidden or visible + var/strap_hidden + /obj/item/clothing/mask/paper/Initialize(mapload) . = ..() register_context() - if(wear_over_hair) + if(wear_hair_over) alternate_worn_layer = BACK_LAYER +/obj/item/clothing/mask/paper/worn_overlays(mutable_appearance/standing, isinhands, icon_file) + . = ..() + if(!strap_hidden) + . += mutable_appearance(icon_file, "mask_paper_strap") + +/obj/item/clothing/mask/paper/alt_click_secondary(mob/user) + . = ..() + if(.) + return + if(user.can_perform_action(src, NEED_DEXTERITY)) + adjust_mask(user) + +/obj/item/clothing/mask/paper/CtrlClick(mob/user) + . = ..() + if(.) + return + if(user.can_perform_action(src, NEED_DEXTERITY)) + adjust_strap(user) + /obj/item/clothing/mask/paper/add_context(atom/source, list/context, obj/item/held_item, mob/user) . = ..() context[SCREENTIP_CONTEXT_ALT_LMB] = "Change Mask Face" + context[SCREENTIP_CONTEXT_ALT_RMB] = "Adjust Mask" + context[SCREENTIP_CONTEXT_CTRL_LMB] = "Hide/Show Strap" return CONTEXTUAL_SCREENTIP_SET /obj/item/clothing/mask/paper/reskin_obj(mob/user) + if(!user.is_holding_item_of_type(/obj/item/pen)) + balloon_alert(user, "must be holding a pen!") + return + . = ..() - user.update_worn_mask() + + var/mob/living/carbon/carbon_user + if(iscarbon(user)) + carbon_user = user + if(carbon_user.wear_mask == src) + carbon_user.update_worn_mask() + current_skin = null //so we can infinitely reskin /obj/item/clothing/mask/paper/proc/adjust_mask(mob/living/carbon/human/user) if(!istype(user)) return if(!user.incapacitated()) - wear_over_hair = !wear_over_hair - if(wear_over_hair) + var/is_worn = user.wear_mask == src + wear_hair_over = !wear_hair_over + if(wear_hair_over) alternate_worn_layer = BACK_LAYER - to_chat(user, "You sweep your hair over the mask.") + to_chat(user, "You [is_worn ? "" : "will "]sweep your hair over the mask.") else alternate_worn_layer = initial(alternate_worn_layer) - to_chat(user, "You sweep your hair under the mask.") + to_chat(user, "You [is_worn ? "" : "will "]sweep your hair under the mask.") + + user.update_worn_mask() + +/obj/item/clothing/mask/paper/proc/adjust_strap(mob/living/carbon/human/user) + if(!istype(user)) + return + if(!user.incapacitated()) + var/is_worn = user.wear_mask == src + strap_hidden = !strap_hidden + to_chat(user, "You [is_worn ? "" : "will "][strap_hidden ? "hide" : "show"] the mask strap.") - user.update_body_parts() - user.update_inv_ears(0) user.update_worn_mask() -/obj/item/clothing/mask/paper/verb/toggle() - set category = "Object" - set name = "Adjust Mask" - set src in usr - adjust_mask(usr) +// Because alternate_worn_layer can potentially get reset on unequipping the mask (ex: for 'Top' snouts), let's make sure we don't lose it our settings +/obj/item/clothing/mask/paper/dropped(mob/living/carbon/human/user) + var/prev_alternate_worn_layer = alternate_worn_layer + . = ..() + alternate_worn_layer = prev_alternate_worn_layer