Arokha Sieyes 3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync ...

# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml

2018-02-27 21:27:35 -05:00

..

fifty_spawner_mats.dm

Adds differing stack sprites

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

material_recipes_vr.dm

Make light switches constructable

2018-02-14 21:26:00 -05:00

material_recipes.dm

Flooring fixes

2018-02-24 15:31:10 -06:00

material_sheets.dm

Build igloos and snowmen (#4811)

2018-02-15 14:25:51 -06: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

Build igloos and snowmen (#4811)

2018-02-15 14:25:51 -06:00