Neerti b93595c19f Merge branch 'master' into 9/4/2015_master_to_dev ...

Conflicts:
	code/game/jobs/job/security.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	maps/colony-1.dmm
	maps/colony-5.dmm

2015-09-04 08:43:37 -04:00

..

ammunition

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

guns

Merge branch 'master' into 9/4/2015_master_to_dev

2015-09-04 08:43:37 -04:00

projectile

Adds changelog and tweaks PTR penetration.

2015-08-15 02:19:23 -04:00

ammunition.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

effects.dm

Projectile visual bug fixes

2015-07-11 00:06:44 +12:00

gun.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-13 08:40:31 +03:00

projectile.dm

Merge pull request #10184 from mwerezak/projectile-cleanup

2015-08-13 07:26:58 +03:00

targeting.dm

fixes #8391

2015-07-09 13:23:13 -07:00