shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6478 from Citadel-Station-13/upstream-merge-37315

Browse Source 
[MIRROR] Gives beer and soda dispensers their own circuitboards and Design ID's
This commit is contained in:
LetterJay
2018-04-22 22:22:03 -05:00
committed by GitHub
parent de2ab536d1 282857aa04
commit fb267270ec
4 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/circuitboards/machine_circuitboards.dm
+8
View File
@@ -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
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+2
View File
@@ -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",
code/modules/research/designs/machine_designs.dm
+16
View File
@@ -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."
code/modules/research/techweb/all_nodes.dm
+1 -1
View File
@@ -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