Merge branch 'master' into prefs-update

This commit is contained in:
BongaTheProto
2022-05-28 02:06:44 -05:00
12 changed files with 388 additions and 319 deletions
@@ -295,6 +295,7 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \
GLOBAL_LIST_INIT(titanium_recipes, list ( \
new/datum/stack_recipe("titanium tile", /obj/item/stack/tile/mineral/titanium, 1, 4, 20), \
new/datum/stack_recipe("titanic ingot", /obj/item/ingot/titanium, 6, time = 100), \
new/datum/stack_recipe("shuttle seat", /obj/structure/chair/comfy/shuttle, 2, one_per_turf = TRUE, on_floor = TRUE), \
))
/obj/item/stack/sheet/mineral/titanium/get_main_recipes()