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

code/modules/reagents/chemistry/machinery/pandemic.dm

@@ -139,9 +139,12 @@
 
 /obj/machinery/computer/pandemic/proc/eject_beaker()
 	if(beaker)
+		var/obj/item/reagent_containers/B = beaker
 		beaker.forceMove(drop_location())
 		beaker = null
 		update_icon()
+		return B
+	return null
 
 /obj/machinery/computer/pandemic/ui_interact(mob/user, datum/tgui/ui)
 	ui = SStgui.try_update_ui(user, src, ui)
@@ -237,14 +240,17 @@
 		. = TRUE //no afterattack
 		if(stat & (NOPOWER|BROKEN))
 			return
+		var/obj/item/reagent_containers/B
 		if(beaker)
-			to_chat(user, "<span class='warning'>A container is already loaded into [src]!</span>")
-			return
+			B = eject_beaker() //now with 100% more swapping
 		if(!user.transferItemToLoc(I, src))
 			return
-
+		if(B)
+			if(user && Adjacent(user) && user.can_hold_items())
+				user.put_in_hands(B)
 		beaker = I
-		to_chat(user, "<span class='notice'>You insert [I] into [src].</span>")
+		if(B) to_chat(user, "<span class='notice'>You remove [B] and insert [I] into [src].</span>")
+		else to_chat(user, "<span class='notice'>You insert [I] into [src].</span>")
 		update_icon()
 	else
 		return ..()

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

@@ -330,7 +330,7 @@
 	name = "Hollow Water"
 	description = "An ubiquitous chemical substance that is composed of hydrogen and oxygen, but it looks kinda hollow."
 	color = "#88878777"
-	taste_description = "emptyiness"
+	taste_description = "emptiness"
 
 
 /datum/reagent/water/holywater

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

@@ -335,7 +335,7 @@
 	required_reagents = list( /datum/reagent/medicine/mannitol = 2, /datum/reagent/water = 2, /datum/reagent/impedrezene = 1)
 
 /datum/chemical_reaction/medsuture
-	required_reagents = list(/datum/reagent/cellulose = 10, /datum/reagent/toxin/formaldehyde = 20, /datum/reagent/medicine/polypyr = 15) //This might be a bit much, reagent cost should be reviewed after implementation.
+	required_reagents = list(/datum/reagent/cellulose = 5, /datum/reagent/toxin/formaldehyde = 5, /datum/reagent/medicine/polypyr = 5) //This might be a bit much, reagent cost should be reviewed after implementation.
 
 /datum/chemical_reaction/medsuture/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
@@ -343,7 +343,7 @@
 		new /obj/item/stack/medical/suture/medicated(location)
 
 /datum/chemical_reaction/medmesh
-	required_reagents = list(/datum/reagent/cellulose = 20, /datum/reagent/consumable/aloejuice = 20, /datum/reagent/space_cleaner/sterilizine = 10)
+	required_reagents = list(/datum/reagent/cellulose = 5, /datum/reagent/consumable/aloejuice = 5, /datum/reagent/space_cleaner/sterilizine = 5)
 
 /datum/chemical_reaction/medmesh/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)

code/modules/reagents/reagent_containers/bottle.dm

@@ -453,3 +453,8 @@
 /obj/item/reagent_containers/glass/bottle/ichor/green
 	name = "green potion"
 	list_reagents = list(/datum/reagent/green_ichor = 1)
+
+/obj/item/reagent_containers/glass/bottle/thermite
+	name = "thermite bottle"
+	list_reagents = list(/datum/reagent/thermite = 30)
+