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

Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm

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

..

beams.dm

Revert "Introduces the new taser. "

2016-03-26 23:01:18 +03:00

bullets.dm

Fixes syringe gun chem reactions

2016-04-21 18:49:22 -07:00

energy.dm

First commit of this big PR

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

magic.dm

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

2016-03-30 22:55:00 -06:00

reusable.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

special.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00