From e937bdd4c23ce094b3440e94884ffd3693988478 Mon Sep 17 00:00:00 2001
From: d3athrow <somepersonsomeplace@yahoo.com>
Date: Fri, 24 Jan 2014 02:43:39 -0600
Subject: [PATCH] Should in fact, really fix the monkey dna

---
 code/game/dna/dna2.dm                           | 3 ++-
 code/game/machinery/cloning.dm                  | 2 +-
 code/global.dm                                  | 2 +-
 code/modules/mob/living/carbon/monkey/monkey.dm | 2 +-
 code/modules/mob/transform_procs.dm             | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm
index b96da7b214c..b2a2108c201 100644
--- a/code/game/dna/dna2.dm
+++ b/code/game/dna/dna2.dm
@@ -232,7 +232,7 @@ var/global/list/datum/dna/gene/dna_genes[0]
 
 // Set a DNA SE block's raw value.
 /datum/dna/proc/SetSEValue(var/block,var/value,var/defer=0)
-	//testing("SetSEBlock([block],[value],[defer]): [value] -> [nval]")
+
 	if (block<=0) return
 	ASSERT(value>=0)
 	ASSERT(value<=4095)
@@ -240,6 +240,7 @@ var/global/list/datum/dna/gene/dna_genes[0]
 	dirtySE=1
 	if(!defer)
 		UpdateSE()
+	//testing("SetSEBlock([block],[value],[defer]): [value] -> [GetSEValue(block)]")
 
 // Get a DNA SE block's raw value.
 /datum/dna/proc/GetSEValue(var/block)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 75e7282c4b0..4d7c2328d1f 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -63,7 +63,7 @@
 		for(var/i=new_SE.len;i<=DNA_SE_LENGTH;i++)
 			new_SE += rand(1,1024)
 		buf.dna.SE=new_SE
-		buf.dna.SetSEValue(MONKEYBLOCK,0xFFF)
+		buf.dna.SetSEValueRange(MONKEYBLOCK,0xDAC, 0xFFF)
 
 
 //Find a dead mob with a brain and client.
diff --git a/code/global.dm b/code/global.dm
index 0bc767ed278..038f9ab0bc0 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -47,7 +47,7 @@ var/GLASSESBLOCK = 0
 var/EPILEPSYBLOCK = 0
 var/TWITCHBLOCK = 0
 var/NERVOUSBLOCK = 0
-var/MONKEYBLOCK = 0
+var/MONKEYBLOCK = 50 // Monkey block will always be the DNA_SE_LENGTH
 
 var/BLOCKADD = 0
 var/DIFFMUT = 0
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 7ac6d7a6f44..12aa97f50fb 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -61,7 +61,7 @@
 
 		// We're a monkey
 		dna.SetSEState(MONKEYBLOCK,   1)
-		dna.SetSEValue(MONKEYBLOCK,0xFFF)
+		dna.SetSEValueRange(MONKEYBLOCK,0xDAC, 0xFFF)
 		// Fix gender
 		dna.SetUIState(DNA_UI_GENDER, gender != MALE, 1)
 
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index a4484536145..95d87409251 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -31,7 +31,7 @@
 
 	O.dna = dna.Clone()
 	O.dna.SetSEState(MONKEYBLOCK,1)
-	O.dna.SetSEValue(MONKEYBLOCK,0xFFF)
+	O.dna.SetSEValueRange(MONKEYBLOCK,0xDAC, 0xFFF)
 	O.loc = loc
 	O.viruses = viruses
 	O.a_intent = "harm"