diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index aeb3e86227..7267b18cb6 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/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 4ff1d206c4..cf5ca92ab2 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 5a73da279d..af3b0d269c 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
diff --git a/html/changelog.html b/html/changelog.html
index fe2ef284d9..8321ca41cc 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,11 +57,25 @@ 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">
 <div class="commit sansserif">
 	<h2 class="date">28.06.2013</h2>
 	<h3 class="author">Segrain updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="rscadd">AIs are now able to examine what they see.</li>
+	<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>
 
@@ -75,7 +89,6 @@ should be listed in the changelog upon commit though. Thanks. -->
 </div>
 
 <div class="commit sansserif">
-<<<<<<< HEAD
 	<h2 class="date">23.06.2013</h2>
 	<h3 class="author">Segrain updated:</h3>
 	<ul class="changes bgimages16">
@@ -91,13 +104,11 @@ should be listed in the changelog upon commit though. Thanks. -->
 		<li class="tweak">Some maintenance doors within RnD and Medbay have had their accesses changed. Maintenance doors in the joint areas (leading to the research shuttle, virology, and xenobiology) are now zero access. Which means anyone in those joints can enter the maintenance tunnels. This was done to add additional evacuation locations during radiation storms. Additional maintenance doors were added to the tunnels in these areas to prevent docs and scientists from running about.</li>
 		<li class="tweak">Starboard emergency storage isn't gone now, it's simply located in the escape wing.</li>
 		<li class="experiment">An engineering training room has been added to engineering. This location was previously where surgery was located. If you are new to engineering or need to brush up on your skills, please use this area for testing.</li>
-=======
 	<h2 class="date">26.06.2013</h2>
 	<h3 class="author">Segrain updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="bugfix">Autopsy scanner properly displays time of wound infliction and death.</li>
 		<li class="bugfix">Autopsy scanner properly displays wounds by projectile weapons.</li>
->>>>>>> f1e3621ec6228115a8bf0fc1c12995064b2e176f
 	</ul>
 </div>