Kelshark 3ab70b7996 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
#	vorestation.dme

2017-10-17 08:49:37 -04:00

..

ammunition

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-10-17 08:49:37 -04:00

guns

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-10-17 08:49:37 -04:00

projectile

More merging updates

2017-09-19 23:58:40 -04:00

targeting

…

ammunition.dm

Macro Replacements. (#3574)

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

dnalocking.dm

…

effects.dm

…

gun.dm

Polaris sync

2017-08-06 19:07:17 -04:00

projectile.dm

Simple Animal Tweaks

2017-09-24 23:43:14 -04:00