reagent holder rework

citadel.dme

@@ -1621,7 +1621,6 @@
 #include "code\game\objects\items\signs.dm"
 #include "code\game\objects\items\spritechanger.dm"
 #include "code\game\objects\items\throwing.dm"
-#include "code\game\objects\items\toys.dm"
 #include "code\game\objects\items\trash.dm"
 #include "code\game\objects\items\upgradekit.dm"
 #include "code\game\objects\items\circuitboards\broken.dm"
@@ -1801,6 +1800,8 @@
 #include "code\game\objects\items\tools\weldingtool.dm"
 #include "code\game\objects\items\tools\wirecutters.dm"
 #include "code\game\objects\items\tools\wrench.dm"
+#include "code\game\objects\items\toys\balloon.dm"
+#include "code\game\objects\items\toys\toys.dm"
 #include "code\game\objects\items\weapons\AI_modules.dm"
 #include "code\game\objects\items\weapons\autopsy.dm"
 #include "code\game\objects\items\weapons\barrier_tape.dm"
@@ -1932,7 +1933,7 @@
 #include "code\game\objects\structures\loot_piles.dm"
 #include "code\game\objects\structures\low_wall.dm"
 #include "code\game\objects\structures\map_blocker.dm"
-#include "code\game\objects\structures\medical_stand_vr.dm"
+#include "code\game\objects\structures\medical_stand.dm"
 #include "code\game\objects\structures\mineral_bath.dm"
 #include "code\game\objects\structures\mirror.dm"
 #include "code\game\objects\structures\mop_bucket.dm"
@@ -3718,7 +3719,11 @@
 #include "code\modules\mob\living\bot\mulebot.dm"
 #include "code\modules\mob\living\bot\secbot.dm"
 #include "code\modules\mob\living\bot\SLed209bot.dm"
+#include "code\modules\mob\living\carbon\blood_fragment.dm"
+#include "code\modules\mob\living\carbon\blood_holder.dm"
+#include "code\modules\mob\living\carbon\blood_mixture.dm"
 #include "code\modules\mob\living\carbon\breathe.dm"
+#include "code\modules\mob\living\carbon\carbon-blood.dm"
 #include "code\modules\mob\living\carbon\carbon-defense.dm"
 #include "code\modules\mob\living\carbon\carbon-hands.dm"
 #include "code\modules\mob\living\carbon\carbon.dm"
@@ -4668,17 +4673,18 @@
 #include "code\modules\random_map\noise\tundra.dm"
 #include "code\modules\reagents\exposedprocs.dm"
 #include "code\modules\reagents\reagent_containers.dm"
-#include "code\modules\reagents\chemistry\_readme.dm"
 #include "code\modules\reagents\chemistry\chemical_reaction-legacy.dm"
 #include "code\modules\reagents\chemistry\chemical_reaction.dm"
-#include "code\modules\reagents\chemistry\colors.dm"
 #include "code\modules\reagents\chemistry\helpers.dm"
 #include "code\modules\reagents\chemistry\machinery.dm"
-#include "code\modules\reagents\chemistry\metabolism.dm"
 #include "code\modules\reagents\chemistry\reagent.dm"
+#include "code\modules\reagents\chemistry\reagent_holder-color.dm"
+#include "code\modules\reagents\chemistry\reagent_holder-helpers.dm"
 #include "code\modules\reagents\chemistry\reagent_holder-legacy.dm"
+#include "code\modules\reagents\chemistry\reagent_holder-metabolism.dm"
 #include "code\modules\reagents\chemistry\reagent_holder-reactions.dm"
 #include "code\modules\reagents\chemistry\reagent_holder.dm"
+#include "code\modules\reagents\chemistry\reagent_metabolism.dm"
 #include "code\modules\reagents\chemistry\wiki_generation.dm"
 #include "code\modules\reagents\chemistry\reactions\automata.dm"
 #include "code\modules\reagents\chemistry\reactions\carpet.dm"
@@ -4701,13 +4707,31 @@
 #include "code\modules\reagents\chemistry\reagents\Chemistry-Reagents-Other.dm"
 #include "code\modules\reagents\chemistry\reagents\Chemistry-Reagents-Toxins.dm"
 #include "code\modules\reagents\chemistry\reagents\Chemistry-Topical.dm"
