Neerti b22f44d560 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again ...

# Conflicts resolved:
#	icons/mob/modifier_effects.dmi

2018-06-15 18:28:00 -04:00

..

animate.dm

More projectiles now ignite things

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

arc.dm

Pre master pull commit

2018-06-15 18:15:24 -04:00

beams.dm

More projectiles now ignite things

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

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.dm

More projectiles now ignite things

2018-03-11 15:47:48 -05: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 15:13:10 -05:00