From beb3896d9825ff40102b2a2632616beb0036d32e Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 10 Mar 2021 14:07:33 -0500 Subject: [PATCH 1/2] Fixes Industrial Expansion --- code/game/mecha/mech_fabricator.dm | 10 ++++++++++ code/modules/research/circuitprinter.dm | 10 ++++++++++ code/modules/research/protolathe.dm | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index fe8ec5876d9..887faa338e0 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -83,6 +83,16 @@ /obj/machinery/mecha_part_fabricator/Initialize() . = ..() + +// Go through all materials, and add them to the possible storage, but hide them unless we contain them. + for(var/Name in name_to_material) + if(Name in materials) + continue + + hidden_materials |= Name + + materials[Name] = 0 + default_apply_parts() files = new /datum/research(src) //Setup the research data holder. diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index d0aaebb7d89..d419829babb 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -26,6 +26,16 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). /obj/machinery/r_n_d/circuit_imprinter/Initialize() . = ..() + + spawn() // Go through all materials, and add them to the possible storage, but hide them unless we contain them. + for(var/Name in name_to_material) + if(Name in materials) + continue + + hidden_materials |= Name + + materials[Name] = 0 + default_apply_parts() /obj/machinery/r_n_d/circuit_imprinter/process() diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 031fe074b1b..97a8274391e 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -40,6 +40,16 @@ /obj/machinery/r_n_d/protolathe/Initialize() . = ..() + +// Go through all materials, and add them to the possible storage, but hide them unless we contain them. + for(var/Name in name_to_material) + if(Name in materials) + continue + + hidden_materials |= Name + + materials[Name] = 0 + default_apply_parts() /obj/machinery/r_n_d/protolathe/process() From c63e3521d938fe6d92210b2bca87743765f58090 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 10 Mar 2021 14:17:01 -0500 Subject: [PATCH 2/2] Mech fabricator does not have hidden materials. --- code/game/mecha/mech_fabricator.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 887faa338e0..4a3a105e9af 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -89,8 +89,6 @@ if(Name in materials) continue - hidden_materials |= Name - materials[Name] = 0 default_apply_parts()