Neerti 3c92193bf5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance ...

# Conflicts resolved:
#	code/modules/projectiles/projectile/beams.dm

2016-04-20 05:41:36 -04:00

..

energy

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance

2016-04-20 05:41:36 -04:00

launcher

Removed the Vox Pox.

2016-02-20 11:24:19 +10:30

projectile

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance

2016-04-20 05:41:36 -04:00

alien.dm

Spike regen rate changed

2016-04-07 16:38:42 -05:00

energy.dm

Fixing some infinite loops in gun update_icon() calls.

2016-01-22 04:27:00 +10:30

launcher.dm

Muzzle-flash lighting effect for guns

2015-05-03 12:19:11 +10:00

projectile.dm

Porting forensics from Aurora.

2015-12-10 19:16:28 +10:30