- Fixed one of the ways the Core R&D Computer can lock up and become completely unusable. If it gets stuck from using this method, just close the window and click on the computer again. Fixes issue 316.

- Vaccine bottles from the panD.E.M.I.C. now auto-name. There was a bug where you could very quickly create a ton of bottles which could cause clients to crash. Fixes issue 326.

- Changed various ASSERT()'s to sanity ifs. ASSERT should really only be used during debugging, not in release. Runtime prevention.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3368 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/chemical/Chemistry-Machinery.dm

@@ -388,24 +388,23 @@
 		if (href_list["create_vaccine"])
 			if(!src.wait)
 				var/obj/item/weapon/reagent_containers/glass/bottle/B = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc)
-				var/vaccine_type = text2path(href_list["create_vaccine"])//the path is received as string - converting
-				var/datum/disease/D = new vaccine_type
-				var/name = input(usr,"Name:","Name the vaccine",D.name)
-				if(!name || name == " ") name = D.name
 				if(B)
-					B.name = "[name] vaccine bottle"
-					B.reagents.add_reagent("vaccine",15,vaccine_type)
-				del(D)
-				wait = 1
-				var/datum/reagents/R = beaker.reagents
-				var/datum/reagent/blood/Blood = null
-				for(var/datum/reagent/blood/L in R.reagent_list)
-					if(L)
-						Blood = L
-						break
-				var/list/res = Blood.data["resistances"]
-				spawn(res.len*500)
-					src.wait = null
+					var/vaccine_type = text2path(href_list["create_vaccine"])//the path is received as string - converting
+					var/datum/disease/D = new vaccine_type
+					if(D)
+						B.name = "[D.name] vaccine bottle"
+						B.reagents.add_reagent("vaccine",15,vaccine_type)
+						del(D)
+						wait = 1
+						var/datum/reagents/R = beaker.reagents
+						var/datum/reagent/blood/Blood = null
+						for(var/datum/reagent/blood/L in R.reagent_list)
+							if(L)
+								Blood = L
+								break
+						var/list/res = Blood.data["resistances"]
+						spawn(res.len*500)
+							src.wait = null
 			else
 				src.temphtml = "The replicator is not ready yet."
 			src.updateUsrDialog()

code/modules/research/rdconsole.dm

@@ -268,6 +268,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 							if(!linked_destroy.hacked)
 								if(!linked_destroy.loaded_item)
 									usr <<"\red The destructive analyzer appears to be empty."
+									screen = 1.0
 									return
 								if(linked_destroy.loaded_item.reliability >= 90)
 									var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech)