PsiOmega 659b07415d Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm

2015-07-26 10:00:12 +02:00

..

changeling_powers.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-07-26 10:00:12 +02:00

changeling.dm

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

modularchangling.dm

Fixes #4495.

2014-05-05 16:14:59 +09:30