moved shield files to folder, made circuitry for shielding gens/caps researchable, various tweaks and balances to the research requirements, made shield gens/capacitors orderable via cargo

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

baystation12.dme

@@ -11,6 +11,7 @@
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jungle"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/ShieldGen"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter"
 #define FILE_DIR "code/WorkInProgress/Susan"
 #define FILE_DIR "html"
@@ -1180,12 +1181,8 @@
 #include "code\WorkInProgress\autopsy.dm"
 #include "code\WorkInProgress\buildmode.dm"
 #include "code\WorkInProgress\explosion_particles.dm"
-#include "code\WorkInProgress\Cael_Aislinn\energy_field.dm"
-#include "code\WorkInProgress\Cael_Aislinn\external_shield_gen.dm"
 #include "code\WorkInProgress\Cael_Aislinn\meteor_battery.dm"
 #include "code\WorkInProgress\Cael_Aislinn\sculpture.dm"
-#include "code\WorkInProgress\Cael_Aislinn\shield_capacitor.dm"
-#include "code\WorkInProgress\Cael_Aislinn\shield_gen.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Economy\Accounts.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Economy\Economy.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Economy\Economy_Events.dm"
@@ -1215,6 +1212,11 @@
 #include "code\WorkInProgress\Cael_Aislinn\Rust\gyrotron_controller.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\radiation.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\virtual_particle_catcher.dm"
+#include "code\WorkInProgress\Cael_Aislinn\ShieldGen\circuits_and_designs.dm"
+#include "code\WorkInProgress\Cael_Aislinn\ShieldGen\energy_field.dm"
+#include "code\WorkInProgress\Cael_Aislinn\ShieldGen\external_shield_gen.dm"
+#include "code\WorkInProgress\Cael_Aislinn\ShieldGen\shield_capacitor.dm"
+#include "code\WorkInProgress\Cael_Aislinn\ShieldGen\shield_gen.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Supermatter\LaserComputer.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Supermatter\SuperMatter.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Supermatter\ZeroPointLaser.dm"

code/WorkInProgress/Cael_Aislinn/Rust/circuits_and_design.dm

@@ -5,15 +5,15 @@
 /obj/item/weapon/circuitboard/rust_core_control
 	name = "Circuit board (RUST core controller)"
 	build_path = "/obj/machinery/computer/rust_core_control"
-	origin_tech = "programming=4;engineering=5;power=6"
+	origin_tech = "programming=3;engineering=4"
 
 datum/design/rust_core_control
 	name = "Circuit Design (RUST core controller)"
 	desc = "Allows for the construction of circuit boards used to build a core control console for the RUST fusion engine."
 	id = "rust_core_control"
-	req_tech = list("programming" = 4, "engineering" = 5, "power" = 6)
+	req_tech = list("programming" = 3, "engineering" = 4)
 	build_type = IMPRINTER
-	materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 2000)
+	materials = list("$glass" = 2000, "sacid" = 20)
 	build_path = "/obj/item/weapon/circuitboard/rust_core_control"
 
 //////////////////////////////////////
@@ -22,30 +22,30 @@ datum/design/rust_core_control
 /obj/item/weapon/circuitboard/rust_fuel_control
 	name = "Circuit board (RUST fuel controller)"
 	build_path = "/obj/machinery/computer/rust_fuel_control"
-	origin_tech = "programming=4;engineering=5;power=6"
+	origin_tech = "programming=3;engineering=4"
 
 datum/design/rust_fuel_control
 	name = "Circuit Design (RUST fuel controller)"
 	desc = "Allows for the construction of circuit boards used to build a fuel injector control console for the RUST fusion engine."
 	id = "rust_fuel_control"
-	req_tech = list("programming" = 4, "engineering" = 5, "power" = 6)
+	req_tech = list("programming" = 3, "engineering" = 4)
 	build_type = IMPRINTER
-	materials = list("$glass" = 2000, "sacid" = 20, "$silver" = 2000)
+	materials = list("$glass" = 2000, "sacid" = 20)
 	build_path = "/obj/item/weapon/circuitboard/rust_fuel_control"
 
 //////////////////////////////////////
 // RUST Fuel Port board
 
 /obj/item/weapon/module/rust_fuel_port
-	name = "Circuit board (RUST fuel port)"
+	name = "Internal circuitry (RUST fuel port)"
 	icon_state = "card_mod"
-	origin_tech = "engineering=3;power=4"
+	origin_tech = "engineering=4;materials=5"
 
 datum/design/rust_fuel_port
-	name = "Circuit Design (RUST fuel port)"
+	name = "Internal circuitry (RUST fuel port)"
 	desc = "Allows for the construction of circuit boards used to build a fuel injection port for the RUST fusion engine."
 	id = "rust_fuel_port"
-	req_tech = list("programming" = 4, "engineering" = 5, "magnets" = 6)
+	req_tech = list("engineering" = 4, "materials" = 5)
 	build_type = IMPRINTER
 	materials = list("$glass" = 2000, "sacid" = 20, "$uranium" = 3000)
 	build_path = "/obj/item/weapon/module/rust_fuel_port"
