diff --git a/Resources/Maps/infiltrator.yml b/Resources/Maps/infiltrator.yml
index 9d09ea2c3d..bcf96b4c4b 100644
--- a/Resources/Maps/infiltrator.yml
+++ b/Resources/Maps/infiltrator.yml
@@ -570,47 +570,47 @@ entities:
       -4,-9: 0
       -4,-8: 0
       -4,-7: 0
-      -4,-6: 1
+      -4,-6: 0
       -4,-5: 0
-      -4,-4: 2
+      -4,-4: 0
       -3,-12: 0
       -3,-5: 0
-      -2,-16: 3
-      -2,-15: 4
-      -2,-14: 5
-      -2,-13: 6
-      -2,-12: 7
-      -2,-11: 8
-      -2,-10: 9
-      -2,-9: 3
-      -2,-8: 10
-      -2,-7: 5
-      -2,-6: 6
+      -2,-16: 0
+      -2,-15: 0
+      -2,-14: 0
+      -2,-13: 0
+      -2,-12: 0
+      -2,-11: 0
+      -2,-10: 0
+      -2,-9: 0
+      -2,-8: 0
+      -2,-7: 0
+      -2,-6: 0
       -2,-5: 0
-      -2,-4: 1
+      -2,-4: 0
       -1,-16: 0
       -1,-15: 0
       -1,-14: 0
       -1,-13: 0
       -1,-12: 0
       -1,-11: 0
-      -1,-10: 11
+      -1,-10: 0
       -1,-9: 0
-      -1,-8: 12
+      -1,-8: 0
       -1,-7: 0
       -1,-6: 0
       -1,-5: 0
       -1,-4: 0
-      -1,-3: 6
-      -1,-2: 5
-      -1,-1: 13
+      -1,-3: 0
+      -1,-2: 0
+      -1,-1: 0
       0,-16: 0
       0,-15: 0
       0,-14: 0
       0,-13: 0
       0,-12: 0
       0,-11: 0
-      0,-10: 14
+      0,-10: 0
       0,-9: 0
       0,-8: 0
       0,-7: 0
@@ -619,15 +619,15 @@ entities:
       0,-4: 0
       0,-3: 0
       0,-2: 0
-      0,-1: 15
+      0,-1: 0
       1,-16: 0
       1,-15: 0
       1,-14: 0
       1,-13: 0
       1,-12: 0
       1,-11: 0
-      1,-10: 16
-      1,-9: 17
+      1,-10: 0
+      1,-9: 0
       1,-8: 0
       1,-7: 0
       1,-6: 0
@@ -635,54 +635,54 @@ entities:
       1,-4: 0
       1,-3: 0
       1,-2: 0
-      1,-1: 18
+      1,-1: 0
       2,-16: 0
       2,-15: 0
       2,-14: 0
-      2,-13: 19
+      2,-13: 0
       2,-12: 0
       2,-11: 0
-      2,-10: 20
-      2,-9: 21
-      2,-8: 22
-      2,-7: 23
+      2,-10: 0
+      2,-9: 0
+      2,-8: 0
+      2,-7: 0
       2,-6: 0
-      2,-5: 24
+      2,-5: 0
       2,-4: 0
-      2,-3: 25
-      2,-2: 26
-      2,-1: 27
+      2,-3: 0
+      2,-2: 0
+      2,-1: 0
       3,-16: 0
       3,-15: 0
       3,-14: 0
-      3,-13: 28
+      3,-13: 0
       3,-12: 0
-      3,-11: 29
-      3,-10: 30
+      3,-11: 0
+      3,-10: 0
       3,-9: 0
