Cheridan 957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet ...

Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi

2015-06-22 22:57:53 -05:00

..

ammunition

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

2015-06-22 22:57:53 -05:00

guns

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

2015-06-22 22:57:53 -05:00

projectile

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

2015-06-22 22:57:53 -05:00

ammunition.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

2015-04-24 20:50:50 +03:00

firing.dm

Fix reagent garbage collection hopefully

2015-03-14 16:52:49 -07:00

gun.dm

Pray pray pray

2015-06-18 18:07:57 +01:00

pins.dm

Pray pray pray

2015-06-18 18:07:57 +01:00

projectile.dm

Pray pray pray

2015-06-18 18:07:57 +01:00