Scrubber overflows now use liquids (#2915)

Absolucy · web-flow · commit 1c50ca626b2f · 2024-09-05T10:15:56.000-06:00
* Scrubber overflows now use liquids

* +50 to all reagent amounts (suggestion from borbop)

* Overflows always evaporate

* wtf???

* Buff evaporation rate
diff --git a/code/__DEFINES/liquids.dm b/code/__DEFINES/liquids.dm
@@ -82,5 +82,6 @@
 
 GLOBAL_LIST_INIT(liquid_blacklist, list(
 	/datum/reagent/sorium,
-	/datum/reagent/liquid_dark_matter
+	/datum/reagent/liquid_dark_matter,
+	/datum/reagent/hydrogen_peroxide, // no instahusk pools please
 ))
diff --git a/code/modules/events/scrubber_overflow.dm b/code/modules/events/scrubber_overflow.dm
@@ -105,6 +105,7 @@
 /datum/round_event/scrubber_overflow/proc/get_overflowing_reagent(dangerous)
 	return dangerous ? get_random_reagent_id() : pick(safer_chems)
 
+/* monkestation edit: replaced in [monkestation/code/modules/events/scrubber_overflow.dm]
 /datum/round_event/scrubber_overflow/start()
 	for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/vent as anything in scrubbers)
 		if(!vent.loc)
@@ -124,6 +125,7 @@
 		dispensed_reagent.create_foam(/datum/effect_system/fluid_spread/foam/short, reagents_amount)
 
 		CHECK_TICK
+monkestation end */
 
 /datum/round_event_control/scrubber_overflow/threatening
 	name = "Scrubber Overflow: Threatening"
diff --git a/monkestation/code/modules/events/scrubber_overflow.dm b/monkestation/code/modules/events/scrubber_overflow.dm
@@ -1,2 +1,40 @@
+#define BASE_EVAPORATION_MULTIPLIER 10
+
 /datum/round_event_control/scrubber_overflow
 	shared_occurence_type = SHARED_SCRUBBERS
+
+/datum/round_event/scrubber_overflow
+	reagents_amount = 100
+	var/evaporation_multiplier = BASE_EVAPORATION_MULTIPLIER
+
+/datum/round_event/scrubber_overflow/start()
+	for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/vent as anything in scrubbers)
+		if(QDELETED(vent) || vent.welded) // in case it was welded after setup() but before we got to it here
+			continue
+		var/turf/vent_turf = get_turf(vent)
+		if(!isopenturf(vent_turf) || QDELING(vent_turf))
+			continue
+		var/dangerous = prob(danger_chance)
+		var/reagent_type = forced_reagent_type || get_overflowing_reagent(dangerous)
+		if(dangerous)
+			new /mob/living/basic/cockroach(vent_turf)
+			new /mob/living/basic/cockroach(vent_turf)
+		vent_turf.add_liquid(reagent_type, reagents_amount, no_react = TRUE)
+		if(vent_turf.liquids?.liquid_group)
+			vent_turf.liquids.liquid_group.always_evaporates = TRUE
+			vent_turf.liquids.liquid_group.evaporation_multiplier += evaporation_multiplier
+		CHECK_TICK
+
+/datum/round_event/scrubber_overflow/threatening
+	reagents_amount = 150
+	evaporation_multiplier = BASE_EVAPORATION_MULTIPLIER * 1.5
+
+/datum/round_event/scrubber_overflow/catastrophic
+	reagents_amount = 200
+	evaporation_multiplier = BASE_EVAPORATION_MULTIPLIER * 2
+
+/datum/round_event/scrubber_overflow/every_vent
+	reagents_amount = 150
+	evaporation_multiplier = BASE_EVAPORATION_MULTIPLIER * 1.5
+
+#undef BASE_EVAPORATION_MULTIPLIER
diff --git a/monkestation/code/modules/liquids/liquid_controller.dm b/monkestation/code/modules/liquids/liquid_controller.dm
@@ -89,7 +89,7 @@ SUBSYSTEM_DEF(liquids)
 					group_process_work_queue -= liquid_group
 					continue
 				liquid_group.process_group(TRUE)
-				if(populate_evaporation && (liquid_group.expected_turf_height < LIQUID_STATE_ANKLES) && liquid_group.evaporates)
+				if(populate_evaporation && (liquid_group.always_evaporates || liquid_group.expected_turf_height < LIQUID_STATE_ANKLES) && liquid_group.evaporates)
 					for(var/turf/listed_turf as anything in liquid_group.members)
 						if(QDELETED(listed_turf))
 							continue