-      3,-8: 31
-      3,-7: 32
-      3,-6: 33
-      3,-5: 34
-      3,-4: 35
-      3,-3: 36
-      3,-2: 37
-      3,-1: 38
-      4,-16: 39
-      4,-15: 40
-      4,-14: 41
-      4,-13: 42
-      4,-12: 43
-      4,-11: 44
-      4,-10: 45
-      4,-9: 46
-      4,-8: 47
-      4,-7: 48
-      4,-6: 49
-      4,-5: 50
-      4,-4: 51
+      3,-8: 0
+      3,-7: 0
+      3,-6: 0
+      3,-5: 0
+      3,-4: 0
+      3,-3: 0
+      3,-2: 0
+      3,-1: 0
+      4,-16: 0
+      4,-15: 0
+      4,-14: 0
+      4,-13: 0
+      4,-12: 0
+      4,-11: 0
+      4,-10: 0
+      4,-9: 0
+      4,-8: 0
+      4,-7: 0
+      4,-6: 0
+      4,-5: 0
+      4,-4: 0
       5,-12: 0
-      5,-5: 52
+      5,-5: 0
       6,-16: 0
       6,-15: 0
       6,-14: 0
@@ -693,330 +693,330 @@ entities:
       6,-9: 0
       6,-8: 0
       6,-7: 0
-      6,-6: 1
+      6,-6: 0
       6,-5: 0
-      6,-4: 2
-      0,-17: 53
-      1,-17: 54
-      2,-17: 55
-      3,-17: 56
-      4,-17: 57
+      6,-4: 0
+      0,-17: 0
+      1,-17: 0
+      2,-17: 0
+      3,-17: 0
+      4,-17: 0
       6,-17: 0
       -4,-17: 0
