Merge pull request #1788 from Datraen/Xenobio2_Tweaks

Xenobio2 tweaks

code/modules/reagents/reagent_containers/glass.dm

@@ -41,7 +41,8 @@
 		/obj/machinery/smartfridge/,
 		/obj/machinery/biogenerator,
 		/obj/structure/frame,
-		/obj/machinery/radiocarbon_spectrometer
+		/obj/machinery/radiocarbon_spectrometer,
+		/obj/machinery/xenobio2/manualinjector
 		)
 
 /obj/item/weapon/reagent_containers/glass/New()

code/modules/xenobio2/machinery/core_extractor.dm

@@ -112,6 +112,8 @@
 			var/obj/item/xenoproduct/slime/core/C = new(src)
 			C.traits = occupant.traitdat
 			
+			C.nameVar = occupant.nameVar
+			
 			C.create_reagents(C.traits.traits[TRAIT_XENO_CHEMVOL])
 			for(var/reagent in occupant.traitdat.chems)
 				C.reagents.add_reagent(reagent, occupant.traitdat.chems[reagent])

code/modules/xenobio2/machinery/injector_computer.dm

@@ -60,9 +60,10 @@
 		data["occupied"] = 1
 	if(isxeno(injector.occupant))
 		var/mob/living/simple_animal/xeno/X = injector.occupant
-		data["instability"] = (X.mut_level / X.mut_max) * 100
+		data["compatible"] = 1
+		data["instability"] = 100 * (X.mut_level / X.mut_max) 
 	else
-		data["instability"] = null
+		data["compatible"] = null
 
 	if(injector.beaker)
 		data["reagentAmount"] = injector.beaker.reagents.total_volume

code/modules/xenobio2/machinery/slime_replicator.dm

@@ -74,6 +74,8 @@
 	spawn(30)
 		var/mob/living/simple_animal/xeno/slime/S = new(src)
 		S.traitdat = core.traits
+		S.nameVar = core.nameVar
+		S.name = "[S.nameVar] baby slime"
 		S.ProcessTraits()
 		qdel(core)
 		spawn(30)

code/modules/xenobio2/mob/xeno procs.dm

@@ -51,8 +51,6 @@ Procs for targeting
 	if(!stasis)
 		if(!reagents)
 			return
-		if(reagents.total_volume <= 0)
-			return
 
 		//Let's handle some chemical smoke, for scientific smoke bomb purposes.
 		for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))

code/modules/xenobio2/mob/xeno_product.dm

@@ -9,4 +9,5 @@ Xenobiological product lives here as a basic type.
 	var/datum/xeno/traits/traits
 	var/source = "Unknown"
 	var/product = "mess"
+	var/nameVar = "blah"