@@ -184,6 +184,7 @@ SUBSYSTEM_DEF(liquids)
 		list_clear_nulls(active_turf_group_queue)
 
 		if(member_counter > REQUIRED_MEMBER_PROCESSES)
+			list_clear_nulls(cached_exposures)
 			if(!length(cached_exposures))
 				for(var/datum/liquid_group/liquid_group as anything in active_turf_group_queue)
 					if(MC_TICK_CHECK)
@@ -195,30 +196,26 @@ SUBSYSTEM_DEF(liquids)
 					active_turf_group_queue -= liquid_group
 					if(!liquid_group.exposure)
 						continue
-					for(var/turf/member as anything in liquid_group.members)
-						cached_exposures += liquid_group.members
+					cached_exposures |= liquid_group.members
 
 			var/process_count = 0
 			var/list/groups_we_rebuilt = list()
 			while((process_count <= 500) && length(cached_exposures))
 				process_count++
 				var/turf/member = pick_n_take(cached_exposures)
-				if(!member)
-					break
-				if(MC_TICK_CHECK)
-					return
-
+				if(QDELETED(member) || QDELETED(member.liquids) || QDELETED(member.liquids.liquid_group))
+					continue
 				var/datum/liquid_group/liquid_group = member.liquids.liquid_group
 				if(!(liquid_group in groups_we_rebuilt))
 					groups_we_rebuilt |= liquid_group
 					liquid_group.build_turf_reagent()
 
-				cached_exposures -= member
 				if(!istype(member) || QDELING(member))
 					liquid_group.members -= member
 					continue
 				liquid_group.process_member(member)
-
+				if(MC_TICK_CHECK)
+					return
 			member_counter = 0
 		run_type = SSLIQUIDS_RUN_TYPE_CACHED_EDGES
 
diff --git a/monkestation/code/modules/liquids/liquid_effect.dm b/monkestation/code/modules/liquids/liquid_effect.dm
@@ -42,20 +42,68 @@
 
 	var/temporary_split_key
 
+/obj/effect/abstract/liquid_turf/Initialize(mapload, datum/liquid_group/group_to_add)
+	. = ..()
+	if(!small_fire)
+		small_fire = new
+	if(!medium_fire)
+		medium_fire = new
+	if(!big_fire)
+		big_fire = new
+
+	my_turf ||= loc
+
+	if(QDELETED(my_turf.liquids))
+		my_turf.liquids = src
+
+	if(!QDELETED(group_to_add))
+		group_to_add.add_to_group(my_turf)
+		set_new_liquid_state(liquid_group.group_overlay_state)
+
+	if(QDELETED(liquid_group) && QDELETED(group_to_add))
+		liquid_group = new(1, src)
+
+	if(!SSliquids)
+		CRASH("Liquid Turf created with the liquids sybsystem not yet initialized!")
+	RegisterSignal(my_turf, COMSIG_ATOM_ENTERED, PROC_REF(movable_entered))
+	RegisterSignal(my_turf, COMSIG_TURF_MOB_FALL, PROC_REF(mob_fall))
+	RegisterSignal(my_turf, COMSIG_ATOM_EXAMINE, PROC_REF(examine_turf))
+
+	if(SEND_SIGNAL(my_turf, COMSIG_TURF_LIQUIDS_CREATION, src) & BLOCK_LIQUID_CREATION)
+		return INITIALIZE_HINT_QDEL
+
+	if(z)
+		QUEUE_SMOOTH(src)
+		QUEUE_SMOOTH_NEIGHBORS(src)
+
+/obj/effect/abstract/liquid_turf/Destroy(force)
+	UnregisterSignal(my_turf, list(COMSIG_ATOM_ENTERED, COMSIG_TURF_MOB_FALL, COMSIG_ATOM_EXAMINE))
+	if(!isnull(my_turf))
+		liquid_group?.remove_from_group(my_turf)
+		SSliquids.evaporation_queue -= my_turf
+		SSliquids.burning_turfs -= my_turf
+		SSliquids.cached_exposures -= my_turf
+		my_turf.liquids = null
+	liquid_group = null
+	my_turf = null
+	QUEUE_SMOOTH_NEIGHBORS(src)
+	return ..()
 
 /obj/effect/abstract/liquid_turf/proc/process_evaporation()