-      -2,-17: 58
-      -1,-17: 56
-      -9,-16: 59
-      -8,-16: 59
-      -8,-15: 59
-      -8,-14: 59
-      -8,-6: 59
-      -8,-5: 59
-      -8,-4: 59
-      -7,-16: 59
-      -7,-15: 59
-      -7,-14: 59
-      -7,-13: 59
-      -7,-12: 59
-      -7,-11: 59
-      -7,-7: 59
-      -7,-6: 59
-      -7,-5: 59
-      -7,-4: 59
-      -7,-3: 59
-      -6,-16: 59
-      -6,-15: 59
-      -6,-14: 59
-      -6,-13: 59
-      -6,-12: 59
-      -6,-11: 59
-      -6,-8: 59
-      -6,-7: 59
-      -6,-6: 59
-      -6,-5: 59
-      -6,-4: 59
-      -6,-3: 59
-      -5,-16: 59
-      -5,-15: 59
-      -5,-14: 59
-      -5,-13: 59
-      -5,-12: 59
-      -5,-11: 59
-      -5,-10: 59
-      -5,-9: 59
-      -5,-8: 59
-      -5,-7: 59
-      -5,-6: 59
-      -5,-5: 59
-      -5,-4: 59
-      -5,-3: 59
-      -5,-2: 59
-      -4,-3: 59
-      -4,-2: 59
-      -3,-16: 59
-      -3,-15: 59
-      -3,-14: 59
-      -3,-13: 59
-      -3,-11: 59
-      -3,-10: 59
-      -3,-9: 59
-      -3,-8: 59
-      -3,-7: 59
-      -3,-6: 59
-      -3,-4: 59
-      -3,-3: 59
-      -3,-2: 59
-      -3,-1: 59
-      -2,-3: 59
-      -2,-2: 59
-      -2,-1: 59
-      4,-3: 59
-      5,-16: 59
-      5,-15: 59
-      5,-14: 59
-      5,-13: 59
-      5,-11: 59
-      5,-7: 59
-      5,-6: 59
-      5,-4: 59
-      5,-3: 59
-      7,-16: 59
-      -1,0: 59
-      -9,-18: 59
-      -9,-17: 59
-      -8,-30: 59
-      -8,-29: 59
-      -8,-28: 59
-      -8,-27: 59
-      -8,-26: 59
-      -8,-25: 59
-      -8,-24: 59
-      -8,-23: 59
-      -8,-22: 59
-      -8,-21: 59
-      -8,-20: 59
-      -8,-19: 59
-      -8,-18: 59
-      -8,-17: 59
-      -7,-31: 59
-      -7,-30: 59
-      -7,-29: 59
-      -7,-28: 59
-      -7,-27: 59
-      -7,-26: 59
-      -7,-25: 59
-      -7,-24: 59
-      -7,-23: 59
-      -7,-22: 59
-      -7,-21: 59
-      -7,-20: 59
-      -7,-19: 59
-      -7,-18: 59
-      -7,-17: 59
-      -6,-31: 59
-      -6,-30: 59
-      -6,-29: 59
-      -6,-28: 59
-      -6,-27: 59
-      -6,-26: 59
-      -6,-25: 59
-      -6,-24: 59
-      -6,-23: 59
-      -6,-22: 59
-      -6,-21: 59
-      -6,-20: 59
-      -6,-19: 59
-      -6,-18: 59
-      -6,-17: 59
-      -5,-31: 59
-      -5,-30: 59
-      -5,-29: 59
-      -5,-28: 59
-      -5,-27: 59
-      -5,-26: 59
-      -5,-25: 59
-      -5,-24: 59
-      -5,-23: 59
-      -5,-22: 59
-      -5,-21: 59
-      -5,-20: 59
-      -5,-19: 59
-      -5,-18: 59
-      -5,-17: 59
-      -4,-31: 59
-      -4,-30: 59
-      -4,-29: 59
-      -4,-28: 59
-      -4,-27: 59
-      -4,-26: 59
-      -4,-25: 59
-      -4,-24: 59
-      -4,-23: 59
-      -4,-22: 59
-      -4,-21: 59
-      -4,-20: 59
-      -4,-19: 59
-      -4,-18: 59
-      -3,-32: 59
-      -3,-31: 59
-      -3,-30: 59
-      -3,-29: 59
-      -3,-28: 59
-      -3,-27: 59
-      -3,-26: 59
-      -3,-25: 59
-      -3,-24: 59
-      -3,-23: 59
-      -3,-22: 59
-      -3,-21: 59
-      -3,-20: 59
-      -3,-19: 59
-      -3,-18: 59
-      -3,-17: 59
-      -2,-32: 59
-      -2,-31: 59
-      -2,-30: 59
-      -2,-29: 59
-      -2,-28: 59
-      -2,-27: 59
-      -2,-26: 59
-      -2,-25: 59
-      -2,-24: 59
-      -2,-23: 59
-      -2,-22: 59
-      -2,-21: 59
-      -2,-20: 59
-      -2,-19: 59
-      -2,-18: 59
-      -1,-31: 59
-      -1,-30: 59
-      -1,-29: 59
-      -1,-28: 59
-      -1,-27: 59
-      -1,-26: 59
-      -1,-25: 59
-      -1,-24: 59
-      -1,-23: 59
-      -1,-22: 59
-      -1,-21: 59
-      -1,-20: 59
-      -1,-19: 59
-      -1,-18: 59
-      0,-32: 59
-      0,-31: 59
-      0,-30: 59
-      0,-29: 59
-      0,-28: 59
-      0,-27: 59
-      0,-26: 59
-      0,-25: 59
-      0,-24: 59
-      0,-23: 59
-      0,-22: 59
-      0,-21: 59
-      0,-20: 59
-      0,-19: 59
-      0,-18: 59
-      1,-32: 59
-      1,-31: 59
-      1,-30: 59
-      1,-29: 59
-      1,-28: 59
-      1,-27: 59
-      1,-26: 59
-      1,-25: 59
-      1,-24: 59
-      1,-23: 59
-      1,-22: 59
-      1,-21: 59
-      1,-20: 59
-      1,-19: 59
-      1,-18: 59
-      2,-31: 59
-      2,-30: 59
-      2,-29: 59
-      2,-28: 59
-      2,-27: 59
-      2,-26: 59
-      2,-25: 59
-      2,-24: 59
-      2,-23: 59
-      2,-22: 59
-      2,-21: 59
-      2,-20: 59
-      2,-19: 59
-      2,-18: 59
-      3,-31: 59
-      3,-30: 59
-      3,-29: 59
-      3,-28: 59
-      3,-27: 59
-      3,-26: 59
-      3,-25: 59
-      3,-24: 59
-      3,-23: 59
-      3,-22: 59
-      3,-21: 59
-      3,-20: 59
-      3,-19: 59
-      3,-18: 59
-      4,-31: 59
-      4,-30: 59
-      4,-29: 59
-      4,-28: 59
-      4,-27: 59
-      4,-26: 59
-      4,-25: 59
-      4,-24: 59
-      4,-23: 59
-      4,-22: 59
-      4,-21: 59
-      4,-20: 59
-      4,-19: 59
-      4,-18: 59
-      5,-31: 59
-      5,-30: 59
-      5,-29: 59
-      5,-28: 59
-      5,-27: 59
-      5,-26: 59
-      5,-25: 59
-      5,-24: 59
-      5,-23: 59
-      5,-22: 59
-      5,-21: 59
-      5,-20: 59
-      5,-19: 59
-      5,-18: 59
-      5,-17: 59
-      6,-30: 59
-      6,-29: 59
-      6,-28: 59
-      6,-27: 59
-      6,-26: 59
-      6,-25: 59
-      6,-24: 59
-      6,-23: 59
-      6,-22: 59
-      6,-21: 59
-      6,-20: 59
-      6,-19: 59
-      6,-18: 59
-      7,-18: 59
-      7,-17: 59
-      -3,-34: 59
-      -3,-33: 59
-      -2,-34: 59
-      -2,-33: 59
-      0,-34: 59
-      0,-33: 59
-      1,-34: 59
-      1,-33: 59
-      -10,-16: 59
-      8,-16: 59
-      -10,-18: 59
-      -10,-17: 59
-      8,-18: 59
-      8,-17: 59
+      -2,-17: 0
+      -1,-17: 0
+      -9,-16: 0
+      -8,-16: 0
+      -8,-15: 0
+      -8,-14: 0
+      -8,-6: 0
+      -8,-5: 0
+      -8,-4: 0
+      -7,-16: 0
+      -7,-15: 0
+      -7,-14: 0
+      -7,-13: 0
+      -7,-12: 0
+      -7,-11: 0
+      -7,-7: 0
+      -7,-6: 0
+      -7,-5: 0
+      -7,-4: 0
+      -7,-3: 0
+      -6,-16: 0
+      -6,-15: 0
+      -6,-14: 0
+      -6,-13: 0
+      -6,-12: 0
+      -6,-11: 0
+      -6,-8: 0
+      -6,-7: 0
+      -6,-6: 0
+      -6,-5: 0
+      -6,-4: 0
+      -6,-3: 0
+      -5,-16: 0
+      -5,-15: 0
+      -5,-14: 0
+      -5,-13: 0
+      -5,-12: 0
+      -5,-11: 0
+      -5,-10: 0
+      -5,-9: 0
+      -5,-8: 0
+      -5,-7: 0
+      -5,-6: 0
+      -5,-5: 0
+      -5,-4: 0
+      -5,-3: 0
+      -5,-2: 0
+      -4,-3: 0
+      -4,-2: 0
+      -3,-16: 0
+      -3,-15: 0
+      -3,-14: 0
+      -3,-13: 0
+      -3,-11: 0
+      -3,-10: 0
+      -3,-9: 0
+      -3,-8: 0
+      -3,-7: 0
+      -3,-6: 0
+      -3,-4: 0
+      -3,-3: 0
+      -3,-2: 0
+      -3,-1: 0
+      -2,-3: 0
+      -2,-2: 0
+      -2,-1: 0
+      4,-3: 0
+      5,-16: 0
+      5,-15: 0
+      5,-14: 0
+      5,-13: 0
+      5,-11: 0
+      5,-7: 0
+      5,-6: 0
+      5,-4: 0
+      5,-3: 0
+      7,-16: 0
+      -1,0: 0
+      -9,-18: 0
+      -9,-17: 0
+      -8,-30: 0
+      -8,-29: 0
+      -8,-28: 0
+      -8,-27: 0
+      -8,-26: 0
+      -8,-25: 0
+      -8,-24: 0
+      -8,-23: 0
+      -8,-22: 0
+      -8,-21: 0
+      -8,-20: 0
+      -8,-19: 0
+      -8,-18: 0
+      -8,-17: 0
+      -7,-31: 0
+      -7,-30: 0
+      -7,-29: 0
+      -7,-28: 0
+      -7,-27: 0
+      -7,-26: 0
+      -7,-25: 0
+      -7,-24: 0
+      -7,-23: 0
+      -7,-22: 0
+      -7,-21: 0
+      -7,-20: 0
+      -7,-19: 0
+      -7,-18: 0
+      -7,-17: 0
+      -6,-31: 0
+      -6,-30: 0
+      -6,-29: 0
+      -6,-28: 0
+      -6,-27: 0
+      -6,-26: 0
+      -6,-25: 0
+      -6,-24: 0
+      -6,-23: 0
+      -6,-22: 0
+      -6,-21: 0
+      -6,-20: 0
+      -6,-19: 0
+      -6,-18: 0
+      -6,-17: 0
+      -5,-31: 0
+      -5,-30: 0
+      -5,-29: 0
+      -5,-28: 0
+      -5,-27: 0
+      -5,-26: 0
+      -5,-25: 0
+      -5,-24: 0
+      -5,-23: 0
+      -5,-22: 0
+      -5,-21: 0
+      -5,-20: 0
+      -5,-19: 0
+      -5,-18: 0
+      -5,-17: 0
+      -4,-31: 0
+      -4,-30: 0
+      -4,-29: 0
+      -4,-28: 0
+      -4,-27: 0
+      -4,-26: 0
+      -4,-25: 0
+      -4,-24: 0
+      -4,-23: 0
+      -4,-22: 0
+      -4,-21: 0
+      -4,-20: 0
+      -4,-19: 0
+      -4,-18: 0
+      -3,-32: 0
+      -3,-31: 0
+      -3,-30: 0
+      -3,-29: 0
+      -3,-28: 0
+      -3,-27: 0
+      -3,-26: 0
+      -3,-25: 0
+      -3,-24: 0
+      -3,-23: 0
+      -3,-22: 0
+      -3,-21: 0
+      -3,-20: 0
+      -3,-19: 0
+      -3,-18: 0
+      -3,-17: 0
+      -2,-32: 0
+      -2,-31: 0
+      -2,-30: 0
+      -2,-29: 0
+      -2,-28: 0
+      -2,-27: 0
+      -2,-26: 0
+      -2,-25: 0
+      -2,-24: 0
+      -2,-23: 0
+      -2,-22: 0
+      -2,-21: 0
+      -2,-20: 0
+      -2,-19: 0
+      -2,-18: 0
+      -1,-31: 0
+      -1,-30: 0
+      -1,-29: 0
+      -1,-28: 0
+      -1,-27: 0
+      -1,-26: 0
+      -1,-25: 0
+      -1,-24: 0
+      -1,-23: 0
+      -1,-22: 0
+      -1,-21: 0
+      -1,-20: 0
+      -1,-19: 0
+      -1,-18: 0
+      0,-32: 0
+      0,-31: 0
+      0,-30: 0
+      0,-29: 0
+      0,-28: 0
+      0,-27: 0
+      0,-26: 0
+      0,-25: 0
+      0,-24: 0
+      0,-23: 0
+      0,-22: 0
+      0,-21: 0
+      0,-20: 0
+      0,-19: 0
+      0,-18: 0
+      1,-32: 0
+      1,-31: 0
+      1,-30: 0
+      1,-29: 0
+      1,-28: 0
+      1,-27: 0
+      1,-26: 0
+      1,-25: 0
+      1,-24: 0
+      1,-23: 0
+      1,-22: 0
+      1,-21: 0
+      1,-20: 0
+      1,-19: 0
+      1,-18: 0
+      2,-31: 0
+      2,-30: 0
+      2,-29: 0
+      2,-28: 0
+      2,-27: 0
+      2,-26: 0
+      2,-25: 0
+      2,-24: 0
+      2,-23: 0
+      2,-22: 0
+      2,-21: 0
+      2,-20: 0
+      2,-19: 0
+      2,-18: 0
+      3,-31: 0
+      3,-30: 0
+      3,-29: 0
+      3,-28: 1
+      3,-27: 1
+      3,-26: 0
+      3,-25: 0
+      3,-24: 0
+      3,-23: 0
+      3,-22: 0
+      3,-21: 0
+      3,-20: 0
+      3,-19: 0
+      3,-18: 0
+      4,-31: 0
+      4,-30: 0
+      4,-29: 0
+      4,-28: 0
+      4,-27: 0
+      4,-26: 0
+      4,-25: 0
+      4,-24: 0
+      4,-23: 0
+      4,-22: 0
+      4,-21: 0
+      4,-20: 0
+      4,-19: 0
+      4,-18: 0
+      5,-31: 0
+      5,-30: 0
+      5,-29: 0
+      5,-28: 2
+      5,-27: 2
+      5,-26: 0
+      5,-25: 0
+      5,-24: 0
+      5,-23: 0
+      5,-22: 0
+      5,-21: 0
+      5,-20: 0
+      5,-19: 0
+      5,-18: 0
+      5,-17: 0
+      6,-30: 0
+      6,-29: 0
+      6,-28: 0
+      6,-27: 0
+      6,-26: 0
+      6,-25: 0
+      6,-24: 0
+      6,-23: 0
+      6,-22: 0
+      6,-21: 0
+      6,-20: 0
+      6,-19: 0
+      6,-18: 0
+      7,-18: 0
+      7,-17: 0
+      -3,-34: 0
+      -3,-33: 0
+      -2,-34: 0
+      -2,-33: 0
+      0,-34: 0
+      0,-33: 0
+      1,-34: 0
+      1,-33: 0
+      -10,-16: 0
+      8,-16: 0
+      -10,-18: 0
+      -10,-17: 0
+      8,-18: 0
+      8,-17: 0
     uniqueMixes:
     - volume: 2500
       temperature: 293.15
