Merge pull request #2426

code/game/machinery/vending.dm

@@ -1067,9 +1067,9 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	icon_state = "engivend"
 	icon_deny = "engivend-deny"
 	req_access_txt = "11" //Engineering Equipment access
-	products = list(/obj/item/clothing/glasses/meson/engine = 2, /obj/item/device/multitool = 4, /obj/item/electronics/airlock = 10, /obj/item/electronics/apc = 10, /obj/item/electronics/airalarm = 10, /obj/item/stock_parts/cell/high = 10, /obj/item/construction/rcd/loaded = 3, /obj/item/device/geiger_counter = 5)
+	products = list(/obj/item/clothing/glasses/meson/engine = 2, /obj/item/device/multitool = 4, /obj/item/electronics/airlock = 10, /obj/item/electronics/apc = 10, /obj/item/electronics/airalarm = 10, /obj/item/stock_parts/cell/high = 10, /obj/item/construction/rcd/loaded = 3, /obj/item/device/geiger_counter = 5, /obj/item/grenade/chem_grenade/smart_metal_foam = 10)
 	contraband = list(/obj/item/stock_parts/cell/potato = 3)
-	premium = list(/obj/item/storage/belt/utility = 3)
+	premium = list(/obj/item/storage/belt/utility = 3, /obj/item/storage/box/smart_metal_foam = 1)
 	armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
 	resistance_flags = FIRE_PROOF
 

code/game/objects/items/storage/boxes.dm

@@ -583,6 +583,15 @@
 	for(var/i in 1 to 7)
 		new /obj/item/grenade/chem_grenade/metalfoam(src)
 
+/obj/item/storage/box/smart_metal_foam
+	name = "box of smart metal foam grenades"
+	desc = "Used to rapidly seal hull breaches. This variety conforms to the walls of its area."
+	illustration = "flashbang"
+
+/obj/item/storage/box/smart_metal_foam/PopulateContents()
+	for(var/i in 1 to 7)
+		new/obj/item/grenade/chem_grenade/smart_metal_foam(src)
+
 /obj/item/storage/box/hug
 	name = "box of hugs"
 	desc = "A special box for sensitive people."
@@ -726,12 +735,13 @@
 
 /obj/item/storage/box/ingredients/Initialize()
 	..()
-	if(item_state)
+	if(icon_state)
-		name = "[name] ([item_state])"
+		name = "[name] ([icon_state])"
-		desc = "A box containing supplementary ingredients for the aspiring chef. This box's theme is '[item_state]'."
+		desc = "A box containing supplementary ingredients for the aspiring chef. This box's theme is '[icon_state]'."
+		item_state = "syringe_kit"
 
 /obj/item/storage/box/ingredients/wildcard
-	item_state = "wildcard"
+	icon_state = "wildcard"
 
 /obj/item/storage/box/ingredients/wildcard/PopulateContents()
 	for(var/i in 1 to 7)
@@ -752,7 +762,7 @@
 		new randomFood(src)
 
 /obj/item/storage/box/ingredients/fiesta
-	item_state = "fiesta"
+	icon_state = "fiesta"
 
 /obj/item/storage/box/ingredients/fiesta/PopulateContents()
 	new /obj/item/reagent_containers/food/snacks/tortilla(src)
@@ -762,7 +772,7 @@
 		new /obj/item/reagent_containers/food/snacks/grown/chili(src)
 
 /obj/item/storage/box/ingredients/italian
-	item_state = "italian"
+	icon_state = "italian"
 
 /obj/item/storage/box/ingredients/italian/PopulateContents()
 	for(var/i in 1 to 3)
@@ -771,7 +781,7 @@
 	new /obj/item/reagent_containers/food/drinks/bottle/wine(src)
 
 /obj/item/storage/box/ingredients/vegetarian
-	item_state = "vegetarian"
+	icon_state = "vegetarian"
 
 /obj/item/storage/box/ingredients/vegetarian/PopulateContents()
 	for(var/i in 1 to 2)
@@ -783,7 +793,7 @@
 	new /obj/item/reagent_containers/food/snacks/grown/tomato(src)
 
 /obj/item/storage/box/ingredients/american
-	item_state = "american"
+	icon_state = "american"
 
 /obj/item/storage/box/ingredients/american/PopulateContents()
 	for(var/i in 1 to 2)
@@ -793,7 +803,7 @@
 	new /obj/item/reagent_containers/food/snacks/faggot(src)
 
 /obj/item/storage/box/ingredients/fruity
-	item_state = "fruity"
+	icon_state = "fruity"
 
 /obj/item/storage/box/ingredients/fruity/PopulateContents()
 	for(var/i in 1 to 2)
@@ -804,7 +814,7 @@
 	new /obj/item/reagent_containers/food/snacks/grown/watermelon(src)
 
 /obj/item/storage/box/ingredients/sweets
-	item_state = "sweets"
+	icon_state = "sweets"
 
 /obj/item/storage/box/ingredients/sweets/PopulateContents()
 	for(var/i in 1 to 2)
@@ -815,7 +825,7 @@
 	new /obj/item/reagent_containers/food/snacks/grown/apple(src)
 
 /obj/item/storage/box/ingredients/delights
-	item_state = "delights"
+	icon_state = "delights"
 
 /obj/item/storage/box/ingredients/delights/PopulateContents()
 	for(var/i in 1 to 2)
@@ -826,7 +836,7 @@
 	new /obj/item/reagent_containers/food/snacks/grown/berries(src)
 
 /obj/item/storage/box/ingredients/grains
-	item_state = "grains"
+	icon_state = "grains"
 
 /obj/item/storage/box/ingredients/grains/PopulateContents()
 	for(var/i in 1 to 3)
@@ -837,7 +847,7 @@
 	new /obj/item/seeds/poppy(src)
 
 /obj/item/storage/box/ingredients/carnivore
-	item_state = "carnivore"
+	icon_state = "carnivore"
 
 /obj/item/storage/box/ingredients/carnivore/PopulateContents()
 	new /obj/item/reagent_containers/food/snacks/meat/slab/bear(src)
@@ -849,7 +859,7 @@
 	new /obj/item/reagent_containers/food/snacks/faggot(src)
 
 /obj/item/storage/box/ingredients/exotic
-	item_state = "exotic"
+	icon_state = "exotic"
 
 /obj/item/storage/box/ingredients/exotic/PopulateContents()
 	for(var/i in 1 to 2)

code/game/turfs/simulated/floor.dm

@@ -24,7 +24,7 @@
 	..()
 	//This is so damaged or burnt tiles or platings don't get remembered as the default tile
 	var/static/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","damaged4",
-					"damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2",
+					"damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2", "foam_plating",
 					"platingdmg3","plating","light_on","light_on_flicker1","light_on_flicker2",
 					"light_on_clicker3","light_on_clicker4","light_on_clicker5","light_broken",
 					"light_on_broken","light_off","wall_thermite","grass", "sand",

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 /////////////////////////////////////////////////