From c349f761d99f5230914ed1d697bc380d6d0fbd6c Mon Sep 17 00:00:00 2001 From: Rob Nelson Date: Thu, 19 Dec 2013 12:28:59 -0800 Subject: [PATCH] Fixes for DNA2, again, --- code/game/dna/dna_modifier.dm | 7 ++++++- code/game/objects/items/weapons/dna_injector.dm | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 10379c6d247..e2b8670886b 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -807,7 +807,12 @@ var/datum/dna2/record/buf = src.buffers[bufferId] if(href_list["createBlockInjector"]) waiting_for_user_input=1 - var/blk = input(usr,"Select Block","Block") in all_dna_blocks(buf.GetData()) + var/list/selectedbuf + if(buf.types & DNA2_BUF_SE) + selectedbuf=buf.dna.SE + else + selectedbuf=buf.dna.UI + var/blk = input(usr,"Select Block","Block") in all_dna_blocks(selectedbuf) success = setInjectorBlock(I,blk,buf) else I.buf = buf diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index da180bab341..852e583733a 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -66,7 +66,7 @@ if (!(NOCLONE in M.mutations)) // prevents drained people from having their DNA changed if (buf.types & DNA2_BUF_UI) if (!block) //isolated block? - M.UpdateAppearance(buf.dna) + M.UpdateAppearance(buf.dna.UI) if (buf.types & DNA2_BUF_UE) //unique enzymes? yes M.real_name = buf.dna.real_name M.name = buf.dna.real_name