From ae078ffbfadb28993ae8271e10a5fc4d9ffa7c67 Mon Sep 17 00:00:00 2001 From: spessbro <51048066+spessbro@users.noreply.github.com> Date: Tue, 29 Jun 2021 04:45:18 -0400 Subject: [PATCH] puts the drag_pickup component on card decks (#59857) --- code/game/objects/items/toys.dm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 691cd08018c..1f83f6253f9 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -711,6 +711,7 @@ /obj/item/toy/cards/deck/Initialize() . = ..() + AddElement(/datum/element/drag_pickup) populate_deck() ///Generates all the cards within the deck. @@ -799,24 +800,6 @@ else return ..() -/obj/item/toy/cards/deck/MouseDrop(atom/over_object) - . = ..() - var/mob/living/M = usr - if(!istype(M) || !(M.mobility_flags & MOBILITY_PICKUP)) - return - if(Adjacent(usr)) - if(over_object == M && loc != M) - M.put_in_hands(src) - to_chat(usr, span_notice("You pick up the deck.")) - - else if(istype(over_object, /atom/movable/screen/inventory/hand)) - var/atom/movable/screen/inventory/hand/H = over_object - if(M.putItemFromInventoryInHandIfPossible(src, H.held_index)) - to_chat(usr, span_notice("You pick up the deck.")) - - else - to_chat(usr, span_warning("You can't reach it from here!")) - /obj/item/toy/cards/cardhand