From e8698ab798b43bc8dccd86fc5d573f48c2fc7c8e Mon Sep 17 00:00:00 2001 From: iksyp <33264221+iskyp@users.noreply.github.com> Date: Sun, 22 Apr 2018 17:20:06 -0700 Subject: [PATCH] Gives beer and soda dispensers their own circuitboards and Design ID's (#37315) * new boards * new boards installed * new designs (wow) (woah) * added the new design ids to the biotech node * tested it works, also, that typo fucking stopped it from compiling --- .../items/circuitboards/machine_circuitboards.dm | 8 ++++++++ .../chemistry/machinery/chem_dispenser.dm | 2 ++ code/modules/research/designs/machine_designs.dm | 16 ++++++++++++++++ code/modules/research/techweb/all_nodes.dm | 2 +- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 82c307d8e5..8caa0407d1 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -610,6 +610,14 @@ def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high) needs_anchored = FALSE +/obj/item/circuitboard/machine/chem_dispenser/drinks + name = "Soda Dispenser (Machine Board)" + build_path = /obj/machinery/chem_dispenser/drinks + +/obj/item/circuitboard/machine/chem_dispenser/drinks/beer + name = "Booze Dispenser (Machine Board)" + build_path = /obj/machinery/chem_dispenser/drinks/beer + /obj/item/circuitboard/machine/smoke_machine name = "Smoke Machine (Machine Board)" build_path = /obj/machinery/smoke_machine diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index e02a228178..02d6bb9152 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -413,6 +413,7 @@ obj/machinery/chem_dispenser/proc/work_animation() amount = 10 pixel_y = 6 layer = WALL_OBJ_LAYER + circuit = /obj/item/circuitboard/machine/chem_dispenser/drinks working_state = null nopower_state = null dispensable_reagents = list( @@ -450,6 +451,7 @@ obj/machinery/chem_dispenser/proc/work_animation() anchored = TRUE icon = 'icons/obj/chemical.dmi' icon_state = "booze_dispenser" + circuit = /obj/item/circuitboard/machine/chem_dispenser/drinks/beer dispensable_reagents = list( "beer", "kahlua", diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 2ab19c4d83..330b6f57a1 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -330,6 +330,22 @@ category = list ("Misc. Machinery") departmental_flags = DEPARTMENTAL_FLAG_SERVICE +/datum/design/board/soda_dispenser + name = "Machine Design (Portable Soda Dispenser Board)" + desc = "The circuit board for a portable soda dispenser." + id = "soda_dispenser" + build_path = /obj/item/circuitboard/machine/chem_dispenser/drinks + departmental_flags = DEPARTMENTAL_FLAG_SERVICE + category = list ("Misc. Machinery") + +/datum/design/board/beer_dispenser + name = "Machine Design (Portable Booze Dispenser Board)" + desc = "The circuit board for a portable booze dispenser." + id = "beer_dispenser" + build_path = /obj/item/circuitboard/machine/chem_dispenser/drinks/beer + departmental_flags = DEPARTMENTAL_FLAG_SERVICE + category = list ("Misc. Machinery") + /datum/design/board/slimeprocessor name = "Machine Design (Slime Processor Board)" desc = "The circuit board for a slime processor." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 24dee05559..881211ea83 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -18,7 +18,7 @@ display_name = "Biological Technology" description = "What makes us tick." //the MC, silly! prereq_ids = list("base") - design_ids = list("chem_heater", "chem_master", "chem_dispenser", "sleeper", "pandemic", "defibmount", "operating") + design_ids = list("chem_heater", "chem_master", "chem_dispenser", "sleeper", "pandemic", "defibmount", "operating", "soda_dispenser", "beer_dispenser") research_cost = 2500 export_price = 5000