From ac6bcbe737613de4517e02e941f106d04f7ffa0f Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 23 Dec 2023 15:20:21 +0100 Subject: [PATCH] [MIRROR] Engineering autolathe now prints engi inducers instead of science ones + boosts recharge rate of sci-printed inducers [MDB IGNORE] (#25795) * Engineering autolathe now prints engi inducers instead of science ones + boosts recharge rate of sci-printed inducers (#80126) ## About The Pull Request Allows engineering to print/order engi inducers instead of science ones. They have their own type of inducer, so its weird that the amount of them is finite. ## Why It's Good For The Game I thought this was the case when I made my crossbow PR, and it only is craftable with an engineering one. Turns out engineering quickly ran out of inducers to make them with since they only get three. Oops. As for the science inducer charge buff, around half of my 400ish hours in ss13 is engi, and not once have I been asked by a scientist if they could have a better inducer. 500 charge vs 1000 charge is only a change of clicking an apc again and waiting an extra second. Plus, the reason I picked inducers as the item that the crossbow required in the first place is that 95% of rounds they never once moved from the closet (and people most certainly open said closet, since the insuls are almost always gone.) ## Changelog :cl: qol: Engineering now can print/order engi inducers instead of science's purple ones. bal: Sci inducers now recharge 1000 charge per go, just like engi ones do. /:cl: --------- Co-authored-by: Jacquerel Co-authored-by: san7890 * Engineering autolathe now prints engi inducers instead of science ones + boosts recharge rate of sci-printed inducers --------- Co-authored-by: KingkumaArt <69398298+KingkumaArt@users.noreply.github.com> Co-authored-by: Jacquerel Co-authored-by: san7890 --- code/game/objects/items/inducer.dm | 9 ++++++++- code/modules/cargo/packs/engineering.dm | 2 +- code/modules/research/designs/power_designs.dm | 14 +++++++++++++- code/modules/research/techweb/all_nodes.dm | 1 + 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm index f6ed89a870f..35c73a8cb95 100644 --- 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 index ae03ffb0190..446da624e13 100644 --- 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 index ea617f36428..80844562eb4 100644 --- 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 index 733cd707578..da0e0748152 100644 --- 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",