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

# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml

2017-04-25 15:04:54 -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

Finished coding makeshift armor.

2017-04-18 03:16:10 -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 #3328 from Neerti/3/14/2017_makeshift_armor

2017-04-19 10:13:20 -05:00