From 7781296fb96a56665936757731e8e38ba1d9e9f4 Mon Sep 17 00:00:00 2001 From: Artur Date: Fri, 3 Jul 2020 11:09:55 +0300 Subject: [PATCH] DNA CONSOLE FIX --- code/__HELPERS/global_lists.dm | 22 --------------------- code/controllers/subsystem/atoms.dm | 1 + code/game/machinery/computer/dna_console.dm | 1 - tgui/packages/tgui/interfaces/DnaConsole.js | 5 +---- 4 files changed, 2 insertions(+), 27 deletions(-) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 0b5c60a95a..d66e83d651 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -90,7 +90,6 @@ init_subtypes(/datum/crafting_recipe, GLOB.crafting_recipes) INVOKE_ASYNC(GLOBAL_PROC, /proc/init_ref_coin_values) //so the current procedure doesn't sleep because of UNTIL() - INVOKE_ASYNC(GLOBAL_PROC, /proc/setupGenetics) //creates every subtype of prototype (excluding prototype) and adds it to list L. //if no list/L is provided, one is created. @@ -117,24 +116,3 @@ GLOB.coin_values[path] = C.value qdel(C) -/proc/setupGenetics() - var/list/mutations = subtypesof(/datum/mutation/human) - shuffle_inplace(mutations) - for(var/A in subtypesof(/datum/generecipe)) - var/datum/generecipe/GR = A - GLOB.mutation_recipes[initial(GR.required)] = initial(GR.result) - for(var/i in 1 to LAZYLEN(mutations)) - var/path = mutations[i] //byond gets pissy when we do it in one line - var/datum/mutation/human/B = new path () - B.alias = "Mutation #[i]" - GLOB.all_mutations[B.type] = B - GLOB.full_sequences[B.type] = generate_gene_sequence(B.blocks) - if(B.locked) - continue - if(B.quality == POSITIVE) - GLOB.good_mutations |= B - else if(B.quality == NEGATIVE) - GLOB.bad_mutations |= B - else if(B.quality == MINOR_NEGATIVE) - GLOB.not_good_mutations |= B - CHECK_TICK \ No newline at end of file diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index c5e7e592f5..db1fced637 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -16,6 +16,7 @@ SUBSYSTEM_DEF(atoms) /datum/controller/subsystem/atoms/Initialize(timeofday) GLOB.fire_overlay.appearance_flags = RESET_COLOR + setupGenetics() initialized = INITIALIZATION_INNEW_MAPLOAD InitializeAtoms() return ..() diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 115de6da07..2dce50aa88 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -485,7 +485,6 @@ // Resolve mutation's BYOND path from the alias var/alias = params["alias"] var/path = GET_MUTATION_TYPE_FROM_ALIAS(alias) - to_chat(usr,"[path] [alias]") // Make sure the occupant still has this mutation if(!(path in scanner_occupant.dna.mutation_index)) return diff --git a/tgui/packages/tgui/interfaces/DnaConsole.js b/tgui/packages/tgui/interfaces/DnaConsole.js index b12bdcda34..f4fd255120 100644 --- a/tgui/packages/tgui/interfaces/DnaConsole.js +++ b/tgui/packages/tgui/interfaces/DnaConsole.js @@ -559,7 +559,6 @@ const MutationInfo = (props, context) => { diskReadOnly, hasDisk, isInjectorReady, - mutationCapacity, } = data; const diskMutations = data.storage.disk ?? []; const mutationStorage = data.storage.console ?? []; @@ -616,7 +615,6 @@ const MutationInfo = (props, context) => { )} {mutation.Source === 'console' && ( )} @@ -657,7 +655,6 @@ const MutationInfo = (props, context) => {