+#include "code\modules\reagents\chemistry\reagents\core\acid.dm"
+#include "code\modules\reagents\chemistry\reagents\core\blood.dm"
 #include "code\modules\reagents\chemistry\reagents\core\elements.dm"
+#include "code\modules\reagents\chemistry\reagents\core\ethanol.dm"
+#include "code\modules\reagents\chemistry\reagents\core\toxin.dm"
+#include "code\modules\reagents\chemistry\reagents\core\water.dm"
+#include "code\modules\reagents\chemistry\reagents\nutrition\nutriment.dm"
+#include "code\modules\reagents\chemistry\reagents\nutrition\nutriment\coating.dm"
+#include "code\modules\reagents\chemistry\reagents\other\adminordrazine.dm"
+#include "code\modules\reagents\chemistry\reagents\other\carpet.dm"
+#include "code\modules\reagents\chemistry\reagents\other\chalk_dust.dm"
 #include "code\modules\reagents\chemistry\reagents\other\cleaner.dm"
+#include "code\modules\reagents\chemistry\reagents\other\crayon_dust.dm"
+#include "code\modules\reagents\chemistry\reagents\other\holywater.dm"
+#include "code\modules\reagents\chemistry\reagents\other\luminol.dm"
+#include "code\modules\reagents\chemistry\reagents\other\marker_ink.dm"
+#include "code\modules\reagents\chemistry\reagents\other\paint.dm"
 #include "code\modules\reagents\chemistry\reagents\pyrotechnics\thermite.dm"
 #include "code\modules\reagents\distilling\Distilling-Recipes.dm"
 #include "code\modules\reagents\distilling\distilling.dm"
 #include "code\modules\reagents\items\hypospray.dm"
 #include "code\modules\reagents\items\hypovial.dm"
+#include "code\modules\reagents\items\spray.dm"
+#include "code\modules\reagents\items\spray\squirt.dm"
+#include "code\modules\reagents\items\spray\waterflower.dm"
 #include "code\modules\reagents\machinery\chem_master.dm"
 #include "code\modules\reagents\machinery\reagent_dispenser.dm"
 #include "code\modules\reagents\machinery\dispenser\cartridge.dm"
@@ -4737,8 +4761,6 @@
 #include "code\modules\reagents\reagent_containers\patch.dm"
 #include "code\modules\reagents\reagent_containers\pill.dm"
 #include "code\modules\reagents\reagent_containers\pill_vr.dm"
-#include "code\modules\reagents\reagent_containers\spray.dm"
-#include "code\modules\reagents\reagent_containers\spray_vr.dm"
 #include "code\modules\reagents\reagent_containers\syringes.dm"
 #include "code\modules\reagents\reagent_containers\syringes_vr.dm"
 #include "code\modules\reagents\reagent_containers\unidentified_hypospray.dm"

code/datums/components/crafting/crafting.dm

@@ -146,8 +146,10 @@
 			if(istype(I, /obj/item/reagent_containers))
 				var/obj/item/reagent_containers/RC = I
 				if(RC.is_open_container())
-					for(var/datum/reagent/A in RC.reagents.reagent_list)
-						.["other"][A.type] += A.volume
+					// todo: this shouldn't be by type.
+					for(var/id in RC.reagents.reagent_volumes)
+						var/datum/reagent/A = SSchemistry.fetch_reagent(id)
+						.["other"][A.type] += RC.reagents.reagent_volumes[id]
 			.["other"][I.type] += 1
 
 /datum/component/personal_crafting/proc/check_tools(atom/a, datum/crafting_recipe/R, list/contents)
@@ -235,34 +237,17 @@
 			surroundings = get_environment(a, R.blacklist)
 			surroundings -= Deletion
 			if(ispath(A, /datum/reagent))
-				var/datum/reagent/RG = new A
-				var/datum/reagent/RGNT
+				var/datum/reagent/wanted_reagent = SSchemistry.fetch_reagent(A)
 				while(amt > 0)
 					var/obj/item/reagent_containers/RC = locate() in surroundings