@@ -54,15 +54,15 @@ datum/design/rust_fuel_port
 // RUST Fuel Compressor board
 
 /obj/item/weapon/module/rust_fuel_compressor
-	name = "Circuit board (RUST fuel compressor)"
+	name = "Internal circuitry (RUST fuel compressor)"
 	icon_state = "card_mod"
-	origin_tech = "power=4;engineering=5;plasmatech=6"
+	origin_tech = "materials=7;plasmatech=4"
 
 datum/design/rust_fuel_compressor
 	name = "Circuit Design (RUST fuel compressor)"
 	desc = "Allows for the construction of circuit boards used to build a fuel compressor of the RUST fusion engine."
 	id = "rust_fuel_compressor"
-	req_tech = list("power" = 4, "engineering" = 5, "plasmatech" = 6)
+	req_tech = list("materials" = 7, "plasmatech" = 4)
 	build_type = IMPRINTER
 	materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 3000, "$diamond" = 1000)
 	build_path = "/obj/item/weapon/module/rust_fuel_compressor"
@@ -71,10 +71,10 @@ datum/design/rust_fuel_compressor
 // RUST Tokamak Core board
 
 /obj/item/weapon/circuitboard/rust_core
-	name = "Circuit Design (RUST tokamak core)"
+	name = "Internal circuitry (RUST tokamak core)"
 	build_path = "/obj/machinery/power/rust_core"
 	board_type = "machine"
-	origin_tech = "bluespace=3;engineering=4;plasmatech=5;magnets=6;power=7"
+	origin_tech = "bluespace=3;plasmatech=4;magnets=5;materials=6;powerstorage=6"
 	frame_desc = "Requires 2 Pico Manipulators, 1 Ultra Micro-Laser, 5 Pieces of Cable, 1 Subspace Crystal and 1 Console Screen."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
@@ -84,10 +84,10 @@ datum/design/rust_fuel_compressor
 							"/obj/item/weapon/cable_coil" = 5)
 
 datum/design/rust_core
-	name = "Circuit board (RUST tokamak core)"
+	name = "Internal circuitry (RUST tokamak core)"
 	desc = "The circuit board that for a RUST-pattern tokamak fusion core."
 	id = "pacman"
-	req_tech = list(bluespace = 3, engineering = 4, plasmatech = 5, magnets = 6, power = 7)
+	req_tech = list(bluespace = 3, plasmatech = 4, magnets = 5, materials = 6, powerstorage = 6)
 	build_type = IMPRINTER
 	reliability_base = 79
 	materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 3000, "$diamond" = 2000)
@@ -97,10 +97,10 @@ datum/design/rust_core
 // RUST Fuel Injector board
 
 /obj/item/weapon/circuitboard/rust_injector
-	name = "Circuit Design (RUST fuel injector)"
+	name = "Internal circuitry (RUST fuel injector)"
 	build_path = "/obj/machinery/power/rust_fuel_injector"
 	board_type = "machine"
-	origin_tech = "power=3;engineering=4;plasmatech=5;magnets=6;materials=7"
+	origin_tech = "powerstorage=3;engineering=4;plasmatech=4;materials=6"
 	frame_desc = "Requires 2 Pico Manipulators, 1 Phasic Scanning Module, 1 Super Matter Bin, 1 Console Screen and 5 Pieces of Cable."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
@@ -110,10 +110,10 @@ datum/design/rust_core
 							"/obj/item/weapon/cable_coil" = 5)
 
 datum/design/rust_injector
-	name = "Circuit board (RUST tokamak core)"
+	name = "Internal circuitry (RUST tokamak core)"
 	desc = "The circuit board that for a RUST-pattern particle accelerator."
 	id = "pacman"
-	req_tech = list(power = 3, engineering = 4, plasmatech = 5, magnets = 6, materials = 7)
+	req_tech = list(powerstorage = 3, engineering = 4, plasmatech = 4, materials = 6)
 	build_type = IMPRINTER
 	reliability_base = 79
 	materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 3000, "$uranium" = 2000)

code/WorkInProgress/Cael_Aislinn/ShieldGen/circuits_and_designs.dm

