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

# Conflicts:
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi

2017-05-12 13:06:10 -04:00

..

ammunition

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

2017-04-13 19:43:56 -04:00

guns

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

2017-05-12 13:06:10 -04:00

projectile

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

targeting

Aiming at someone is now logged

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

ammunition.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

dnalocking.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

effects.dm

Tweaks the Vox weapons

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

gun.dm

Merge pull request #3377 from LorenLuke/PointBlankAim

2017-04-29 10:42:22 -05:00

projectile.dm

Makes Technomancer use modifiers, fixes a few bugs

2017-04-28 16:27:51 -04:00