-					RG = RC.reagents.get_reagent(RG.id)
-					if(RG)
-						if(!locate(RG.type) in Deletion)
-							Deletion += new RG.type()
-						if(RG.volume > amt)
-							RG.volume -= amt
-							data = RG.data
-							RC.reagents.conditional_update(RC)
-							RG = locate(RG.type) in Deletion
-							RG.volume = amt
-							RG.data += data
+					surroundings -= RC
+					if(RC.reagents?.reagent_volumes?[wanted_reagent.id])
+						var/removing_volume = RC.reagents.reagent_volumes[wanted_reagent.id]
+						removing_volume = min(removing_volume, amt)
+						RC.reagents.remove_reagent(wanted_reagent.id, removing_volume)
+						amt -= removing_volume
+						if(amt <= 0)
 							continue main_loop
-						else
-							surroundings -= RC
-							amt -= RG.volume
-							RC.reagents.reagent_list -= RG
-							RC.reagents.conditional_update(RC)
-							RGNT = locate(RG.type) in Deletion
-							RGNT.volume += RG.volume
-							RGNT.data += RG.data
-							qdel(RG)
-						RC.on_reagent_change()
-					else
-						surroundings -= RC
 			else if(ispath(A, /obj/item/stack))
 				var/obj/item/stack/S
 				var/obj/item/stack/SD
@@ -296,14 +281,7 @@
 	for(var/M in R.parts)
 		partlist[M] = R.parts[M]
 	for(var/A in R.parts)
-		if(istype(A, /datum/reagent))
-			var/datum/reagent/RG = locate(A) in Deletion
-			if(RG.volume > partlist[A])
-				RG.volume = partlist[A]
-			. += RG
-			Deletion -= RG
-			continue
-		else if(istype(A, /obj/item/stack))
+		if(istype(A, /obj/item/stack))
 			var/obj/item/stack/ST = locate(A) in Deletion
 			if(ST.amount > partlist[A])
 				ST.amount = partlist[A]

code/datums/material_container.dm

@@ -214,14 +214,14 @@
 /**
  * basically, divides by given resources and takes lowest.
  */
-/datum/material_container/proc/has_multiple(list/wanted, multiplier = 1)
+/datum/material_container/proc/has_multiple(list/wanted)
 	if(isnull(stored))
 		return 0
 	. = INFINITY
 	for(var/key in wanted)
 		if(!wanted[key])
 			continue
-		. = min(., stored[key] / (wanted[key] * multiplier))
+		. = min(., stored[key] / wanted[key])
 		if(!.)
 			return
 

code/datums/recipe/recipe.dm

@@ -92,7 +92,7 @@
 		else
 			return -1
 
-	if ((reagents?(reagents.len):(0)) < avail_reagents.reagent_list.len)
+	if ((reagents?(reagents.len):(0)) < avail_reagents.reagent_volumes.len)
 		return 0
 	return .
 
@@ -268,26 +268,20 @@
 		if (RECIPE_REAGENT_MAX)
 			//We want the highest of each.
 			//Iterate through everything in buffer. If the target has less than the buffer, then top it up
-			for (var/datum/reagent/R in temp.reagents.reagent_list)
-				var/rvol = tempholder.reagents.get_reagent_amount(R.id)
-				if (rvol < R.volume)
-					//Transfer the difference
-					temp.reagents.trans_id_to(tempholder, R.id, R.volume-rvol)
+			for(var/id in temp.reagents.reagent_volumes)
+				var/volume = temp.reagents.reagent_volumes[id]
+				if(tempholder.reagents.reagent_volumes[id] < volume)
+					temp.reagents.trans_id_to(tempholder, id, volume - tempholder.reagents.reagent_volumes[id])
 
 		if (RECIPE_REAGENT_MIN)
 			//Min is slightly more complex. We want the result to have the lowest from each side
 			//But zero will not count. Where a side has zero its ignored and the side with a nonzero value is used
