Joan Lung 179b0b532d Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur ...

Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi

2016-09-12 17:14:39 -04:00

..

ammunition

Kinetic Accelerator Overhaul

2016-08-13 18:06:28 -05:00

guns

Allows for sabre renaming. (#20367)

2016-09-13 09:05:30 +12:00

projectile

Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur

2016-09-12 17:14:39 -04:00

ammunition.dm

Adds an actual bow to the game (#19990)

2016-08-23 09:07:17 +12:00

firing.dm

pixel projectiles dream

2016-05-16 21:26:20 -05:00

gun.dm

Allows for sabre renaming. (#20367)

2016-09-13 09:05:30 +12:00

pins.dm

Gotcha

2016-06-07 13:44:54 -07:00

projectile.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00