diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
index bac7632d01..002919aff9 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
@@ -34,7 +34,7 @@ public sealed partial class AtmosphereSystem
            return;
        }
 
-       var mixtures = new GasMixture[6];
+       var mixtures = new GasMixture[7];
        for (var i = 0; i < mixtures.Length; i++)
            mixtures[i] = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C };
 
@@ -58,6 +58,11 @@ public sealed partial class AtmosphereSystem
        mixtures[5].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner);
        mixtures[5].Temperature = 5000f;
 
+       // 6: (Walk-In) Freezer
+       mixtures[6].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesStandard);
+       mixtures[6].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard);
+       mixtures[6].Temperature = 235f; // Little colder than an actual freezer but gives a grace period to get e.g. themomachines set up, should keep warm for a few door openings
+
        foreach (var arg in args)
        {
            if(!EntityUid.TryParse(arg, out var euid))
diff --git a/Resources/Prototypes/Entities/Markers/atmos_blocker.yml b/Resources/Prototypes/Entities/Markers/atmos_blocker.yml
index 51f9f56a49..a5e91e6e53 100644
--- a/Resources/Prototypes/Entities/Markers/atmos_blocker.yml
+++ b/Resources/Prototypes/Entities/Markers/atmos_blocker.yml
@@ -83,3 +83,19 @@
     - type: AtmosFixMarker
       mode: 5
 
+- type: entity
+  name: Atmos Fix Freezer Marker
+  id: AtmosFixFreezerMarker
+  description: "Change air temp to 235K, for freezer with a big of wiggle room to get set up."
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - sprite: Markers/atmos.rsi # {
+          state: base
+          shader: unshaded
+        - sprite: Markers/atmos.rsi
+          shader: unshaded # }
+          state: freeze
+    - type: AtmosFixMarker
+      mode: 6
diff --git a/Resources/Textures/Markers/atmos.rsi/freeze.png b/Resources/Textures/Markers/atmos.rsi/freeze.png
new file mode 100644
index 0000000000..d1779c2d12
Binary files /dev/null and b/Resources/Textures/Markers/atmos.rsi/freeze.png differ
diff --git a/Resources/Textures/Markers/atmos.rsi/meta.json b/Resources/Textures/Markers/atmos.rsi/meta.json
index 019a9f02d2..aaa8485a86 100644
--- a/Resources/Textures/Markers/atmos.rsi/meta.json
+++ b/Resources/Textures/Markers/atmos.rsi/meta.json
@@ -30,6 +30,9 @@
     },
     {
       "name": "fire"
+    },
+    {
+     "name": "freeze"
     }
   ]
 }