cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 07:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Should fix Teshari stripping intent bugs.

Browse Source
This commit is contained in:
Zuhayr
2016-02-08 10:29:32 +10:30
parent 64ff66d522
commit 81a6d9ddbf
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/holder.dm
+1 -1
View File
@@ -98,7 +98,7 @@ var/list/holder_mob_icon_cache = list()
/mob/living/MouseDrop(var/atom/over_object)
var/mob/living/carbon/human/H = over_object
if(holder_type && istype(H) && !H.lying && !issmall(H) && Adjacent(H))
if(holder_type && istype(H) && !H.lying && !issmall(H) && Adjacent(H) && (src.a_intent == I_HELP && H.a_intent == I_HELP))
get_scooped(H, (usr == src))
return
return ..()
code/modules/mob/living/carbon/human/human.dm
-7
View File
@@ -1357,13 +1357,6 @@
return 1
return 0
/mob/living/carbon/human/MouseDrop(var/atom/over_object)
var/mob/living/carbon/human/H = over_object
if(holder_type && a_intent == I_HELP && istype(H) && H == usr && H.a_intent == I_HELP && !issmall(H) && Adjacent(H))
get_scooped(H)
return
return ..()
//Puts the item into our active hand if possible. returns 1 on success.
/mob/living/carbon/human/put_in_active_hand(var/obj/item/W)
return (hand ? put_in_l_hand(W) : put_in_r_hand(W))