From 78abe5bfdac19df750fe526bc6b320f7e339a3b4 Mon Sep 17 00:00:00 2001
From: "giacomand@gmail.com"
 <giacomand@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Thu, 21 Feb 2013 13:46:03 +0000
Subject: [PATCH]  - The user wasn't being put into the arguments of the proc,
 which allows admins to create their own disesases. I put the argument back.
 Fixes Issue 1312

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5753 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/datums/diseases/advance/advance.dm | 27 ++++++++++++++++---------
 code/modules/admin/topic.dm             |  2 +-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index abc19e19899..4cb30ac2071 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -372,7 +372,11 @@ var/list/advance_cures = 	list(
 		if(preserve.len)
 			R.data["viruses"] = preserve
 
-/proc/AdminCreateVirus(var/mob/user)
+/proc/AdminCreateVirus(var/client/user)
+
+	if(!user)
+		return
+
 	var/i = 5
 
 	var/datum/disease/advance/D = new(0, null)
@@ -382,19 +386,24 @@ var/list/advance_cures = 	list(
 	symptoms += "Done"
 	symptoms += list_symptoms.Copy()
 	do
-		var/symptom = input(user, "Choose a symptom to add ([i] remaining)", "Choose a Symptom") in symptoms
-		if(istext(symptom))
-			i = 0
-		else if(ispath(symptom))
-			var/datum/symptom/S = new symptom
-			if(!D.HasSymptom(S))
-				D.symptoms += S
-				i -= 1
+		if(user)
+			var/symptom = input(user, "Choose a symptom to add ([i] remaining)", "Choose a Symptom") in symptoms
+			if(isnull(symptom))
+				return
+			else if(istext(symptom))
+				i = 0
+			else if(ispath(symptom))
+				var/datum/symptom/S = new symptom
+				if(!D.HasSymptom(S))
+					D.symptoms += S
+					i -= 1
 	while(i > 0)
 
 	if(D.symptoms.len > 0)
 
 		var/new_name = input(user, "Name your new disease.", "New Name")
+		if(!new_name)
+			return
 		D.AssignName(new_name)
 		D.Refresh()
 
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 29baee6db3b..a944869c215 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2089,7 +2089,7 @@
 				feedback_add_details("admin_secrets_fun_used","V")
 				switch(alert("Do you want this to be a random disease or do you have something in mind?",,"Make Your Own","Random","Choose"))
 					if("Make Your Own")
-						AdminCreateVirus()
+						AdminCreateVirus(usr.client)
 					if("Random")
 						new /datum/event/disease_outbreak(overrides)
 					if("Choose")