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

# Conflicts:
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt

2017-09-23 11:40:55 -04:00

..

ammunition

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

2017-09-21 18:37:11 -04:00

guns

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

2017-09-23 11:40:55 -04:00

projectile

Polaris sync

2017-09-15 21:17:34 -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

…

effects.dm

Tweaks the Vox weapons

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

gun.dm

Polaris sync

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

projectile.dm

work

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