@@ -1030,648 +1030,21 @@ entities:
       - 0
       - 0
     - volume: 2500
-      temperature: 147.925
+      temperature: 293.15
       moles:
-      - 10.912439
-      - 41.05156
+      - 6666.982
       - 0
       - 0
       - 0
       - 0
       - 0
       - 0
-    - volume: 2500
-      temperature: 75.31251
-      moles:
-      - 5.4562197
-      - 20.52578
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 196.71153
-      moles:
-      - 14.578337
-      - 54.842316
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 197.84608
-      moles:
-      - 14.66359
-      - 55.163033
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 202.38438
-      moles:
-      - 15.004604
-      - 56.445892
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 220.53749
-      moles:
-      - 16.36866
-      - 61.57734
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 250.79861
-      moles:
-      - 18.642529
-      - 70.13142
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 196.35698
-      moles:
-      - 14.551695
-      - 54.742096
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 166.15733
-      moles:
-      - 12.282446
-      - 46.205395
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 173.73648
-      moles:
-      - 12.851955
-      - 48.34783
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 268.86084
-      moles:
-      - 19.999752
-      - 75.23717
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 263.2966
-      moles:
-      - 19.58165
-      - 73.6643
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 125.2336
-      moles:
-      - 9.207371
-      - 34.637253
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 292.7155
-      moles:
-      - 21.792229
-      - 81.9803
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 178.5584
-      moles:
-      - 13.214282
-      - 49.710873
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 291.30347
-      moles:
-      - 21.686125
-      - 81.58115
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 292.24573
-      moles:
-      - 21.756931
-      - 81.8475
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 167.4077
-      moles:
-      - 12.376401
-      - 46.558846
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 288.61172
-      moles:
-      - 21.483864
-      - 80.82026
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 287.10254
-      moles:
-      - 21.370464
-      - 80.393654
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 289.53293
-      moles:
-      - 21.553085
-      - 81.08066
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 284.7291
-      moles:
-      - 21.19212
-      - 79.72274
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 283.4404
-      moles:
-      - 21.095284
-      - 79.35845
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 282.5287
-      moles:
-      - 21.026775
-      - 79.10074
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 248.21454
-      moles:
-      - 18.448357
-      - 69.40097
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 203.54666
-      moles:
-      - 15.091939
-      - 56.774445
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 133.36478
-      moles:
-      - 9.81836
-      - 36.93574
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 274.9969
-      moles:
-      - 20.460823
-      - 76.97167
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 262.90198
-      moles:
-      - 19.551994
-      - 73.55274
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 268.9602
-      moles:
-      - 20.007221
-      - 75.26526
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 269.17603
-      moles:
-      - 20.023434
-      - 75.32626
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 254.31155
-      moles:
-      - 18.906494
-      - 71.12444
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 254.90399
-      moles:
-      - 18.951012
-      - 71.29191
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 250.66476
-      moles:
-      - 18.63247
-      - 70.09358
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 213.9815
-      moles:
-      - 15.876031
-      - 59.72412
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 151.08833
-      moles:
-      - 11.150137
-      - 41.94576
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 139.45728
-      moles:
-      - 10.27616
-      - 38.657944
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 123.4431
-      moles:
-      - 9.07283
-      - 34.131126
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 196.71152
-      moles:
-      - 14.578337
-      - 54.842316
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 197.8461
-      moles:
-      - 14.66359
-      - 55.163033
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 202.38437
-      moles:
-      - 15.004604
-      - 56.445892
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 220.5375
-      moles:
-      - 16.36866
-      - 61.57734
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 250.7963
-      moles:
-      - 18.642353
-      - 70.13077
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 196.34772
-      moles:
-      - 14.551
-      - 54.73948
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 196.39087
-      moles:
-      - 14.554243
-      - 54.75168
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 196.5635
-      moles:
-      - 14.567215
-      - 54.80048
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 197.25406
-      moles:
-      - 14.619103
-      - 54.99568
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 200.01624
-      moles:
-      - 14.826658
-      - 55.77648
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 182.65118
-      moles:
-      - 13.521821
-      - 50.867805
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 222.89883
-      moles:
-      - 16.546093
-      - 62.24483
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 114.55389
-      moles:
-      - 8.404881
-      - 31.618362
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 130.36221
-      moles:
-      - 9.592743
-      - 36.086987
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 167.31352
-      moles:
-      - 12.369325
-      - 46.53222
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 163.74112
-      moles:
-      - 12.100888
-      - 45.522392
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 191.80096
-      moles:
-      - 14.20935
-      - 53.454224
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 178.20384
-      moles:
-      - 13.18764
-      - 49.61065
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 123.81538
-      moles:
-      - 9.100803
-      - 34.23636
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 123.815384
-      moles:
-      - 9.100803
-      - 34.23636
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
       - 0
     - volume: 2500
       temperature: 293.15
       moles:
       - 0
