cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark

Browse Source 
Conflicts:
	code/game/objects/items.dm
This commit is contained in:
Tigercat2000
2015-10-08 11:16:30 -07:00
parent 514a09bf0c 71047d20ab
commit 545c38a79b
180 changed files with 3562 additions and 5061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/targeting.dm
+1 -1
View File
@@ -74,7 +74,7 @@
var/mob/living/M = loc
if(M == T) return
if(!istype(M)) return
if(src != M.equipped())
if(src != M.get_active_hand())
stop_aim()
return
M.last_move_intent = world.time