Merge pull request #5209 from MistakeNot4892/tweak/reagents

Replacing direct access to /datum/reagents vars with macros.

Author: out-of-phaze

code/__defines/chemistry.dm

@@ -78,13 +78,30 @@
 #define HANDLE_REACTIONS(_reagents)  if(!QDELETED(_reagents)) { SSmaterials.active_holders[_reagents] = TRUE; }
 #define UNQUEUE_REACTIONS(_reagents) SSmaterials.active_holders -= _reagents
 
-#define REAGENT_LIST(R) (R.reagents?.get_reagents() || "No reagent holder")
+#define REAGENT_LIST(R) ((istype(R, /datum/reagents) && R:get_reagents()) || "No reagent holder")
+
+#define REAGENT_TOTAL_VOLUME(R) (UNLINT((istype(R, /datum/reagents) && R:total_volume) || 0))
+#define REAGENT_TOTAL_LIQUID_VOLUME(R) (UNLINT((istype(R, /datum/reagents) && R:total_liquid_volume) || 0))
+
+#define REAGENT_MAXIMUM_VOLUME(R) (UNLINT((istype(R, /datum/reagents) && R:maximum_volume) || 0))
+#define REAGENTS_FREE_SPACE(R) (UNLINT(istype(R, /datum/reagents) ? (R.maximum_volume - R.total_volume) : 0))
+
+#define REAGENT_VOLUMES(R)        ( (istype(R, /datum/reagents) && UNLINT(R:reagent_volumes)) || null )
+#define REAGENT_SOLID_VOLUMES(R)  ( (istype(R, /datum/reagents) && UNLINT(R:solid_volumes))   || null )
+#define REAGENT_LIQUID_VOLUMES(R) ( (istype(R, /datum/reagents) && UNLINT(R:liquid_volumes))  || null )
+#define REAGENT_GET_MAX_VOL(R)    ( (istype(R, /datum/reagents) && UNLINT(R:maximum_volume))  || 0 )
+#define REAGENT_GET_ATOM(R)       ( (istype(R, /datum/reagents) && UNLINT(R:my_atom))         || null )
+
+#define REAGENT_VOLUME(R, M)      ( istype(R, /datum/reagents) && UNLINT(R:reagent_volumes && R:reagent_volumes[RESOLVE_TO_DECL(M)]) )
+#define LIQUID_VOLUME(R, M)       ( istype(R, /datum/reagents) && UNLINT(R:liquid_volumes  && R:liquid_volumes[RESOLVE_TO_DECL(M)]) )
+#define SOLID_VOLUME(R, M)        ( istype(R, /datum/reagents) && UNLINT(R:solid_volumes   && R:solid_volumes[RESOLVE_TO_DECL(M)]) )
+#define REAGENT_DATA(R, M)        ( istype(R, /datum/reagents) && UNLINT(R:reagent_data    && R:reagent_data[RESOLVE_TO_DECL(M)]) )
+
+#define REAGENT_SET_MAX_VOL(R, V) if(istype(R, /datum/reagents)) { UNLINT(R:maximum_volume = V) }
+#define REAGENT_ADD_MAX_VOL(R, V) if(istype(R, /datum/reagents)) { UNLINT(R:maximum_volume += V) }
+#define REAGENT_SET_ATOM(R, A)    if(istype(R, /datum/reagents)) { UNLINT(R:my_atom = A) }
+#define REAGENT_SET_DATA(R, M, D) if(istype(R, /datum/reagents)) { LAZYSET(UNLINT(R:reagent_data), M, D) }
 
