Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09 ...

# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#

2018-01-09 14:40:09 -05:00

..

fifty_spawner_mats.dm

Adds differing stack sprites

2017-09-28 01:04:19 -04:00

material_recipes.dm

Adds Bonfires

2018-01-05 02:35:19 -05:00

material_sheets.dm

Adds Bonfires

2018-01-05 02:35:19 -05:00

material_synth.dm

Changes reinforced glass material name

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

materials_vr.dm

Adds riding crop

2017-09-27 23:27:17 -04:00

materials.dm

Adds Bonfires

2018-01-05 02:35:19 -05:00