-      - 0
+      - 6666.982
       - 0
       - 0
       - 0
@@ -5300,11 +4673,38 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 441
-  type: AirlockExternalGlass
+  type: AirlockGlassShuttle
   components:
-  - pos: -8.5,-16.5
+  - rot: -1.5707963267948966 rad
+    pos: -9.5,-16.5
     parent: 73
     type: Transform
+  - fixtures:
+    - shape: !type:PolygonShape
+        vertices:
+        - 0.49,-0.49
+        - 0.49,0.49
+        - -0.49,0.49
+        - -0.49,-0.49
+      mask:
+      - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      - InteractImpassable
+      layer:
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
+      - InteractImpassable
+      - Opaque
+      mass: 100
+    - shape: !type:PhysShapeCircle
+        position: 0,-0.5
+        radius: 0.2
+      hard: False
+      id: docking
+    type: Fixtures
 - uid: 442
   type: AirlockExternalGlass
   components:
@@ -5330,29 +4730,29 @@ entities:
     parent: 73
     type: Transform
 - uid: 446
-  type: AirlockExternal
-  components:
-  - pos: -4.5,-14.5
-    parent: 73
-    type: Transform
-- uid: 447
-  type: AirlockExternal
-  components:
-  - pos: 3.5,-14.5
-    parent: 73
-    type: Transform
-- uid: 448
-  type: AirlockExternal
+  type: AirlockExternalGlass
   components:
   - pos: 4.5,-16.5
     parent: 73
     type: Transform
