From 31e44872292ff6f70492a01c6c41459f17219c50 Mon Sep 17 00:00:00 2001
From: Segrain <dldobrolubov@gmail.com>
Date: Thu, 27 Jun 2013 14:10:05 +0300
Subject: [PATCH 1/2] Fix for #2430.

---
 code/game/objects/items/weapons/cards_ids.dm | 8 ++++++++
 html/changelog.html                          | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index aeb3e86227d..7267b18cb61 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -80,6 +80,14 @@
 	var/rank = null			//actual job
 	var/dorm = 0		// determines if this ID has claimed a dorm already
 
+/obj/item/weapon/card/id/New()
+	..()
+	spawn(30)
+	if(istype(loc, /mob/living/carbon/human))
+		blood_type = loc:dna:b_type
+		dna_hash = loc:dna:unique_enzymes
+		fingerprint_hash = md5(loc:dna:uni_identity)
+
 /obj/item/weapon/card/id/attack_self(mob/user as mob)
 	for(var/mob/O in viewers(user, null))
 		O.show_message(text("[] shows you: \icon[] []: assignment: []", user, src, src.name, src.assignment), 1)
diff --git a/html/changelog.html b/html/changelog.html
index 56d036eff25..7dd21709f23 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,6 +57,14 @@ Stuff which is in development and not yet visible to players or just code relate
 (ie. code improvements for expandability, etc.) should not be listed here. They 
 should be listed in the changelog upon commit though. Thanks. -->
 
+<div class="commit sansserif">
+	<h2 class="date">27.06.2013</h2>
+	<h3 class="author">Segrain updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">ID cards properly setup bloodtype, DNA and fingerprints again.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">26.06.2013</h2>
 	<h3 class="author">Segrain updated:</h3>

From 6f207a3a14b3aa0d9132cbde4fe1e85bd1bd5f67 Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Thu, 27 Jun 2013 18:09:48 -0700
Subject: [PATCH 2/2] Fixes #2424

---
 code/modules/power/smes.dm  | 4 ++--
 code/modules/power/solar.dm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 4ff1d206c43..cf5ca92ab22 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -177,7 +177,7 @@
 
 
 /obj/machinery/power/smes/interact(mob/user)
-	if(get_dist(src, user) > 1 && !istype(user, /mob/living/silicon/ai))
+	if(get_dist(src, user) > 1 && !istype(user, /mob/living/silicon))
 		user.unset_machine()
 		user << browse(null, "window=smes")
 		return
@@ -364,4 +364,4 @@
 	return rate
 
 
-#undef SMESRATE
+#undef SMESRATE
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 5a73da279d5..af3b0d269c1 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -395,7 +395,7 @@ var/list/solars_list = list()
 /obj/machinery/power/solar_control/interact(mob/user)
 	if(stat & (BROKEN | NOPOWER)) return
 	if ( (get_dist(src, user) > 1 ))
-		if (!istype(user, /mob/living/silicon/ai))
+		if (!istype(user, /mob/living/silicon))
 			user.unset_machine()
 			user << browse(null, "window=solcon")
 			return