From 64f83c51ad05ef1608f0a37a14bcf8d53dde6f16 Mon Sep 17 00:00:00 2001
From: Rob Nelson <nexis@7chan.org>
Date: Thu, 6 Feb 2014 23:52:58 -0800
Subject: [PATCH] And now tested in game, with some fixes.

---
 code/game/gamemodes/setupgame.dm               | 18 +++++++++++++++---
 code/modules/admin/topic.dm                    | 13 +++++++++++++
 .../modules/mob/living/carbon/monkey/monkey.dm |  3 +++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm
index 813bbbabf2c..d2b54fe5ba5 100644
--- a/code/game/gamemodes/setupgame.dm
+++ b/code/game/gamemodes/setupgame.dm
@@ -6,6 +6,9 @@
 // The name is used on /vg/ for species with predefined genetic traits,
 //  and for the DNA panel in the player panel.
 /proc/getAssignedBlock(var/name,var/list/blocksLeft, var/activity_bounds=DNA_DEFAULT_BOUNDS)
+	if(blocksLeft.len==0)
+		warning("[name]: No more blocks left to assign!")
+		return 0
 	var/assigned = pick(blocksLeft)
 	blocksLeft.Remove(assigned)
 	assigned_blocks[assigned]=name
@@ -60,7 +63,7 @@
 	BLINDBLOCK = tempnum
 	*/
 	var/list/numsToAssign=new()
-	for(var/i=1;i<STRUCDNASIZE;i++)
+	for(var/i=1;i<DNA_SE_LENGTH;i++)
 		numsToAssign += i
 
 	//testing("Assigning DNA blocks:")
@@ -96,8 +99,15 @@
 	//SHOCKIMMUNITYBLOCK = getAssignedBlock("SHOCKIMMUNITY", numsToAssign)
 	//SMALLSIZEBLOCK     = getAssignedBlock("SMALLSIZE",     numsToAssign, DNA_HARD_BOUNDS)
 
+	//
+	// Static Blocks
+	/////////////////////////////////////////////.
+
+	// Monkeyblock is always last.
+	MONKEYBLOCK = DNA_SE_LENGTH
+
 	// And the genes that actually do the work. (domutcheck improvements)
-	var/list/blocks_assigned[STRUCDNASIZE]
+	var/list/blocks_assigned[DNA_SE_LENGTH]
 	for(var/gene_type in typesof(/datum/dna/gene))
 		var/datum/dna/gene/G = new gene_type
 		if(G.block)
@@ -109,7 +119,9 @@
 				assignedToBlock=blocks_assigned[G.block]
 			assignedToBlock.Add(G.name)
 			blocks_assigned[G.block]=assignedToBlock
-			testing("DNA2: Gene [G.name] assigned to block [G.block].")
+			//testing("DNA2: Gene [G.name] assigned to block [G.block].")
+
+	testing("DNA2: [numsToAssign.len] blocks are unused: [english_list(numsToAssign)]")
 
 	// HIDDEN MUTATIONS / SUPERPOWERS INITIALIZTION
 
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index e5a8c3ae86a..0754c39fc95 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1237,6 +1237,19 @@
 
 		usr.client.cmd_admin_animalize(M)
 
+	else if(href_list["togmutate"])
+		if(!check_rights(R_SPAWN))	return
+
+		var/mob/living/carbon/human/H = locate(href_list["togmutate"])
+		if(!istype(H))
+			usr << "This can only be used on instances of type /mob/living/carbon/human"
+			return
+		var/block=text2num(href_list["block"])
+		//testing("togmutate([href_list["block"]] -> [block])")
+		usr.client.cmd_admin_toggle_block(H,block)
+		show_player_panel(H)
+		//H.regenerate_icons()
+
 /***************** BEFORE**************
 
 	if (href_list["l_players"])
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index a37f16ff1a3..92edb9aacd1 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -54,11 +54,14 @@
 		dna.ResetSE()
 		dna.ResetUI()
 		//dna.uni_identity = "00600200A00E0110148FC01300B009"
+		//dna.SetUI(list(0x006,0x002,0x00A,0x00E,0x011,0x014,0x8FC,0x013,0x00B,0x009))
 		//dna.struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6"
+		//dna.SetSE(list(0x433,0x591,0x567,0x561,0x31E,0x137,0x633,0x34D,0x1C3,0x690,0x120,0x321,0x64D,0x4FE,0x4CD,0x615,0x44B,0x6C0,0x3F2,0x51B,0x6C6,0x0A4,0x282,0x1D2,0x6BA,0x3B0,0xFD6))
 		dna.unique_enzymes = md5(name)
 
 		// We're a monkey
 		dna.SetSEState(MONKEYBLOCK,   1)
+		dna.SetSEValueRange(MONKEYBLOCK,0xDAC, 0xFFF)
 		// Fix gender
 		dna.SetUIState(DNA_UI_GENDER, gender != MALE, 1)