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

..

energy

Tesla Revolver

2016-04-23 13:55:03 -05:00

magic

Slowed recharge

2016-04-16 23:11:25 -04:00

projectile

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

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

energy.dm

Dual Wield

2015-12-20 00:22:35 -06:00

grenade_launcher.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

magic.dm

Defines

2016-03-02 00:23:50 +03:00

medbeam.dm

Mining Balance

2016-03-28 06:30:26 -05:00

mounted.dm

Defines

2016-03-02 00:23:50 +03:00

projectile.dm

fixes being able to grind guns with an autolathe

2016-03-30 17:03:43 -07:00

syringe_gun.dm

Dual Wield

2015-12-20 00:22:35 -06:00