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

..

_defines.dm

…

cartridge_presets.dm

Revert "Replaces gaseous reagents with organic chemistry ones."

2015-07-26 22:43:40 -04:00

cartridge_spawn.dm

Spawn fixes

2015-06-02 02:24:32 +01:00

cartridge.dm

Fixes #10645

2015-08-14 23:20:10 -04:00

dispenser2.dm

Moves the energy chemical dispenser and cartridge chemical dispenser under one common object. Fixes the map due to type path changes.

2015-07-26 23:20:42 -04:00

dispenser_old.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

dispenser_presets.dm

Moves the energy chemical dispenser and cartridge chemical dispenser under one common object. Fixes the map due to type path changes.

2015-07-26 23:20:42 -04:00

supply.dm

Moves the energy chemical dispenser and cartridge chemical dispenser under one common object. Fixes the map due to type path changes.

2015-07-26 23:20:42 -04:00