Razharas 76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit ...

Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts

2014-12-28 11:20:15 +03:00

..

ammunition

fixes a few bugs

2014-12-26 19:23:22 -08:00

guns

Merge pull request #6607 from paprka/aiturrets

2014-12-28 02:21:04 -03:00

projectile

disabler now makes a sound when it hits

2014-12-26 20:29:52 -08:00

ammunition.dm

* fixes #3765 (shotguns sawing off)

2014-12-21 01:35:49 +01:00

firing.dm

* fixes #3765 (shotguns sawing off)

2014-12-21 01:35:49 +01:00

gun.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit

2014-12-28 11:20:15 +03:00

projectile.dm

Merge pull request #6207 from phil235/RecursiveHearVisibleMessage

2014-12-27 13:20:50 +01:00