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
This commit is contained in:
committed by
CitadelStationBot
parent
120457d8fd
commit
075a879343
@@ -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, "<span class='notice'>You take [P] out of \the [src].</span>")
|
||||
@@ -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, "<span class='notice'>You take [P] out of \the [src].</span>")
|
||||
|
||||
Reference in New Issue
Block a user