Neerti 8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again ...

# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme

2017-09-05 00:58:27 -04:00

..

ammunition

Might as well fix shotgun clip icons too

2017-08-10 06:39:49 -04:00

guns

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again

2017-09-05 00:58:27 -04:00

projectile

work

2017-09-04 21:52:47 -04:00

targeting

Aiming at someone is now logged

2017-04-14 03:40:03 -04:00

ammunition.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

dnalocking.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

effects.dm

Tweaks the Vox weapons

2017-04-01 22:41:46 -05:00

gun.dm

Updates Tools

2017-08-03 04:49:23 -04:00

projectile.dm

work

2017-09-04 21:52:47 -04:00