Merge pull request #1119 from SkyMarshal/BugFixes

Bug fixes

code/game/atom_procs.dm

@@ -213,7 +213,8 @@
 		for(var/obj/effect/decal/cleanable/blood/B in T.contents)
 			if(!B.blood_DNA[M.dna.unique_enzymes])
 				B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
-			B.virus2 += M.virus2
+			if(!B.virus2)
+				B.virus2 = M.virus2
 			for(var/datum/disease/D in M.viruses)
 				var/datum/disease/newDisease = new D.type
 				B.viruses += newDisease

code/game/machinery/cloning.dm

@@ -193,17 +193,19 @@
 		del(ghost) //Don't leave ghosts everywhere!!
 
 	if(!src.occupant.dna)
-		src.occupant.dna = new /datum/dna(  )
+		src.occupant.dna = new /datum/dna()
 	if(ui)
 		src.occupant.dna.uni_identity = ui
 		updateappearance(src.occupant, ui)
 	if(se)
 		src.occupant.dna.struc_enzymes = se
-		randmutb(src.occupant) //Sometimes the clones come out wrong.
+		for(var/i = 0 to 5)
+			randmutb(src.occupant) //Sometimes the clones come out wrong.
 	src.occupant:update_face()
 	src.occupant:update_body()
 	src.occupant:mutantrace = mrace
 	src.occupant:suiciding = 0
+	occupant.brainloss = 100
 	src.attempting = 0
 	return 1
 

code/game/machinery/computer/cloning.dm

@@ -217,8 +217,9 @@
 		if(2)
 			dat += "<h4>Current records</h4>"
 			dat += "<a href='byond://?src=\ref[src];menu=1'>Back</a><br><br>"
-			for(var/datum/data/record/R in geneticsrecords)
-				dat += "<a href='byond://?src=\ref[src];view_rec=\ref[R]'>[R.fields["id"]]-[R.fields["name"]]</a><br>"
+			for(var/id in geneticsrecords)
+				var/datum/data/record/R = geneticsrecords[id]
+				dat += "<a href='byond://?src=\ref[src];view_rec=[id]'>[R.fields["id"]]-[R.fields["name"]]</a><br>"
 
 		if(3)
 			dat += "<h4>Selected Record</h4>"
@@ -250,7 +251,7 @@
 				dat += {"<b>UI:</b> [src.active_record.fields["UI"]]<br>
 				<b>SE:</b> [src.active_record.fields["SE"]]<br><br>"}
 				if(wantspod)
-					dat += "<a href='byond://?src=\ref[src];clone=\ref[src.active_record]'>Clone</a><br>"
+					dat += "<a href='byond://?src=\ref[src];clone=[src.active_record.fields["id"]]'>Clone</a><br>"
 
 		if(4)
 			if (!src.active_record)
@@ -281,7 +282,7 @@
 			src.scanner.locked = 0
 
 	else if (href_list["view_rec"])
-		src.active_record = locate(href_list["view_rec"])
+		src.active_record = geneticsrecords[href_list["view_rec"]]
 		if ((isnull(src.active_record.fields["ckey"])) || (src.active_record.fields["ckey"] == ""))
 			del(src.active_record)
 			src.temp = "ERROR: Record Corrupt"
@@ -299,7 +300,7 @@
 			var/obj/item/weapon/card/id/C = usr.equipped()
 			if (istype(C)||istype(C, /obj/item/device/pda))
 				if(src.check_access(C))
-					geneticsrecords.Remove(src.active_record)
+					geneticsrecords.Remove(active_record["id"])
 					del(src.active_record)
 					src.temp = "Record deleted."
 					src.menu = 2
@@ -359,10 +360,11 @@
 		src.updateUsrDialog()
 
 	else if (href_list["clone"])
-		var/datum/data/record/C = locate(href_list["clone"])
+		var/datum/data/record/C = geneticsrecords[href_list["clone"]]
 		//Look for that player! They better be dead!
 		if(C)
 			var/mob/selected = find_dead_player("[C.fields["ckey"]]")
+			selected << 'chime.ogg'	//probably not the best sound but I think it's reasonable
 			var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No")
 			if(answer == "No")
 				selected = null
@@ -371,7 +373,7 @@
 				src.temp = "Unable to initiate cloning cycle." // most helpful error message in THE HISTORY OF THE WORLD
 			else if (src.pod1.growclone(selected, C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["interface"],C.fields["changeling"],C.fields["original"]))
 				src.temp = "Cloning cycle activated."
-				geneticsrecords.Remove(C)
+				geneticsrecords.Remove(C.fields["id"])
 				del(C)
 				src.menu = 1
 
@@ -438,7 +440,7 @@
 	if (!isnull(subject.mind)) //Save that mind so traitors can continue traitoring after cloning.
 		R.fields["mind"] = "\ref[subject.mind]"
 
-	geneticsrecords += R //Save it to the global scan list.
+	geneticsrecords["[copytext(md5(subject.real_name), 2, 6)]"] = R //Save it to the global scan list.
 	src.temp = "Subject successfully scanned."
 
 //Find a specific record by key.

code/game/machinery/doors/airlock.dm

@@ -1612,7 +1612,7 @@ About the new airlock wires panel:
 		name = "CentCom Secure Airlock"
 		desc = "I hope you have insulated gloves...."
 		icon = 'Doorhatchele.dmi'
-		var/list/mob/morons
+		var/list/mob/morons = list()
 
 		pulse(var/wireColor)
 			if(prob(25))

code/game/magic/cultist/ritual.dm

@@ -562,6 +562,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 				R.word2 = w2
 				R.word3 = w3
 				R.check_icon()
+				if(!R.blood_DNA)
+					R.blood_DNA = list()
 				R.blood_DNA[H.dna.unique_enzymes] = H.dna.b_type
 			return
 		else

code/game/objects/biomass.dm

@@ -1,3 +1,5 @@
+//UNTICKED DUE TO BUGGY SHIT
+
 /obj/effect/biomass
 	icon = 'biomass.dmi'
 	icon_state = "stage1"

code/game/objects/devices/PDA/cart.dm

@@ -466,7 +466,7 @@ Code:
 
 					else
 						for(var/obj/machinery/bot/mulebot/B in QC.botlist)
-							menu += "<A href='byond://?src=\ref[QC];op=control;bot=\ref[B]'>[B] at [B.loc.loc]</A><BR>"
+							menu += "<A href='byond://?src=\ref[QC];op=control;bot=\ref[B]'>[B] at [get_area(B)]</A><BR>"
 
 					menu += "<BR><A href='byond://?src=\ref[QC];op=scanbots'><img src=pda_scanner.png> Scan for active bots</A><BR>"