Merge branch 'master' into donoritemmodularization

code/modules/reagents/chemistry/holder.dm

@@ -1,5 +1,4 @@
 
-
 ///////////////////////////////////////////////////////////////////////////////////
 
 /datum/reagents
@@ -377,8 +376,8 @@
 						remove_reagent(B, (multiplier * cached_required_reagents[B]), safety = 1)
 
 					for(var/P in C.results)
-						SSblackbox.add_details("chemical_reaction", "[P]|[cached_results[P]*multiplier]")
 						multiplier = max(multiplier, 1) //this shouldnt happen ...
+						SSblackbox.record_feedback("tally", "chemical_reaction", cached_results[P]*multiplier, P)
 						add_reagent(P, cached_results[P]*multiplier, null, chem_temp)
 
 					var/list/seen = viewers(4, get_turf(my_atom))
@@ -428,7 +427,7 @@
 			reagent_list -= R
 			update_total()
 			if(my_atom)
-				my_atom.on_reagent_change()
+				my_atom.on_reagent_change(DEL_REAGENT)
 				check_ignoreslow(my_atom)
 				check_gofast(my_atom)
 				check_goreallyfast(my_atom)
@@ -526,7 +525,7 @@
 			R.volume += amount
 			update_total()
 			if(my_atom)
-				my_atom.on_reagent_change()
+				my_atom.on_reagent_change(ADD_REAGENT)
 			R.on_merge(data, amount)
 			if(!no_react)
 				handle_reactions()
@@ -545,7 +544,7 @@
 
 		update_total()
 		if(my_atom)
-			my_atom.on_reagent_change()
+			my_atom.on_reagent_change(ADD_REAGENT)
 		if(!no_react)
 			handle_reactions()
 		if(isliving(my_atom))
@@ -587,7 +586,7 @@
 			if(!safety)//So it does not handle reactions when it need not to
 				handle_reactions()
 			if(my_atom)
-				my_atom.on_reagent_change()
+				my_atom.on_reagent_change(REM_REAGENT)
 			return TRUE
 
 	return FALSE

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

@@ -170,7 +170,7 @@
 				. = TRUE
 		if("eject")
 			if(beaker)
-				beaker.forceMove(loc)
+				beaker.forceMove(drop_location())
 				beaker = null
 				cut_overlays()
 				. = TRUE
@@ -301,7 +301,7 @@
 
 /obj/machinery/chem_dispenser/constructable/on_deconstruction()
 	if(beaker)
-		beaker.loc = loc
+		beaker.forceMove(drop_location())
 		beaker = null
 
 /obj/machinery/chem_dispenser/drinks

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

@@ -111,7 +111,7 @@
 
 /obj/machinery/chem_heater/proc/eject_beaker()
 	if(beaker)
-		beaker.loc = get_turf(src)
+		beaker.forceMove(drop_location())
 		beaker.reagents.handle_reactions()
 		beaker = null
 		icon_state = "mixer0b"

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

@@ -121,7 +121,7 @@
 		add_overlay("waitlight")
 
 /obj/machinery/computer/pandemic/proc/eject_beaker()
-	beaker.forceMove(get_turf(src))
+	beaker.forceMove(drop_location())
 	beaker = null
 	update_icon()
 
@@ -186,7 +186,7 @@
 			var/id = get_virus_id_by_index(text2num(params["index"]))
 			var/datum/disease/advance/A = new(FALSE, SSdisease.archive_diseases[id])
 			var/list/data = list("viruses" = list(A))
-			var/obj/item/reagent_containers/glass/bottle/B = new(get_turf(src))
+			var/obj/item/reagent_containers/glass/bottle/B = new(drop_location())
 			B.name = "[A.name] culture bottle"
 			B.desc = "A small bottle. Contains [A.agent] culture in synthblood medium."
 			B.reagents.add_reagent("blood", 20, data)
@@ -195,11 +195,11 @@
 			addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 50)
 			. = TRUE
 		if("create_vaccine_bottle")
-			var/index = text2num(params["index"])
-			var/datum/disease/D = SSdisease.archive_diseases[get_virus_id_by_index(index)]
-			var/obj/item/reagent_containers/glass/bottle/B = new(get_turf(src))
+			var/id = params["index"]
+			var/datum/disease/D = SSdisease.archive_diseases[id]
+			var/obj/item/reagent_containers/glass/bottle/B = new(drop_location())
 			B.name = "[D.name] vaccine bottle"
-			B.reagents.add_reagent("vaccine", 15, list(index))
+			B.reagents.add_reagent("vaccine", 15, list(id))
 			wait = TRUE
 			update_icon()
 			addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 200)
@@ -237,6 +237,6 @@
 
 /obj/machinery/computer/pandemic/on_deconstruction()
 	if(beaker)
-		beaker.forceMove(get_turf(src))
+		beaker.forceMove(drop_location())
 		beaker = null
 	. = ..()

code/modules/reagents/chemistry/recipes.dm

@@ -29,9 +29,9 @@
 			for (var/T in typesof(/mob/living/simple_animal))
 				var/mob/living/simple_animal/SA = T
 				switch(initial(SA.gold_core_spawnable))
-					if(1)
+					if(HOSTILE_SPAWN)
 						chemical_mob_spawn_meancritters += T
