From 52b9242c4ff4202e7b167b0b6a06f85a5522f5f7 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 7 Aug 2013 11:19:31 -0700 Subject: [PATCH] Compile fixes, blah. --- code/game/dna.dm | 10 +++++----- code/modules/mob/living/carbon/monkey/monkey.dm | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/dna.dm b/code/game/dna.dm index 6ee04afcc92..13f90e7d506 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -550,10 +550,10 @@ var/mob/living/carbon/monkey/O = null - if(M.species.primitive) - O = new M.species.primitive(src) + if(H.species.primitive) + O = new H.species.primitive(src) else - M.gib() //Trying to change the species of a creature with no primitive var set is messy. + H.gib() //Trying to change the species of a creature with no primitive var set is messy. return if(M) @@ -622,8 +622,8 @@ del(animation) var/mob/living/carbon/human/O = new( src ) - if(Mo.greater) - O.set_species(Mo.greater) + if(Mo.greaterform) + O.set_species(Mo.greaterform) if (isblockon(getblock(M.dna.uni_identity, 11,3),11)) O.gender = FEMALE diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index d253d55770c..09c659b2d60 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -40,7 +40,7 @@ R.my_atom = src if(name == "monkey" || name == "farwa" || name == "stok" || name == "neara") //Hideous but necessary to stop Pun-Pun becoming generic. - name = "[name] ([rand(1, 1000)])") + name = "[name] ([rand(1, 1000)])" real_name = name if (!(dna)) @@ -68,19 +68,19 @@ ..() dna.mutantrace = "lizard" - greaterform = "Unathi" + greaterform = "Unathi" /mob/living/carbon/monkey/skrell/New() ..() dna.mutantrace = "skrell" - greaterform = "Skrell" + greaterform = "Skrell" /mob/living/carbon/monkey/tajara/New() ..() dna.mutantrace = "tajaran" - greaterform = "Tajaran" + greaterform = "Tajaran" /mob/living/carbon/monkey/movement_delay() var/tally = 0