From b1a4041edfc4db9f489ca7f9894368a92fe54b26 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 4 Jul 2015 14:16:56 -0400 Subject: [PATCH] Reverted some mouse drop changes, Sprite issue Having issue with head sprite showing up now. --- code/modules/mob/holder.dm | 2 +- code/modules/mob/living/silicon/pai/pai.dm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 8ddffd00636..c02d86abb7c 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -44,7 +44,7 @@ src.forceMove(H) H.name = name if(desc) H.desc = desc - H.MouseDrop(grabber) + H.attack_hand(grabber) grabber << "You scoop up \the [src]." src << "\The [grabber] scoops you up." diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index d7952787b79..da04516ee0c 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -528,8 +528,9 @@ var/obj/item/weapon/holder/H = ..() if(!istype(H)) return - H.icon_override = 'icons/mob/in-hand/paiheld.dmi'//I have these in diffrent DMI so i am overriding H.icon_state = "pai-[icon_state]" + H.item_state = "pai-[icon_state]" + H.icon_override = 'icons/mob/in-hand/paiheld.dmi'//I have these in diffrent DMI so i am overriding grabber.put_in_active_hand(H)//for some reason unless i call this it dosen't work grabber.update_inv_l_hand() grabber.update_inv_r_hand() @@ -541,6 +542,6 @@ if(!istype(H) || !Adjacent(H)) return ..() if(H.a_intent == "help") get_scooped(H) - return + //return else return ..() \ No newline at end of file