From 4956f2a425650b4d22ec9580d78d984da2533642 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Mon, 22 May 2017 22:47:05 -0700 Subject: [PATCH] Switch to cleaner implementation --- code/modules/surgery/organs/subtypes/skrell.dm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/code/modules/surgery/organs/subtypes/skrell.dm b/code/modules/surgery/organs/subtypes/skrell.dm index 110c8e2491a..58610e1ccbb 100644 --- a/code/modules/surgery/organs/subtypes/skrell.dm +++ b/code/modules/surgery/organs/subtypes/skrell.dm @@ -15,20 +15,16 @@ var/obj/item/weapon/storage/internal/pocket /obj/item/organ/internal/headpocket/New() + ..() pocket = new /obj/item/weapon/storage/internal(src) pocket.storage_slots = 1 - //fit only pocket sized items + // Allow adjacency calculation to work properly + loc = owner + // Fit only pocket sized items pocket.max_w_class = 2 pocket.max_combined_w_class = 2 ..() /obj/item/organ/internal/headpocket/ui_action_click() - var/obj/item/hand_item = owner.get_active_hand() - if(hand_item) - // Store item - if(pocket.can_be_inserted(hand_item)) - pocket.handle_item_insertion(hand_item) - return - // Try to remove item - if(pocket.contents.len) - pocket.remove_from_storage(pocket.contents.len, get_turf(owner)) + pocket.MouseDrop(owner) + return