Leshana 6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync ...

# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme

2017-04-01 19:19:42 -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

Wooden circlets can now be worn as hats

2017-04-01 15:31:06 -05: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