-	if(liquid_group.expected_turf_height > LIQUID_ANKLES_LEVEL_HEIGHT)
+	if(!liquid_group.always_evaporates && (liquid_group.expected_turf_height > LIQUID_ANKLES_LEVEL_HEIGHT))
 		SSliquids.evaporation_queue -= my_turf
 		return
 
 	//See if any of our reagents evaporates
 	var/any_change = FALSE
+	var/always_evaporates = liquid_group.always_evaporates
+	var/evaporation_multiplier = liquid_group.evaporation_multiplier
 	var/datum/reagent/R //Faster declaration
 	for(var/reagent_type in liquid_group.reagents.reagent_list)
 		R = reagent_type
 		//We evaporate. bye bye
-		if(initial(R.evaporates))
-			var/remove_amount = min((initial(R.evaporation_rate)), R.volume, (liquid_group.reagents_per_turf / length(liquid_group.reagents.reagent_list)))
+		if(initial(R.evaporates) || always_evaporates)
+			var/remove_amount = min((initial(R.evaporation_rate)) * evaporation_multiplier, R.volume, (liquid_group.reagents_per_turf / length(liquid_group.reagents.reagent_list)))
 			liquid_group.remove_specific(src, remove_amount, R, TRUE)
 			any_change = TRUE
 			R.evaporate(src.loc, remove_amount)
@@ -64,7 +112,7 @@
 		SSliquids.evaporation_queue -= my_turf
 		return
 
-/obj/effect/abstract/liquid_turf/forceMove(atom/destination, no_tp=FALSE, harderforce = FALSE)
+/obj/effect/abstract/liquid_turf/forceMove(atom/destination, no_tp = FALSE, harderforce = FALSE)
 	if(harderforce)
 		. = ..()
 
@@ -171,56 +219,6 @@
 		else
 			to_chat(M, span_userdanger("You fall in the water!"))
 
-/obj/effect/abstract/liquid_turf/Initialize(mapload, datum/liquid_group/group_to_add)
-	. = ..()
-	if(!small_fire)
-		small_fire = new
-	if(!medium_fire)
-		medium_fire = new
-	if(!big_fire)
-		big_fire = new
-
-	if(!my_turf)
-		my_turf = loc
-
-	if(!my_turf.liquids)
-		my_turf.liquids = src
-
-	if(group_to_add)
-		group_to_add.add_to_group(my_turf)
-		set_new_liquid_state(liquid_group.group_overlay_state)
-
-	if(!liquid_group && !group_to_add)
-		liquid_group = new(1, src)
-
-	if(!SSliquids)
-		CRASH("Liquid Turf created with the liquids sybsystem not yet initialized!")
-	my_turf = loc
-	RegisterSignal(my_turf, COMSIG_ATOM_ENTERED, PROC_REF(movable_entered))
-	RegisterSignal(my_turf, COMSIG_TURF_MOB_FALL, PROC_REF(mob_fall))
-	RegisterSignal(my_turf, COMSIG_ATOM_EXAMINE, PROC_REF(examine_turf))
-
-	if(SEND_SIGNAL(my_turf, COMSIG_TURF_LIQUIDS_CREATION, src) & BLOCK_LIQUID_CREATION)
-		return INITIALIZE_HINT_QDEL
-
-	if(z)
-		QUEUE_SMOOTH(src)
-		QUEUE_SMOOTH_NEIGHBORS(src)
-
-
-/obj/effect/abstract/liquid_turf/Destroy(force)
-	UnregisterSignal(my_turf, list(COMSIG_ATOM_ENTERED, COMSIG_TURF_MOB_FALL, COMSIG_ATOM_EXAMINE))
-	if(liquid_group)
-		liquid_group.remove_from_group(my_turf)
-	if(my_turf in SSliquids.evaporation_queue)
-		SSliquids.evaporation_queue -= my_turf
-	if(my_turf in SSliquids.burning_turfs)
-		SSliquids.burning_turfs -= my_turf
-	my_turf.liquids = null
-	my_turf = null
-	QUEUE_SMOOTH_NEIGHBORS(src)
-	return ..()
-
 /obj/effect/abstract/liquid_turf/proc/ChangeToNewTurf(turf/NewT)
 	if(NewT.liquids)
 		stack_trace("Liquids tried to change to a new turf, that already had liquids on it!")
diff --git a/monkestation/code/modules/liquids/liquid_groups.dm b/monkestation/code/modules/liquids/liquid_groups.dm
@@ -58,6 +58,10 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 	var/list/current_temperature_queue = list()
 	///do we evaporate
 	var/evaporates = TRUE
