Merge branch 'master' into tgui-medical

code/modules/reagents/chemistry/reagents/toxins.dm

@@ -1237,6 +1237,7 @@
 	description = "An advanced corruptive toxin produced by something terrible."
 	reagent_state = LIQUID
 	color = "#5EFF3B" //RGB: 94, 255, 59
+	can_synth = FALSE
 	taste_description = "decay"
 
 /datum/reagent/gluttonytoxin/reaction_mob(mob/living/L, method=REAGENT_TOUCH, reac_volume)

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

@@ -56,7 +56,6 @@
 /datum/chemical_reaction/nitroglycerin
 	name = "Nitroglycerin"
 	id = "nitroglycerin"
-	result = "nitroglycerin"
 	required_reagents = list("glycerol" = 1, "facid" = 1, "sacid" = 1)
 	result_amount = 2
 

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

@@ -38,7 +38,7 @@
 /datum/chemical_reaction/slimemonkey/on_reaction(datum/reagents/holder)
 	feedback_add_details("slime_cores_used","[type]")
 	for(var/i = 1, i <= 3, i++)
-		var /obj/item/reagent_containers/food/snacks/monkeycube/M = new /obj/item/reagent_containers/food/snacks/monkeycube
+		var/obj/item/reagent_containers/food/snacks/monkeycube/M = new /obj/item/reagent_containers/food/snacks/monkeycube
 		M.forceMove(get_turf(holder.my_atom))
 
 //Green

code/modules/reagents/reagent_containers/applicator.dm

@@ -5,6 +5,7 @@
 	icon_state = "mender"
 	item_state = "mender"
 	volume = 200
+	possible_transfer_amounts = null
 	resistance_flags = ACID_PROOF
 	container_type = REFILLABLE | AMOUNT_VISIBLE
 	temperature_min = 270
@@ -21,6 +22,9 @@
 		ignore_flags = TRUE
 		to_chat(user, "<span class='warning'>You short out the safeties on [src].</span>")
 
+/obj/item/reagent_containers/applicator/set_APTFT()
+	set hidden = TRUE
+
 /obj/item/reagent_containers/applicator/on_reagent_change()
 	if(!emagged)
 		var/found_forbidden_reagent = FALSE
@@ -93,6 +97,20 @@
 
 		playsound(get_turf(src), pick('sound/goonstation/items/mender.ogg', 'sound/goonstation/items/mender2.ogg'), 50, 1)
 
+/obj/item/reagent_containers/applicator/verb/empty()
+	set name = "Empty Applicator"
+	set category = "Object"
+	set src in usr
+
+	if(usr.incapacitated())
+		return
+	if(alert(usr, "Are you sure you want to empty [src]?", "Empty Applicator:", "Yes", "No") != "Yes")
+		return
+	if(!usr.incapacitated() && isturf(usr.loc) && loc == usr)
+		to_chat(usr, "<span class='notice'>You empty [src] onto the floor.</span>")
+		reagents.reaction(usr.loc)
+		reagents.clear_reagents()
+
 /obj/item/reagent_containers/applicator/brute
 	name = "brute auto-mender"
 	list_reagents = list("styptic_powder" = 200)
@@ -104,3 +122,6 @@
 /obj/item/reagent_containers/applicator/dual
 	name = "dual auto-mender"
 	list_reagents = list("synthflesh" = 200)
+
+/obj/item/reagent_containers/applicator/dual/syndi // It magically goes through hardsuits. Don't ask how.
+	ignore_flags = TRUE

code/modules/reagents/reagent_containers/bottle.dm

@@ -42,6 +42,13 @@
 		var/image/lid = image(icon, src, "lid_bottle")
 		overlays += lid
 
+/obj/item/reagent_containers/glass/bottle/decompile_act(obj/item/matter_decompiler/C, mob/user)
+	if(!reagents.total_volume)
+		C.stored_comms["glass"] += 3
+		qdel(src)
+		return TRUE
+	return ..()
+
 /obj/item/reagent_containers/glass/bottle/toxin
 	name = "toxin bottle"
 	desc = "A small bottle containing toxic compounds."

code/modules/reagents/reagent_containers/glass_containers.dm

@@ -47,6 +47,9 @@
 			reagents.reaction(M, REAGENT_TOUCH)
 			reagents.clear_reagents()
 		else
+			if(!iscarbon(M)) // Non-carbons can't process reagents
+				to_chat(user, "<span class='warning'>You cannot find a way to feed [M].</span>")
+				return
 			if(M != user)
 				M.visible_message("<span class='danger'>[user] attempts to feed something to [M].</span>", \
 							"<span class='userdanger'>[user] attempts to feed something to you.</span>")

code/modules/reagents/reagent_containers/syringes.dm

@@ -24,6 +24,9 @@
 		mode = SYRINGE_INJECT
 		update_icon()
 
+/obj/item/reagent_containers/syringe/set_APTFT()
+	set hidden = TRUE
+
 /obj/item/reagent_containers/syringe/on_reagent_change()
 	update_icon()