Leshana f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 ...

# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme

2017-03-06 20:58:38 -05:00

..

fifty_spawner_mats.dm

Replaces [stack]/fifty atoms with atoms that spawn the normal stack

2016-12-17 17:27:04 -06:00

material_recipes.dm

More stuff, finalizes it I hope.

2017-02-20 18:28:31 -05:00

material_sheets.dm

More stuff, finalizes it I hope.

2017-02-20 18:28:31 -05:00

material_synth.dm

…

materials_vr.dm

Flesh Turfs

2017-01-24 23:48:50 -03:00

materials.dm

Ports Turbolifts from Bay.

2017-03-04 21:35:00 -05:00