part of tgstation/tgstation#76104, bother if perf is an issue

Kapu1178 · Apr 17, 2024 · 6170076 · 6170076
1 parent c642c6b
commit 6170076
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
@@ -196,7 +196,6 @@
 #define FIRE_PRIORITY_DATABASE 5
 
 /*	Normal bucket	*/
-#define FIRE_PRIORITY_ASSETS 105
 #define FIRE_PRIORITY_EXPLOSIONS 100
 #define FIRE_PRIORITY_STATPANEL 95
 #define FIRE_PRIORITY_TGUI 90
@@ -220,6 +219,7 @@
 #define FIRE_PRIORITY_ACID 27
 #define FIRE_PRIORITY_WET_FLOORS 25
 #define FIRE_PRIORITY_VIS 20
+#define FIRE_PRIORITY_ASSETS 20
 #define FIRE_PRIORITY_RESEARCH 15
 #define FIRE_PRIORITY_SERVER_MAINT 10
 #define FIRE_PRIORITY_PING 5

diff --git a/code/__HELPERS/reagents.dm b/code/__HELPERS/reagents.dm
@@ -70,13 +70,13 @@
 		SSreagents.chemical_reactions_list_reactant_index[rid] -= R
 
 //see build_chemical_reactions_list in holder.dm for explanations
-/proc/add_chemical_reaction(datum/chemical_reaction/R)
-	if(!SSreagents.chemical_reactions_list_reactant_index || !R.required_reagents || !R.required_reagents.len)
+/proc/add_chemical_reaction(datum/chemical_reaction/add)
+	if(!SSreagents.chemical_reactions_list_reactant_index || !add.required_reagents || !add.required_reagents.len)
 		return
-	var/primary_reagent = R.required_reagents[1]
-	if(!SSreagents.chemical_reactions_list_reactant_index[primary_reagent])
-		SSreagents.chemical_reactions_list_reactant_index[primary_reagent] = list()
-	SSreagents.chemical_reactions_list_reactant_index[primary_reagent] += R
+	var/rand_reagent = pick(add.required_reagents)
+	if(!SSreagents.chemical_reactions_list_reactant_index[rand_reagent])
+		SSreagents.chemical_reactions_list_reactant_index[rand_reagent] = list()
+	SSreagents.chemical_reactions_list_reactant_index[rand_reagent] += add
 
 //Creates foam from the reagent. Metaltype is for metal foam, notification is what to show people in textbox
 /datum/reagents/proc/create_foam(foamtype, foam_volume, result_type = null, notification = null, log = FALSE)

diff --git a/code/controllers/subsystem/fluids.dm b/code/controllers/subsystem/fluids.dm
@@ -21,7 +21,7 @@ SUBSYSTEM_DEF(fluids)
 	name = "Fluid"
 	wait = 0 // Will be autoset to whatever makes the most sense given the spread and effect waits.
 	flags = SS_KEEP_TIMING
-	runlevels = RUNLEVEL_GAME|RUNLEVEL_POSTGAME
+	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 	priority = FIRE_PRIORITY_FLUIDS
 
 	// Fluid spread processing:

diff --git a/code/datums/elements/forced_gravity.dm b/code/datums/elements/forced_gravity.dm
@@ -11,14 +11,18 @@
 	if(!isatom(target))
 		return ELEMENT_INCOMPATIBLE
 
+	var/our_ref = REF(src)
+	if(HAS_TRAIT_FROM(target, TRAIT_FORCED_GRAVITY, our_ref))
+		return
+
 	src.gravity = gravity
 	src.ignore_turf_gravity = ignore_turf_gravity
 
 	RegisterSignal(target, COMSIG_ATOM_HAS_GRAVITY, PROC_REF(gravity_check))
 	if(isturf(target))
 		RegisterSignal(target, COMSIG_TURF_HAS_GRAVITY, PROC_REF(turf_gravity_check))
 
-	ADD_TRAIT(target, TRAIT_FORCED_GRAVITY, REF(src))
+	ADD_TRAIT(target, TRAIT_FORCED_GRAVITY, our_ref)
 
 /datum/element/forced_gravity/Detach(datum/source)
 	. = ..()
@@ -38,4 +42,4 @@
 /datum/element/forced_gravity/proc/turf_gravity_check(datum/source, atom/checker, list/gravs)
 	SIGNAL_HANDLER
 
-	return gravity_check(null, source, gravs)
+	gravity_check(null, source, gravs)
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
@@ -546,10 +546,8 @@
 		// pass over previous ongoing reactions before handle_reactions is called
 		transfer_reactions(target_holder)
 
-		src.update_total()
 		target_holder.update_total()
 		target_holder.handle_reactions()
-		src.handle_reactions()
 
 	return amount