Merge branch 'master' of https://github.com/PolarisSS13/Polaris into FishingFtWorldServer

This commit is contained in:
Mechoid
2019-05-03 21:44:53 -07:00
344 changed files with 11620 additions and 7580 deletions
@@ -89,6 +89,12 @@
recipes += new/datum/stack_recipe("small light fixture frame", /obj/item/frame/light/small, 1)
recipes += new/datum/stack_recipe("floor lamp fixture frame", /obj/machinery/light_construct/flamp, 2)
recipes += new/datum/stack_recipe("apc frame", /obj/item/frame/apc, 2)
recipes += new/datum/stack_recipe_list("modular computer frames", list( \
new/datum/stack_recipe("modular console frame", /obj/item/modular_computer/console, 20),\
new/datum/stack_recipe("modular telescreen frame", /obj/item/modular_computer/telescreen, 10),\
new/datum/stack_recipe("modular laptop frame", /obj/item/modular_computer/laptop, 10),\
new/datum/stack_recipe("modular tablet frame", /obj/item/modular_computer/tablet, 5),\
))
recipes += new/datum/stack_recipe_list("filing cabinets", list( \
new/datum/stack_recipe("filing cabinet", /obj/structure/filingcabinet, 4, time = 20, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("tall filing cabinet", /obj/structure/filingcabinet/filingcabinet, 4, time = 20, one_per_turf = 1, on_floor = 1), \