Ccomp5950 c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

2014-02-26 09:34:38 -06:00

..

animate.dm

Fixes #3777

2013-10-16 11:21:51 +01:00

beams.dm

Added Sue's new weapon code and sprites.

2013-12-27 16:44:44 -08:00

bullets.dm

Bullet inscriptions

2014-02-09 22:52:27 +13:00

change.dm

Prevented staff of change from working on infested mobs.

2013-12-18 13:49:35 +10:30

energy.dm

Added Sue's new weapon code and sprites.

2013-12-27 16:44:44 -08:00

force.dm

Fix for embedding.

2014-02-22 10:16:55 +03:00

special.dm

Vast array of changes to replace mutantrace with species datum

2013-08-03 15:08:54 -07:00