cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pickup() improvements

Browse Source 
Fixes flashlight exploit.
Removes unused proc can_use_hands().

Fixes #11282
This commit is contained in:
Tkdrg
2015-11-14 17:05:08 -03:00
parent 20242d946c
commit 11ab5901ee
4 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+6 -3
View File
@@ -230,12 +230,13 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
pickup(user)
add_fingerprint(user)
user.put_in_active_hand(src)
if(!user.put_in_active_hand(src))
dropped(user)
return
/obj/item/attack_paw(mob/user)
var/picked_up = 0
if (istype(src.loc, /obj/item/weapon/storage))
for(var/mob/M in range(1, src.loc))
if (M.s_active == src.loc)
@@ -249,8 +250,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
if(istype(src.loc, /mob/living))
return
src.pickup(user)
picked_up = 1
user.put_in_active_hand(src)
if(!user.put_in_active_hand(src) && picked_up)
dropped(user)
return