Merge pull request #2426

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -62,6 +62,13 @@
 				data["viruses"] = preserve
 	return 1
 
+/datum/reagent/blood/proc/get_diseases()
+	. = list()
+	if(data && data["viruses"])
+		for(var/thing in data["viruses"])
+			var/datum/disease/D = thing
+			. += D
+
 /datum/reagent/blood/reaction_turf(turf/T, reac_volume)//splash the blood all over the place
 	if(!istype(T))
 		return
@@ -1079,6 +1086,14 @@
 	color = "#664B63" // rgb: 102, 75, 99
 	taste_description = "metal"
 
+/datum/reagent/smart_foaming_agent //Smart foaming agent. Functions similarly to metal foam, but conforms to walls.
+	name = "Smart foaming agent"
+	id = "smart_foaming_agent"
+	description = "A agent that yields metallic foam which conforms to area boundaries when mixed with light metal and a strong acid."
+	reagent_state = SOLID
+	color = "#664B63" // rgb: 102, 75, 99
+	taste_description = "metal"
+
 /datum/reagent/ammonia
 	name = "Ammonia"
 	id = "ammonia"
@@ -1558,6 +1573,18 @@
 		ZI.Insert(H)
 	..()
 
+/datum/reagent/magillitis
+	name = "Magillitis"
+	id = "magillitis"
+	description = "An experimental serum which causes rapid muscular growth in basic primates. Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
+	reagent_state = LIQUID
+	color = "#00f041"
+
+/datum/reagent/magillitis/on_mob_life(mob/living/carbon/M)
+	..()
+	if(ismonkey(M) && current_cycle >= 10)
+		return M.gorillize()
+
 /datum/reagent/growthserum
 	name = "Growth Serum"
 	id = "growthserum"

code/modules/reagents/chemistry/recipes/others.dm

@@ -466,6 +466,20 @@
 	s.start()
 	holder.clear_reagents()
 
+/datum/chemical_reaction/smart_foam
+	name = "Smart Metal Foam"
+	id = "smart_metal_foam"
+	required_reagents = list("aluminium" = 3, "smart_foaming_agent" = 1, "facid" = 1)
+	mob_react = TRUE
+
+/datum/chemical_reaction/smart_foam/on_reaction(datum/reagents/holder, created_volume)
+	var/turf/location = get_turf(holder.my_atom)
+	location.visible_message("<span class='danger'>The solution spews out metallic foam!</span>")
+	var/datum/effect_system/foam_spread/metal/smart/s = new()
+	s.set_up(created_volume * 5, location, holder, TRUE)
+	s.start()
+	holder.clear_reagents()
+
 /datum/chemical_reaction/ironfoam
 	name = "Iron Foam"
 	id = "ironlfoam"
@@ -487,6 +501,13 @@
 	results = list("foaming_agent" = 1)
 	required_reagents = list("lithium" = 1, "hydrogen" = 1)
 
+/datum/chemical_reaction/smart_foaming_agent
+	name = "Smart foaming Agent"
+	id = "smart_foaming_agent"
+	results = list("smart_foaming_agent" = 3)
+	required_reagents = list("foaming_agent" = 3, "acetone" = 1, "iron" = 1)
+	mix_message = "The solution mixes into a frothy metal foam and conforms to the walls of its container."
+
 
 /////////////////////////////// Cleaning and hydroponics /////////////////////////////////////////////////