-			for (var/datum/reagent/R in temp.reagents.reagent_list)
-				var/rvol = tempholder.reagents.get_reagent_amount(R.id)
-				if (rvol == 0) //If the target has zero of this reagent
-					temp.reagents.trans_id_to(tempholder, R.id, R.volume)
-					//Then transfer all of ours
-
-				else if (rvol > R.volume)
-					//if the target has more than ours
-					//Remove the difference
-					tempholder.reagents.remove_reagent(R.id, rvol-R.volume)
-
+			for(var/id in temp.reagents.reagent_volumes)
+				var/volume = temp.reagents.reagent_volumes[id]
+				if(!tempholder.reagents.reagent_volumes[id])
+					temp.reagents.trans_id_to(tempholder, id, volume)
+				else if(tempholder.reagents.reagent_volumes[id] > volume)
+					temp.reagents.remove_reagent(id, tempholder.reagents.reagent_volumes[id] - volume)
 
 	if (results.len > 1)
 		//If we're here, then holder is a buffer containing the total reagents for all the results.

code/game/atoms/_atom.dm

@@ -95,6 +95,8 @@
 
 	//? Chemistry
 	// todo: properly finalize the semantics of this variable and what it's for.
+	// todo: should this variable even exist? most atoms don't need this, and we can easily have an APi
+	//       to fetch a relevant holder upon being inspected by an analyzer.
 	var/datum/reagent_holder/reagents = null
 
 	//? Detective Work
@@ -297,7 +299,6 @@
 			found += A.search_contents_for(path,filter_path)
 	return found
 
-
 // called by mobs when e.g. having the atom as their machine, pulledby, loc (AKA mob being inside the atom) or buckled var set.
 // see code/modules/mob/mob_movement.dm for more.
 /atom/proc/relaymove()
@@ -671,12 +672,13 @@
 
 /atom/proc/CheckParts(list/parts_list)
 	for(var/A in parts_list)
-		if(istype(A, /datum/reagent))
-			if(!reagents)
-				reagents = new()
-			reagents.reagent_list.Add(A)
-			reagents.conditional_update()
-		else if(ismovable(A))
+		// todo: i don't know why we do this in crafting but crafting needs fucking refactored lmao
+		// if(istype(A, /datum/reagent))
+		// 	if(!reagents)
+		// 		reagents = new()
+		// 	reagents.reagent_list.Add(A)
+		// 	reagents.conditional_update()
+		if(ismovable(A))
 			var/atom/movable/M = A
 			M.forceMove(src)
 

code/game/atoms/atom-examine.dm

@@ -73,19 +73,19 @@
 	if(reagents)
 		if(reagents.reagents_holder_flags & TRANSPARENT)
 			. += "It contains:"
-			if(length(reagents.reagent_list))
+			if(reagents.total_volume)
 				var/has_alcohol = FALSE
 				if(user.can_see_reagents()) //Show each individual reagent
-					for(var/datum/reagent/current_reagent as anything in reagents.reagent_list)
+					for(var/datum/reagent/current_reagent as anything in reagents.get_reagent_datums())
 						if(!has_alcohol && istype(current_reagent,/datum/reagent/ethanol))
 							has_alcohol = TRUE
-						. += "• [round(current_reagent.volume, 0.01)] units of [current_reagent.name]"
+						. += "• [round(reagents.reagent_volumes[current_reagent.id], 0.01)] units of [current_reagent.name]"
 				else //Otherwise, just show the total volume
 					var/total_volume = 0
-					for(var/datum/reagent/current_reagent as anything in reagents.reagent_list)
+					for(var/datum/reagent/current_reagent as anything in reagents.get_reagent_datums())
 						if(!has_alcohol && istype(current_reagent,/datum/reagent/ethanol))
 							has_alcohol = TRUE
-						total_volume += current_reagent.volume
+						total_volume += reagents.reagent_volumes[current_reagent.id]
 					. += "[total_volume] units of various reagents"
 				if(has_alcohol)
 					. += "It smells of alcohol."

code/game/atoms/movable/pulling.dm

@@ -119,11 +119,11 @@
 					if(H.species.species_flags & NO_BLOOD)
 						bloodtrail = 0
 					else
-						var/blood_volume = H.vessel.get_reagent_amount("blood")
+						var/blood_volume = H.blood_holder.get_total_volume()
 						if(blood_volume < H.species?.blood_volume * H.species?.blood_level_fatal)
 							bloodtrail = 0	//Most of it's gone already, just leave it be
 						else
