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

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/RandomZLevels/listeningpost.dmm
#	vorestation.dme

2017-03-26 00:20:03 -04:00

..

ammunition

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

2017-03-26 00:20:03 -04:00

guns

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

2017-03-26 00:20:03 -04:00

projectile

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

targeting

Lock-on time is now 2.5 seconds.

2017-02-11 20:05:22 -06: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

Fixes a few more Vox Toy things

2017-01-26 16:25:28 -06:00

gun.dm

Changes the formatting for attack logs for reflex shots.

2016-11-23 19:22:38 -06:00

projectile.dm

Implements the vacuum traversal part of the plasmastun

2017-01-15 17:42:05 -06:00