diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index ce60af916e9..816d92c5a7e 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -20,8 +20,8 @@ //Puts the item into your l_hand if possible and calls all necessary triggers/updates. returns 1 on success. /mob/proc/put_in_l_hand(var/obj/item/W) - if(lying && !(W.flags&ABSTRACT)) return 0 - if(!istype(W)) return 0 + if(!put_in_hand_check(W)) + return 0 if(!l_hand) W.loc = src //TODO: move to equipped? l_hand = W @@ -37,8 +37,8 @@ //Puts the item into your r_hand if possible and calls all necessary triggers/updates. returns 1 on success. /mob/proc/put_in_r_hand(var/obj/item/W) - if(lying && !(W.flags&ABSTRACT)) return 0 - if(!istype(W)) return 0 + if(!put_in_hand_check(W)) + return 0 if(!r_hand) W.loc = src r_hand = W @@ -51,6 +51,10 @@ return 1 return 0 +/mob/proc/put_in_hand_check(var/obj/item/W) + if(lying && !(W.flags&ABSTRACT)) return 0 + if(!istype(W)) return 0 + return 1 //Puts the item into our active hand if possible. returns 1 on success. /mob/proc/put_in_active_hand(var/obj/item/W) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 19b8d8b45dc..00137619c42 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -298,4 +298,7 @@ now_pushing = 0 return step(AM, t) - now_pushing = null \ No newline at end of file + now_pushing = null + +/mob/living/silicon/put_in_hand_check() + return 0 \ No newline at end of file