From 0cc06cf6eccfc6a3c3b0955138e7ad47e8af7448 Mon Sep 17 00:00:00 2001 From: Watermelon914 <37270891+Watermelon914@users.noreply.github.com> Date: Sat, 9 Oct 2021 12:31:15 +0100 Subject: [PATCH] Fixed dispenser and new circuit list components not being available (#61960) Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com> Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> --- .../research/designs/wiremod_designs.dm | 23 +++++++++++++++++++ code/modules/research/techweb/all_nodes.dm | 3 +++ code/modules/wiremod/shell/dispenser.dm | 2 +- code/modules/wiremod/shell/shell_items.dm | 5 ++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/code/modules/research/designs/wiremod_designs.dm b/code/modules/research/designs/wiremod_designs.dm index 620882e14b1..cd349dee038 100644 --- a/code/modules/research/designs/wiremod_designs.dm +++ b/code/modules/research/designs/wiremod_designs.dm @@ -291,6 +291,17 @@ id = "comp_counter_overlay" build_path = /obj/item/circuit_component/counter_overlay +/datum/design/component/foreach + name = "For Each Component" + id = "comp_foreach" + build_path = /obj/item/circuit_component/foreach + +/datum/design/component/filter_list + name = "Filter List Component" + id = "comp_filter_list" + build_path = /obj/item/circuit_component/foreach + + /datum/design/compact_remote_shell name = "Compact Remote Shell" desc = "A handheld shell with one big button." @@ -383,6 +394,18 @@ build_type = PROTOLATHE | COMPONENT_PRINTER category = list("Circuitry", "Shells") +/datum/design/dispenser_shell + name = "Dispenser Shell" + desc = "A dispenser shell that can dispense items." + id = "dispenser_shell" + materials = list( + /datum/material/glass = 5000, + /datum/material/iron = 15000, + ) + build_path = /obj/item/shell/dispenser + build_type = PROTOLATHE | COMPONENT_PRINTER + category = list("Circuitry", "Shells") + /datum/design/bci_shell name = "Brain-Computer Interface Shell" desc = "An implant that can be placed in a user's head to control circuits using their brain." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 7a2beb9f796..b76496f42b1 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -206,6 +206,8 @@ "comp_concat_list", "comp_delay", "comp_direction", + "comp_filter_list", + "comp_foreach", "comp_get_column", "comp_gps", "comp_health", @@ -673,6 +675,7 @@ design_ids = list( "bot_shell", "controller_shell", + "dispenser_shell", "door_shell", "gun_shell", "money_bot_shell", diff --git a/code/modules/wiremod/shell/dispenser.dm b/code/modules/wiremod/shell/dispenser.dm index 6c41cff47cd..a6aaeb4070e 100644 --- a/code/modules/wiremod/shell/dispenser.dm +++ b/code/modules/wiremod/shell/dispenser.dm @@ -6,7 +6,7 @@ /obj/structure/dispenser_bot name = "dispenser" icon = 'icons/obj/wiremod.dmi' - icon_state = "setup_large" + icon_state = "setup_drone_arms" density = FALSE light_system = MOVABLE_LIGHT diff --git a/code/modules/wiremod/shell/shell_items.dm b/code/modules/wiremod/shell/shell_items.dm index 4e6673e7c86..a82a2999b91 100644 --- a/code/modules/wiremod/shell/shell_items.dm +++ b/code/modules/wiremod/shell/shell_items.dm @@ -53,6 +53,11 @@ shell_to_spawn = /obj/machinery/door/airlock/shell screw_delay = 10 SECONDS +/obj/item/shell/dispenser + name = "circuit dispenser assembly" + icon_state = "setup_drone_arms-open" + shell_to_spawn = /obj/structure/dispenser_bot + /obj/item/shell/bci name = "brain-computer interface assembly" icon_state = "bci-open"