From dfeee914206efd5c18f083e84e5573aec6646e24 Mon Sep 17 00:00:00 2001 From: KasparoVy Date: Sun, 16 Apr 2017 19:56:19 -0400 Subject: [PATCH] GEMK Injector Fix I forgot to include this in the PR I wrote that added the 6 new UI blocks. Woops! Anyway, this fixes the GEMK injector. This also fixes a bug where injecting yourself with a UI that affects eye colour (i.e. GEMK) wouldn't actually change your eye colour unless you injected yourself twice (to proc UpdateAppearance a second time, when really all you needed was update_eyes to be called). --- code/game/dna/dna2_helpers.dm | 3 +++ code/game/machinery/cloning.dm | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index 6efd0ffc41a..c5f9ce2b7fe 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -132,8 +132,11 @@ dna.check_integrity() var/mob/living/carbon/human/H = src var/obj/item/organ/external/head/head_organ = H.get_organ("head") + var/obj/item/organ/internal/eyes/eye_organ = H.get_int_organ(/obj/item/organ/internal/eyes) var/datum/species/S = H.species dna.write_head_attributes(head_organ) + dna.write_eyes_attributes(eye_organ) + H.update_eyes() H.r_skin = dna.GetUIValueRange(DNA_UI_SKIN_R, 255) H.g_skin = dna.GetUIValueRange(DNA_UI_SKIN_G, 255) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 72d63d8233d..60ad6a84b5b 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -122,10 +122,11 @@ //data = "0C80C80C80C80C80C8000000000000161FBDDEF" - Farmer Jeff buf.dna.real_name="God Emperor of Mankind" buf.dna.unique_enzymes = md5(buf.dna.real_name) - buf.dna.UI=list(0x066,0x000,0x033,0x000,0x000,0x000,0xAF0,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x033,0x066,0x0FF,0x4DB,0x002,0x690,0x000,0x000) + buf.dna.UI=list(0x066,0x000,0x033,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0xAF0,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x033,0x066,0x0FF,0x4DB,0x002,0x690,0x000,0x000,0x000,0x328,0x045,0x5FC,0x053,0x035,0x035,0x035) //buf.dna.UI=list(0x0C8,0x0C8,0x0C8,0x0C8,0x0C8,0x0C8,0x000,0x000,0x000,0x000,0x161,0xFBD,0xDEF) // Farmer Jeff - for(var/i in buf.dna.UI.len to DNA_UI_LENGTH) - buf.dna.UI += 0x000 + if(buf.dna.UI.len != DNA_UI_LENGTH) //If there's a disparity b/w the dna UI string lengths, 0-fill the extra blocks in this UI. + for(var/i in buf.dna.UI.len to DNA_UI_LENGTH) + buf.dna.UI += 0x000 buf.dna.ResetSE() buf.dna.UpdateUI()