@@ -0,0 +1,52 @@
+
+////////////////////////////////////////
+// Shield Generator
+
+/obj/item/weapon/circuitboard/shield_gen
+	name = "Circuit board (Experimental shield generator)"
+	board_type = "machine"
+	build_path = "/obj/machinery/shield_gen/external"
+	origin_tech = "bluespace=4;plasmatech=3"
+	frame_desc = "Requires 2 Pico Manipulators, 1 Subspace Transmitter, 5 Pieces of cable, 1 Subspace Crystal, 1 Subspace Amplifier and 1 Console Screen."
+	req_components = list(
+							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
+							"/obj/item/weapon/stock_parts/subspace/transmitter" = 1,
+							"/obj/item/weapon/stock_parts/subspace/crystal" = 1,
+							"/obj/item/weapon/stock_parts/subspace/amplifier" = 1,
+							"/obj/item/weapon/stock_parts/console_screen" = 1,
+							"/obj/item/weapon/cable_coil" = 5)
+
+datum/design/shield_gen
+	name = "Circuit Design (Experimental hull shield generator)"
+	desc = "Allows for the construction of circuit boards used to build an experimental hull shield generator."
+	id = "shield_gen"
+	req_tech = list("bluespace" = 4, "plasmatech" = 3)
+	build_type = IMPRINTER
+	materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 10000, "$diamond" = 5000, "$gold" = 10000)
+	build_path = "/obj/machinery/shield_gen/external"
+
+////////////////////////////////////////
+// Shield Capacitor
+
+/obj/item/weapon/circuitboard/shield_cap
+	name = "Circuit board (Experimental shield capacitor)"
+	board_type = "machine"
+	build_path = "/obj/machinery/shield_capacitor"
+	origin_tech = "magnets=3;powerstorage=4"
+	frame_desc = "Requires 2 Pico Manipulators, 1 Subspace Filter, 5 Pieces of cable, 1 Subspace Treatment disk, 1 Subspace Analyzer and 1 Console Screen."
+	req_components = list(
+							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
+							"/obj/item/weapon/stock_parts/subspace/filter" = 1,
+							"/obj/item/weapon/stock_parts/subspace/treatment" = 1,
+							"/obj/item/weapon/stock_parts/subspace/analyzer" = 1,
+							"/obj/item/weapon/stock_parts/console_screen" = 1,
+							"/obj/item/weapon/cable_coil" = 5)
+
+datum/design/shield_cap
+	name = "Circuit Design (Experimental shield capacitor)"
+	desc = "Allows for the construction of circuit boards used to build an experimental shielding capacitor."
+	id = "shield_cap"
+	req_tech = list("magnets" = 3, "powerstorage" = 4)
+	build_type = IMPRINTER
+	materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 10000, "$diamond" = 5000, "$silver" = 10000)
+	build_path = "/obj/machinery/shield_gen/external"

code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_capacitor.dm

@@ -154,5 +154,6 @@
 	t += "Capacitor charge rate (approx): <a href='?src=\ref[src];charge_rate=[-max_charge_rate]'>\[min\]</a> <a href='?src=\ref[src];charge_rate=-1000'>\[--\]</a> <a href='?src=\ref[src];charge_rate=-100'>\[-\]</a>[charge_rate] Watts/sec <a href='?src=\ref[src];charge_rate=100'>\[+\]</a> <a href='?src=\ref[src];charge_rate=1000'>\[++\]</a> <a href='?src=\ref[src];charge_rate=[max_charge_rate]'>\[max\]</a><br>"
 	t += "<hr>"
 	t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
+
 	user << browse(t, "window=shield_capacitor;size=500x800")
 	user.machine = src

code/datums/supplypacks.dm

@@ -850,18 +850,47 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	containername = "Formalwear for the best occasions."
 	group = "Operations"
 
+/datum/supply_packs/rust_injector
+	contains = list(/obj/machinery/power/rust_fuel_injector)
+	name = "RUST fuel injector"
+	cost = 50
+	containertype = /obj/structure/largecrate
+	containername = "RUST injector crate"
+	group = "Engineering"
+	access = access_engine
+
+/datum/supply_packs/rust_compressor
+	contains = list(/obj/item/weapon/module/rust_fuel_compressor)
+	name = "RUST fuel compressor circuitry"
+	cost = 60
+	containertype = /obj/structure/closet/crate/secure
+	containername = "RUST fuel compressor circuitry"
+	group = "Engineering"
+	access = access_engine
+
 /datum/supply_packs/rust_core
 	contains = list(/obj/machinery/power/rust_core)
 	name = "RUST Tokamak Core"
 	cost = 75
 	containertype = /obj/structure/largecrate
-	containername = "RUST tokamak crate."
+	containername = "RUST tokamak crate"
 	group = "Engineering"
+	access = access_engine
 
-/datum/supply_packs/rust_injector
-	contains = list(/obj/machinery/power/rust_fuel_injector)
-	name = "RUST fuel injector"
-	cost = 40
-	containertype = /obj/structure/largecrate
-	containername = "RUST injector crate."
+/datum/supply_packs/shield_gen
+	contains = list(/obj/item/weapon/circuitboard/shield_gen)
+	name = "Experimental shield generator circuitry"
+	cost = 50
+	containertype = /obj/structure/closet/crate/secure
+	containername = "Experimental shield generator"
 	group = "Engineering"
+	access = access_ce
+
+/datum/supply_packs/shield_cap
+	contains = list(/obj/item/weapon/circuitboard/shield_cap)
+	name = "Experimental shield capacitor circuitry"
+	cost = 50
+	containertype = /obj/structure/closet/crate/secure
+	containername = "Experimental shield capacitor"
+	group = "Engineering"
+	access = access_ce