PsiOmega d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml

2015-05-30 16:11:57 +02:00

..

material_recipes.dm

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

material_sheets.dm

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

2015-05-30 16:11:57 +02:00

material_synth.dm

Bit of documentation.

2015-05-20 14:00:14 +09:30

materials.dm

Updates to properly DA materials

2015-05-23 15:21:11 +03:00