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

Conflicts:
	_maps/map_files/generic/z2.dmm
	code/_globalvars/lists/mapping.dm

2015-01-06 12:17:29 +08:00

..

ammunition

PulseRifleVarients+ArmouryRooms+FixesAndRefinements

2015-01-01 13:33:23 +08:00

guns

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

2015-01-06 12:17:29 +08: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

Fixed a typo that can prevent gun firing message from appearing.

2015-01-02 17:51:34 +01:00

projectile.dm

Merge pull request #6207 from phil235/RecursiveHearVisibleMessage

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