-							H.vessel.remove_reagent("blood", 1)
+							H.blood_holder?.draw(1)
 				if(bloodtrail)
 					var/turf/location = M.loc
 					if(istype(location, /turf/simulated))
@@ -144,11 +144,11 @@
 							if(H.species.species_flags & NO_BLOOD)
 								bloodtrail = 0
 							else
-								var/blood_volume = H.vessel.get_reagent_amount("blood")
+								var/blood_volume = H.blood_holder.get_total_volume()
 								if(blood_volume < H.species?.blood_volume * H.species?.blood_level_fatal)
 									bloodtrail = 0	//Most of it's gone already, just leave it be
 								else
-									H.vessel.remove_reagent("blood", 1)
+									H.blood_holder?.draw(1)
 						if(bloodtrail)
 							if(istype(location, /turf/simulated))
 								location.add_blood(M)

code/game/dna/dna_modifier.dm

@@ -389,9 +389,7 @@
 	data["beakerVolume"] = 0
 	if(connected.beaker)
 		data["beakerLabel"] = connected.beaker.label_text ? connected.beaker.label_text : null
-		if (connected.beaker.reagents && connected.beaker.reagents.reagent_list.len)
-			for(var/datum/reagent/R in connected.beaker.reagents.reagent_list)
-				data["beakerVolume"] += R.volume
+		data["beakerVolume"] = connected.beaker.reagents?.total_volume || 0
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)

code/game/gamemodes/changeling/powers/epinephrine_overdose.dm

@@ -50,10 +50,10 @@
 	description = "Reduces stun times, but causing toxicity due to high concentration."
 	reagent_state = REAGENT_LIQUID
 	color = "#C8A5DC"
-	metabolism = REM * 2
+	metabolism_rate = REM * 2
 	overdose = 5 //This is intentionally low, as we want the ling to take some tox damage, to discourage spamming the ability.
 
-/datum/reagent/epinephrine/affect_blood(mob/living/carbon/M, alien, removed)
+/datum/reagent/epinephrine/legacy_affect_blood(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
 	if(alien == IS_DIONA)
 		return
 	M.add_chemical_effect(CE_SPEEDBOOST, 3)

code/game/gamemodes/cult/construct_spells.dm

@@ -473,8 +473,8 @@
 		var/mob/living/carbon/human/H = owner
 		if(!H.should_have_organ(O_HEART))
 			return 1
-		if(H.vessel.remove_reagent("blood", amount))
-			return 1
+		if(H.erase_checked_blood(amount))
+			return TRUE
 	return 0
 
 /obj/item/spell/construct/afterattack(atom/target, mob/user, clickchain_flags, list/params)

code/game/gamemodes/cult/narsie.dm

@@ -189,8 +189,6 @@ var/global/list/narsie_list = list()
 
 		if (dist <= consume_range && !istype(A, /turf/space))
 			var/turf/T = A
-			if(T.holy)
-				T.holy = 0 //Nar-Sie doesn't give a shit about sacred grounds.
 			T.cultify()
 
 /obj/singularity/narsie/proc/old_narsie(const/atom/A)

code/game/machinery/Sleeper.dm

@@ -253,11 +253,11 @@
 					beaker.reagents,
 					min(
 						remaining_beaker_volume_for_dialysis * (3 / 4),
-						length(occupant.reagents.reagent_list) * 3,
+						length(occupant.reagents.reagent_volumes) * 3,
 					),
 					dialysis_reagent_filter_flags,
 				)
-				occupant.vessel.trans_to_holder(beaker.reagents, filtered_volume * (1 / 3))
+				occupant.take_blood_legacy(beaker, filtered_volume * (1 / 3))
 			else
 				toggle_filter()
 
@@ -268,7 +268,7 @@
 					beaker.reagents,
 					min(
 						beaker.reagents.maximum_volume - beaker.reagents.total_volume,
-						length(occupant.ingested.reagent_list) * 3,
+						length(occupant.ingested.reagent_volumes) * 3,
 					),
 					dialysis_reagent_filter_flags,
 				)