Razharas 10b21b20ab Conflicts resolution ...

In items weapons melee misc

2014-12-29 11:49:30 +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

Merge pull request #6608 from paprka/disablerrebuff

2014-12-29 01:12:52 -03: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