phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction ...

Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm

2016-04-26 21:49:51 +02:00

..

ammunition

Honk Bullet (#16788)

2016-04-16 12:39:04 +02:00

guns

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

2016-04-26 21:49:51 +02:00

projectile

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

2016-04-24 21:22:37 +02:00

ammunition.dm

Gatling Laser

2016-04-21 20:26:13 -05:00

firing.dm

Runtime and MC crash fixes

2016-04-22 11:17:42 -05:00

gun.dm

Runtime and MC crash fixes

2016-04-22 11:17:42 -05:00

pins.dm

Fixes firing_pin not qdeling.

2016-01-17 16:06:36 +01:00

projectile.dm

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00