Merge pull request #3255 from MistakeNot4892/devupdate

Dev update from staging.
NebulaSS13 · Jul 25, 2023 · 5b51c66 · 5b51c66
2 parents 9c7bf4a + 9ec5064
commit 5b51c66
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 28 deletions.
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
@@ -401,11 +401,11 @@ var/global/list/hygiene_props = list()
 
 	var/obj/item/chems/RG = O
 	if (istype(RG) && ATOM_IS_OPEN_CONTAINER(RG) && RG.reagents)
-		RG.reagents.add_reagent(/decl/material/liquid/water, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
 		user.visible_message(
 			SPAN_NOTICE("\The [user] fills \the [RG] using \the [src]."),
 			SPAN_NOTICE("You fill \the [RG] using \the [src]."))
 		playsound(loc, 'sound/effects/sink.ogg', 75, 1)
+		RG.reagents.add_reagent(/decl/material/liquid/water, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
 		return 1
 
 	else if (istype(O, /obj/item/baton))

diff --git a/code/game/turfs/exterior/exterior_water.dm b/code/game/turfs/exterior/exterior_water.dm
@@ -16,7 +16,7 @@
 		if(fill_amount <= 0)
 			to_chat(user, SPAN_WARNING("\The [O] is full."))
 			return TRUE
-		O.reagents.add_reagent(reagent_type, fill_amount)
 		user.visible_message(SPAN_NOTICE("\The [user] fills \the [O] from \the [src]."), SPAN_NOTICE("You fill \the [O] from \the [src]."))
+		O.reagents.add_reagent(reagent_type, fill_amount)
 		return TRUE
 	. = ..()
diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm
@@ -40,7 +40,7 @@ var/global/list/floor_decals = list()
 				I.overlays |= overlay_image(icon, "[detail_overlay]", color = detail_color, flags=RESET_COLOR)
 			floor_decals[cache_key] = I
 		LAZYDISTINCTADD(T.decals, floor_decals[cache_key])
-		T.add_overlay(floor_decals[cache_key])
+		T.queue_icon_update()
 	qdel(src)
 
 /obj/effect/floor_decal/reset

diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm
@@ -59,7 +59,7 @@ var/global/list/flooring_cache = list()
 						add_overlay(get_flooring_overlay("[flooring.icon]_[flooring.icon_base]-edge-[direction]", "[flooring.icon_base]_edges", direction,(flooring.flags & TURF_HAS_EDGES)))
 
 	for(var/image/I in decals)
-		if(I.layer != DECAL_PLATING_LAYER)
+		if(I.layer < layer)
 			continue
 		add_overlay(I)
 

diff --git a/code/game/turfs/simulated/footsteps.dm b/code/game/turfs/simulated/footsteps.dm
@@ -1,30 +1,26 @@
-/proc/get_footstep(var/footstep_type, var/mob/caller)
-	. = caller && caller.get_footstep(footstep_type)
+/proc/get_footstep_for_mob(var/footstep_type, var/mob/living/caller)
+	. = istype(caller) && caller.get_mob_footstep(footstep_type)
 	if(!.)
 		var/decl/footsteps/FS = GET_DECL(footstep_type)
 		. = pick(FS.footstep_sounds)
 
-/turf/get_footstep_sound(var/mob/caller)
+/turf/proc/get_footstep_sound(var/mob/caller)
+
 	for(var/obj/structure/S in contents)
 		if(S.footstep_type)
-			return get_footstep(S.footstep_type, caller)
+			return get_footstep_for_mob(S.footstep_type, caller)
 
 	if(check_fluid_depth(10) && !is_flooded(TRUE))
-		return get_footstep(/decl/footsteps/water, caller)
+		return get_footstep_for_mob(/decl/footsteps/water, caller)
 
 	if(footstep_type)
-		return get_footstep(footstep_type, caller)
+		return get_footstep_for_mob(footstep_type, caller)
 
 	if(is_plating())
-		return get_footstep(/decl/footsteps/plating, caller)
+		return get_footstep_for_mob(/decl/footsteps/plating, caller)
 
 /turf/simulated/floor/get_footstep_sound(var/mob/caller)
-	. = ..()
-	if(!.)
-		if(!flooring || !flooring.footstep_type)
-			return get_footstep(/decl/footsteps/blank, caller)
-		else
-			return get_footstep(flooring.footstep_type, caller)
+	. = ..() || get_footstep_for_mob(flooring?.footstep_type || /decl/footsteps/blank, caller)
 
 /mob/living/carbon/human/proc/has_footsteps()
 	if(species.silent_steps || buckled || lying || throwing)
@@ -60,7 +56,7 @@
 	if(!footsound)
 		return
 
-	var/range = -(world.view - 2)
+	var/range = world.view - 2
 	var/volume = 70
 	if(MOVING_DELIBERATELY(src))
 		volume -= 45
@@ -73,7 +69,7 @@
 		volume -= 60
 		range -= 0.333
 
-	range = round(range)
+	range  = round(range)
 	volume = round(volume)
 	if(volume > 0 && range > 0)
 		playsound(T, footsound, volume, 1, range)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
@@ -398,9 +398,6 @@
 /turf/proc/is_floor()
 	return FALSE
 
-/turf/proc/get_footstep_sound(var/mob/caller)
-	return
-
 /turf/proc/update_weather(var/obj/abstract/weather_system/new_weather, var/force_update_below = FALSE)
 
 	if(isnull(new_weather))

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
@@ -1157,9 +1157,6 @@
 			else
 				reagents.trans_to_obj(vomit, 5)
 
-/mob/living/carbon/human/get_footstep(var/footstep_type)
-	. = species.get_footstep(src, footstep_type) || ..()
-
 /mob/living/carbon/human/get_sound_volume_multiplier()
 	. = ..()
 	for(var/slot in list(slot_l_ear_str, slot_r_ear_str, slot_head_str))

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
@@ -1138,3 +1138,8 @@ default behaviour is:
 /mob/living/proc/handle_some_updates()
 	//We are long dead, or we're junk mobs spawned like the clowns on the clown shuttle
 	return life_tick <= 5 || !timeofdeath || (timeofdeath >= 5 && (world.time-timeofdeath) <= 10 MINUTES)
+
+/mob/living/proc/get_mob_footstep(var/footstep_type)
+	var/decl/species/my_species = get_species()
+	return my_species?.get_footstep(src, footstep_type)
+
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
@@ -1051,9 +1051,6 @@
 		return TRUE
 	return FALSE
 
-/mob/proc/get_footstep(var/footstep_type)
-	return
-
 /mob/proc/handle_embedded_and_stomach_objects()
 	return