diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index 3889be11743..1c19ede2166 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs @@ -340,7 +340,7 @@ private void OnSolutionUpdate(Entity entity, ref SolutionContai _deletionQueue.Remove(entity); UpdateSlip(entity, entity.Comp, args.Solution); - UpdateSlow(entity, args.Solution); + UpdateSlow(entity, args.Solution); // 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(Entity uid, Solution solution) // backmen: footsteps { + // start-backmen: footsteps + if (!uid.Comp.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? 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