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

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/species/akula/mask_vr.dmi
#	icons/mob/species/fennec/mask_vr.dmi
#	icons/mob/species/fox/mask_vr.dmi
#	icons/mob/species/nevrean/mask_vr.dmi
#	icons/mob/species/vulpkanin/mask.dmi
#	icons/mob/vore/taurs_vr.dmi

2017-10-03 19:04:51 -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-10-03 19:04:51 -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