From a010860f10f3f70ed36c80142f6cf3d54ffde74c Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 7 Jan 2025 18:01:54 -0400
Subject: [PATCH 1/4] Fix AbsorbentTest test fail

---
 .../Fluids/EntitySystems/AbsorbentSystem.Footprints.cs          | 2 +-
 Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.Footprints.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.Footprints.cs
index 50b5b7a6601..ae96fc20f9c 100644
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.Footprints.cs
+++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.Footprints.cs
@@ -12,7 +12,7 @@ public sealed partial class AbsorbentSystem
     /// <summary>
     ///     Tries to clean a number of footprints in a range determined by the component. Returns the number of cleaned footprints.
     /// </summary>
-    private int TryCleanNearbyFootprints(EntityUid user, EntityUid used, Entity<AbsorbentComponent> target,  Entity<SolutionComponent> absorbentSoln)
+    private int TryCleanNearbyFootprints(EntityUid user, EntityUid target, Entity<AbsorbentComponent> used,  Entity<SolutionComponent> absorbentSoln)
     {
         var footprintQuery = GetEntityQuery<FootPrintComponent>();
         var targetCoords = Transform(target).Coordinates;
diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
index 1f8c44a2409..99f2ac4a987 100644
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
@@ -119,7 +119,7 @@ public void Mop(EntityUid user, EntityUid target, EntityUid used, AbsorbentCompo
                 return;
         }
 
-        TryCleanNearbyFootprints(user, used, (target, component), absorberSoln.Value);
+        TryCleanNearbyFootprints(user, target, (used, component), absorberSoln.Value);
     }
 
     /// <summary>

From f5d02a0b9d11833bec24e7a1d76c9c7c7d53c809 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 7 Jan 2025 18:06:28 -0400
Subject: [PATCH 2/4] Right, these exist

---
 .../Fluids/EntitySystems/AbsorbentSystem.Footprints.cs        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.Footprints.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.Footprints.cs
index ae96fc20f9c..9c2213a7a0c 100644
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.Footprints.cs
+++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.Footprints.cs
@@ -29,10 +29,10 @@ private int TryCleanNearbyFootprints(EntityUid user, EntityUid target, Entity<Ab
         var processed = 0;
         foreach (var (uid, footprintComp) in cleaned)
         {
-            if (TryPuddleInteract(user, used, uid, target.Comp, useDelay: null, absorbentSoln))
+            if (TryPuddleInteract(user, used.Owner, uid, used.Comp, useDelay: null, absorbentSoln))
                 processed++;
 
-            if (processed >= target.Comp.MaxCleanedFootprints)
+            if (processed >= used.Comp.MaxCleanedFootprints)
                 break;
         }
 

From 8a768d113860f11aed199f5afbbfab47270b5ff8 Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 7 Jan 2025 18:11:15 -0400
Subject: [PATCH 3/4] Silly

---
 .../Fluids/EntitySystems/AbsorbentSystem.Footprints.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.Footprints.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.Footprints.cs
index 9c2213a7a0c..aefb429f20d 100644
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.Footprints.cs
+++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.Footprints.cs
@@ -16,7 +16,7 @@ private int TryCleanNearbyFootprints(EntityUid user, EntityUid target, Entity<Ab
     {
         var footprintQuery = GetEntityQuery<FootPrintComponent>();
         var targetCoords = Transform(target).Coordinates;
-        var entities = _lookup.GetEntitiesInRange<FootPrintComponent>(targetCoords, target.Comp.FootprintCleaningRange, LookupFlags.Uncontained);
+        var entities = _lookup.GetEntitiesInRange<FootPrintComponent>(targetCoords, used.Comp.FootprintCleaningRange, LookupFlags.Uncontained);
 
         // Take up to [MaxCleanedFootprints] footprints closest to the target
         var cleaned = entities.AsEnumerable()

From c8012543371bb61c37d0caceb28410d06a901bcd Mon Sep 17 00:00:00 2001
From: sleepyyapril <flyingkarii@gmail.com>
Date: Tue, 7 Jan 2025 18:14:02 -0400
Subject: [PATCH 4/4] Fix shadowkin test fail

---
 Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml
index f45adde2618..4ac1183f294 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml
@@ -5,6 +5,7 @@
     - MobAtmosStandard
     - MobFlammable
     - BaseMobSpecies
+    - MobRespirator
   id: MobShadowkinBase
   name: Urist McShadow
   abstract: true