Merge pull request #3858 from deathride58/boxfixesandothersyncs

Map syncs with upstream + small Boxstation fixes and tweaks
This commit is contained in:
LetterJay
2017-11-09 03:18:34 -06:00
committed by GitHub
5 changed files with 6170 additions and 429 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