-- uid: 449
-  type: AirlockExternal
+- uid: 447
+  type: AirlockExternalGlass
+  components:
+  - pos: -4.5,-14.5
+    parent: 73
+    type: Transform
+- uid: 448
+  type: AirlockExternalGlass
   components:
   - pos: -5.5,-16.5
     parent: 73
     type: Transform
+- uid: 449
+  type: AirlockExternalGlass
+  components:
+  - pos: 3.5,-14.5
+    parent: 73
+    type: Transform
 - uid: 450
   type: AirlockExternal
   components:
@@ -6375,17 +5775,17 @@ entities:
   - solution: drink
     type: DrainableSolution
 - uid: 539
-  type: DrinkGlass
+  type: DrinkMugDog
   components:
-  - pos: 2.0779252,-19.320925
+  - pos: 2.2843437,-19.542192
     parent: 73
     type: Transform
   - solution: drink
     type: DrainableSolution
 - uid: 540
-  type: DrinkGlass
+  type: DrinkMugMetal
   components:
-  - pos: 2.2654252,-19.3053
+  - pos: 2.0968437,-19.526567
     parent: 73
     type: Transform
   - solution: drink
@@ -7740,12 +7140,12 @@ entities:
   - containers:
       EntityStorageComponent: !type:Container
         ents:
