Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/datums/datacore.dm

@@ -18,10 +18,10 @@
 
 	if(foundrecord)
 		foundrecord.fields["rank"] = assignment
-	if(alt_title)
+		if(alt_title)
-		foundrecord.fields["real_rank"] = alt_title
+			foundrecord.fields["real_rank"] = alt_title
-	else
+		else
-		foundrecord.fields["real_rank"] = assignment
+			foundrecord.fields["real_rank"] = assignment
 
 
 

code/game/machinery/computer/cloning.dm

@@ -378,13 +378,17 @@
 				temp = "Error: Clonepod malfunction."
 			else if(!config.revival_cloning)
 				temp = "Error: Unable to initiate cloning cycle."
-			else if(pod1.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["interface"]))
-				temp = "Initiating cloning cycle..."
-				records.Remove(C)
-				del(C)
-				menu = 1
 			else
-				temp = "Initiating cloning cycle...<br>Error: Post-initialisation failed. Cloning cycle aborted."
+				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" && pod1.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["interface"]))
+					temp = "Initiating cloning cycle..."
+					records.Remove(C)
+					del(C)
+					menu = 1
+				else
+					temp = "Initiating cloning cycle...<br>Error: Post-initialisation failed. Cloning cycle aborted."
 
 		else
 			temp = "Error: Data corruption."
@@ -406,9 +410,9 @@
 	if (subject.suiciding == 1)
 		scantemp = "Error: Subject's brain is not responding to scanning stimuli."
 		return
-	if ((!subject.ckey) || (!subject.client))
+//	if ((!subject.ckey) || (!subject.client))
-		scantemp = "Error: Mental interface failure."
+//		scantemp = "Error: Mental interface failure."
-		return
+//		return
 	if (NOCLONE in subject.mutations)
 		scantemp = "Error: Mental interface failure."
 		return

code/game/machinery/computer/communications.dm

@@ -541,7 +541,7 @@
 			status_signal.data["msg1"] = data1
 			status_signal.data["msg2"] = data2
 			log_admin("STATUS: [src.fingerprintslast] set status screen message with [src]: [data1] [data2]")
-			message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]")
+			//message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]")
 		if("alert")
 			status_signal.data["picture_state"] = data1
 

code/game/machinery/computer/medical.dm

@@ -98,11 +98,12 @@
 						if(!M)
 							continue
 						var/turf/bl = get_turf(M)
-						bdat += "[M.name] - <b>\[[bl.x],[bl.y]\]</b> - [M.on ? "Online" : "Offline"]<br>"
+						if(bl)
-						if((!isnull(M.reagent_glass)) && M.use_beaker)
+							bdat += "[M.name] - <b>\[[bl.x],[bl.y]\]</b> - [M.on ? "Online" : "Offline"]<br>"
-							bdat += "Reservoir: \[[M.reagent_glass.reagents.total_volume]/[M.reagent_glass.reagents.maximum_volume]\]<br>"
+							if((!isnull(M.reagent_glass)) && M.use_beaker)
-						else
+								bdat += "Reservoir: \[[M.reagent_glass.reagents.total_volume]/[M.reagent_glass.reagents.maximum_volume]\]<br>"
-							bdat += "Using Internal Synthesizer.<br>"
+							else
+								bdat += "Using Internal Synthesizer.<br>"
 
 					if(!bdat)
 						dat += "<br><center>None detected</center>"

code/game/machinery/computer/security.dm

@@ -105,12 +105,12 @@
 					dat += "<B>Records Maintenance</B><HR>"
 					dat += "<BR><A href='?src=\ref[src];choice=Delete All Records'>Delete All Records</A><BR><BR><A href='?src=\ref[src];choice=Return'>Back</A>"
 				if(3.0)
-					var/icon/front = new(active1.fields["photo"], dir = SOUTH)
-					var/icon/side = new(active1.fields["photo"], dir = WEST)
-					user << browse_rsc(front, "front.png")
-					user << browse_rsc(side, "side.png")
 					dat += "<CENTER><B>Security Record</B></CENTER><BR>"
 					if ((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
+						var/icon/front = new(active1.fields["photo"], dir = SOUTH)
+						var/icon/side = new(active1.fields["photo"], dir = WEST)
+						user << browse_rsc(front, "front.png")
+						user << browse_rsc(side, "side.png")
 						dat += text("<table><tr><td>	\
 						Name: <A href='?src=\ref[src];choice=Edit Field;field=name'>[active1.fields["name"]]</A><BR> \
 						ID: <A href='?src=\ref[src];choice=Edit Field;field=id'>[active1.fields["id"]]</A><BR>\n	\

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

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

config/admins.txt

@@ -19,7 +19,7 @@ miniature - Game Master
 misterbook - Game Admin
 misterfox - Game Admin
 mloc - Game Master
-skymarshal - Retired Admin
+skymarshal - Game Master
 spaceman96 - Retired Admin
 strumpetplaya - Retired Admin
 tastyfish - Retired Admin