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

2014-12-31 20:22:32 +00:00

..

energy

SubSystem rewrite

2014-12-31 13:25:41 +00:00

magic

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

projectile

Fixes shortening barrel: only live chambered ammo goes off in your face; the gun goes off even if not in your hand; when blowing up "you fire the X" message won't show up anymore.

2014-12-31 12:04:39 +01:00

energy.dm

* fixes #3765 (shotguns sawing off)

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

magic.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

projectile.dm

* fixes #3765 (shotguns sawing off)

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