-        - 721
-        - 706
-        - 842
-        - 732
         - 845
+        - 842
+        - 721
         - 707
+        - 706
+        - 732
     type: ContainerContainer
 - uid: 699
   type: AMEShielding
@@ -8978,35 +8378,13 @@ entities:
     parent: 73
     type: Transform
 - uid: 851
-  type: AirlockShuttle
+  type: AirlockExternalGlass
   components:
-  - rot: -1.5707963267948966 rad
-    pos: -9.5,-16.5
+  - pos: -8.5,-16.5
     parent: 73
     type: Transform
-  - fixtures:
-    - shape: !type:PolygonShape
-        vertices:
-        - 0.49,-0.49
-        - 0.49,0.49
-        - -0.49,0.49
-        - -0.49,-0.49
-      mask:
-      - Impassable
-      layer:
-      - Impassable
-      - HighImpassable
-      - BulletImpassable
-      - Opaque
-      mass: 100
-    - shape: !type:PhysShapeCircle
-        position: 0,-0.5
-        radius: 0.2
-      hard: False
-      id: docking
-    type: Fixtures
 - uid: 852
-  type: AirlockShuttle
+  type: AirlockGlassShuttle
   components:
   - rot: 1.5707963267948966 rad
     pos: 8.5,-16.5
