cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Large merge resultion. Used remote for map conflicts.

Browse Source
This commit is contained in:
Zuhayr
2014-09-23 21:41:54 +09:30
parent c529e014a7 29c29cd408
commit 0c83a95b90
164 changed files with 8010 additions and 7210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/hud/screen_objects.dm
View File

@@ -91,7 +91,7 @@
if(master)
var/obj/item/I = usr.get_active_hand()
if(I)
master.attackby(I, usr)
usr.ClickOn(master)
usr.next_move = world.time+2
return 1