From 075a8793430c579988b55eb7335bac291ec25a83 Mon Sep 17 00:00:00 2001 From: Davidj361 Date: Mon, 9 Apr 2018 15:13:35 -0400 Subject: [PATCH 1/2] Fixed paperbin dropping and fingerprints (#36788) * Removed parent call to stop the paperbin from dropping from being carried when getting a pen or paper. * Found a better fix * Better operator * Fixed fingerprints not being created upon paper bin interaction * Review change --- code/modules/paperwork/paperbin.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 2818f04344..144d5f73ab 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -18,6 +18,7 @@ /obj/item/paper_bin/Initialize(mapload) . = ..() + interaction_flags_item &= ~INTERACT_ITEM_ATTACK_HAND_PICKUP if(!mapload) return var/obj/item/pen/P = locate(/obj/item/pen) in src.loc @@ -64,6 +65,7 @@ user.changeNext_move(CLICK_CD_MELEE) if(bin_pen) var/obj/item/pen/P = bin_pen + P.add_fingerprint(user) P.forceMove(user.loc) user.put_in_hands(P) to_chat(user, "You take [P] out of \the [src].") @@ -85,6 +87,7 @@ P.rigged = 1 P.updateinfolinks() + P.add_fingerprint(user) P.forceMove(user.loc) user.put_in_hands(P) to_chat(user, "You take [P] out of \the [src].")