Merge remote-tracking branch 'citadel/master' into mobility_flags

code/modules/research/designs/biogenerator_designs.dm

@@ -3,7 +3,7 @@
 ///////////////////////////////////
 
 /datum/design/milk
-	name = "10 Milk"
+	name = "10u Milk"
 	id = "milk"
 	build_type = BIOGENERATOR
 	materials = list(MAT_BIOMASS = 20)
@@ -11,7 +11,7 @@
 	category = list("initial","Food")
 
 /datum/design/cream
-	name = "10 Cream"
+	name = "10u Cream"
 	id = "cream"
 	build_type = BIOGENERATOR
 	materials = list(MAT_BIOMASS = 30)
@@ -123,6 +123,22 @@
 	build_path = /obj/item/reagent_containers/glass/bottle/killer/pestkiller
 	category = list("initial","Botany Chemicals")
 
+/datum/design/ammonia
+	name = "10u Ammonia"
+	id = "ammonia_biogen"
+	build_type = BIOGENERATOR
+	materials = list(MAT_BIOMASS = 25)
+	make_reagents = list(/datum/reagent/ammonia = 10)
+	category = list("initial","Botany Chemicals")
+
+/datum/design/saltpetre
+	name = "10u Saltpetre"
+	id = "saltpetre_biogen"
+	build_type = BIOGENERATOR
+	materials = list(MAT_BIOMASS = 75)
+	make_reagents = list(/datum/reagent/saltpetre = 10)
+	category = list("initial","Botany Chemicals")
+
 /datum/design/botany_bottle
 	name = "Empty Bottle"
 	id = "botany_bottle"

code/modules/research/xenobiology/crossbreeding/_status_effects.dm

@@ -890,8 +890,8 @@ datum/status_effect/stabilized/blue/on_remove()
 			healing_types += TOX
 		if(owner.getCloneLoss() > 0)
 			healing_types += CLONE
-
-		owner.apply_damage_type(-heal_amount, damagetype=pick(healing_types))
+		if(length(healing_types))
+			owner.apply_damage_type(-heal_amount, damagetype=pick(healing_types))
 		owner.nutrition += 3
 		M.adjustCloneLoss(heal_amount * 1.2) //This way, two people can't just convert each other's damage away.
 	else