From ab5a7fdcbe6783157512ab50cb6932c0a3931005 Mon Sep 17 00:00:00 2001 From: Arthri <41360489+Arthri@users.noreply.github.com> Date: Mon, 30 Jun 2025 18:37:55 +0800 Subject: [PATCH] Fix technology levels of some items (#29596) * Synchronize TECH defines with /datum/tech IDs * Fix origin_tech values --------- Co-authored-by: Arthri <41360489+a@users.noreply.github.com> --- code/__DEFINES/misc_defines.dm | 6 ++--- .../objects/items/robot/robot_upgrades.dm | 2 +- code/modules/cooking/machines/deep_fryer.dm | 2 +- code/modules/cooking/machines/grill.dm | 2 +- .../cooking/machines/ice_cream_mixer.dm | 2 +- code/modules/cooking/machines/oven.dm | 2 +- code/modules/cooking/machines/stovetop.dm | 2 +- code/modules/research/research.dm | 24 +++++++++---------- .../modules/surgery/organs/organ_extractor.dm | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/code/__DEFINES/misc_defines.dm b/code/__DEFINES/misc_defines.dm index 82f8f4fc89c..3c78bf684d2 100644 --- a/code/__DEFINES/misc_defines.dm +++ b/code/__DEFINES/misc_defines.dm @@ -745,10 +745,10 @@ do { \ #define BANK_PIN_MAX 99999 /// Defines for hidden organ techs -#define TECH_MATERIAL "material" +#define TECH_MATERIAL "materials" #define TECH_ENGINEERING "engineering" -#define TECH_PLASMA "plasma" -#define TECH_POWER "power" +#define TECH_PLASMA "plasmatech" +#define TECH_POWER "powerstorage" #define TECH_BLUESPACE "bluespace" #define TECH_BIO "biotech" #define TECH_COMBAT "combat" diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index ec0d2af01c4..bdf315b867d 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -416,7 +416,7 @@ name = "executive service upgrade" desc = "An upgrade that replaces a service cyborg's Rapid Service Fabricator with a classy Executive version." icon_state = "cyborg_upgrade5" - origin_tech = "bio=2;materials=1" + origin_tech = "biotech=2;materials=1" require_module = TRUE module_type = /obj/item/robot_module/butler items_to_add = list(/obj/item/kitchen/knife/cheese) diff --git a/code/modules/cooking/machines/deep_fryer.dm b/code/modules/cooking/machines/deep_fryer.dm index 37f5e57e22f..31194bdfd93 100644 --- a/code/modules/cooking/machines/deep_fryer.dm +++ b/code/modules/cooking/machines/deep_fryer.dm @@ -126,7 +126,7 @@ build_path = /obj/machinery/cooking/deepfryer icon_state = "service" board_type = "machine" - origin_tech = list(TECH_BIO = 1) + origin_tech = "biotech=1" req_components = list( /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/micro_laser = 2, diff --git a/code/modules/cooking/machines/grill.dm b/code/modules/cooking/machines/grill.dm index 22553b5b167..6ff9de814a3 100644 --- a/code/modules/cooking/machines/grill.dm +++ b/code/modules/cooking/machines/grill.dm @@ -197,7 +197,7 @@ build_path = /obj/machinery/cooking/grill board_type = "machine" icon_state = "service" - origin_tech = list(TECH_BIO = 1) + origin_tech = "biotech=1" req_components = list( /obj/item/stock_parts/micro_laser = 2, /obj/item/stock_parts/matter_bin = 2, diff --git a/code/modules/cooking/machines/ice_cream_mixer.dm b/code/modules/cooking/machines/ice_cream_mixer.dm index 497a64ae44c..6cd3edaad24 100644 --- a/code/modules/cooking/machines/ice_cream_mixer.dm +++ b/code/modules/cooking/machines/ice_cream_mixer.dm @@ -81,7 +81,7 @@ build_path = /obj/machinery/cooking/ice_cream_mixer board_type = "machine" icon_state = "service" - origin_tech = list(TECH_BIO = 1) + origin_tech = "biotech=1" req_components = list( /obj/item/stock_parts/micro_laser = 2, /obj/item/stock_parts/capacitor = 1, diff --git a/code/modules/cooking/machines/oven.dm b/code/modules/cooking/machines/oven.dm index 614635982d8..38cc330aa35 100644 --- a/code/modules/cooking/machines/oven.dm +++ b/code/modules/cooking/machines/oven.dm @@ -158,7 +158,7 @@ build_path = /obj/machinery/cooking/oven board_type = "machine" icon_state = "service" - origin_tech = list(TECH_BIO = 1) + origin_tech = "biotech=1" req_components = list( /obj/item/stack/cable_coil = 5, /obj/item/stack/sheet/glass = 1, diff --git a/code/modules/cooking/machines/stovetop.dm b/code/modules/cooking/machines/stovetop.dm index d4ef431f654..0a2e5bd0637 100644 --- a/code/modules/cooking/machines/stovetop.dm +++ b/code/modules/cooking/machines/stovetop.dm @@ -127,7 +127,7 @@ build_path = /obj/machinery/cooking/stovetop board_type = "machine" icon_state = "service" - origin_tech = list(TECH_BIO = 1) + origin_tech = "biotech=1" req_components = list( /obj/item/stock_parts/micro_laser = 2, /obj/item/stock_parts/capacitor = 1, diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index f5f9b94d74c..e8e06cb19d7 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -278,21 +278,21 @@ research holder datum. /datum/tech/materials name = "Materials Research" desc = "Development of new and improved materials." - id = "materials" + id = TECH_MATERIAL max_level = 7 ui_icon = "layer-group" /datum/tech/engineering name = "Engineering Research" desc = "Development of new and improved engineering parts and methods." - id = "engineering" + id = TECH_ENGINEERING max_level = 7 ui_icon = "tools" /datum/tech/plasmatech name = "Plasma Research" desc = "Research into the mysterious substance colloqually known as 'plasma'." - id = "plasmatech" + id = TECH_PLASMA max_level = 7 rare = 3 ui_icon = "fire" @@ -300,14 +300,14 @@ research holder datum. /datum/tech/powerstorage name = "Power Manipulation Technology" desc = "The various technologies behind the storage and generation of electicity." - id = "powerstorage" + id = TECH_POWER max_level = 7 ui_icon = "bolt" /datum/tech/bluespace name = "'Bluespace' Research" desc = "Research into the sub-reality known as 'bluespace'." - id = "bluespace" + id = TECH_BLUESPACE max_level = 7 rare = 2 ui_icon = "gem" @@ -315,28 +315,28 @@ research holder datum. /datum/tech/biotech name = "Biological Technology" desc = "Research into the deeper mysteries of life and organic substances." - id = "biotech" + id = TECH_BIO max_level = 7 ui_icon = "seedling" /datum/tech/combat name = "Combat Systems Research" desc = "The development of offensive and defensive systems." - id = "combat" + id = TECH_COMBAT max_level = 7 ui_icon = "shield-alt" /datum/tech/magnets name = "Electromagnetic Spectrum Research" desc = "Research into the electromagnetic spectrum. No clue how they actually work, though." - id = "magnets" + id = TECH_MAGNETS max_level = 7 ui_icon = "magnet" /datum/tech/programming name = "Data Theory Research" desc = "The development of new computer and artificial intelligence and data storage systems." - id = "programming" + id = TECH_PROGRAM max_level = 7 ui_icon = "server" @@ -344,7 +344,7 @@ research holder datum. /datum/tech/toxins name = "Toxins Research" desc = "Research into plasma based explosive devices. Upgrade through testing explosives in the toxins lab." - id = "toxins" + id = TECH_TOXINS max_level = 7 rare = 2 ui_icon = "explosion" @@ -352,7 +352,7 @@ research holder datum. /datum/tech/syndicate name = "Illegal Technologies Research" desc = "The study of technologies that violate standard Nanotrasen regulations." - id = "syndicate" + id = TECH_SYNDICATE max_level = 0 // Don't count towards maxed research, since it's illegal. rare = 4 ui_icon = "user-astronaut" @@ -360,7 +360,7 @@ research holder datum. /datum/tech/abductor name = "Alien Technologies Research" desc = "The study of technologies used by the advanced alien race known as Abductors." - id = "abductor" + id = TECH_ABDUCTOR rare = 5 level = 0 ui_icon = "satellite" diff --git a/code/modules/surgery/organs/organ_extractor.dm b/code/modules/surgery/organs/organ_extractor.dm index 6f1bc9fabd8..af27f04b8bf 100644 --- a/code/modules/surgery/organs/organ_extractor.dm +++ b/code/modules/surgery/organs/organ_extractor.dm @@ -173,7 +173,7 @@ /// Advanced abductor version. Is a lot faster with implanting into others /obj/item/organ_extractor/abductor name = "alien organ extractor" - origin_tech = "biotech=6;materials=5;alien=4" + origin_tech = "biotech=6;materials=5;abductor=4" icon_state = "abductor_extractor" insert_time = 3 SECONDS self_insert_time = 1 SECONDS