Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055

[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -665,7 +665,7 @@
 
 /obj/item/circuitboard/machine/circuit_imprinter
 	name = "Circuit Imprinter (Machine Board)"
-	build_path = /obj/machinery/rnd/circuit_imprinter
+	build_path = /obj/machinery/rnd/production/circuit_imprinter
 	req_components = list(
 		/obj/item/stock_parts/matter_bin = 1,
 		/obj/item/stock_parts/manipulator = 1,
@@ -673,11 +673,11 @@
 
 /obj/item/circuitboard/machine/circuit_imprinter/department
 	name = "Departmental Circuit Imprinter (Machine Board)"
-	build_path = /obj/machinery/rnd/circuit_imprinter/department
+	build_path = /obj/machinery/rnd/production/circuit_imprinter/department
 
 /obj/item/circuitboard/machine/circuit_imprinter/department/science
 	name = "Departmental Circuit Imprinter - Science (Machine Board)"
-	build_path = /obj/machinery/rnd/circuit_imprinter/department/science
+	build_path = /obj/machinery/rnd/production/circuit_imprinter/department/science
 
 /obj/item/circuitboard/machine/destructive_analyzer
 	name = "Destructive Analyzer (Machine Board)"
@@ -697,7 +697,7 @@
 
 /obj/item/circuitboard/machine/protolathe
 	name = "Protolathe (Machine Board)"
-	build_path = /obj/machinery/rnd/protolathe
+	build_path = /obj/machinery/rnd/production/protolathe
 	req_components = list(
 		/obj/item/stock_parts/matter_bin = 2,
 		/obj/item/stock_parts/manipulator = 2,
@@ -705,31 +705,67 @@
 
 /obj/item/circuitboard/machine/protolathe/department
 	name = "Departmental Protolathe (Machine Board)"
-	build_path = /obj/machinery/rnd/protolathe/department
+	build_path = /obj/machinery/rnd/production/protolathe/department
 
 /obj/item/circuitboard/machine/protolathe/department/cargo
 	name = "Departmental Protolathe (Machine Board) - Cargo"
-	build_path = /obj/machinery/rnd/protolathe/department/cargo
+	build_path = /obj/machinery/rnd/production/protolathe/department/cargo
 
 /obj/item/circuitboard/machine/protolathe/department/engineering
 	name = "Departmental Protolathe (Machine Board) - Engineering"
-	build_path = /obj/machinery/rnd/protolathe/department/engineering
+	build_path = /obj/machinery/rnd/production/protolathe/department/engineering
 
 /obj/item/circuitboard/machine/protolathe/department/medical
 	name = "Departmental Protolathe (Machine Board) - Medical"
-	build_path = /obj/machinery/rnd/protolathe/department/medical
+	build_path = /obj/machinery/rnd/production/protolathe/department/medical
 
 /obj/item/circuitboard/machine/protolathe/department/science
 	name = "Departmental Protolathe (Machine Board) - Science"
-	build_path = /obj/machinery/rnd/protolathe/department/science
+	build_path = /obj/machinery/rnd/production/protolathe/department/science
 
 /obj/item/circuitboard/machine/protolathe/department/security
 	name = "Departmental Protolathe (Machine Board) - Security"
-	build_path = /obj/machinery/rnd/protolathe/department/security
+	build_path = /obj/machinery/rnd/production/protolathe/department/security
 
 /obj/item/circuitboard/machine/protolathe/department/service
 	name = "Departmental Protolathe - Service (Machine Board)"
-	build_path = /obj/machinery/rnd/protolathe/department/service
+	build_path = /obj/machinery/rnd/production/protolathe/department/service
+
+/obj/item/circuitboard/machine/techfab
+	name = "\improper Techfab (Machine Board)"
+	build_path = /obj/machinery/rnd/production/techfab
+	req_components = list(
+		/obj/item/stock_parts/matter_bin = 2,
+		/obj/item/stock_parts/manipulator = 2,
+		/obj/item/reagent_containers/glass/beaker = 2)
+
+/obj/item/circuitboard/machine/techfab/department
+	name = "\improper Departmental Techfab (Machine Board)"
+	build_path = /obj/machinery/rnd/production/techfab/department
+
+/obj/item/circuitboard/machine/techfab/department/cargo
+	name = "\improper Departmental Techfab (Machine Board) - Cargo"
+	build_path = /obj/machinery/rnd/production/techfab/department/cargo
+
+/obj/item/circuitboard/machine/techfab/department/engineering
+	name = "\improper Departmental Techfab (Machine Board) - Engineering"
+	build_path = /obj/machinery/rnd/production/techfab/department/engineering
+
+/obj/item/circuitboard/machine/techfab/department/medical
+	name = "\improper Departmental Techfab (Machine Board) - Medical"
+	build_path = /obj/machinery/rnd/production/techfab/department/medical
+
+/obj/item/circuitboard/machine/techfab/department/science
+	name = "\improper Departmental Techfab (Machine Board) - Science"
+	build_path = /obj/machinery/rnd/production/techfab/department/science
+
+/obj/item/circuitboard/machine/techfab/department/security
+	name = "\improper Departmental Techfab (Machine Board) - Security"
+	build_path = /obj/machinery/rnd/production/techfab/department/security
+
+/obj/item/circuitboard/machine/techfab/department/service
+	name = "\improper Departmental Techfab - Service (Machine Board)"
+	build_path = /obj/machinery/rnd/production/techfab/department/service
 
 /obj/item/circuitboard/machine/rdserver
 	name = "R&D Server (Machine Board)"

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -18,4 +18,4 @@
 	new /obj/item/clothing/head/soft(src)
 	new /obj/item/device/export_scanner(src)
 	new /obj/item/door_remote/quartermaster(src)
-	new /obj/item/circuitboard/machine/protolathe/department/cargo(src)
+	new /obj/item/circuitboard/machine/techfab/department/cargo(src)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -27,7 +27,7 @@
 	new /obj/item/door_remote/chief_engineer(src)
 	new /obj/item/pipe_dispenser(src)
 	new /obj/item/inducer(src)
-	new /obj/item/circuitboard/machine/protolathe/department/engineering(src)
+	new /obj/item/circuitboard/machine/techfab/department/engineering(src)
 
 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "electrical supplies locker"

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -75,7 +75,7 @@
 	new /obj/item/clothing/neck/petcollar(src)
 	new /obj/item/pet_carrier(src)
 	new /obj/item/wallframe/defib_mount(src)
-	new /obj/item/circuitboard/machine/protolathe/department/medical(src)
+	new /obj/item/circuitboard/machine/techfab/department/medical(src)
 
 /obj/structure/closet/secure_closet/animal
 	name = "animal control"

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -25,4 +25,4 @@
 	new /obj/item/device/laser_pointer(src)
 	new /obj/item/door_remote/research_director(src)
 	new /obj/item/storage/box/firingpins(src)
-	new /obj/item/circuitboard/machine/protolathe/department/science(src)
+	new /obj/item/circuitboard/machine/techfab/department/science(src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -57,7 +57,7 @@
 	new /obj/item/clothing/neck/petcollar(src)
 	new /obj/item/pet_carrier(src)
 	new /obj/item/door_remote/civillian(src)
-	new /obj/item/circuitboard/machine/protolathe/department/service(src)
+	new /obj/item/circuitboard/machine/techfab/department/service(src)
 
 /obj/structure/closet/secure_closet/hos
 	name = "\proper head of security's locker"
@@ -89,7 +89,7 @@
 	new /obj/item/gun/energy/e_gun/hos(src)
 	new /obj/item/device/flashlight/seclite(src)
 	new /obj/item/pinpointer/nuke(src)
-	new /obj/item/circuitboard/machine/protolathe/department/security(src)
+	new /obj/item/circuitboard/machine/techfab/department/security(src)
 
 /obj/structure/closet/secure_closet/warden
 	name = "\proper warden's locker"