From 02fd487008429d25b144c7ae8b6f695ba530aac1 Mon Sep 17 00:00:00 2001
From: Spamcat <spamcat@derpy.ru>
Date: Sat, 4 May 2013 13:22:21 +0400
Subject: [PATCH 1/5] Blood type now saves in savefile. fixes #2738

---
 code/modules/client/preferences_savefile.dm | 3 +++
 html/changelog.html                         | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 4a4d49d25f..baee59ea6a 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -119,6 +119,7 @@
 	S["eyes_blue"]			>> b_eyes
 	S["underwear"]			>> underwear
 	S["backbag"]			>> backbag
+	S["b_type"]				>> b_type
 
 	//Jobs
 	S["userandomjob"]		>> userandomjob
@@ -170,6 +171,7 @@
 	b_eyes			= sanitize_integer(b_eyes, 0, 255, initial(b_eyes))
 	underwear		= sanitize_integer(underwear, 1, underwear_m.len, initial(underwear))
 	backbag			= sanitize_integer(backbag, 1, backbaglist.len, initial(backbag))
+	b_type			= sanitize_text(b_type, initial(b_type))
 
 	userandomjob	= sanitize_integer(userandomjob, 0, 1, initial(userandomjob))
 	job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))
@@ -218,6 +220,7 @@
 	S["eyes_blue"]			<< b_eyes
 	S["underwear"]			<< underwear
 	S["backbag"]			<< backbag
+	S["b_type"]				<< b_type
 
 	//Jobs
 	S["userandomjob"]		<< userandomjob
diff --git a/html/changelog.html b/html/changelog.html
index 414782d977..09c1e070e0 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -59,6 +59,14 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
+<div class="commit sansserif">
+	<h2 class="date">Spamcat</h2>
+	<h3 class="author">04.05.2013 updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Blood type is now saved in character creation menu, no need to edit it manually every round.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">30.04.2013</h2>
 	<h3 class="author">Spamcat updated:</h3>

From 15d4cc531a6848052f9f7fa0b93bff31da17639b Mon Sep 17 00:00:00 2001
From: Spamcat <spamcat@derpy.ru>
Date: Sat, 4 May 2013 13:24:40 +0400
Subject: [PATCH 2/5] Removed misleading information from changelog.html yell
 at me if you don't like it

---
 html/changelog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/changelog.html b/html/changelog.html
index 09c1e070e0..8c476633f7 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -46,7 +46,7 @@ Header Section
 		</td>
 	</tr>
 </table>
-<font size='4' color='red'><b>Visit the bleeding-edge test server at <a href="byond://tekkit.fallemmc.com:8000">byond://tekkit.fallemmc.com:8000</a></b></font>
+<!-- <font size='4' color='red'><b>Visit the bleeding-edge test server at <a href="byond://tekkit.fallemmc.com:8000">byond://tekkit.fallemmc.com:8000</a></b></font>--!>
 
 <!-- 
 Changelog Section 

