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

Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
	icons/obj/gun.dmi

2015-01-09 11:02:50 +08:00

..

ammunition

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

2015-01-09 11:02:50 +08:00

guns

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

2015-01-09 11:02:50 +08:00

projectile

further changes to the ranged stun system

2015-01-01 22:22:03 -08:00

ammunition.dm

further changes to the ranged stun system

2015-01-01 22:22:03 -08: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 gunchangesv2baby

2015-01-03 17:05:27 -08:00

projectile.dm

Merge pull request #6207 from phil235/RecursiveHearVisibleMessage

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