+	/// Liquids in this group will always evaporate regardless of height
+	var/always_evaporates = FALSE
+	/// The multiplier added to the evaporation rate of all reagents in this group.
+	var/evaporation_multiplier = 1
 	///can we merge?
 	var/can_merge = TRUE
 	///number in decimal value that acts as a multiplier to the amount of liquids lost in applications
@@ -83,16 +87,26 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 /datum/liquid_group/Destroy()
 	UnregisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT)
 	SSliquids.active_groups -= src
-
-	if(src in SSliquids.arrayed_groups)
-		SSliquids.arrayed_groups -= src /// Someone made a massive fucky wucky if this is happening
-
+	SSliquids.active_turf_group_queue -= src
+	SSliquids.arrayed_groups -= src /// Someone made a massive fucky wucky if this is happening
 	for(var/turf/member_turf as anything in members)
-		member_turf?.liquids?.liquid_group = null
-	members = list()
+		if(member_turf?.liquids?.liquid_group == src)
+			QDEL_NULL(member_turf.liquids)
+	members = null
 	burning_members = null
+	cached_edge_turfs = null
+	cached_fire_spreads = null
+	cached_reagent_list = null
+	current_temperature_queue = null
+	splitting_array = null
 	return ..()
 
+/datum/liquid_group/proc/copy_properties(datum/liquid_group/from)
+	if(isnull(from))
+		return
+	always_evaporates = from.always_evaporates
+	evaporation_multiplier = from.evaporation_multiplier
+
 /datum/liquid_group/proc/removed_reagent(datum/reagents/source, datum/reagent/modified)
 	for(var/turf/member as anything in members)
 		if(QDELETED(member.liquids))
@@ -122,19 +136,21 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 	process_group()
 
 /datum/liquid_group/proc/remove_from_group(turf/T, should_reprocess = TRUE)
-
-	if(T in burning_members)
+	if(isnull(T))
+		return
+	SSliquids.burning_turfs -= T
+	if(burning_members)
 		burning_members -= T
-
-	if(T in SSliquids.burning_turfs)
-		SSliquids.burning_turfs -= T
-
-	members -= T
+	if(members)
+		members -= T
 	T.liquids?.liquid_group = null
 
 	for(var/datum/reagent/reagent as anything in reagents.reagent_list)
 		reagent.remove_from_member(T.liquids)
 
+	if(QDELING(src))
+		return
+
 	if(!length(members))
 		qdel(src)
 		return
@@ -171,6 +187,8 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 
 	total_reagent_volume = reagents.total_volume
 	reagents_per_turf = total_reagent_volume / length(members)
+	always_evaporates ||= otherg.always_evaporates
+	evaporation_multiplier = (evaporation_multiplier + otherg.evaporation_multiplier) * 0.5 // average the evaporation multipliers
 
 	qdel(otherg)
 	process_group()
@@ -392,6 +410,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 /datum/liquid_group/proc/move_liquid_group(obj/effect/abstract/liquid_turf/member)
 	remove_from_group(member.my_turf)
 	member.liquid_group = new(1, member)
+	member.liquid_group.copy_properties(src)
 	var/remove_amount = reagents_per_turf / length(reagents.reagent_list)
 	for(var/datum/reagent/reagent_type in reagents.reagent_list)
 		member.liquid_group.reagents.add_reagent(reagent_type, remove_amount, no_react = TRUE)
@@ -694,6 +713,8 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 		passed_directions.Add(direction)
 
 	if(length(passed_directions))
+		if(!islist(cached_edge_turfs)) // what the fuck???
+			cached_edge_turfs = list()
 		cached_edge_turfs |= checker
 		cached_edge_turfs[checker] = passed_directions
 
@@ -808,6 +829,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 	var/amount_to_transfer = length(connected_liquids) * reagents_per_turf
 
 	var/datum/liquid_group/new_group = new(1)
+	new_group.copy_properties(src)
 
 	for(var/turf/connected_liquid in connected_liquids)
 		new_group.check_edges(connected_liquid)
@@ -884,6 +906,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 		var/amount_to_transfer = length(connected_liquids) * reagents_per_turf
 
 		var/datum/liquid_group/new_group = new(1)
+		new_group.copy_properties(src)
 		if(!members)
 			members = list()
 		trans_to_seperate_group(new_group.reagents, amount_to_transfer)