From bb962862cabbcef66644704fc46ab95ce25f9081 Mon Sep 17 00:00:00 2001
From: Spamcat <spamcat@derpy.ru>
Date: Tue, 7 May 2013 20:08:12 +0400
Subject: [PATCH 3/5] Posibrains should work correctly in spiderbots. Fixed the
 key transfer issue. (#2534)

---
 code/modules/mob/living/carbon/brain/posibrain.dm          | 1 +
 .../modules/mob/living/simple_animal/friendly/spiderbot.dm | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 3bba11e32d..731f8ba3bf 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -50,6 +50,7 @@
 		src.searching = 0
 		src.brainmob.mind = candidate.mind
 		src.brainmob.key = candidate.key
+		src.brainmob.ckey = candidate.ckey
 		src.name = "positronic brain ([src.brainmob.name])"
 
 		src.brainmob << "<b>You are a positronic brain, brought into existence on [station_name()].</b>"
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index 719c9764ce..30bf04c7ad 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -150,6 +150,7 @@
 
 		src.mind = M.brainmob.mind
 		src.mind.key = M.brainmob.key
+		src.ckey = M.brainmob.ckey
 		src.name = "Spider-bot ([M.brainmob.name])"
 
 /mob/living/simple_animal/spiderbot/proc/explode() //When emagged.
@@ -162,12 +163,13 @@
 
 /mob/living/simple_animal/spiderbot/proc/update_icon()
 	if(mmi)
-		if (istype(mmi,/obj/item/device/mmi))
+		if(istype(mmi,/obj/item/device/mmi))
 			icon_state = "spiderbot-chassis-mmi"
 			icon_living = "spiderbot-chassis-mmi"
-		else
+		if(istype(mmi, /obj/item/device/mmi/posibrain))
 			icon_state = "spiderbot-chassis-posi"
 			icon_living = "spiderbot-chassis-posi"
+
 	else
 		icon_state = "spiderbot-chassis"
 		icon_living = "spiderbot-chassis"
@@ -326,6 +328,7 @@
 				visible_message("\blue [src] scoops up \the [held_item]!", "\blue You grab \the [held_item]!", "You hear a skittering noise and a clink.")
 				return held_item
 		src << "\red \The [selection] is too far away."
+		return 0
 
 	src << "\red There is nothing of interest to take."
 	return 0

From 754057cd098739b1d1aec32c37771cf918268c02 Mon Sep 17 00:00:00 2001
From: Ravensdale <Tri@rdinn.com>
Date: Fri, 10 May 2013 17:39:59 -0700
Subject: [PATCH 4/5] hopefully disables glasses, unable to replicate bug.

---
 code/modules/client/preferences.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 4799dcffbc..845b04b4a2 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -252,7 +252,7 @@ datum/preferences
 		dat += "Blood Type: <a href='byond://?src=\ref[user];preference=b_type;task=input'>[b_type]</a><br>"
 		dat += "Skin Tone: <a href='?_src_=prefs;preference=s_tone;task=input'>[-s_tone + 35]/220<br></a>"
 		//dat += "Skin pattern: <a href='byond://?src=\ref[user];preference=skin_style;task=input'>Adjust</a><br>"
-		dat += "Needs Glasses: <a href='?_src_=prefs;preference=disabilities'><b>[disabilities == 0 ? "No" : "Yes"]</b></a><br>"
+		//dat += "Needs Glasses: <a href='?_src_=prefs;preference=disabilities'><b>[disabilities == 0 ? "No" : "Yes"]</b></a><br>"
 		dat += "Limbs: <a href='byond://?src=\ref[user];preference=limbs;task=input'>Adjust</a><br>"
 
 		//display limbs below

From b81d0f123440286f4067c6942a6279d012d608ed Mon Sep 17 00:00:00 2001
From: Asanadas <asanadas@hotmail.com>
Date: Sun, 12 May 2013 02:19:56 -0400
Subject: [PATCH 5/5] carnie	umm, dunno if you guys have this bug: mobs not
 getting bloodyhands etc? carnie	do a find-all for "//people with TK
 won't get smeared with blood" without the quotes carnie	the > on that
 line should be a <= carnie	erro's to blame carnie	Mport provided the fix
 Asanadas	if you say so, strange IRC man

---
 code/modules/mob/living/carbon/human/human_defense.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 249b72a4c4..214100d2cc 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -117,7 +117,7 @@ emp_act
 	if(!target_zone)
 		visible_message("\red <B>[user] misses [src] with \the [I]!")
 		return
-		
+
 	var/datum/organ/external/affecting = get_organ(target_zone)
 	if (!affecting)
 		return
@@ -152,7 +152,7 @@ emp_act
 				location.add_blood(src)
 			if(ishuman(user))
 				var/mob/living/carbon/human/H = user
-				if(get_dist(H, src) > 1) //people with TK won't get smeared with blood
+				if(get_dist(H, src) <= 1) //people with TK won't get smeared with blood
 					H.bloody_body(src)
 					H.bloody_hands(src)