-					if(2)
+					if(FRIENDLY_SPAWN)
 						chemical_mob_spawn_nicecritters += T
 		var/atom/A = holder.my_atom
 		var/turf/T = get_turf(A)

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

@@ -3,7 +3,7 @@
 	var/deletes_extract = TRUE
 
 /datum/chemical_reaction/slime/on_reaction(datum/reagents/holder)
-	SSblackbox.add_details("slime_cores_used","[type]")
+	SSblackbox.record_feedback("tally", "slime_cores_used", 1, "type")
 	if(deletes_extract)
 		delete_extract(holder)
 
@@ -641,4 +641,3 @@
 /datum/chemical_reaction/slime/flight_potion/on_reaction(datum/reagents/holder)
 	new /obj/item/reagent_containers/glass/bottle/potion/flight(get_turf(holder.my_atom))
 	..()
-

code/modules/reagents/reagent_containers/blood_pack.dm

@@ -13,7 +13,7 @@
 		reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
 		update_icon()
 
-/obj/item/reagent_containers/blood/on_reagent_change()
+/obj/item/reagent_containers/blood/on_reagent_change(changetype)
 	if(reagents)
 		var/datum/reagent/blood/B = reagents.has_reagent("blood")
 		if(B && B.data && B.data["blood_type"])

code/modules/reagents/reagent_containers/bottle.dm

@@ -15,7 +15,7 @@
 		icon_state = "bottle"
 	update_icon()
 
-/obj/item/reagent_containers/glass/bottle/on_reagent_change()
+/obj/item/reagent_containers/glass/bottle/on_reagent_change(changetype)
 	update_icon()
 
 /obj/item/reagent_containers/glass/bottle/update_icon()

code/modules/reagents/reagent_containers/glass.dm

@@ -126,7 +126,7 @@
 	. = ..()
 	update_icon()
 
-/obj/item/reagent_containers/glass/beaker/on_reagent_change()
+/obj/item/reagent_containers/glass/beaker/on_reagent_change(changetype)
 	update_icon()
 
 /obj/item/reagent_containers/glass/beaker/update_icon()
@@ -315,101 +315,101 @@
 	list_reagents = list()
 
 /obj/item/reagent_containers/glass/beaker/large/hydrogen
-	name = "hydrogen"
+	name = "hydrogen beaker"
 	list_reagents = list("hydrogen" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/lithium
-	name = "lithium"
+	name = "lithium beaker"
 	list_reagents = list("lithium" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/carbon
-	name = "carbon"
+	name = "carbon beaker"
 	list_reagents = list("carbon" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/nitrogen
-	name = "nitrogen"
+	name = "nitrogen beaker"
 	list_reagents = list("nitrogen" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/oxygen
-	name = "oxygen"
+	name = "oxygen beaker"
 	list_reagents = list("oxygen" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/fluorine
-	name = "fluorine"
+	name = "fluorine beaker"
 	list_reagents = list("fluorine" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/sodium
-	name = "sodium"
+	name = "sodium beaker"
 	list_reagents = list("sodium" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/aluminium
-	name = "aluminium"
+	name = "aluminium beaker"
 	list_reagents = list("aluminium" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/silicon
-	name = "silicon"
+	name = "silicon beaker"
 	list_reagents = list("silicon" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/phosphorus
-	name = "phosphorus"
+	name = "phosphorus beaker"
 	list_reagents = list("phosphorus" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/sulfur
-	name = "sulfur"
+	name = "sulfur beaker"
 	list_reagents = list("sulfur" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/chlorine
-	name = "chlorine"
+	name = "chlorine beaker"
 	list_reagents = list("chlorine" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/potassium
-	name = "potassium"
+	name = "potassium beaker"
 	list_reagents = list("potassium" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/iron
-	name = "iron"
+	name = "iron beaker"
 	list_reagents = list("iron" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/copper
-	name = "copper"
+	name = "copper beaker"
 	list_reagents = list("copper" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/mercury
-	name = "mercury"
+	name = "mercury beaker"
 	list_reagents = list("mercury" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/radium
-	name = "radium"
+	name = "radium beaker"
 	list_reagents = list("radium" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/water
-	name = "water"
+	name = "water beaker"
 	list_reagents = list("water" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/ethanol
-	name = "ethanol"
+	name = "ethanol beaker"
 	list_reagents = list("ethanol" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/sugar
-	name = "sugar"
+	name = "sugar beaker"
 	list_reagents = list("sugar" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/sacid
-	name = "sacid"
+	name = "sulphuric acid beaker"
 	list_reagents = list("sacid" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/welding_fuel
-	name = "welding_fuel"
+	name = "welding fuel beaker"
 	list_reagents = list("welding_fuel" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/silver
-	name = "silver"
+	name = "silver beaker"
 	list_reagents = list("silver" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/iodine
-	name = "iodine"
+	name = "iodine beaker"
 	list_reagents = list("iodine" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/bromine
-	name = "bromine"
+	name = "bromine beaker"
 	list_reagents = list("bromine" = 50)

code/modules/reagents/reagent_containers/syringes.dm

@@ -21,7 +21,7 @@
 		mode = SYRINGE_INJECT
 		update_icon()
 
-/obj/item/reagent_containers/syringe/on_reagent_change()
+/obj/item/reagent_containers/syringe/on_reagent_change(changetype)
 	update_icon()
 
 /obj/item/reagent_containers/syringe/pickup(mob/user)