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

..

recipe_dump.dm

Fix flour!!!

2017-03-13 18:01:29 -04:00

recipes_microwave_vr.dm

Changes a couple new recipes

2017-03-13 14:59:33 -04:00

recipes_microwave.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2

2017-03-22 17:29:01 -05:00