From 7c24643fed0229e957389637c59b36c28529b7cf Mon Sep 17 00:00:00 2001
From: csqrb <56765288+CaptainSqrBeard@users.noreply.github.com>
Date: Sun, 1 Dec 2024 05:40:02 +0600
Subject: [PATCH 1/2] =?UTF-8?q?=D0=92=D1=8F=D0=B7=D0=BA=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D1=8C=20=D1=80=D0=B5=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D1=81=D0=BB=D0=B5=D0=B4=D0=BE=D0=B2=20=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=BD=D0=B5=20=D0=B2=D0=BB=D0=B8=D1=8F?=
 =?UTF-8?q?=D0=B5=D1=82=20=D0=BD=D0=B0=20=D1=81=D0=BA=D0=BE=D1=80=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=B4=D0=B2=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20(#99)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* no viscosity for footprints

* // Corvax-Next-Footsteps

* footprintsteps
---
 Content.Server/Fluids/EntitySystems/PuddleSystem.cs | 9 +++++++--
 Content.Shared/Fluids/Components/PuddleComponent.cs | 5 +++++
 Resources/Prototypes/Entities/Effects/puddle.yml    | 5 +++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index 3889be11743..f2c4d0b6d32 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -340,7 +340,7 @@ private void OnSolutionUpdate(Entity<PuddleComponent> entity, ref SolutionContai
 
         _deletionQueue.Remove(entity);
         UpdateSlip(entity, entity.Comp, args.Solution);
-        UpdateSlow(entity, args.Solution);
+        UpdateSlow(entity, args.Solution, entity.Comp); // backmen: footsteps
         UpdateEvaporation(entity, args.Solution);
         UpdateAppearance(entity, entity.Comp);
     }
@@ -421,8 +421,13 @@ private void UpdateSlip(EntityUid entityUid, PuddleComponent component, Solution
         }
     }
 
-    private void UpdateSlow(EntityUid uid, Solution solution)
+    private void UpdateSlow(EntityUid uid, Solution solution, PuddleComponent component) // Corvax-Next-Footprints
     {
+        // start-backmen: footsteps
+        if (!component.ViscosityAffectsMovement)
+            return;
+        // end-backmen: footsteps
+
         var maxViscosity = 0f;
         foreach (var (reagent, _) in solution.Contents)
         {
diff --git a/Content.Shared/Fluids/Components/PuddleComponent.cs b/Content.Shared/Fluids/Components/PuddleComponent.cs
index b8a6fe0cb88..f7c8d9a7e84 100644
--- a/Content.Shared/Fluids/Components/PuddleComponent.cs
+++ b/Content.Shared/Fluids/Components/PuddleComponent.cs
@@ -21,5 +21,10 @@ public sealed partial class PuddleComponent : Component
 
         [DataField("solutionRef")]
         public Entity<SolutionComponent>? Solution;
+
+        // start-backmen: footsteps
+        [DataField]
+        public bool ViscosityAffectsMovement = true;
+        // end-backmen: footsteps
     }
 }
diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml
index 7f8cfdcebb7..64937f399b0 100644
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -167,7 +167,7 @@
     tags:
     - DNASolutionScannable
 
-#BACKMEN-EDIT
+# start-backmen: footsteps
 - type: entity
   name: след
   id: Footstep
@@ -208,5 +208,6 @@
       solution: step
     - type: Puddle
       solution: step
+      viscosityAffectsMovement: false
     - type: Appearance
-#BACKMEN-EDIT
+# end-backmen: footsteps

From 28988441af8dd9cb458218988a645aa98d037aa6 Mon Sep 17 00:00:00 2001
From: Roudenn <romabond091@gmail.com>
Date: Sat, 7 Dec 2024 11:50:45 +0300
Subject: [PATCH 2/2] Update PuddleSystem.cs

---
 Content.Server/Fluids/EntitySystems/PuddleSystem.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index f2c4d0b6d32..1c19ede2166 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -340,7 +340,7 @@ private void OnSolutionUpdate(Entity<PuddleComponent> entity, ref SolutionContai
 
         _deletionQueue.Remove(entity);
         UpdateSlip(entity, entity.Comp, args.Solution);
-        UpdateSlow(entity, args.Solution, entity.Comp); // backmen: footsteps
+        UpdateSlow(entity, args.Solution); // backmen: footsteps
         UpdateEvaporation(entity, args.Solution);
         UpdateAppearance(entity, entity.Comp);
     }
@@ -421,10 +421,10 @@ private void UpdateSlip(EntityUid entityUid, PuddleComponent component, Solution
         }
     }
 
-    private void UpdateSlow(EntityUid uid, Solution solution, PuddleComponent component) // Corvax-Next-Footprints
+    private void UpdateSlow(Entity<PuddleComponent> uid, Solution solution) // backmen: footsteps
     {
         // start-backmen: footsteps
-        if (!component.ViscosityAffectsMovement)
+        if (!uid.Comp.ViscosityAffectsMovement)
             return;
         // end-backmen: footsteps