cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-30 16:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #561 from jack-fractal/bugfix_clickcode

Browse Source 
Bugfix: #548 - Adding delay to throw_item and UnarmedAttack
This commit is contained in:
skull132
2015-05-31 16:37:52 +03:00
parent 38f3f001db a6ce30df10
commit 99e8e59df0
11 changed files with 89 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+2 -3
View File
@@ -150,7 +150,7 @@
else
if(isliving(src.loc))
return
user.next_move = max(user.next_move+2,world.time + 2)
user.AllowedToClickAgainAfter(CLICK_CD_ACTIVATE_OBJECT)
src.pickup(user)
add_fingerprint(user)
user.put_in_active_hand(src)
@@ -175,8 +175,7 @@
if(istype(src.loc, /mob/living))
return
src.pickup(user)
user.next_move = max(user.next_move+2,world.time + 2)
user.AllowedToClickAgainAfter(CLICK_CD_ACTIVATE_OBJECT)
user.put_in_active_hand(src)
return