Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06:00
parent 545ac04b78 1f7deabbfb
commit 6286f4d4c2
625 changed files with 27981 additions and 20284 deletions
@@ -274,6 +274,9 @@ GLOBAL_LIST_INIT(titanium_recipes, list ( \
 	recipes = GLOB.titanium_recipes
 	. = ..()

+/obj/item/stack/sheet/mineral/titanium/fifty
+	amount = 50
+

 /*
 * Plastitanium
@@ -93,7 +93,7 @@
 /obj/item/stack/tile/basalt
 	name = "basalt tile"
 	singular_name = "basalt floor tile"
-	desc = "Artificially made ashy soil themed on a hostile enviroment."
+	desc = "Artificially made ashy soil themed on a hostile environment."
 	icon_state = "tile_basalt"
 	origin_tech = "materials=1"
 	turf_type = /turf/open/floor/grass/fakebasalt