-#define REAGENTS_FREE_SPACE(R) (R?.maximum_volume - R?.total_volume)
-#define REAGENT_VOLUME(REAGENT_HOLDER, REAGENT_TYPE) (REAGENT_HOLDER?.reagent_volumes && REAGENT_HOLDER.reagent_volumes[RESOLVE_TO_DECL(REAGENT_TYPE)])
-#define LIQUID_VOLUME(REAGENT_HOLDER,  REAGENT_TYPE) (REAGENT_HOLDER?.liquid_volumes  && REAGENT_HOLDER.liquid_volumes[RESOLVE_TO_DECL(REAGENT_TYPE)])
-#define SOLID_VOLUME(REAGENT_HOLDER,   REAGENT_TYPE) (REAGENT_HOLDER?.solid_volumes   && REAGENT_HOLDER.solid_volumes[RESOLVE_TO_DECL(REAGENT_TYPE)])
-#define REAGENT_DATA(REAGENT_HOLDER,   REAGENT_TYPE) (REAGENT_HOLDER?.reagent_data    && REAGENT_HOLDER.reagent_data[RESOLVE_TO_DECL(REAGENT_TYPE)])
 
 #define CHEM_DOSE(M, R) LAZYACCESS(M._chem_doses, RESOLVE_TO_DECL(R))
 

code/_helpers/medical_scans.dm

@@ -42,15 +42,14 @@
 	.["immune_system"] =    get_immunity()
 	.["reagents"] = list()
 
-	if(reagents?.total_volume)
-		for(var/decl/material/reagent as anything in reagents.liquid_volumes)
+	if(REAGENT_TOTAL_VOLUME(reagents))
+		for(var/decl/material/reagent as anything in REAGENT_LIQUID_VOLUMES(reagents))
 			var/list/reagent_data = list()
 			reagent_data["name"]      = reagent.get_reagent_name(reagents, MAT_PHASE_LIQUID)
 			reagent_data["quantity"]  = round(REAGENT_VOLUME(reagents, reagent),1)
 			reagent_data["scannable"] = reagent.scannable
 			.["reagents"] += list(reagent_data)
-
-		for(var/decl/material/reagent as anything in reagents.solid_volumes)
+		for(var/decl/material/reagent as anything in REAGENT_SOLID_VOLUMES(reagents))
 			var/list/reagent_data = list()
 			reagent_data["name"]      = reagent.get_reagent_name(reagents, MAT_PHASE_SOLID)
 			reagent_data["quantity"]  = round(REAGENT_VOLUME(reagents, reagent),1)
@@ -98,8 +97,8 @@
 	.["blood_pressure"] =   get_blood_pressure()
 	.["blood_o2"] =         get_blood_oxygenation()
 	if(vessel)
-		.["blood_volume"] =     vessel.total_volume
-		.["blood_volume_max"] = vessel.maximum_volume
+		.["blood_volume"] =     REAGENT_TOTAL_VOLUME(vessel)
+		.["blood_volume_max"] = REAGENT_MAXIMUM_VOLUME(vessel)
 
 /proc/display_medical_data_header(var/list/scan, skill_level = SKILL_DEFAULT)
 	//In case of problems, abort.

code/controllers/subsystems/fluids.dm

@@ -100,7 +100,7 @@ SUBSYSTEM_DEF(fluids)
 		i++
 		current_fluid_holder = processing_fluids[i]
 
-		if(QDELETED(current_fluid_holder) || !current_fluid_holder.reagents?.total_volume)
+		if(QDELETED(current_fluid_holder) || !REAGENT_TOTAL_VOLUME(current_fluid_holder.reagents))
 			REMOVE_ACTIVE_FLUID(current_fluid_holder)
 			continue
 
@@ -110,7 +110,7 @@ SUBSYSTEM_DEF(fluids)
 
 		reagent_holder = current_fluid_holder.reagents
 		UPDATE_FLUID_BLOCKED_DIRS(current_fluid_holder)
