Merge pull request #3 from GalacticStation/upstream-merge-80126

[MIRROR] Engineering autolathe now prints engi inducers instead of science ones + boosts recharge rate of sci-printed inducers
ss220-space · Dec 23, 2023 · a55eca1 · a55eca1
2 parents 90b3823 + 897f234
commit a55eca1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm
@@ -172,12 +172,19 @@
 		return
 	. += "inducer-[cell ? "bat" : "nobat"]"
 
+/obj/item/inducer/empty
+	cell_type = null
+	opened = TRUE
+
+/obj/item/inducer/orderable
+	cell_type = /obj/item/stock_parts/cell/inducer_supply
+	opened = FALSE
+
 /obj/item/inducer/sci
 	icon_state = "inducer-sci"
 	inhand_icon_state = "inducer-sci"
 	desc = "A tool for inductively charging internal power cells. This one has a science color scheme, and is less potent than its engineering counterpart."
 	cell_type = null
-	powertransfer = 500
 	opened = TRUE
 
 /obj/item/inducer/sci/Initialize(mapload)

diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm
@@ -73,7 +73,7 @@
 	desc = "No rechargers? No problem, with the NT-75 EPI, you can recharge any standard \
 		cell-based equipment anytime, anywhere. Contains two Inducers."
 	cost = CARGO_CRATE_VALUE * 4
-	contains = list(/obj/item/inducer/sci {cell_type = /obj/item/stock_parts/cell/inducer_supply; opened = 0} = 2) //FALSE doesn't work in modified type paths apparently.
+	contains = list(/obj/item/inducer/orderable = 2)
 	crate_name = "inducer crate"
 	crate_type = /obj/structure/closet/crate/engineering/electrical
 

diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm
@@ -77,7 +77,19 @@
 	category = list(
 		RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING
 	)
-	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
+
+/datum/design/inducerengi
+	name = "Inducer"
+	desc = "The NT-75 Electromagnetic Power Inducer can wirelessly induce electric charge in an object, allowing you to recharge power cells without having to remove them."
+	id = "inducerengi"
+	build_type = PROTOLATHE | AWAY_LATHE
+	materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT)
+	build_path = /obj/item/inducer/empty
+	category = list(
+		RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
 
 /datum/design/board/pacman
 	name = "PACMAN Board"

diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
@@ -1115,6 +1115,7 @@
 		"holosignrestaurant",
 		"holosignbar",
 		"inducer",
+		"inducerengi",
 		"tray_goggles",
 		"holopad",
 		"vendatray",