From 80f1b0d113ef6543ab6e3c0a850b6f224cd2f52e Mon Sep 17 00:00:00 2001 From: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com> Date: Sun, 28 Jan 2024 14:27:03 +0100 Subject: [PATCH] Extinguisher and spray bottle works on tile you're standing fix (#23914) * extinguisher once again works on yourself * you too --- code/game/objects/effects/effect_system/effects_water.dm | 2 +- code/modules/reagents/reagent_containers/spray.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/effect_system/effects_water.dm b/code/game/objects/effects/effect_system/effects_water.dm index ef5f1d02e0e..be73848e2e7 100644 --- a/code/game/objects/effects/effect_system/effects_water.dm +++ b/code/game/objects/effects/effect_system/effects_water.dm @@ -26,7 +26,7 @@ /obj/effect/particle_effect/water/proc/extinguish_move(turf/target) for(var/counter in 1 to 5) - if(!step_towards(src, target)) + if(!step_towards(src, target) && counter != 1) return var/turf/current_turf = get_turf(src) reagents.reaction(current_turf) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index e493a7c0c95..9d28a5b3038 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -79,7 +79,7 @@ D.icon += mix_color_from_reagents(D.reagents.reagent_list) for(var/i in 1 to spray_currentrange) - if(!step_towards(D, A)) + if(!step_towards(D, A) && i != 1) qdel(D) return D.reagents.reaction(get_turf(D))