From de299e82b364138fd5f88ca2a76cf43e9143a35c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 7 Mar 2021 02:58:35 +0100 Subject: [PATCH] [MIRROR] Right-click to remove carbon-copies (#3966) * Right-click to remove carbon-copies (#57402) * Right-click to remove carbon-copies Co-authored-by: mozi_h --- code/modules/paperwork/carbonpaper.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm index d3842155cb7..f693310efef 100644 --- a/code/modules/paperwork/carbonpaper.dm +++ b/code/modules/paperwork/carbonpaper.dm @@ -17,6 +17,12 @@ icon_state = "[icon_state]_words" return ..() +/obj/item/paper/carbon/examine() + . = ..() + if(copied || iscopy) + return + . += "Right-click to tear off the carbon-copy (you must use both hands)." + /obj/item/paper/carbon/proc/removecopy(mob/living/user) if(copied || iscopy) to_chat(user, "There are no more carbon copies attached to this paper!") @@ -38,8 +44,8 @@ C.update_icon_state() user.put_in_hands(Copy) -/obj/item/paper/carbon/attack_hand(mob/living/user, list/modifiers) +/obj/item/paper/carbon/attack_hand_secondary(mob/user, list/modifiers) if(loc == user && user.is_holding(src)) removecopy(user) - return + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN return ..()