Skip to content

Commit

Permalink
Revert "Refactors the paper bin behavior for dragging to pick up into…
Browse files Browse the repository at this point in the history
… an element (#57501)"

This reverts commit 586a0cc.
  • Loading branch information
Gboster-0 committed Oct 21, 2023
1 parent 586a0cc commit b59c6d8
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 33 deletions.
29 changes: 0 additions & 29 deletions code/datums/elements/drag_pickup.dm

This file was deleted.

5 changes: 2 additions & 3 deletions code/modules/paperwork/paperbin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
/obj/item/paper_bin/Initialize(mapload)
. = ..()
interaction_flags_item &= ~INTERACT_ITEM_ATTACK_HAND_PICKUP
AddElement(/datum/element/drag_pickup)
if(!mapload)
return
var/obj/item/pen/P = locate(/obj/item/pen) in src.loc
Expand Down Expand Up @@ -56,8 +55,8 @@

add_fingerprint(M)

/obj/item/paper_bin/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
/obj/item/paper_bin/attack_paw(mob/user)
return attack_hand(user)

//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/paper_bin/attack_hand(mob/user)
Expand Down
1 change: 0 additions & 1 deletion lobotomy-corp13.dme
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,6 @@
#include "code\datums\elements\decal.dm"
#include "code\datums\elements\deferred_aquarium_content.dm"
#include "code\datums\elements\digitalcamo.dm"
#include "code\datums\elements\drag_pickup.dm"
#include "code\datums\elements\dryable.dm"
#include "code\datums\elements\earhealing.dm"
#include "code\datums\elements\embed.dm"
Expand Down

0 comments on commit b59c6d8

Please sign in to comment.