Merge conflic fix

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

@@ -85,10 +85,10 @@
 		return
 	ui_interact(user)
 
-/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
-	ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
+/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
 	if (!ui)
-		ui = new(user, src, ui_key, "chem_dispenser", name, 530, 700)
+		ui = new(user, src, ui_key, "chem_dispenser", name, 550, 700)
 		ui.open()
 
 /obj/machinery/chem_dispenser/get_ui_data()
@@ -119,7 +119,7 @@
 	for(var/re in dispensable_reagents)
 		var/datum/reagent/temp = chemical_reagents_list[re]
 		if(temp)
-			chemicals.Add(list(list("title" = temp.name, "id" = temp.id, "commands" = list("reagent" = temp.id))))
+			chemicals.Add(list(list("title" = temp.name, "id" = temp.id)))
 	data["chemicals"] = chemicals
 	return data
 
@@ -129,7 +129,7 @@
 
 	switch(action)
 		if("amount")
-			amount = round(text2num(params["set"]), 5) // round to nearest 5
+			amount = round(text2num(params["amount"]), 5) // round to nearest 5
 			if (amount < 0) // Since the user can actually type the commands himself, some sanity checking
 				amount = 0
 			if (amount > 100)

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

@@ -87,6 +87,7 @@
 		if("temperature")
 			desired_temp = Clamp(input("Please input the target temperature", name) as num, 0, 1000)
 		if("eject")
+			on = FALSE
 			eject_beaker()
 	return 1
 
@@ -95,10 +96,10 @@
 		return
 	ui_interact(user)
 
-/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
-	ui = SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
+/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
 	if (!ui)
-		ui = new(user, src, ui_key, "chem_heater", name, 350, 400)
+		ui = new(user, src, ui_key, "chem_heater", name, 275, 400)
 		ui.open()
 
 /obj/machinery/chem_heater/get_ui_data()

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

@@ -141,9 +141,8 @@
  */
 
 /datum/reagent/water/reaction_obj(obj/O, reac_volume)
-	if(istype(O,/obj/item))
-		var/obj/item/Item = O
-		Item.extinguish()
+	if(istype(O))
+		O.extinguish()
 
 	// Monkey cube
 	if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/monkeycube))
@@ -163,10 +162,11 @@
  */
 
 /datum/reagent/water/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with water can help put them out!
-	if(!istype(M, /mob/living))
+	if(!istype(M))
 		return
 	if(method == TOUCH)
 		M.adjust_fire_stacks(-(reac_volume / 10))
+		M.ExtinguishMob()
 	..()
 
 /datum/reagent/water/holywater

code/modules/reagents/reagent_containers.dm

@@ -5,7 +5,7 @@
 	icon_state = null
 	w_class = 1
 	var/amount_per_transfer_from_this = 5
-	var/list/possible_transfer_amounts = list(5,10,15,25,30)
+	var/list/possible_transfer_amounts = list(5,10,15,20,25,30)
 	var/volume = 30
 	var/list/list_reagents = null
 	var/spawned_disease = null

code/modules/reagents/reagent_containers/glass.dm

@@ -1,7 +1,7 @@
 /obj/item/weapon/reagent_containers/glass
 	name = "glass"
 	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5, 10, 15, 25, 30, 50)
+	possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
 	volume = 50
 	flags = OPENCONTAINER
 	spillable = 1
@@ -197,7 +197,7 @@
 	materials = list(MAT_GLASS=2500)
 	volume = 100
 	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5,10,15,25,30,50,100)
+	possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
 	flags = OPENCONTAINER
 
 /obj/item/weapon/reagent_containers/glass/beaker/noreact
@@ -216,7 +216,7 @@
 	materials = list(MAT_GLASS=5000)
 	volume = 300
 	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5,10,15,25,30,50,100,300)
+	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
 	flags = OPENCONTAINER
 
 /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
@@ -253,7 +253,7 @@
 	materials = list(MAT_METAL=200)
 	w_class = 3
 	amount_per_transfer_from_this = 20
-	possible_transfer_amounts = list(10,20,30,50,70)
+	possible_transfer_amounts = list(10,15,20,25,30,50,70)
 	volume = 70
 	flags = OPENCONTAINER | BLOCKHAIR
 	slot_flags = SLOT_HEAD
@@ -290,4 +290,4 @@
 		. = ..()
 		slot_equipment_priority.Insert(index, slot_head)
 		return
-	return ..()
+	return ..()