From 8131287d038f55d08d828b6b0b236ec8e92d46a2 Mon Sep 17 00:00:00 2001
From: Erthilo <erthilo@gmail.com>
Date: Tue, 22 May 2012 22:14:47 +0100
Subject: [PATCH] Hopefully fixes the handle_regular_status_updates runtime.
 Also adds option for admins to allow Taj/Sog for a round on the player panel.
 This needs to be done before spawning!

---
 code/modules/admin/admin.dm                  | 27 ++++++++++++++++++++
 code/modules/mob/living/carbon/human/life.dm | 15 ++++++-----
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index f38a9d2790b..5f57b027bb6 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1267,6 +1267,31 @@ var/global/BSACooldown = 0
 		else
 			alert("You cannot perform this action. You must be of a higher administrative rank!")
 			return
+
+	if (href_list["granttaj"])
+		if (src.level>=5)
+			var/mob/M = locate(href_list["granttaj"])
+			for (var/s in alien_whitelist)
+				if(findtext(s,"[M.ckey] - Tajaran"))
+					alert("This key is already on the whitelist!", null, null, null, null, null)
+					return
+			alien_whitelist += "[M.ckey] - Tajaran"
+		else
+			alert("You cannot perform this action. You must be of a higher administrative rank!")
+			return
+
+	if (href_list["grantsog"])
+		if (src.level>=5)
+			var/mob/M = locate(href_list["grantsog"])
+			for (var/s in alien_whitelist)
+				if(findtext(s,"[M.ckey] - Soghun"))
+					alert("This key is already on the whitelist!", null, null, null, null, null)
+					return
+			alien_whitelist += "[M.ckey] - Soghun"
+		else
+			alert("You cannot perform this action. You must be of a higher administrative rank!")
+			return
+
 /***************** BEFORE**************
 
 	if (href_list["l_players"])
@@ -2473,6 +2498,8 @@ var/global/BSACooldown = 0
 		body += "<A href='?src=\ref[src];tdome2=\ref[M]'>Thunderdome 2</A> | "
 		body += "<A href='?src=\ref[src];tdomeadmin=\ref[M]'>Thunderdome Admin</A> | "
 		body += "<A href='?src=\ref[src];tdomeobserve=\ref[M]'>Thunderdome Observer</A> | "
+		body += "<A href='?src=\ref[src];granttaj=\ref[M]'>Grant Tajaran (Temp)</A> | "
+		body += "<A href='?src=\ref[src];grantsog=\ref[M]'>Grant Soghun (Temp)</A> | "
 
 	body += "<br>"
 	body += "</body></html>"
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 73e78818d2c..1e5b0833a21 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -917,13 +917,14 @@
 					drip(bloodloss)
 				else if(blood_volume < 560 && blood_volume)
 					var/datum/reagent/blood/B = locate() in vessel //Grab some blood
-					if(!B.data["donor"] == src) //If it's not theirs, then we look for theirs
-						for(var/datum/reagent/blood/D in vessel)
-							if(D.data["donor"] == src)
-								B = D
-								break
-					//At this point, we dun care which blood we are adding to, as long as they get more blood.
-					B.volume = max(min(B.volume + 560/blood_volume,560), 0) //Less blood = More blood generated per tick
+					if(B.data)
+						if(!B.data["donor"] == src) //If it's not theirs, then we look for theirs
+							for(var/datum/reagent/blood/D in vessel)
+								if(D.data["donor"] == src)
+									B = D
+									break
+						//At this point, we dun care which blood we are adding to, as long as they get more blood.
+						B.volume = max(min(B.volume + 560/blood_volume,560), 0) //Less blood = More blood generated per tick
 				if(!blood_volume)
 					bloodloss = 0
 				else if(blood_volume > 448)