Neerti e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 ...

Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme

2015-10-10 23:17:26 -04:00

..

drilling

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

abandonedcrates.dm

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

2015-09-11 08:38:28 +02:00

alloys.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2

2015-09-01 03:22:08 +02:00

coins.dm

…

machine_input_output_plates.dm

…

machine_processing.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

machine_stacking.dm

Removes machinedir on in machine_processing.dm and machine_stacking.dm

2015-07-07 18:43:59 -04:00

machine_unloading.dm

…

mine_items.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

mine_turfs.dm

Hopefully fixes some bugs that came out of that merge.

2015-09-06 20:00:01 -04:00

mineral_effect.dm

…

mint.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

money_bag.dm

…

ore_datum.dm

…

ore.dm

…

satchel_ore_boxdm.dm

…