Repede 2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

2018-06-23 17:53:13 -04:00

..

animate.dm

More projectiles now ignite things

2018-03-11 15:47:48 -05:00

arc.dm

Merge pull request #5359 from Anewbe/arc_projectiles

2018-06-17 15:58:50 -04:00

beams_vr.dm

…

beams.dm

More projectiles now ignite things

2018-03-11 15:47:48 -05:00

bullets_vr.dm

…

bullets.dm

44 revolvers

2018-03-26 14:33:43 -07:00

change.dm

More projectiles now ignite things

2018-03-11 15:47:48 -05:00

energy_vr.dm

…

energy_yw.dm

blueshield, more clothes/vests, more weapons, phorochem fixes,

2018-06-11 21:27:11 -04:00

energy.dm

More Phase Guns

2018-06-17 13:35:54 -04:00

force.dm

More projectiles now ignite things

2018-03-11 15:47:48 -05:00

magnetic.dm

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

special.dm

Ion Rifle returned to original radius. (#5326)

2018-06-04 16:13:45 -04:00