Monkestation · dwasint · Sep 20, 2023 · Sep 14, 2023 · Sep 14, 2023 · Sep 14, 2023
diff --git a/code/__DEFINES/liquids.dm b/code/__DEFINES/liquids.dm
@@ -78,6 +78,8 @@
 
 #define SUBMERGEMENT_PERCENT(carbon, liquids) min(1,(!MOBILITY_STAND ? liquids.liquid_group.group_overlay_state+LYING_DOWN_SUBMERGEMENT_STATE_BONUS : liquids.liquid_group.group_overlay_state)/TOTAL_LIQUID_STATES)
 
+#define LIQUID_PROTECTION "liquid_protection"
+
 GLOBAL_LIST_INIT(liquid_blacklist, list(
 	/datum/reagent/sorium,
 	/datum/reagent/liquid_dark_matter

diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm
@@ -57,6 +57,7 @@
 	equip_delay_other = 80
 	resistance_flags = NONE
 	actions_types = list(/datum/action/item_action/toggle_spacesuit)
+	clothing_traits = list(LIQUID_PROTECTION)
 	var/temperature_setting = BODYTEMP_NORMAL /// The default temperature setting
 	var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high /// If this is a path, this gets created as an object in Initialize.
 	var/cell_cover_open = FALSE /// Status of the cell cover on the suit

diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
@@ -79,7 +79,7 @@
 	if(mob.control_object)
 		return Move_object(direct)
 	if(!isliving(mob))
-		SEND_SIGNAL(src, COMSIG_MOB_CLIENT_MOVED_CLIENT_SEND, direct)
+		SEND_SIGNAL(src, COMSIG_MOB_CLIENT_MOVED_CLIENT_SEND, direct, new_loc)
 		return mob.Move(new_loc, direct)
 	if(mob.stat == DEAD)
 		mob.ghostize()
@@ -156,7 +156,7 @@
 		// At this point we've moved the client's attached mob. This is one of the only ways to guess that a move was done
 		// as a result of player input and not because they were pulled or any other magic.
 		SEND_SIGNAL(mob, COMSIG_MOB_CLIENT_MOVED, direct, old_dir)
-		SEND_SIGNAL(src, COMSIG_MOB_CLIENT_MOVED_CLIENT_SEND, direct)
+		SEND_SIGNAL(src, COMSIG_MOB_CLIENT_MOVED_CLIENT_SEND, direct, new_loc)
 
 	var/atom/movable/P = mob.pulling
 	if(P && !ismob(P) && P.density)

diff --git a/monkestation/code/modules/cassettes/machines/media/media_manager.dm b/monkestation/code/modules/cassettes/machines/media/media_manager.dm
@@ -192,7 +192,7 @@
 	if (client?.media && !client.media.forced)
 		client.media.recalc_volume()
 
-/datum/media_manager/proc/recalc_volume()
+/datum/media_manager/proc/recalc_volume(datum/source, direction, turf/new_loc)
 	if(!(owner.prefs))
 		return
 
@@ -213,8 +213,8 @@
 
 	var/obj/machinery/media/M = A.media_source
 	if(M && M.playing)
-		var/dist = get_dist(owner.mob, M)
-		var/x_dist = -(owner.mob.x - M.x) * 10
+		var/dist = get_dist(new_loc, M)
+		var/x_dist = -(new_loc.x - M.x) * 10
 
 		targetVolume = max(0, M.volume - (dist * 0.1))
 		targetBalance = x_dist

diff --git a/monkestation/code/modules/liquids/liquid_controller.dm b/monkestation/code/modules/liquids/liquid_controller.dm
@@ -61,7 +61,7 @@ SUBSYSTEM_DEF(liquids)
 
 				LG.build_turf_reagent()
 				LG.process_cached_edges()
-				LG.process_group()
+				LG.process_group(TRUE)
 				if(populate_evaporation && LG.expected_turf_height < LIQUID_STATE_ANKLES && LG.evaporates)
 					for(var/tur in LG.members)
 						var/turf/listed_turf = tur

diff --git a/monkestation/code/modules/liquids/liquid_groups.dm b/monkestation/code/modules/liquids/liquid_groups.dm
@@ -32,8 +32,6 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 	var/group_temperature = 300
 	///the generated color used to apply coloring to all the members
 	var/group_color
-	///a variable to forcibly trigger a recount of our reagents
-	var/updated_total = FALSE
 	///have we failed a process? if so we are added to a death check so it will gracefully die on its own
 	var/failed_death_check = FALSE
 	///the burn power of our group, used to determine how strong we burn each process_fire()
@@ -101,7 +99,6 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 	members[T] = TRUE
 	T.liquids.liquid_group = src
 	reagents.maximum_volume += 1000 /// each turf will hold 1000 units plus the base amount spread across the group
-	updated_total = TRUE
 	if(group_color)
 		T.liquids.color = group_color
 	process_group()
@@ -121,7 +118,6 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 	if(!members.len)
 		qdel(src)
 		return
-	updated_total = TRUE
 	process_group()
 
 /datum/liquid_group/proc/remove_all()
@@ -148,7 +144,6 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 
 	total_reagent_volume = reagents.total_volume
 	reagents_per_turf = total_reagent_volume / length(members)
-	updated_total = TRUE
 
 	qdel(otherg)
 	process_group()
@@ -164,7 +159,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 		failed_death_check = TRUE
 
 ///PROCESSING
-/datum/liquid_group/proc/process_group()
+/datum/liquid_group/proc/process_group(from_SS = FALSE)
 	if(merging)
 		return
 	if(!members || !members.len) // this ideally shouldn't exist, ideally groups would die before they got to this point but alas here we are
@@ -185,8 +180,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 			cached_temperature_shift =((math_cache.return_temperature() * max(1, math_cache.total_moles())) + ((group_temperature * max(1, (total_reagent_volume * 0.025))))) / (max(1, (total_reagent_volume * 0.025)) + max(1, math_cache.total_moles()))
 			temperature_shift_needs_action = TRUE
 
-	if(total_reagent_volume != reagents.total_volume || updated_total)
-		updated_total = FALSE
+	if(from_SS)
 		total_reagent_volume = reagents.total_volume
 		reagents.handle_reactions()
 
@@ -293,7 +287,6 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 	reagents.remove_any(amount, TRUE)
 	if(remover)
 		check_liquid_removal(remover, amount)
-	updated_total = TRUE
 	total_reagent_volume = reagents.total_volume
 	reagents_per_turf = total_reagent_volume / members.len
 	expected_turf_height = CEILING(reagents_per_turf, 1) / LIQUID_HEIGHT_DIVISOR
@@ -305,14 +298,12 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 	reagents.remove_reagent(reagent_type.type, amount)
 	if(remover)
 		check_liquid_removal(remover, amount)
-	updated_total = TRUE
 	total_reagent_volume = reagents.total_volume
 
 /datum/liquid_group/proc/transfer_to_atom(obj/effect/abstract/liquid_turf/remover, amount, atom/transfer_target, transfer_method = INGEST)
 	reagents.trans_to(transfer_target, amount, methods = transfer_method)
 	if(remover)
 		check_liquid_removal(remover, amount)
-	updated_total = TRUE
 	total_reagent_volume = reagents.total_volume
 
 /datum/liquid_group/proc/move_liquid_group(obj/effect/abstract/liquid_turf/member)
@@ -732,6 +723,8 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE)
 /datum/liquid_group/proc/expose_atom(atom/target, modifier = 0, method)
 	if(!turf_reagents)
 		return
+	if(HAS_TRAIT(target, LIQUID_PROTECTION))
+		return
 	turf_reagents.expose(target, method, liquid = TRUE)
 
 /datum/liquid_group/proc/spread_liquid(turf/new_turf, turf/source_turf)

diff --git a/monkestation/code/modules/liquids/liquid_ocean.dm b/monkestation/code/modules/liquids/liquid_ocean.dm
@@ -30,6 +30,7 @@ GLOBAL_LIST_INIT(initalized_ocean_areas, list())
 
 /area/ocean/dark
 	base_lighting_alpha = 0
+
 /area/ruin/ocean
 	has_gravity = TRUE
 
@@ -77,7 +78,7 @@ GLOBAL_LIST_INIT(initalized_ocean_areas, list())
 	light_power = 0.75
 
 	var/static/obj/effect/abstract/ocean_overlay/static_overlay
-	var/static/list/ocean_reagents = list(/datum/reagent/water = 100)
+	var/static/list/ocean_reagents = list(/datum/reagent/water = 10)
 	var/ocean_temp = T20C
 	var/list/ocean_turfs = list()
 	var/list/open_turfs = list()
@@ -490,10 +491,12 @@ GLOBAL_LIST_INIT(the_lever, list())
 	base_lighting_alpha = 0
 	//map_generator = /datum/map_generator/ocean_generator
 	map_generator = /datum/map_generator/cave_generator/trench
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED
 
 
 /area/ocean/generated_above
 	map_generator = /datum/map_generator/ocean_generator
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED
 
 /turf/open/floor/plating/ocean/pit
 	name = "pit"

diff --git a/monkestation/code/modules/liquids/ocean_generator.dm b/monkestation/code/modules/liquids/ocean_generator.dm
@@ -184,8 +184,6 @@
 	string_gen = rustg_cnoise_generate("[initial_closed_chance]", "[smoothing_iterations]", "[birth_limit]", "[death_limit]", "[world.maxx]", "[world.maxy]") //Generate the raw CA data
 
 	// Area var pullouts to make accessing in the loop faster
-	var/flora_allowed = (generate_in.area_flags & FLORA_ALLOWED) && length(flora_spawn_list)
-	var/feature_allowed = (generate_in.area_flags & FLORA_ALLOWED) && length(feature_spawn_list)
 	var/mobs_allowed = (generate_in.area_flags & MOB_SPAWN_ALLOWED) && length(mob_spawn_list)
 	var/megas_allowed = (generate_in.area_flags & MEGAFAUNA_SPAWN_ALLOWED) && length(megafauna_spawn_list)
 
@@ -208,26 +206,6 @@
 		var/spawned_something = FALSE
 
 		///Spawning isn't done in procs to save on overhead on the 60k turfs we're going through.
-		//FLORA SPAWNING HERE
-		if(flora_allowed && prob(flora_spawn_chance))
-			var/flora_type = pick(flora_spawn_list)
-			new flora_type(new_turf)
-			spawned_something = TRUE
-
-		//FEATURE SPAWNING HERE
-		if(feature_allowed && prob(feature_spawn_chance))
-			var/can_spawn = TRUE
-
-			var/atom/picked_feature = pick(feature_spawn_list)
-
-			for(var/obj/structure/existing_feature in range(7, new_turf))
-				if(istype(existing_feature, picked_feature))
-					can_spawn = FALSE
-					break
-
-			if(can_spawn)
-				new picked_feature(new_turf)
-				spawned_something = TRUE
 
 		//MOB SPAWNING HERE
 		if(mobs_allowed && !spawned_something && prob(mob_spawn_chance))

diff --git a/monkestation/code/modules/liquids/tools.dm b/monkestation/code/modules/liquids/tools.dm
@@ -61,7 +61,7 @@
 	for(var/turf/open/floor/plating/ocean/listed_ocean as anything in SSliquids.ocean_turfs)
 		if(!rebuilt)
 			listed_ocean.ocean_reagents = list()
-			listed_ocean.ocean_reagents[chosen_reagent] = 100
+			listed_ocean.ocean_reagents[chosen_reagent] = 10
 			listed_ocean.static_overlay.mix_colors(listed_ocean.ocean_reagents)
 			for(var/area/ocean/ocean_types in GLOB.initalized_ocean_areas)
 				ocean_types.base_lighting_color = listed_ocean.static_overlay.color