From 118c7a0a3e36c71a598cef1808d96b2b2f0a496f Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Tue, 23 Aug 2016 01:34:28 -0700 Subject: [PATCH] Fixes a runtime when creating a golem --- code/modules/mob/living/carbon/human/human.dm | 4 ++-- code/modules/mob/living/carbon/human/species/golem.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 857ff6b2de2..05031a4a82b 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -12,6 +12,8 @@ var/obj/item/weapon/rig/wearing_rig // This is very not good, but it's much much better than calling get_rig() every update_canmove() call. /mob/living/carbon/human/New(var/new_loc, var/new_species = null, var/delay_ready_dna = 0) + ..() + if(!dna) dna = new /datum/dna(null) // Species name is handled by set_species() @@ -32,8 +34,6 @@ reagents = R R.my_atom = src - ..() - prev_gender = gender // Debug for plural genders make_blood() diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm index 024172abe8b..1e255ea50cc 100644 --- a/code/modules/mob/living/carbon/human/species/golem.dm +++ b/code/modules/mob/living/carbon/human/species/golem.dm @@ -99,4 +99,4 @@ desc = "strong adamantine hands" icon_state = "golem" item_state = null - flags = ABSTRACT | NODROP \ No newline at end of file + flags = ABSTRACT | NODROP