@@ -9021,10 +8399,15 @@ entities:
         - -0.49,-0.49
       mask:
       - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      - InteractImpassable
       layer:
-      - Impassable
+      - MidImpassable
       - HighImpassable
       - BulletImpassable
+      - InteractImpassable
       - Opaque
       mass: 100
     - shape: !type:PhysShapeCircle
@@ -9167,4 +8550,37 @@ entities:
   - pos: 0.5,-3.5
     parent: 73
     type: Transform
+- uid: 869
+  type: PinpointerNuclear
+  components:
+  - pos: -1.5331463,-2.6787243
+    parent: 73
+    type: Transform
+- uid: 870
+  type: PinpointerNuclear
+  components:
+  - pos: -1.5956463,-2.4287243
+    parent: 73
+    type: Transform
+- uid: 871
+  type: PinpointerNuclear
+  components:
+  - pos: 4.5606036,-4.4755993
+    parent: 73
+    type: Transform
+- uid: 872
+  type: PinpointerNuclear
+  components:
+  - pos: 1.1699787,-13.472618
+    parent: 73
+    type: Transform
+- uid: 873
+  type: NuclearBombUnanchored
+  components:
+  - pos: 0.5,-11.5
+    parent: 73
+    type: Transform
+  - containers:
+      Nuke: !type:ContainerSlot {}
+    type: ContainerContainer
 ...