Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge ...

Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme

2015-11-06 17:41:18 -05:00

..

material_recipes.dm

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

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

material_sheets.dm

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

2015-10-14 08:41:38 +02:00

material_synth.dm

Changes reinforced glass material name

2015-08-03 23:01:34 -04:00

materials.dm

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

2015-10-14 08:41:38 +02:00