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

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

Browse Source 
Conflicts:
	html/changelog.html
This commit is contained in:
Mloc-Argent
2013-12-13 19:13:43 +00:00
parent a9549ac036 bf1216ea3d
commit b175c6906b
19 changed files with 140 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/projectiles/targeting.dm
View File

@@ -269,6 +269,7 @@ client/proc/add_gun_icons()
screen += usr.gun_run_icon
client/proc/remove_gun_icons()
if(isnull(usr)) return 1 // Runtime prevention on N00k agents spawning with SMG
screen -= usr.item_use_icon
screen -= usr.gun_move_icon
if (target_can_move)