Leshana f93141d7d3 Merge remote-tracking branch 'polaris/master' ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	vorestation.dme

2017-03-22 20:08:29 -04: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

Continues work on the surface map

2017-03-21 16:11:13 -04:00

material_sheets.dm

More stuff, finalizes it I hope.

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

material_synth.dm

Changes reinforced glass material name

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

materials_vr.dm

Flesh Turfs

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

materials.dm

Merge pull request #3118 from Neerti/3/6/2017_surface_map

2017-03-22 16:33:40 -05:00