-		current_depth = reagent_holder?.total_volume || 0
+		current_depth = REAGENT_TOTAL_VOLUME(reagent_holder)
 
 		// How is this happening
 		if(QDELETED(reagent_holder) || current_depth == -1.#IND || current_depth == 1.#IND)
@@ -123,7 +123,7 @@ SUBSYSTEM_DEF(fluids)
 			current_depth = current_fluid_holder.get_fluid_depth()
 
 		// Mimimum liquid depth for creation of slurries. Do this after evaporation since it may change the total depth.
-		if(reagent_holder?.total_liquid_volume < FLUID_SLURRY)
+		if(REAGENT_TOTAL_LIQUID_VOLUME(reagent_holder) < FLUID_SLURRY)
 			current_fluid_holder.dump_solid_reagents()
 			current_depth = current_fluid_holder.get_fluid_depth()
 
@@ -135,7 +135,7 @@ SUBSYSTEM_DEF(fluids)
 		// Wash our turf.
 		current_fluid_holder.fluid_act(reagent_holder)
 
-		if(isspaceturf(current_fluid_holder) || (istype(current_fluid_holder, /turf/floor) && (current_fluid_holder.turf_flags & TURF_FLAG_ABSORB_LIQUID) && (current_fluid_holder.reagents?.total_volume + current_fluid_holder.get_physical_height()) > 0))
+		if(isspaceturf(current_fluid_holder) || (istype(current_fluid_holder, /turf/floor) && (current_fluid_holder.turf_flags & TURF_FLAG_ABSORB_LIQUID) && (REAGENT_TOTAL_VOLUME(current_fluid_holder.reagents) + current_fluid_holder.get_physical_height()) > 0))
 			removing = round(current_depth * 0.5)
 			if(removing > 0)
 				current_fluid_holder.remove_fluids(removing, defer_update = TRUE)
@@ -154,8 +154,9 @@ SUBSYSTEM_DEF(fluids)
 			if(other_fluid_holder)
 				UPDATE_FLUID_BLOCKED_DIRS(other_fluid_holder)
 				if(!(other_fluid_holder.fluid_blocked_dirs & UP) && other_fluid_holder.CanFluidPass(UP))
-					if(!QDELETED(other_fluid_holder) && other_fluid_holder.reagents?.total_volume < FLUID_MAX_DEPTH)
-						current_fluid_holder.transfer_fluids_to(other_fluid_holder, min(floor(current_depth*0.5), FLUID_MAX_DEPTH - other_fluid_holder.reagents?.total_volume))
+					var/other_volume = REAGENT_TOTAL_VOLUME(other_fluid_holder.reagents)
+					if(!QDELETED(other_fluid_holder) && other_volume < FLUID_MAX_DEPTH)
+						current_fluid_holder.transfer_fluids_to(other_fluid_holder, min(floor(current_depth*0.5), FLUID_MAX_DEPTH - other_volume))
 						current_depth = current_fluid_holder.get_fluid_depth()
 
 		// Flow into the lowest level neighbor.
@@ -173,7 +174,7 @@ SUBSYSTEM_DEF(fluids)
 			if((neighbor.fluid_blocked_dirs & coming_from) || !neighbor.CanFluidPass(coming_from) || neighbor.is_flooded(absolute = TRUE) || !neighbor.CanFluidPass(global.reverse_dir[spread_dir]))
 				continue
 			other_fluid_holder = neighbor
-			neighbor_depth = (other_fluid_holder?.reagents?.total_volume || 0) + neighbor.get_physical_height()
+			neighbor_depth = (REAGENT_TOTAL_VOLUME(other_fluid_holder.reagents)) + neighbor.get_physical_height()
 			flow_amount = round((current_turf_depth - neighbor_depth)*0.5)
 			// TODO: multiply flow amount or minimum transfer amount by some
 			// viscosity calculation to allow for piles of jelly vs piles of water.
@@ -235,7 +236,7 @@ SUBSYSTEM_DEF(fluids)
 		if(current_fluid_holder.last_flow_strength >= 10)
 			// Catwalks mean items will be above the turf; subtract the turf height from our volume.
 			// TODO: somehow handle stuff that is on a catwalk or on the turf within the same turf.
-			var/effective_volume = current_fluid_holder.reagents?.total_volume
+			var/effective_volume = REAGENT_TOTAL_VOLUME(current_fluid_holder.reagents)
 			if(current_fluid_holder.get_supporting_platform())
 				// Depth is negative height, hence +=. TODO: positive heights? No idea how to handle that.
 				effective_volume += current_fluid_holder.get_physical_height()

code/datums/extensions/milkable/milkable.dm

@@ -73,7 +73,7 @@
 	if(critter.stat == DEAD)
 		return FALSE
 
-	if(udder?.total_volume <= 0)
+	if(REAGENT_TOTAL_VOLUME(udder) <= 0)
 		to_chat(user, SPAN_WARNING("\The [critter]'s udder is dry. Wait a little longer."))
 		return TRUE
 
@@ -108,7 +108,7 @@
 	if(critter.stat == DEAD)
 		return FALSE
 
-	if(udder?.total_volume <= 0)
+	if(REAGENT_TOTAL_VOLUME(udder) <= 0)
 		to_chat(user, SPAN_WARNING("\The [critter]'s udder is dry. Wait a little longer."))
 		return TRUE
 

code/datums/inventory_slots/inventory_gripper_subtypes.dm

@@ -23,8 +23,9 @@
 
 		// This means critters can hoover up beakers as a kind of impromptu chem disposal
 		// technique, so long as they're okay with the reagents reacting inside them.
-		if(prop.reagents?.total_volume)
-			prop.reagents.trans_to_mob(src, prop.reagents.total_volume, CHEM_INGEST)
+		var/prop_reagents = REAGENT_TOTAL_VOLUME(prop.reagents)
+		if(prop_reagents)
+			prop.reagents.trans_to_mob(src, prop_reagents, CHEM_INGEST)
 
 		// It also means they can do the old school cartoon schtick of eating
 		// an entire sandwich and spitting up an empty plate. Ptooie.

code/datums/inventory_slots/slots/slot_shoes.dm

@@ -23,7 +23,7 @@
 		var/blood_color
 		for(var/foot_tag in list(BP_L_FOOT, BP_R_FOOT))
 			var/obj/item/organ/external/stomper = GET_EXTERNAL_ORGAN(user, foot_tag)
-			if(stomper && stomper.coating?.total_volume)
+			if(REAGENT_TOTAL_VOLUME(stomper?.coating))
 				blood_color = stomper.coating.get_color()
 				break
 		if(blood_color)
@@ -39,7 +39,7 @@
 		return "[pronouns.He] [pronouns.is] wearing [_holding.get_examine_line()] on [pronouns.his] feet."
 	for(var/bp in list(BP_L_FOOT, BP_R_FOOT))
 		var/obj/item/organ/external/E = GET_EXTERNAL_ORGAN(owner, bp)
-		if(E && E.coating?.total_volume)
+		if(REAGENT_TOTAL_VOLUME(E?.coating))
 			if(user == owner)
 				return "There's <font color='[E.coating.get_color()]'>something on your feet</font>!"
 			return "There's <font color='[E.coating.get_color()]'>something on [pronouns.his] feet</font>!"

code/datums/storage/_storage.dm

@@ -193,7 +193,7 @@ var/global/list/_test_storage_items = list()
 		if(!M.try_unequip(inserting))
 			return FALSE
 
-	if(holder.reagents?.total_volume)
+	if(REAGENT_TOTAL_VOLUME(holder.reagents))
 		inserting.fluid_act(holder.reagents)
 		if(QDELETED(inserting))
 			return FALSE

code/datums/storage/subtypes_box.dm

@@ -51,7 +51,7 @@
 	if(istype(removing, /obj/item/clothing/mask/smokable/cigarette/cigar) && isatom(holder))
 		var/atom/atom_holder = holder
 		if(atom_holder.reagents)
-			atom_holder.reagents.trans_to_obj(removing, (atom_holder.reagents.total_volume/max(1, length(get_contents()))))
+			atom_holder.reagents.trans_to_obj(removing, (REAGENT_TOTAL_VOLUME(atom_holder.reagents)/max(1, length(get_contents()))))
 	return ..()
 
 /datum/storage/box/cigarettes
@@ -63,7 +63,7 @@
 	if(istype(removing, /obj/item/clothing/mask/smokable/cigarette) && isatom(holder))
 		var/atom/atom_holder = holder
 		if(atom_holder.reagents)
-			atom_holder.reagents.trans_to_obj(removing, (atom_holder.reagents.total_volume/max(1, length(get_contents()))))
+			atom_holder.reagents.trans_to_obj(removing, (REAGENT_TOTAL_VOLUME(atom_holder.reagents)/max(1, length(get_contents()))))
 	return ..()
 
 /datum/storage/box/cigarettes/cigarello

code/datums/storage/subtypes_misc.dm

@@ -124,7 +124,7 @@
 	. = ..()
 	if(!.)
 		return
-	return inserting_item.reagents?.total_volume > 0
+	return REAGENT_TOTAL_VOLUME(inserting_item.reagents) > 0
 
 /datum/storage/photo_album
 	storage_slots = DEFAULT_BOX_STORAGE //yes, that's storage_slots. Photos are w_class 1 so this has as many slots equal to the number of photos you could put in a box

code/game/atoms.dm

@@ -164,7 +164,7 @@
 
 /atom/proc/on_reagent_change()
 	SHOULD_CALL_PARENT(TRUE)
-	if(storage && reagents?.total_volume)
+	if(storage && REAGENT_TOTAL_VOLUME(reagents))
 		for(var/obj/item/thing in get_stored_inventory())
 			thing.fluid_act(reagents)
 	return TRUE
@@ -445,9 +445,10 @@
  * Most useful for calculating worth or deconstructing something along with its contents.
  */
 /atom/proc/get_contained_matter(include_reagents = TRUE)
-	if(include_reagents && length(reagents?.reagent_volumes))
+	var/list/reagent_volumes = REAGENT_VOLUMES(reagents)
+	if(include_reagents && length(reagent_volumes))
 		LAZYINITLIST(.)
-		for(var/decl/material/reagent as anything in reagents.reagent_volumes)
+		for(var/decl/material/reagent as anything in reagent_volumes)
 			.[reagent.type] += floor(REAGENT_VOLUME(reagents, reagent) / REAGENT_UNITS_PER_MATERIAL_UNIT)
 	for(var/atom/contained_obj as anything in get_contained_external_atoms()) // machines handle component parts separately
 		. = MERGE_ASSOCS_WITH_NUM_VALUES(., contained_obj.get_contained_matter(include_reagents))
@@ -504,7 +505,7 @@
 */
 /atom/proc/try_detonate_reagents(var/severity = 3)
 	if(reagents)
-		for(var/decl/material/reagent as anything in reagents.reagent_volumes)
+		for(var/decl/material/reagent as anything in REAGENT_VOLUMES(reagents))
 			reagent.explosion_act(src, severity)
 
 /**
@@ -1026,13 +1027,13 @@
 	return istype(turf) ? turf.is_outside() : OUTSIDE_UNCERTAIN
 
 /atom/proc/can_be_poured_into(atom/source)
-	return (reagents?.maximum_volume > 0) && ATOM_IS_OPEN_CONTAINER(src)
+	return (REAGENT_MAXIMUM_VOLUME(reagents) > 0) && ATOM_IS_OPEN_CONTAINER(src)
 
 /// This is whether it's physically possible to pour from this atom to the target atom, based on context like user intent and src being open, etc.
 /// This should not check things like whether there is actually anything in src to pour.
 /// It should also not check anything controlled by the target atom, because can_be_poured_into() already exists.
 /atom/proc/can_be_poured_from(mob/user, atom/target)
-	return (reagents?.maximum_volume > 0) && ATOM_IS_OPEN_CONTAINER(src)
+	return (REAGENT_MAXIMUM_VOLUME(reagents) > 0) && ATOM_IS_OPEN_CONTAINER(src)
 
 /atom/proc/take_vaporized_reagent(reagent, amount)
 	return
@@ -1041,7 +1042,7 @@
 	return !ATOM_IS_OPEN_CONTAINER(src)
 
 /atom/proc/can_drink_from(mob/user)
-	return ATOM_IS_OPEN_CONTAINER(src) && reagents?.total_volume && user.check_has_mouth()
+	return ATOM_IS_OPEN_CONTAINER(src) && REAGENT_TOTAL_VOLUME(reagents) && user.check_has_mouth()
 
 /atom/proc/adjust_required_attack_dexterity(mob/user, required_dexterity)
 	if(storage) // TODO: possibly check can_be_inserted() to avoid being able to shoot mirrors as a drake.