diff --git a/code/__DEFINES/dna.dm b/code/__DEFINES/dna.dm index 6f6b03b29ad8..39cd592983d0 100644 --- a/code/__DEFINES/dna.dm +++ b/code/__DEFINES/dna.dm @@ -69,3 +69,5 @@ #define DNA_GENDER_FEMALE 0 #define DNA_GENDER_MALE 1 #define DNA_GENDER_PLURAL 2 + +#define ENCODE_DNA_BLOCK(value) num2hex(value, 3) diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index f0db39b99bf3..b0e4b11d83d4 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -255,7 +255,7 @@ GLOBAL_LIST_EMPTY(bad_blocks) // Get a hex-encoded UI block. /datum/dna/proc/GetUIBlock(block) - return EncodeDNABlock(GetUIValue(block)) + return ENCODE_DNA_BLOCK(GetUIValue(block)) // Do not use this unless you absolutely have to. // Set a block from a hex string. This is inefficient. If you can, use SetUIValue(). @@ -352,7 +352,7 @@ GLOBAL_LIST_EMPTY(bad_blocks) // Get hex-encoded SE block. /datum/dna/proc/GetSEBlock(block) - return EncodeDNABlock(GetSEValue(block)) + return ENCODE_DNA_BLOCK(GetSEValue(block)) // Do not use this unless you absolutely have to. // Set a block from a hex string. This is inefficient. If you can, use SetUIValue(). @@ -383,15 +383,11 @@ GLOBAL_LIST_EMPTY(bad_blocks) //testing("SetSESubBlock([block],[subBlock],[newSubBlock],[defer]): [oldBlock] -> [newBlock]") SetSEBlock(block, newBlock, defer) - -/proc/EncodeDNABlock(value) - return num2hex(value, 3) - /datum/dna/proc/UpdateUI() var/list/ui_text_list = list() uni_identity = "" for(var/block in UI) - ui_text_list += EncodeDNABlock(block) + ui_text_list += ENCODE_DNA_BLOCK(block) uni_identity = ui_text_list.Join("") //testing("New UI: [uni_identity]") dirtyUI = 0 @@ -401,7 +397,7 @@ GLOBAL_LIST_EMPTY(bad_blocks) var/list/se_text_list = list() struc_enzymes = "" for(var/block in SE) - se_text_list += EncodeDNABlock(block) + se_text_list += ENCODE_DNA_BLOCK(block) struc_enzymes = se_text_list.Join("") //testing("Old SE: [oldse]") //testing("New SE: [struc_enzymes]") diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 13964ce6225f..662a0bcd33fd 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -357,7 +357,7 @@ /obj/machinery/computer/scan_consolenew/proc/all_dna_blocks(list/buffer) var/list/arr = list() for(var/i = 1, i <= length(buffer), i++) - arr += "[i]:[EncodeDNABlock(buffer[i])]" + arr += "[i]:[ENCODE_DNA_BLOCK(buffer[i])]" return arr /obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(obj/item/dnainjector/I, blk, datum/dna2/record/buffer)