From 42916744eec2879af8a923a6cfd697f0a1557b55 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:53:56 -0400
Subject: [PATCH 01/39] Add Paradise fire extinguisher with attribution (#1851)

---
 .../Catalog/Cargo/cargo_emergency.yml         |   2 +-
 .../Objects/Misc/fire_extinguisher.yml        |   4 +--
 .../Construction/Graphs/furniture/altars.yml  |   2 +-
 .../fire_extinguisher_closed.png              | Bin 0 -> 303 bytes
 .../fire_extinguisher_open.png                | Bin 0 -> 315 bytes
 .../fire_extinguisher.rsi/inhand-left.png     | Bin 0 -> 284 bytes
 .../fire_extinguisher.rsi/inhand-right.png    | Bin 0 -> 326 bytes
 .../Misc/fire_extinguisher.rsi/meta.json      |  26 ++++++++++++++++++
 8 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
index d5ecc285ceb8..66db9df98f69 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
@@ -13,7 +13,7 @@
   id: EmergencyFire
   abstract: true # Frontier
   icon:
-    sprite: Objects/Misc/fire_extinguisher.rsi
+    sprite: _NF/Objects/Misc/fire_extinguisher.rsi # Frontier
     state: fire_extinguisher_closed
   product: CrateEmergencyFire
   cost: 1500
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 89b421c97d4d..0e1bf5d43e9b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -5,12 +5,12 @@
   description: It extinguishes fires.
   components:
   - type: Sprite
-    sprite: Objects/Misc/fire_extinguisher.rsi
+    sprite: _NF/Objects/Misc/fire_extinguisher.rsi # Frontier
     layers:
     - state: fire_extinguisher_closed
       map: [ "enum.ToggleVisuals.Layer" ]
   - type: Item
-    sprite: Objects/Misc/fire_extinguisher.rsi
+    sprite: _NF/Objects/Misc/fire_extinguisher.rsi # Frontier
     size: Normal
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/altars.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/altars.yml
index 7f99133ca5c0..0fe0c34b382c 100644
--- a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/altars.yml
+++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/altars.yml
@@ -66,7 +66,7 @@
         name: fire extinguisher
         store: altar_component
         icon:
-          sprite: Objects/Misc/fire_extinguisher.rsi
+          sprite: _NF/Objects/Misc/fire_extinguisher.rsi # Frontier
           state: fire_extinguisher_closed
       - component: ExtinguishOnInteract # Not exclusive to candles I believe, but it's something that narrows down the list
         name: candle (any)
diff --git a/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png b/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b84389a06bd18e2ef60cf5e4bc94fde649b421bf
GIT binary patch
literal 303
zcmV+~0nq-5P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0000yP)t-s>h%44
zdwb>O<+irASy@>&H#$*NRW~;`At5GD0UV44BI$H=x&;NL007xIIOa`FiHC=UiIls+
z$>iti!sI6h00001bW%=J06^y0W&i*Hp-DtRR5*>b($NmXAP5Ces3Kz3t@{7}I@;}R
zVv{!I^`2Zv6yTvjJc*YX(0FnFB%b7xn25kTyPZM^j1CdUf&#_J=>6h&xPw9jU}o=7
zdj{kHB1w&?_`hTavgTY$siKNUH%MOBT5A#GN(C=%$kzeIDcCD+19}>S_Xz;leqb{}
zJ3upmwAOoX&0Hb*0QL>@xA=<vKiIj7l+rA}G9QYM3CE9d_ALMa002ovPDHLkV1gtk
BevbeE

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png b/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/fire_extinguisher_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cf52827fca440fc3ec9a0d956ea5e53e86f2176
GIT binary patch
literal 315
zcmV-B0mS}^P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0000yP)t-s>h%44
zdwb>O<+irASy@>&H##>rH&IkoAt5GD0UV44BI$H=x&;NL007xIIOa`FiHC=UiIls+
z$>itiGCWwu00001bW%=J06^y0W&i*Htw}^dR5*>b(%lZjAP5Cuse;A7t@i!jb!d07
zWTMHMaeKbt3DKB84ZtGaW<cW2x<x$6=dp2ivK<i#EC471z4rvpZI*^_pvQeDB4<JN
z3<&z&80H{`MSM4DfMZHI=fa|B2vUrtl+5Ff4LoE+8iLkw0b0i!pueC1FDJfo1w7@%
zSFQlLu#C~c$1K6|28Rl22UP`J>v^8FPC9gOqoj!TAM{*A2w|50GA|%_3Obz{x$^)3
N002ovPDHLkV1iTDfUN)k

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb697da3566cbff8c83c5fb85a8fd37c93211b3c
GIT binary patch
literal 284
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k3C%+Ln`LHy|t0|kbyw!L-uLa
z-x4&-JUqQm3-vtoosf~a>BvO^LB$C&H8<S;%%7rHwR6rKlX4-TRuB-elHGQ#_}-mc
z)&&#Z)a=Zf;M4zFSncGzPruAOrX_7LWRZ5>5P8wNd%I@-DKEoY=CdBuG2M&M++VT#
ze!S~iHjkhBp>Llq-NpMth&LnFA^Y9^+kgCPOHO=0#|$x_fnopJl==guMqBRZo=MbK
z2(SOm%va60^UgQ+JAMvbAFm#s{)Y8Q(Ovl!hB9C0J>U84@86OcY+Ljem~MZ+@~X`I
czl;k`@Y-kuSKmF&c@AWxr>mdKI;Vst0LVXiZvX%Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..e06a534c249a612e6885170923ec12052bd1726d
GIT binary patch
literal 326
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z89ZGaLn`LH
zy=BPP<RH@W(DBZ_>I%*G4w>1fRrj>sIdbIMF>QfQIvi~p31Z=4PyP#WJ2gCH-9B?F
z&>#?aaPs4Ztv4iVemsfgon!1d&9iJ@%+#yL?cZzWfBu|y_H15e)^?Mvhb(`8RZN*A
zdd}8p`=@Wu-u+_o3Hmg(<)g|gNvG=!|K2{8p8MW(3!4rTbBC<Lw(bAFe>*k*d_wJv
z=s1Wi3=Gc_@~YW>^<=d<m41+us}}vX+xO1F{+AEzzibLud~(*gta-2OA9kznS|aCI
ztNmUSnUsis|C*Qo@vQ;a$gS^LcTQQM^Y)6}JO@41RjaB#u3n`n$EkBrw&H!{$#os>
Q`XGxuUHx3vIVCg!0Jvd|4*&oF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/meta.json
new file mode 100644
index 000000000000..6f4150e8f7cc
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Misc/fire_extinguisher.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f",
+  "copyright": "fire_extinguisher_open, fire_extinguisher_open taken from Paradise at commit https://github.com/ParadiseSS13/Paradise/commit/fd1e9ec033f1af410bb31e883ce0b19902d305c3",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "fire_extinguisher_open"
+    },
+    {
+      "name": "fire_extinguisher_closed"
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    }
+  ]
+}

From 5afd8c53c0a886b95c2f593a3879fc07ba53fc10 Mon Sep 17 00:00:00 2001
From: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com>
Date: Mon, 12 Aug 2024 21:11:25 +0200
Subject: [PATCH 02/39] Add currency notation (#1768)

* Implement currency string notation

* Darin fix

* Update Resources/Locale/en-US/_NF/store/uplink-catalog.ftl

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Content.Client/Cargo/UI/CargoConsoleMenu.xaml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Changelog/Changelog.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Currency-specific conversion functions

---------

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com>
---
 Content.Client/Bank/UI/BankATMMenu.xaml.cs    |  7 +-
 .../Bank/UI/StationBankATMMenu.xaml.cs        |  7 +-
 Content.Client/Bank/UI/WithdrawBankATMMenu.cs |  5 +-
 Content.Client/Cargo/UI/BountyEntry.xaml.cs   |  3 +-
 Content.Client/Cargo/UI/CargoConsoleMenu.xaml |  2 +-
 .../Cargo/UI/CargoConsoleMenu.xaml.cs         |  7 +-
 .../Cargo/UI/CargoPalletMenu.xaml.cs          |  3 +-
 .../Lobby/UI/Loadouts/LoadoutWindow.xaml.cs   |  6 +-
 Content.Client/PDA/PdaMenu.xaml.cs            |  5 +-
 .../Shipyard/UI/ShipyardConsoleMenu.xaml.cs   |  9 ++-
 Content.Client/Store/Ui/StoreMenu.xaml.cs     |  3 +-
 .../Store/Ui/StoreWithdrawWindow.xaml.cs      |  3 +-
 .../UI/VendingMachineMenu.xaml.cs             |  9 ++-
 .../BountyContractUiFragmentListEntry.xaml.cs |  4 +-
 .../UI/ContrabandPalletMenu.xaml.cs           |  4 +-
 .../_NF/Pirate/UI/PirateBountyEntry.xaml.cs   |  3 +-
 .../Cargo/Systems/CargoSystem.Bounty.cs       |  3 +-
 .../_NF/Cargo/CargoSystem.PirateBounty.cs     |  5 +-
 .../Preferences/HumanoidCharacterProfile.cs   | 12 +--
 .../_NF/Bank/BankSystemExtensions.cs          | 80 +++++++++++++++++++
 Resources/Changelog/Changelog.yml             | 12 +--
 .../en-US/_NF/bank/bank-ATM-component.ftl     |  2 -
 .../Locale/en-US/_NF/loadouts/loadouts.ftl    |  4 +-
 .../humanoid-character-profile.ftl            |  2 -
 .../shipyard/shipyard-console-component.ftl   |  1 -
 .../Locale/en-US/_NF/store/uplink-catalog.ftl |  2 +-
 .../en-US/cargo/cargo-bounty-console.ftl      |  4 +-
 .../en-US/cargo/cargo-console-component.ftl   |  1 -
 .../_NF/Catalog/Fills/Items/briefcases.yml    | 10 +--
 29 files changed, 154 insertions(+), 64 deletions(-)
 create mode 100644 Content.Shared/_NF/Bank/BankSystemExtensions.cs
 delete mode 100644 Resources/Locale/en-US/_NF/preferences/humanoid-character-profile.ftl

diff --git a/Content.Client/Bank/UI/BankATMMenu.xaml.cs b/Content.Client/Bank/UI/BankATMMenu.xaml.cs
index e60d878fa856..d72ab5315d9c 100644
--- a/Content.Client/Bank/UI/BankATMMenu.xaml.cs
+++ b/Content.Client/Bank/UI/BankATMMenu.xaml.cs
@@ -4,6 +4,7 @@
  * See AGPLv3.txt for details.
  */
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -27,14 +28,14 @@ public BankATMMenu()
 
     public void SetBalance(int amount)
     {
-        BalanceLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+        BalanceLabel.Text = BankSystemExtensions.ToSpesoString(amount);
     }
 
     public void SetDeposit(int amount)
     {
         DepositButton.Disabled = amount <= 0;
         if (amount >= 0) // Valid
-            DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+            DepositLabel.Text = BankSystemExtensions.ToSpesoString(amount);
         else
             DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-error");
     }
@@ -59,6 +60,6 @@ private void OnAmountChanged(LineEdit.LineEditEventArgs args)
         if (int.TryParse(args.Text, out var amount))
         {
             Amount = amount;
-        }    
+        }
     }
 }
diff --git a/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs b/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs
index bbc0e9a55d28..bee11b750fbc 100644
--- a/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs
+++ b/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs
@@ -4,6 +4,7 @@
  * See AGPLv3.txt for details.
  */
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -41,14 +42,14 @@ private void OnReasonSelected(OptionButton.ItemSelectedEventArgs args)
     }
     public void SetBalance(int amount)
     {
-        BalanceLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+        BalanceLabel.Text = BankSystemExtensions.ToSpesoString(amount);
     }
 
     public void SetDeposit(int amount)
     {
         DepositButton.Disabled = amount <= 0;
         if (amount >= 0) // Valid
-            DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+            DepositLabel.Text = BankSystemExtensions.ToSpesoString(amount);
         else
             DepositLabel.Text = Loc.GetString("bank-atm-menu-cash-error");
     }
@@ -74,7 +75,7 @@ private void OnAmountChanged(LineEdit.LineEditEventArgs args)
         if (int.TryParse(args.Text, out var amount))
         {
             Amount = amount;
-        }    
+        }
     }
 
     private void OnDescChanged(LineEdit.LineEditEventArgs args)
diff --git a/Content.Client/Bank/UI/WithdrawBankATMMenu.cs b/Content.Client/Bank/UI/WithdrawBankATMMenu.cs
index 4a5cbd41a554..78f61ec94e50 100644
--- a/Content.Client/Bank/UI/WithdrawBankATMMenu.cs
+++ b/Content.Client/Bank/UI/WithdrawBankATMMenu.cs
@@ -4,6 +4,7 @@
  * See AGPLv3.txt for details.
  */
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -26,7 +27,7 @@ public WithdrawBankATMMenu()
 
     public void SetBalance(int amount)
     {
-        BalanceLabel.Text = Loc.GetString("bank-atm-menu-cash-amount", ("amount", amount.ToString()));
+        BalanceLabel.Text = BankSystemExtensions.ToSpesoString(amount);
     }
 
     public void SetEnabled(bool enabled)
@@ -44,6 +45,6 @@ private void OnAmountChanged(LineEdit.LineEditEventArgs args)
         if (int.TryParse(args.Text, out var amount))
         {
             Amount = amount;
-        }    
+        }
     }
 }
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml.cs b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
index 027d7b3e8011..acc6aa365486 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml.cs
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.Message;
+using Content.Shared._NF.Bank;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.Random;
@@ -40,7 +41,7 @@ public BountyEntry(CargoBountyData bounty, TimeSpan untilNextSkip)
                 ("item", Loc.GetString(entry.Name))));
         }
         ManifestLabel.SetMarkup(Loc.GetString("bounty-console-manifest-label", ("item", string.Join(", ", items))));
-        RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", bountyPrototype.Reward)));
+        RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", BankSystemExtensions.ToSpesoString(bountyPrototype.Reward)))); // Frontier: bountyPrototype.Reward<BankSystemExtensions.ToSpesoString(bountyPrototype.Reward)
         DescriptionLabel.SetMarkup(Loc.GetString("bounty-console-description-label", ("description", Loc.GetString(bountyPrototype.Description))));
         IdLabel.SetMarkup(Loc.GetString("bounty-console-id-label", ("id", bounty.Id)));
 
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
index dd7a9f110cab..bb59b2b0a866 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
@@ -14,7 +14,7 @@
             <Label Text="{Loc 'cargo-console-menu-points-label'}"
                    StyleClasses="LabelKeyText" />
             <Label Name="PointsLabel"
-                   Text="$0" />
+                   Text="-" /> <!-- Frontier: "$0"<"-" -->
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc 'cargo-console-menu-order-capacity-label'}"
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index e60335bc45c3..0a227dd7ea9c 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
@@ -100,7 +101,7 @@ public void PopulateProducts()
                         Product = prototype,
                         ProductName = { Text = prototype.Name },
                         MainButton = { ToolTip = prototype.Description },
-                        PointCost = { Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", prototype.Cost.ToString())) },
+                        PointCost = { Text = BankSystemExtensions.ToSpesoString(prototype.Cost) }, // Frontier: 
                         Icon = { Texture = _spriteSystem.Frame0(prototype.Icon) },
                     };
                     button.MainButton.OnPressed += args =>
@@ -189,10 +190,10 @@ public void UpdateCargoCapacity(int count, int capacity)
             ShuttleCapacityLabel.Text = $"{count}/{capacity}";
         }
 
-        public void UpdateBankData(string name, int points)
+        public void UpdateBankData(string name, int bankBalance)
         {
             AccountNameLabel.Text = name;
-            PointsLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", points.ToString()));
+            PointsLabel.Text = BankSystemExtensions.ToSpesoString(bankBalance);
         }
     }
 }
diff --git a/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs b/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs
index 3ac0117dc701..1364452c234d 100644
--- a/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Content.Shared.Cargo;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -21,7 +22,7 @@ public CargoPalletMenu()
 
     public void SetAppraisal(int amount)
     {
-        AppraisalLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", amount.ToString()));
+        AppraisalLabel.Text = BankSystemExtensions.ToSpesoString(amount);
     }
 
     public void SetCount(int count)
diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
index 9902dd1836d9..30c92ff26ebf 100644
--- a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
+++ b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
 using Robust.Client.AutoGenerated;
@@ -51,7 +52,7 @@ public LoadoutWindow(HumanoidCharacterProfile profile, RoleLoadout loadout, Role
         CalculateLoadoutCost(loadout, collection);
         // Frontier - update bank balance label text - value should not change.
         Balance.Margin = new Thickness(5, 2, 5, 5);
-        Balance.Text = Loc.GetString("frontier-loadout-balance", ("balance", Profile.BankBalance));
+        Balance.Text = Loc.GetString("frontier-loadout-balance", ("balance", BankSystemExtensions.ToSpesoString(Profile.BankBalance)));
     }
 
     public void RefreshLoadouts(RoleLoadout loadout, ICommonSession session, IDependencyCollection collection)
@@ -85,6 +86,7 @@ private void CalculateLoadoutCost(RoleLoadout loadout, IDependencyCollection col
         }
 
         Cost.Margin = new Thickness(5, 2, 5, 5);
-        Cost.Text = Loc.GetString("frontier-loadout-cost", ("cost", cost));
+        Cost.Text = Loc.GetString("frontier-loadout-cost", ("cost", BankSystemExtensions.ToSpesoString(cost)));
     }
+    // End Frontier
 }
diff --git a/Content.Client/PDA/PdaMenu.xaml.cs b/Content.Client/PDA/PdaMenu.xaml.cs
index c53a33ee45c3..39a6c7a2ba57 100644
--- a/Content.Client/PDA/PdaMenu.xaml.cs
+++ b/Content.Client/PDA/PdaMenu.xaml.cs
@@ -3,6 +3,7 @@
 using Robust.Shared.Utility;
 using Content.Shared.CartridgeLoader;
 using Content.Client.Message;
+using Content.Shared._NF.Bank;
 using Robust.Client.UserInterface;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -139,7 +140,7 @@ public PdaMenu()
                 _clipboard.SetText(_instructions);
             };
 
-            
+
 
 
             HideAllViews();
@@ -175,7 +176,7 @@ public void UpdateState(PdaUpdateState state)
             StationNameLabel.SetMarkup(Loc.GetString("comp-pda-ui-station",
                 ("station", _stationName)));
 
-            _balance = state.Balance.ToString(); // Frontier
+            _balance = BankSystemExtensions.ToSpesoString(state.Balance); // Frontier
             BalanceLabel.SetMarkup(Loc.GetString("comp-pda-ui-balance", ("balance", _balance))); // Frontier
 
             _shuttleDeed = state.OwnedShipName ?? ""; // Frontier
diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
index 091985b32931..6cf03f61b732 100644
--- a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
+++ b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Client.UserInterface.Controls;
 using Content.Client.Shipyard.BUI;
+using Content.Shared._NF.Bank;
 using Content.Shared.Shipyard.BUI;
 using Content.Shared.Shipyard.Prototypes;
 using Robust.Client.AutoGenerated;
@@ -85,7 +86,7 @@ public void PopulateProducts(List<string> prototypes, string type, bool free)
                 if (_freeListings)
                     priceText = Loc.GetString("shipyard-console-menu-listing-free");
                 else
-                    priceText = Loc.GetString("shipyard-console-menu-listing-amount", ("amount", prototype!.Price.ToString()));
+                    priceText = BankSystemExtensions.ToSpesoString(prototype!.Price);
 
                 var vesselEntry = new VesselRow
                 {
@@ -132,12 +133,12 @@ public void PopulateCategories()
 
     public void UpdateState(ShipyardConsoleInterfaceState state)
     {
-        BalanceLabel.Text = Loc.GetString("shipyard-console-menu-listing-amount", ("amount", state.Balance.ToString()));
-        int shipPrice = 0;
+        BalanceLabel.Text = BankSystemExtensions.ToSpesoString(state.Balance);
+        var shipPrice = 0;
         if (!state.FreeListings)
             shipPrice = state.ShipSellValue;
 
-        ShipAppraisalLabel.Text = Loc.GetString("shipyard-console-menu-listing-amount", ("amount", shipPrice.ToString()));
+        ShipAppraisalLabel.Text = BankSystemExtensions.ToSpesoString(shipPrice);
         SellShipButton.Disabled = state.ShipDeedTitle == null;
         TargetIdButton.Text = state.IsTargetIdPresent
             ? Loc.GetString("id-card-console-window-eject-button")
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml.cs b/Content.Client/Store/Ui/StoreMenu.xaml.cs
index 388b31291c19..a851471c4623 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml.cs
+++ b/Content.Client/Store/Ui/StoreMenu.xaml.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Client.Actions;
 using Content.Client.Message;
+using Content.Shared._NF.Bank;
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
 using Robust.Client.AutoGenerated;
@@ -52,7 +53,7 @@ public void UpdateBalance(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> ba
         var balanceStr = string.Empty;
         foreach (var ((_, amount), proto) in currency)
         {
-            balanceStr += Loc.GetString("store-ui-balance-display", ("amount", amount),
+            balanceStr += Loc.GetString("store-ui-balance-display", ("amount", BankSystemExtensions.ToIndependentString((int) amount)), // Frontier: amount<BankSystemExtensions.GetIndependentString((int)amount)
                 ("currency", Loc.GetString(proto.DisplayName, ("amount", 1))));
         }
 
diff --git a/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs b/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs
index 793685575621..dd817b280db4 100644
--- a/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs
+++ b/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs
@@ -2,6 +2,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Content.Shared._NF.Bank; // Frontier
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
 using Robust.Client.UserInterface.Controls;
@@ -52,7 +53,7 @@ public void CreateCurrencyButtons(Dictionary<ProtoId<CurrencyPrototype>, FixedPo
                 Id = currency.Value.ID,
                 Amount = currency.Key,
                 MinHeight = 20,
-                Text = Loc.GetString("store-withdraw-button-ui", ("currency",Loc.GetString(currency.Value.DisplayName, ("amount", currency.Key)))),
+                Text = Loc.GetString("store-withdraw-button-ui", ("currency",Loc.GetString(currency.Value.DisplayName, ("amount", BankSystemExtensions.ToIndependentString((int) currency.Key))))), // Frontier: currency.Key -> BankSystemExtensions.GetIndendependentString((int) currency.Key)
             };
             button.Disabled = false;
             button.OnPressed += args =>
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
index eec26dbecd79..1d4b37e59c78 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
@@ -7,6 +7,7 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank; // Frontier
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using Content.Shared.Chemistry.Components.SolutionManager;
@@ -198,9 +199,9 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, float priceMo
                 // New Frontiers - Unlimited vending - support items with unlimited vending stock.
                 // This code is licensed under AGPLv3. See AGPLv3.txt
                 if (entry.Amount != uint.MaxValue)
-                    vendingItem.Text = $"[${cost}] {itemName} [{entry.Amount}]";
+                    vendingItem.Text = $"[{BankSystemExtensions.ToSpesoString(cost)}] {itemName} [{entry.Amount}]";
                 else
-                    vendingItem.Text = $"[${cost}] {itemName}";
+                    vendingItem.Text = $"[{BankSystemExtensions.ToSpesoString(cost)}] {itemName}";
                 // End of modified code
                 vendingItem.Icon = icon;
                 filteredInventory.Add(i);
@@ -209,10 +210,12 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, float priceMo
             SetSizeAfterUpdate(longestEntry.Length, inventory.Count);
         }
 
+        // Frontier
         public void UpdateBalance(int balance)
         {
-            BalanceLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", balance.ToString()));
+            BalanceLabel.Text = BankSystemExtensions.ToSpesoString(balance);
         }
+        // End Frontier
 
         private void SetSizeAfterUpdate(int longestEntryLength, int contentCount)
         {
diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs
index 5cce35dcdcca..f988c0509179 100644
--- a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs
+++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentListEntry.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Shared._NF.Bank;
 using Content.Shared._NF.BountyContracts;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
@@ -33,8 +34,7 @@ public BountyContractUiFragmentListEntry(BountyContract contract, bool canRemove
         }
 
         // bounty reward
-        BountyReward.Text = Loc.GetString("cargo-console-menu-points-amount",
-            ("amount", contract.Reward.ToString()));
+        BountyReward.Text = BankSystemExtensions.ToSpesoString(contract.Reward);
 
         // remove button
         RemoveButton.OnPressed += _ => OnRemoveButtonPressed?.Invoke(contract);
diff --git a/Content.Client/_NF/Contraband/UI/ContrabandPalletMenu.xaml.cs b/Content.Client/_NF/Contraband/UI/ContrabandPalletMenu.xaml.cs
index 6c4ab735b2f9..a9fb833ffc0d 100644
--- a/Content.Client/_NF/Contraband/UI/ContrabandPalletMenu.xaml.cs
+++ b/Content.Client/_NF/Contraband/UI/ContrabandPalletMenu.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.UserInterface.Controls;
+using Content.Shared._NF.Bank;
 using Content.Shared._NF.Contraband.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -37,7 +38,8 @@ public ContrabandPalletMenu(string locPrefix)
 
     public void SetAppraisal(int amount)
     {
-        AppraisalLabel.Text = Loc.GetString($"{_locPrefix}contraband-console-menu-points-amount", ("amount", amount.ToString()));
+        // TODO: switch currency function by currency in component
+        AppraisalLabel.Text = Loc.GetString($"{_locPrefix}contraband-console-menu-points-amount", ("amount", BankSystemExtensions.ToIndependentString(amount)));
     }
 
     public void SetCount(int count)
diff --git a/Content.Client/_NF/Pirate/UI/PirateBountyEntry.xaml.cs b/Content.Client/_NF/Pirate/UI/PirateBountyEntry.xaml.cs
index 0890ba05030b..9252958213bd 100644
--- a/Content.Client/_NF/Pirate/UI/PirateBountyEntry.xaml.cs
+++ b/Content.Client/_NF/Pirate/UI/PirateBountyEntry.xaml.cs
@@ -6,6 +6,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using Content.Shared._NF.Bank;
 
 namespace Content.Client._NF.Pirate.UI;
 
@@ -46,7 +47,7 @@ public PirateBountyEntry(PirateBountyData bounty, TimeSpan untilNextSkip)
                 ("item", Loc.GetString(entry.Name))));
         }
         ManifestLabel.SetMarkup(Loc.GetString("pirate-bounty-console-manifest-label", ("item", string.Join(", ", items))));
-        RewardLabel.SetMarkup(Loc.GetString("pirate-bounty-console-reward-label", ("reward", bountyPrototype.Reward)));
+        RewardLabel.SetMarkup(Loc.GetString("pirate-bounty-console-reward-label", ("reward", BankSystemExtensions.ToIndependentString(bountyPrototype.Reward))));
         DescriptionLabel.SetMarkup(Loc.GetString("pirate-bounty-console-description-label", ("description", Loc.GetString(bountyPrototype.Description))));
         IdLabel.SetMarkup(Loc.GetString("pirate-bounty-console-id-label", ("id", bounty.Id)));
 
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 4cbf2e63be8f..d6a886f1c65b 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -4,6 +4,7 @@
 using Content.Server.Labels;
 using Content.Server.NameIdentifier;
 using Content.Server.Paper;
+using Content.Shared._NF.Bank;
 using Content.Shared.Access.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
@@ -124,7 +125,7 @@ public void SetupBountyLabel(EntityUid uid, EntityUid stationId, CargoBountyData
                 ("item", Loc.GetString(entry.Name)))}");
             msg.PushNewline();
         }
-        msg.AddMarkup(Loc.GetString("bounty-console-manifest-reward", ("reward", prototype.Reward)));
+        msg.AddMarkup(Loc.GetString("bounty-console-manifest-reward", ("reward", BankSystemExtensions.ToSpesoString(prototype.Reward))));
         _paperSystem.SetContent(uid, msg.ToMarkup(), paper);
     }
 
diff --git a/Content.Server/_NF/Cargo/CargoSystem.PirateBounty.cs b/Content.Server/_NF/Cargo/CargoSystem.PirateBounty.cs
index 4c2d0ed06507..cbba0c2489d3 100644
--- a/Content.Server/_NF/Cargo/CargoSystem.PirateBounty.cs
+++ b/Content.Server/_NF/Cargo/CargoSystem.PirateBounty.cs
@@ -4,6 +4,7 @@
 using Content.Server._NF.Pirate.Components;
 using Content.Server.Labels;
 using Content.Server.Paper;
+using Content.Shared._NF.Bank;
 using Content.Shared._NF.Pirate;
 using Content.Shared._NF.Pirate.Components;
 using Content.Shared._NF.Pirate.Prototypes;
@@ -141,7 +142,7 @@ private void SetupPirateBountyChest(EntityUid uid, PirateBountyData bounty, Pira
                 ("item", Loc.GetString(entry.Name)))}", out var _);
         }
         message.PushNewline();
-        message.TryAddMarkup(Loc.GetString("pirate-bounty-console-manifest-reward", ("reward", prototype.Reward)), out var _);
+        message.TryAddMarkup(Loc.GetString("pirate-bounty-console-manifest-reward", ("reward", BankSystemExtensions.ToDoubloonString(prototype.Reward))), out var _);
 
         _metaSystem.SetEntityDescription(uid, message.ToMarkup());
 
@@ -168,7 +169,7 @@ private void SetupPirateBountyManifest(EntityUid uid, PirateBountyData bounty, P
                 ("item", Loc.GetString(entry.Name)))}", out var _);
             msg.PushNewline();
         }
-        msg.TryAddMarkup(Loc.GetString("pirate-bounty-console-manifest-reward", ("reward", prototype.Reward)), out var _);
+        msg.TryAddMarkup(Loc.GetString("pirate-bounty-console-manifest-reward", ("reward", BankSystemExtensions.ToDoubloonString(prototype.Reward))), out var _);
         _paperSystem.SetContent(uid, msg.ToMarkup(), paper);
     }
 
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index e28416715384..8fa3996f2d95 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Text.RegularExpressions;
+using Content.Shared._NF.Bank;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
@@ -91,7 +92,7 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile
 
         [DataField]
         public Gender Gender { get; private set; } = Gender.Male;
- 
+
         [DataField] // Frontier: Bank balance
         public int BankBalance { get; private set; } = DefaultBalance; // Frontier: Bank balance
 
@@ -470,13 +471,8 @@ public HumanoidCharacterProfile WithoutTraitPreference(ProtoId<TraitPrototype> t
                 ("age", Age)
             );
 
-        // Frontier: bank balance text
-        public string BankBalanceText =>
-            Loc.GetString(
-                "humanoid-character-profile-bankbalance",
-                ("bankBalance", BankBalance)
-            );
-        // End Frontier
+        // Frontier
+        public string BankBalanceText => BankSystemExtensions.ToSpesoString(BankBalance);
 
         public bool MemberwiseEquals(ICharacterProfile maybeOther)
         {
diff --git a/Content.Shared/_NF/Bank/BankSystemExtensions.cs b/Content.Shared/_NF/Bank/BankSystemExtensions.cs
new file mode 100644
index 000000000000..10499785542e
--- /dev/null
+++ b/Content.Shared/_NF/Bank/BankSystemExtensions.cs
@@ -0,0 +1,80 @@
+using System.Globalization;
+
+namespace Content.Shared._NF.Bank;
+
+public static class BankSystemExtensions
+{
+
+    public enum CurrencySymbolLocation
+    {
+        Default, // Dependent on local CultureInfo
+        Prefix, // Currency symbol goes before the number
+        Suffix // Currency symbols goes after the number
+    }
+
+    const int PrefixCurrencyPositivePattern = 0; //$N
+    const int PrefixCurrencyNegativePattern = 1; //-$N
+    const int SuffixCurrencyPositivePattern = 3; //N $
+    const int SuffixCurrencyNegativePattern = 8; //-N $
+
+    /// <summary>
+    /// Formats a integer to the current CultureInfo's number formatting for currency.
+    /// </summary>
+    /// <param name="amount">The amount to format</param>
+    /// <param name="culture">The optional culture to use for formatting</param>
+    /// <param name="symbolOverride">Optionally override the symbol</param>
+    /// <param name="separatorOverride">Optionally override the separator</param>
+    /// <returns></returns>
+    public static string ToCurrencyString(int amount, CultureInfo? culture = null, string? symbolOverride = null, string? separatorOverride = null, CurrencySymbolLocation symbolLocation = CurrencySymbolLocation.Default)
+    {
+        culture ??= CultureInfo.CurrentCulture;
+        var numberFormat = (NumberFormatInfo) culture.NumberFormat.Clone();
+
+        if (symbolOverride != null)
+        {
+            numberFormat.CurrencySymbol = symbolOverride;
+        }
+        if (separatorOverride != null)
+        {
+            numberFormat.CurrencyGroupSeparator = separatorOverride;
+        }
+        switch (symbolLocation)
+        {
+            case CurrencySymbolLocation.Default:
+                break; // Do nothing
+            case CurrencySymbolLocation.Prefix:
+                numberFormat.CurrencyPositivePattern = PrefixCurrencyPositivePattern;
+                numberFormat.CurrencyNegativePattern = PrefixCurrencyNegativePattern;
+                break;
+            case CurrencySymbolLocation.Suffix:
+                numberFormat.CurrencyPositivePattern = SuffixCurrencyPositivePattern;
+                numberFormat.CurrencyNegativePattern = SuffixCurrencyNegativePattern;
+                break;
+        }
+
+
+        return string.Format(numberFormat, "{0:C0}", amount);
+    }
+
+    // Convenience methods for specific currencies.
+    public static string ToIndependentString(int amount, CultureInfo? culture = null)
+    {
+        return ToCurrencyString(amount, culture, symbolOverride: "", symbolLocation: CurrencySymbolLocation.Prefix); //Prefix results in no space, prefer that.
+    }
+
+    public static string ToSpesoString(int amount, CultureInfo? culture = null)
+    {
+        return ToCurrencyString(amount, culture, symbolOverride: "$", symbolLocation: CurrencySymbolLocation.Prefix);
+    }
+
+    public static string ToDoubloonString(int amount, CultureInfo? culture = null)
+    {
+        return ToCurrencyString(amount, culture, symbolOverride: "DB", symbolLocation: CurrencySymbolLocation.Suffix);
+    }
+
+    public static string ToFUCString(int amount, CultureInfo? culture = null)
+    {
+        return ToCurrencyString(amount, culture, symbolOverride: "FUC", symbolLocation: CurrencySymbolLocation.Suffix);
+    }
+}
+
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 4ad3bb7b975b..f1ca814c8ac1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4046,7 +4046,7 @@ Entries:
     - type: Tweak
       message: >-
         Added the new Expeditionary FlatpackVend to the Lodge, not restockable
-        but contains expedition unique machines like the IFF,  
+        but contains expedition unique machines like the IFF,
   id: 4914
   time: '2024-04-17T21:40:06.0000000+00:00'
 - author: GreaseMonk
@@ -4244,7 +4244,7 @@ Entries:
     - type: Add
       message: >-
         Mail carrier hoverbike flatpack that can be bought from vendomat. and
-        NFSD 
+        NFSD
     - type: Add
       message: >-
         NFSD hoverbike flatpack that can be bought from uplink (utility
@@ -4372,7 +4372,7 @@ Entries:
     - type: Tweak
       message: >-
         The cultist and syndicate migrated to the harder difficulty expeditions
-        only. 
+        only.
   id: 4958
   time: '2024-04-29T17:22:51.0000000+00:00'
 - author: erhardsteinhauer
@@ -4440,7 +4440,7 @@ Entries:
     - type: Fix
       message: >-
         All Jumpskirts in the game have been correctly listed as skirts, now
-        Harpies can wear them again. 
+        Harpies can wear them again.
   id: 4964
   time: '2024-05-01T21:37:35.0000000+00:00'
 - author: erhardsteinhauer
@@ -4858,7 +4858,7 @@ Entries:
     - type: Tweak
       message: >-
         Frontier has increased mail related profits, but lowered the amount of
-        existing mail, expect the mail to find you soon. 
+        existing mail, expect the mail to find you soon.
   id: 5017
   time: '2024-06-07T17:10:14.0000000+00:00'
 - author: dvir01
@@ -5082,7 +5082,7 @@ Entries:
     - type: Tweak
       message: >-
         Rules have been updated to place contraband and docking restrictions on
-        the safe-zone, make sure to read them again! 
+        the safe-zone, make sure to read them again!
   id: 5040
   time: '2024-06-14T22:57:57.0000000+00:00'
 - author: whatston3
diff --git a/Resources/Locale/en-US/_NF/bank/bank-ATM-component.ftl b/Resources/Locale/en-US/_NF/bank/bank-ATM-component.ftl
index c1a7d877a9fe..dc8a6a29da8f 100644
--- a/Resources/Locale/en-US/_NF/bank/bank-ATM-component.ftl
+++ b/Resources/Locale/en-US/_NF/bank/bank-ATM-component.ftl
@@ -23,8 +23,6 @@ station-bank-other = Other
 station-bank-required = {"("}Required{")"}
 station-bank-requires-reason = NT Requires transaction details
 station-bank-unauthorized = Unauthorized!
-
-bank-atm-menu-cash-amount = ${$amount}
 bank-atm-menu-cash-error = ERR: INVALID
 
 ## ATM entity
diff --git a/Resources/Locale/en-US/_NF/loadouts/loadouts.ftl b/Resources/Locale/en-US/_NF/loadouts/loadouts.ftl
index 4bddf64c9a9a..3924bd4a7b7e 100644
--- a/Resources/Locale/en-US/_NF/loadouts/loadouts.ftl
+++ b/Resources/Locale/en-US/_NF/loadouts/loadouts.ftl
@@ -1,2 +1,2 @@
-frontier-loadout-cost = Total Loadout Cost: ${$cost}
-frontier-loadout-balance = Available Balance: ${$balance}
+frontier-loadout-cost = Total Loadout Cost: {$cost}
+frontier-loadout-balance = Available Balance: {$balance}
diff --git a/Resources/Locale/en-US/_NF/preferences/humanoid-character-profile.ftl b/Resources/Locale/en-US/_NF/preferences/humanoid-character-profile.ftl
deleted file mode 100644
index 89a42b90fdbd..000000000000
--- a/Resources/Locale/en-US/_NF/preferences/humanoid-character-profile.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-# Frontier
-humanoid-character-profile-bankbalance = ${$bankBalance}
diff --git a/Resources/Locale/en-US/_NF/shipyard/shipyard-console-component.ftl b/Resources/Locale/en-US/_NF/shipyard/shipyard-console-component.ftl
index 6e8b7fc045ce..733c87e489a8 100644
--- a/Resources/Locale/en-US/_NF/shipyard/shipyard-console-component.ftl
+++ b/Resources/Locale/en-US/_NF/shipyard/shipyard-console-component.ftl
@@ -2,7 +2,6 @@
 shipyard-console-invalid-vessel = Cannot purchase vessel:
 shipyard-console-menu-title = Shipyard Menu
 shipyard-console-menu-listing-free = Free
-shipyard-console-menu-listing-amount = ${$amount}
 shipyard-console-docking = Captain {$owner} shuttle {$vessel} en route, eta 10 seconds.
 shipyard-console-leaving = Captain {$owner} shuttle {$vessel} sold by {$player}.
 shipyard-console-docking-secret = Unregistered vessel detected entering your sector.
diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
index ee8142a05cc6..96e919a55592 100644
--- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
@@ -121,7 +121,7 @@ uplink-security-shotincend-name = Incendiary Shotgun Shells
 uplink-security-shotincend-desc = A box of lethal .50 calibre incendiary shotgun shells.
 uplink-security-shotslug-name = Lethal Shotgun Slug Shells
 uplink-security-shotslug-desc = A box of lethal .50 calibre slug shotgun shells.
-uplink-security-cash1000-name = 1000 Spesos
+uplink-security-cash1000-name = 1,000 Spesos
 uplink-security-cash1000-desc = Cold, hard cash.
 uplink-security-empgrenade-box-name = EMP Grenade Box
 uplink-security-empgrenade-box-desc = A box containing 4 EMP grenades.
diff --git a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
index 4314cbf44960..955aebb135b3 100644
--- a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
@@ -2,14 +2,14 @@
 bounty-console-label-button-text = Print label
 bounty-console-skip-button-text = Skip
 bounty-console-time-label = Time: [color=orange]{$time}[/color]
-bounty-console-reward-label = Reward: [color=limegreen]${$reward}[/color]
+bounty-console-reward-label = Reward: [color=limegreen]{$reward}[/color]
 bounty-console-manifest-label = Manifest: [color=orange]{$item}[/color]
 bounty-console-manifest-entry =
     { $amount ->
         [1] {$item}
         *[other] {$item} x{$amount}
     }
-bounty-console-manifest-reward = Reward: ${$reward}
+bounty-console-manifest-reward = Reward: {$reward}
 bounty-console-description-label = [color=gray]{$description}[/color]
 bounty-console-id-label = ID#{$id}
 
diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
index 22d9040c46df..79f35fa585e6 100644
--- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
@@ -5,7 +5,6 @@ cargo-console-menu-account-name-none-text = None
 cargo-console-menu-shuttle-name-label = Shuttle name:{" "}
 cargo-console-menu-shuttle-name-none-text = None
 cargo-console-menu-points-label = Spesos:{" "}
-cargo-console-menu-points-amount = ${$amount}
 cargo-console-menu-shuttle-status-label = Shuttle status:{" "}
 cargo-console-menu-shuttle-status-away-text = Away
 cargo-console-menu-order-capacity-label = Order capacity:{" "}
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml
index 8a5d41779cbe..d32a34a4170a 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml
@@ -18,7 +18,7 @@
 - type: entity
   parent: SpaceCashExpedition
   id: SpaceCashExpeditionT1
-  name: spesos (5000)
+  name: spesos (5,000)
   noSpawn: true
   components:
   - type: SpawnItemsOnUse
@@ -32,7 +32,7 @@
 - type: entity
   parent: SpaceCashExpedition
   id: SpaceCashExpeditionT2
-  name: spesos (10000)
+  name: spesos (10,000)
   noSpawn: true
   components:
   - type: SpawnItemsOnUse
@@ -46,7 +46,7 @@
 - type: entity
   parent: SpaceCashExpedition
   id: SpaceCashExpeditionT3
-  name: spesos (20000)
+  name: spesos (20,000)
   noSpawn: true
   components:
   - type: SpawnItemsOnUse
@@ -60,7 +60,7 @@
 - type: entity
   parent: SpaceCashExpedition
   id: SpaceCashExpeditionT4
-  name: spesos (40000)
+  name: spesos (40,000)
   noSpawn: true
   components:
   - type: SpawnItemsOnUse
@@ -75,7 +75,7 @@
 - type: entity
   parent: SpaceCashExpedition
   id: SpaceCashExpeditionT5
-  name: spesos (70000)
+  name: spesos (70,000)
   noSpawn: true
   components:
   - type: SpawnItemsOnUse

From 1ce6347c32e2f96fc90aed4a25b2cdf36cc63fef Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 19:11:52 +0000
Subject: [PATCH 03/39] Automatic Changelog (#1768)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f1ca814c8ac1..604e0629b4bb 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6209,3 +6209,9 @@ Entries:
       message: Chicken and duck crates are no longer available for purchase.
   id: 5189
   time: '2024-08-11T19:54:33.0000000+00:00'
+- author: GreaseMonk
+  changes:
+    - type: Add
+      message: Currency notation
+  id: 5190
+  time: '2024-08-12T19:11:25.0000000+00:00'

From 6b90b139a4040da3fa20ff2497424c5423b21427 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 12 Aug 2024 15:27:08 -0400
Subject: [PATCH 04/39] Add FTL knockdown immunity to hostile NPCs (#1846)

* FTLKnockdownImmune component

* Make exped enemies (human, non-human) FTL immune

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com>
---
 .../Systems/ShuttleSystem.FasterThanLight.cs         |  4 ++++
 .../Components/FTLKnockdownImmuneComponent.cs        | 12 ++++++++++++
 .../_NF/Entities/Mobs/NPCs/mob_hostile_base.yml      |  2 ++
 3 files changed, 18 insertions(+)
 create mode 100644 Content.Server/_NF/Shuttles/Components/FTLKnockdownImmuneComponent.cs

diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index 89f1a627c733..1f347b1251af 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
+using Content.Server._NF.Shuttles.Components; // Frontier: NPC knockdown immunity
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
 using Content.Server.Station.Events;
@@ -614,6 +615,9 @@ private void DoTheDinosaur(TransformComponent xform)
             {
                 if (!_statusQuery.TryGetComponent(child, out var status))
                     continue;
+                
+                if (HasComp<FTLKnockdownImmuneComponent>(child)) // Frontier: NPC knockdown immunity
+                    continue; // Frontier: NPC knockdown immunity
 
                 _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status);
 
diff --git a/Content.Server/_NF/Shuttles/Components/FTLKnockdownImmuneComponent.cs b/Content.Server/_NF/Shuttles/Components/FTLKnockdownImmuneComponent.cs
new file mode 100644
index 000000000000..dbccd826ed26
--- /dev/null
+++ b/Content.Server/_NF/Shuttles/Components/FTLKnockdownImmuneComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server._NF.Shuttles.Components;
+
+/// <summary>
+///     Denotes an entity as being immune from knockdown on FTL
+/// </summary>
+[RegisterComponent]
+public sealed partial class FTLKnockdownImmuneComponent : Component
+{
+}
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
index f524f7307227..6500297187f8 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
@@ -228,6 +228,7 @@
     maximumWait: 240 # 2 * 60
     nextAdvertisementTime: 0
   - type: SalvageMobRestrictionsNF
+  - type: FTLKnockdownImmune
 
 # NonHuman NPC base, no equipment, immune to vacuum/low pressure
 - type: entity
@@ -302,3 +303,4 @@
     - CanPilot
     - FootstepSound
     - DoorBumpOpener
+  - type: FTLKnockdownImmune

From 5b498af09e82c26973370843ef09c7e3e563edf7 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 19:27:38 +0000
Subject: [PATCH 05/39] Automatic Changelog (#1846)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 604e0629b4bb..a06752b24246 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6215,3 +6215,9 @@ Entries:
       message: Currency notation
   id: 5190
   time: '2024-08-12T19:11:25.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Tweak
+      message: Hostile NPCs no longer fall over on entering/exiting bluespace.
+  id: 5191
+  time: '2024-08-12T19:27:08.0000000+00:00'

From 24ca4c61b09ecafeb562a1f60ea53c483730abf1 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 12 Aug 2024 15:52:25 -0400
Subject: [PATCH 06/39] Expedition Console: block mission selection if shuttle
 has FTL component (#1845)

* Expedition: check for FTL component before mission

* Less text in salvage expedition console

* plural, "party supplies"->"party supply stash"

* in the area->inside the area

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 .../SalvageSystem.ExpeditionConsole.cs        | 28 +++++++++++++++++++
 .../Salvage/SalvageSystem.Expeditions.cs      |  3 +-
 .../Locale/en-US/_NF/adventure/adventure.ftl  |  1 +
 .../Locale/en-US/procedural/expeditions.ftl   |  5 ++--
 .../Entities/Structures/Specific/punks.yml    |  2 +-
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
index b8966db32554..23ed5b005611 100644
--- a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
+++ b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
@@ -59,6 +59,16 @@ private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleCompon
         }
         // end of Frontier proximity check
 
+        // Frontier: check for FTL component - if one exists, the station won't be taken into FTL.
+        if (HasComp<FTLComponent>(grid))
+        {
+            PlayDenySound(uid, component);
+            _popupSystem.PopupEntity(Loc.GetString("shuttle-ftl-recharge"), uid, PopupType.MediumCaution);
+            UpdateConsoles(data); // Sure, why not?
+            return;
+        }
+        // End Frontier
+
         // Frontier  change - disable coordinate disks for expedition missions
         //var cdUid = Spawn(CoordinatesDisk, Transform(uid).Coordinates);
         SpawnMission(missionparams, station.Value, null);
@@ -96,6 +106,15 @@ private void UpdateConsoles(SalvageExpeditionDataComponent component)
             if (station != component.Owner)
                 continue;
 
+            // Frontier: if we have a lingering FTL component, we cannot start a new mission
+            if (!TryComp<StationDataComponent>(station, out var stationData) ||
+                    _station.GetLargestGrid(stationData) is not {Valid : true} grid || 
+                    HasComp<FTLComponent>(grid))
+            {
+                state.Cooldown = true; //Hack: disable buttons
+            }
+            // End Frontier
+
             _ui.SetUiState((uid, uiComp), SalvageConsoleUiKey.Expedition, state);
         }
     }
@@ -114,6 +133,15 @@ private void UpdateConsole(Entity<SalvageExpeditionConsoleComponent> component)
             state = new SalvageExpeditionConsoleState(TimeSpan.Zero, false, true, 0, new List<SalvageMissionParams>());
         }
 
+        // Frontier: if we have a lingering FTL component, we cannot start a new mission
+        if (!TryComp<StationDataComponent>(station, out var stationData) ||
+                _station.GetLargestGrid(stationData) is not {Valid : true} grid || 
+                HasComp<FTLComponent>(grid))
+        {
+            state.Cooldown = true; //Hack: disable buttons
+        }
+        // End Frontier
+
         _ui.SetUiState(component.Owner, SalvageConsoleUiKey.Expedition, state);
     }
     private void PlayDenySound(EntityUid uid, SalvageExpeditionConsoleComponent component)
diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
index c1cf7518b639..4ef23c62a2fc 100644
--- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs
+++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
@@ -168,7 +168,8 @@ private void UpdateExpeditions()
                 continue;
 
             comp.Cooldown = false;
-            comp.NextOffer += TimeSpan.FromSeconds(_cooldown);
+            //comp.NextOffer += TimeSpan.FromSeconds(_cooldown); // Frontier
+            comp.NextOffer = currentTime + TimeSpan.FromSeconds(_cooldown); // Frontier
             GenerateMissions(comp);
             UpdateConsoles(comp);
         }
diff --git a/Resources/Locale/en-US/_NF/adventure/adventure.ftl b/Resources/Locale/en-US/_NF/adventure/adventure.ftl
index 77c511dbfcad..c572adf364a8 100644
--- a/Resources/Locale/en-US/_NF/adventure/adventure.ftl
+++ b/Resources/Locale/en-US/_NF/adventure/adventure.ftl
@@ -18,6 +18,7 @@ shipyard-rules-default2 =
     Thank you for choosing Nanotrasen Security Forces.
 
 shuttle-ftl-proximity = Nearby objects too massive for FTL!
+shuttle-ftl-recharge = FTL drives still spooling down!
 
 changelog-tab-title-Upstream = Upstream Changelog
 multiauth-already-connected = Already connected to Frontier Official servers.
diff --git a/Resources/Locale/en-US/procedural/expeditions.ftl b/Resources/Locale/en-US/procedural/expeditions.ftl
index a0192fabd32f..dcfefe8ab5bf 100644
--- a/Resources/Locale/en-US/procedural/expeditions.ftl
+++ b/Resources/Locale/en-US/procedural/expeditions.ftl
@@ -19,14 +19,15 @@ salvage-expedition-window-claim = Claim
 
 salvage-expedition-window-next = Next offer
 
-# Expedition descriptions
+# Frontier: Expedition descriptions
 salvage-expedition-desc-mining = Collect resources inside the area.
 #  You will be taxed {$tax}% of the resources collected.
 salvage-expedition-desc-structure = {$count ->
     [one] Destroy {$count} {$structure} inside the area.
-    *[other] Destroy {$count} {$structure}s inside the area.
+    *[other] Destroy {$count} {MAKEPLURAL($structure)} inside the area.
 }
 salvage-expedition-desc-elimination = Kill a large and dangerous creature inside the area.
+# End Frontier
 
 salvage-expedition-type-Mining = Mining
 salvage-expedition-type-Destruction = Destruction
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/punks.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/punks.yml
index 68981fa9d59a..e74c78e81026 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Specific/punks.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/punks.yml
@@ -2,7 +2,7 @@
 - type: entity
   parent: CarpStatue
   id: PunkPartySupplies
-  name: party supplies
+  name: party supply stash
   description: The only thing that can hold a gang together.
   components:
   - type: Sprite

From e6cb084952be5212632e055ad213994dca6f6935 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 19:52:51 +0000
Subject: [PATCH 07/39] Automatic Changelog (#1845)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a06752b24246..68b1f00746c3 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6221,3 +6221,11 @@ Entries:
       message: Hostile NPCs no longer fall over on entering/exiting bluespace.
   id: 5191
   time: '2024-08-12T19:27:08.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: >-
+        Expedition ships no longer get stuck when selecting an expedition
+        shortly after returning.
+  id: 5192
+  time: '2024-08-12T19:52:25.0000000+00:00'

From 279d0660ca5f7d3cc9991e6e91059dbd46f96f8e Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Mon, 12 Aug 2024 22:58:34 +0300
Subject: [PATCH 08/39] Windows and glass airlocks in expeditions (and only
 there) block lasers (#1849)

* Windows and glass airlocks block lasers

* grilles

* descr

* cleanup

* comments

* dungeon templates yml swap

* dungeon_configs.yml comments

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
---
 Resources/Maps/_NF/Dungeon/cave_factory.yml   |  10 +-
 Resources/Maps/_NF/Dungeon/experiment.yml     |   4 +-
 Resources/Maps/_NF/Dungeon/haunted.yml        |   4 +-
 Resources/Maps/_NF/Dungeon/lava_brig.yml      |   6 +-
 Resources/Maps/_NF/Dungeon/lava_mercenary.yml |   4 +-
 Resources/Maps/_NF/Dungeon/mineshaft.yml      |   2 +-
 .../Maps/_NF/Dungeon/salvage_outpost.yml      |   4 +-
 Resources/Maps/_NF/Dungeon/snowy_labs.yml     |   6 +-
 Resources/Maps/_NF/Dungeon/virology_lab.yml   |   8 +-
 .../Prototypes/Procedural/dungeon_configs.yml |  10 +-
 .../Entities/Structures/Dungeon/airlocks.yml  | 133 ++++++++++++++++++
 .../Entities/Structures/Dungeon/grille.yml    |  15 ++
 .../Entities/Structures/Dungeon/windows.yml   |  82 +++++++++++
 .../_NF/Procedural/dungeon_configs.yml        |  16 +--
 14 files changed, 267 insertions(+), 37 deletions(-)
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dungeon/airlocks.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml

diff --git a/Resources/Maps/_NF/Dungeon/cave_factory.yml b/Resources/Maps/_NF/Dungeon/cave_factory.yml
index 4b695adca818..ad4ee2168f12 100644
--- a/Resources/Maps/_NF/Dungeon/cave_factory.yml
+++ b/Resources/Maps/_NF/Dungeon/cave_factory.yml
@@ -3143,7 +3143,7 @@ entities:
     - type: Transform
       pos: 19.5,43.5
       parent: 1
-- proto: AirlockEngineeringGlassLocked
+- proto: AirlockEngineeringGlassLockedDungeon
   entities:
   - uid: 1949
     components:
@@ -3182,7 +3182,7 @@ entities:
     - type: Transform
       pos: 27.5,46.5
       parent: 1
-- proto: AirlockMaintGlassLocked
+- proto: AirlockMaintGlassLockedDungeon
   entities:
   - uid: 754
     components:
@@ -11043,7 +11043,7 @@ entities:
     - type: Transform
       pos: 20.5,47.5
       parent: 1
-- proto: ReinforcedPlasmaWindow
+- proto: ReinforcedPlasmaWindowDungeon
   entities:
   - uid: 1378
     components:
@@ -11069,7 +11069,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 32.5,21.5
       parent: 1
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 409
     components:
@@ -14380,7 +14380,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,45.5
       parent: 1
-- proto: Window
+- proto: WindowDungeon
   entities:
   - uid: 253
     components:
diff --git a/Resources/Maps/_NF/Dungeon/experiment.yml b/Resources/Maps/_NF/Dungeon/experiment.yml
index a0a3694f23ce..a7aa1a0decc7 100644
--- a/Resources/Maps/_NF/Dungeon/experiment.yml
+++ b/Resources/Maps/_NF/Dungeon/experiment.yml
@@ -2255,7 +2255,7 @@ entities:
     - type: Transform
       pos: 3.5,18.5
       parent: 1653
-- proto: AirlockScienceGlassLocked
+- proto: AirlockScienceGlassLockedDungeon
   entities:
   - uid: 741
     components:
@@ -8077,7 +8077,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,24.5
       parent: 1653
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 739
     components:
diff --git a/Resources/Maps/_NF/Dungeon/haunted.yml b/Resources/Maps/_NF/Dungeon/haunted.yml
index 538de449ad20..210b7f4864b1 100644
--- a/Resources/Maps/_NF/Dungeon/haunted.yml
+++ b/Resources/Maps/_NF/Dungeon/haunted.yml
@@ -362,7 +362,7 @@ entities:
     - type: Transform
       pos: 11.5,43.5
       parent: 1653
-- proto: AirlockMiningGlassLocked
+- proto: AirlockMiningGlassLockedDungeon
   entities:
   - uid: 492
     components:
@@ -1592,7 +1592,7 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: MiningWindow
+- proto: MiningWindowDungeon
   entities:
   - uid: 155
     components:
diff --git a/Resources/Maps/_NF/Dungeon/lava_brig.yml b/Resources/Maps/_NF/Dungeon/lava_brig.yml
index b03f914aee48..de7e1ab96dcb 100644
--- a/Resources/Maps/_NF/Dungeon/lava_brig.yml
+++ b/Resources/Maps/_NF/Dungeon/lava_brig.yml
@@ -2688,7 +2688,7 @@ entities:
     - type: LoadedMap
     - type: SpreaderGrid
     - type: GridPathfinding
-- proto: AirlockBrigGlassLocked
+- proto: AirlockBrigGlassLockedDungeon
   entities:
   - uid: 1245
     components:
@@ -2712,7 +2712,7 @@ entities:
     - type: Transform
       pos: 19.5,43.5
       parent: 588
-- proto: AirlockSecurityGlassLocked
+- proto: AirlockSecurityGlassLockedDungeon
   entities:
   - uid: 1579
     components:
@@ -10052,7 +10052,7 @@ entities:
     - type: Transform
       pos: 8.5,24.5
       parent: 588
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 214
     components:
diff --git a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
index bfd75e303330..d14ec6493ab0 100644
--- a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
+++ b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
@@ -2757,7 +2757,7 @@ entities:
     - type: Transform
       pos: 19.5,43.5
       parent: 588
-- proto: AirlockMercenaryGlassLocked
+- proto: AirlockMercenaryGlassLockedDungeon
   entities:
   - uid: 254
     components:
@@ -10049,7 +10049,7 @@ entities:
     - type: Transform
       pos: 8.5,24.5
       parent: 588
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 214
     components:
diff --git a/Resources/Maps/_NF/Dungeon/mineshaft.yml b/Resources/Maps/_NF/Dungeon/mineshaft.yml
index 6cdd1b1a18e6..17fcf0404695 100644
--- a/Resources/Maps/_NF/Dungeon/mineshaft.yml
+++ b/Resources/Maps/_NF/Dungeon/mineshaft.yml
@@ -3131,7 +3131,7 @@ entities:
     - type: Transform
       pos: 40.5,7.5
       parent: 2
-- proto: MiningWindow
+- proto: MiningWindowDungeon
   entities:
   - uid: 102
     components:
diff --git a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
index 8421f2968684..8007bdae1161 100644
--- a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
+++ b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
@@ -1965,7 +1965,7 @@ entities:
     - type: Transform
       pos: 44.5,39.5
       parent: 1653
-- proto: AirlockMiningGlass
+- proto: AirlockMiningGlassDungeon
   entities:
   - uid: 22
     components:
@@ -8770,7 +8770,7 @@ entities:
     - type: Transform
       pos: 9.5,40.5
       parent: 1653
-- proto: MiningWindow
+- proto: MiningWindowDungeon
   entities:
   - uid: 146
     components:
diff --git a/Resources/Maps/_NF/Dungeon/snowy_labs.yml b/Resources/Maps/_NF/Dungeon/snowy_labs.yml
index ac88663a5d81..453f74ff2fbb 100644
--- a/Resources/Maps/_NF/Dungeon/snowy_labs.yml
+++ b/Resources/Maps/_NF/Dungeon/snowy_labs.yml
@@ -2907,7 +2907,7 @@ entities:
     - type: Transform
       pos: 3.5,18.5
       parent: 1653
-- proto: AirlockHydroGlassLocked
+- proto: AirlockHydroGlassLockedDungeon
   entities:
   - uid: 10
     components:
@@ -11088,7 +11088,7 @@ entities:
     - type: Transform
       pos: 17.5,47.5
       parent: 1653
-- proto: ReinforcedUraniumWindow
+- proto: ReinforcedUraniumWindowDungeon
   entities:
   - uid: 289
     components:
@@ -11130,7 +11130,7 @@ entities:
     - type: Transform
       pos: 3.5,13.5
       parent: 1653
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 104
     components:
diff --git a/Resources/Maps/_NF/Dungeon/virology_lab.yml b/Resources/Maps/_NF/Dungeon/virology_lab.yml
index 64ea78c721a6..cc35e158396e 100644
--- a/Resources/Maps/_NF/Dungeon/virology_lab.yml
+++ b/Resources/Maps/_NF/Dungeon/virology_lab.yml
@@ -2637,7 +2637,7 @@ entities:
     - type: Transform
       pos: 3.5,18.5
       parent: 1653
-- proto: AirlockVirologyGlass
+- proto: AirlockVirologyGlassDungeon
   entities:
   - uid: 1472
     components:
@@ -2669,7 +2669,7 @@ entities:
     - type: Transform
       pos: 3.5,3.5
       parent: 1653
-- proto: AirlockVirologyGlassLocked
+- proto: AirlockVirologyGlassLockedDungeon
   entities:
   - uid: 115
     components:
@@ -9876,14 +9876,14 @@ entities:
     - type: Transform
       pos: 16.5,22.5
       parent: 1653
-- proto: ReinforcedPlasmaWindow
+- proto: ReinforcedPlasmaWindowDungeon
   entities:
   - uid: 533
     components:
     - type: Transform
       pos: 29.5,38.5
       parent: 1653
-- proto: ReinforcedWindow
+- proto: ReinforcedWindowDungeon
   entities:
   - uid: 395
     components:
diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml
index 89715bc94002..1c96ee625578 100644
--- a/Resources/Prototypes/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/Procedural/dungeon_configs.yml
@@ -194,20 +194,20 @@
   id: BaseAirlock
   entries:
   - id: CableApcExtension
-  - id: AirlockGlass
+  - id: AirlockGlassDungeon # Frontier: AirlockGlass<AirlockGlassDungeon
 
 - type: entitySpawnEntry
   id: BaseWindow
   entries:
-  - id: Grille
-  - id: Window
+  - id: GrilleDungeon # Frontier: Grille<GrilleDungeon
+  - id: WindowDungeon # Frontier: Window<WindowDungeon
 
 # Lava brig
 - type: entitySpawnEntry
   id: LavaBrigEntrance
   entries:
   - id: CableApcExtension
-  - id: AirlockSecurityGlass # Frontier AirlockSecurityGlassLocked<AirlockSecurityGlass
+  - id: AirlockSecurityGlassDungeon # Frontier: AirlockSecurityGlassLocked<AirlockSecurityGlassDungeon
 
 # Mineshaft
 - type: entitySpawnEntry
@@ -265,7 +265,7 @@
   id: SnowyLabsEntrance
   entries:
   - id: CableApcExtension
-  - id: AirlockFreezer # Frontier - AirlockFreezerHydroponicsLocked<AirlockFreezer
+  - id: AirlockFreezer # Frontier: AirlockFreezerHydroponicsLocked<AirlockFreezer
 
 - type: entitySpawnEntry
   id: SnowyLabsWalls
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/airlocks.yml
new file mode 100644
index 000000000000..5c1ebdb6ee1e
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/airlocks.yml
@@ -0,0 +1,133 @@
+# Special glass airlocks for dungeons that block lasers
+# Base
+- type: entity
+  id: AirlockGlassMurkyDungeon
+  abstract: true
+  suffix: DO NOT MAP, Dungeon only
+  description: An airlock with murky glass windows, it's hard to see what's on the other side.
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"
+        density: 100
+        mask:
+        - FullTileMask
+        layer:
+        - AirlockLayer # Blocks lasers, but not LoS
+
+# Basic airlock
+- type: entity
+  id: AirlockGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockGlass
+  noSpawn: true
+
+# Maint airlock
+- type: entity
+  id: AirlockMaintGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMaintGlassLocked
+  noSpawn: true
+
+# Engineering airlocks
+- type: entity
+  id: AirlockEngineeringGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockEngineeringGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockEngineeringGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockEngineeringGlassLocked
+  noSpawn: true
+
+# Security airlocks
+- type: entity
+  id: AirlockSecurityGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockSecurityGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockSecurityGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockSecurityGlassLocked
+  noSpawn: true
+
+- type: entity
+  id: AirlockBrigGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockBrigGlassLocked
+  noSpawn: true
+
+# Mining airlocks
+- type: entity
+  id: AirlockMiningGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMiningGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockMiningGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMiningGlassLocked
+  noSpawn: true
+
+# Virology airlocks
+- type: entity
+  id: AirlockVirologyGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockVirologyGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockVirologyGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockVirologyGlassLocked
+  noSpawn: true
+
+# Mercenary airlocks
+- type: entity
+  id: AirlockMercenaryGlassDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMercenaryGlass
+  noSpawn: true
+
+- type: entity
+  id: AirlockMercenaryGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockMercenaryGlassLocked
+  noSpawn: true
+
+# Science airlock
+- type: entity
+  id: AirlockScienceGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockScienceGlassLocked
+  noSpawn: true
+
+# Hydroponics ailock
+- type: entity
+  id: AirlockHydroGlassLockedDungeon
+  parent:
+  - AirlockGlassMurkyDungeon
+  - AirlockHydroGlassLocked
+  noSpawn: true
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml
new file mode 100644
index 000000000000..0371c11c4b14
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/grille.yml
@@ -0,0 +1,15 @@
+# Special grilles for dungeons that block lasers
+- type: entity
+  id: GrilleDungeon
+  parent: Grille
+  noSpawn: true
+  suffix: DO NOT MAP, Dungeon only
+  components:
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.5,-0.5,0.5,0.5"
+          layer:
+          - WallLayer # Blocks lasers, but not LoS
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml
new file mode 100644
index 000000000000..32b86cf2e6e5
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dungeon/windows.yml
@@ -0,0 +1,82 @@
+# Special windows for dungeons that block lasers
+# Base
+- type: entity
+  id: WindowMurkyDungeon
+  abstract: true
+  suffix: DO NOT MAP, Dungeon only
+  description: A murky glass window, it's hard to see what's on the other side.
+  components:
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb {}
+        mask:
+        - FullTileMask
+        layer:
+        - WallLayer # Blocks lasers, but not LoS
+
+# Common window
+- type: entity
+  id: WindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - Window
+  noSpawn: true
+
+# Reinforced window
+- type: entity
+  id: ReinforcedWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - ReinforcedWindow
+  noSpawn: true
+
+# Mining window
+- type: entity
+  id: MiningWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - MiningWindow
+  noSpawn: true
+  components:
+  - type: Destructible # Made it as durable as common window
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+# Plasma window
+- type: entity
+  id: PlasmaWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - PlasmaWindow
+  noSpawn: true
+
+# Plasma reinforced window
+- type: entity
+  id: ReinforcedPlasmaWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - ReinforcedPlasmaWindow
+  noSpawn: true
+
+# Uranium reinforced window
+- type: entity
+  id: ReinforcedUraniumWindowDungeon
+  parent:
+  - WindowMurkyDungeon
+  - ReinforcedUraniumWindow
+  noSpawn: true
diff --git a/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml b/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml
index 50d0a6c8de52..181a8cc8a8fb 100644
--- a/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/_NF/Procedural/dungeon_configs.yml
@@ -68,13 +68,13 @@
   id: BaseAirlockNF
   entries:
   - id: CableApcExtension
-  - id: AirlockGlass
+  - id: AirlockGlassDungeon
 
 - type: entitySpawnEntry
   id: BaseWindowNF
   entries:
-  - id: Grille
-  - id: Window
+  - id: GrilleDungeon
+  - id: WindowDungeon
 
 - type: entitySpawnEntry
   id: BaseWallMountsNF
@@ -219,7 +219,7 @@
   id: MercenaryAirlockNF
   entries:
     - id: CableApcExtension
-    - id: AirlockMercenaryGlass
+    - id: AirlockMercenaryGlassDungeon
 
 - type: entitySpawnEntry
   id: LavaMercenaryWallMountsNF
@@ -272,7 +272,7 @@
   id: VirologyAirlockNF
   entries:
     - id: CableApcExtension
-    - id: AirlockVirologyGlass
+    - id: AirlockVirologyGlassDungeon
 
 # SalvageOutpost prototypes
 - type: dungeonConfig
@@ -316,10 +316,10 @@
   id: MiningAirlockNF
   entries:
     - id: CableApcExtension
-    - id: AirlockMiningGlass
+    - id: AirlockMiningGlassDungeon
 
 - type: entitySpawnEntry
   id: MiningWindowNF
   entries:
-    - id: Grille
-    - id: MiningWindow
+    - id: GrilleDungeon
+    - id: MiningWindowDungeon

From a235ff3d17733b75446d3f20387f9db3bc02f462 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 19:59:02 +0000
Subject: [PATCH 09/39] Automatic Changelog (#1849)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 68b1f00746c3..c23a1e2c410e 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6229,3 +6229,11 @@ Entries:
         shortly after returning.
   id: 5192
   time: '2024-08-12T19:52:25.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Windows and glass airlocks in expeditions (and only there) now block
+        lasers.
+  id: 5193
+  time: '2024-08-12T19:58:34.0000000+00:00'

From 1aec1e08f0ff3c35b262da9d570f37aa5b51fb39 Mon Sep 17 00:00:00 2001
From: "Alice \"Arimah\" Heurlin" <30327355+arimah@users.noreply.github.com>
Date: Mon, 12 Aug 2024 23:59:15 +0200
Subject: [PATCH 10/39] PTS 2.0: complete remake (#1832)

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 Resources/Maps/_NF/Shuttles/pts.yml       | 2333 +++++++++++----------
 Resources/Prototypes/_NF/Shipyard/pts.yml |   12 +-
 2 files changed, 1261 insertions(+), 1084 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/pts.yml b/Resources/Maps/_NF/Shuttles/pts.yml
index c91ddca37e49..631bf7be387a 100644
--- a/Resources/Maps/_NF/Shuttles/pts.yml
+++ b/Resources/Maps/_NF/Shuttles/pts.yml
@@ -3,162 +3,253 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  28: FloorDark
-  33: FloorDarkMono
-  37: FloorDarkPlastic
-  93: FloorSteelMono
-  97: FloorTechMaint
-  113: Lattice
-  114: Plating
+  33: FloorDark
+  38: FloorDarkMono
+  1: FloorGlass
+  99: FloorSteelCheckerDark
+  112: FloorTechMaint
+  126: FloorWood
+  129: Lattice
+  130: Plating
 entities:
 - proto: ""
   entities:
-  - uid: 8756
+  - uid: 2
     components:
     - type: MetaData
       name: PTS
-    - parent: invalid
-      type: Transform
-    - chunks:
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXQAAAAAAJQAAAAACJQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAXQAAAAADJQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAJQAAAAADJQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAACJQAAAAAAIQAAAAACJQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAAAcgAAAAAAJQAAAAADJQAAAAAB
+    - type: Transform
+      pos: -0.47916666,-0.5364844
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: IQAAAAADfgAAAAADfgAAAAAAfgAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAfgAAAAAAfgAAAAADfgAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAIQAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAIQAAAAADJQAAAAAAIQAAAAACJQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAJQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAHAAAAAADHAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIQAAAAABggAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAACJgAAAAAAJgAAAAADIQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
-        0,0:
-          ind: 0,0
-          tiles: IQAAAAADJQAAAAAAIQAAAAACcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAABcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAADcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAADJgAAAAADJgAAAAABIQAAAAAC
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAABXQAAAAABcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAAAXQAAAAADcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAABcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAACJQAAAAAAIQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAADcgAAAAAAHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAYwAAAAADYwAAAAABggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAYwAAAAACYwAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAYwAAAAAAYwAAAAABggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAYwAAAAAAYwAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAfgAAAAADfgAAAAACfgAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
-      type: MapGrid
     - type: Broadphase
-    - bodyStatus: InAir
+    - type: Physics
+      bodyStatus: InAir
       angularDamping: 0.05
       linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
-      type: Physics
-    - fixtures: {}
-      type: Fixtures
+    - type: Fixtures
+      fixtures: {}
     - type: OccluderTree
+    - type: SpreaderGrid
     - type: Shuttle
     - type: GridPathfinding
-    - gravityShakeSound: !type:SoundPathSpecifier
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
-      type: Gravity
-    - chunkCollection:
+    - type: DecalGrid
+      chunkCollection:
         version: 2
         nodes:
         - node:
-            angle: 1.5707963267948966 rad
+            angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            0: 0,-2
-            1: 2,-2
-            2: 0,0
-            3: 2,0
+            17: -3,1
+            18: -3,-1
         - node:
-            angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
-            id: Arrows
+            id: Bot
           decals:
-            4: -4,0
-            5: -4,-2
-            6: -2,0
-            7: -2,-2
+            8: -1,3
+            13: -2,-5
+            14: -1,-5
+            15: -3,1
+            16: -3,-1
         - node:
-            angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
-            id: Bot
+            id: BotRightGreyscale
+          decals:
+            10: 1,3
+        - node:
+            color: '#0096FFFF'
+            id: BoxGreyscale
           decals:
-            8: -2,-2
-            9: -4,-2
-            10: -4,0
-            11: -2,0
-            12: 0,0
-            13: 0,-2
-            14: 2,-2
-            15: 2,0
-            16: 1,-4
-            17: 1,-5
-            18: -3,-4
-            19: -3,-5
-            20: -1,-4
+            12: -2,-3
+        - node:
+            color: '#FF0000FF'
+            id: BoxGreyscale
+          decals:
+            11: -2,-4
         - node:
             color: '#FFFFFFFF'
-            id: DeliveryGreyscale
+            id: BoxGreyscale
           decals:
-            41: -2,-6
-            42: -1,-6
-            43: 0,-6
+            9: 0,3
         - node:
             cleanable: True
-            color: '#83543273'
+            color: '#FFFFFFFF'
             id: Dirt
           decals:
-            21: -4,0
-            22: -4,-1
-            23: -1,-1
-            24: 0,0
-            25: -1,-2
-            26: -2,-2
-            27: -2,-4
-            28: -2,-5
-            29: 0,-5
-            30: 0,-4
-            31: 0,-2
-            32: 0,-1
-            33: -1,2
-            34: -2,2
-            35: 0,-1
-            36: 2,0
-            37: 2,-1
-            38: 2,-2
-            39: 2,0
-            40: 1,0
-      type: DecalGrid
-    - version: 2
+            35: -1,-4
+            45: 2,0
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            36: -1,0
+            41: -1,-3
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            37: -3,-1
+            38: -3,1
+            42: -1,-5
+            43: -1,-1
+            44: 0,0
+            46: 2,-2
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            39: 1,-3
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtMedium
+          decals:
+            40: 0,1
+        - node:
+            color: '#334E6DFF'
+            id: HalfTileOverlayGreyscale
+          decals:
+            21: 0,4
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: StandClear
+          decals:
+            26: -2,-1
+            27: -2,1
+        - node:
+            color: '#334E6DFF'
+            id: ThreeQuarterTileOverlayGreyscale
+          decals:
+            19: -1,4
+        - node:
+            color: '#334E6DFF'
+            id: ThreeQuarterTileOverlayGreyscale90
+          decals:
+            20: 1,4
+        - node:
+            color: '#FFFF00FF'
+            id: WarnLineGreyscaleE
+          decals:
+            24: -2,1
+            25: -2,-1
+            33: -4,-1
+            34: -4,1
+        - node:
+            color: '#334E6DC8'
+            id: WarnLineGreyscaleN
+          decals:
+            28: 0,1
+        - node:
+            color: '#FFFF00FF'
+            id: WarnLineGreyscaleW
+          decals:
+            22: -2,-1
+            23: -2,1
+            29: -1,1
+            30: -1,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            31: -4,-1
+            32: -4,1
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNe
+          decals:
+            3: 3,1
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNw
+          decals:
+            1: 1,1
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSe
+          decals:
+            2: 3,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSw
+          decals:
+            4: 1,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineE
+          decals:
+            6: 3,0
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineN
+          decals:
+            7: 2,1
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            5: 2,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineW
+          decals:
+            0: 1,0
+    - type: GridAtmosphere
+      version: 2
       data:
         tiles:
-          -1,-1:
-            0: 65535
-          -1,0:
-            0: 61183
-            1: 256
           0,0:
-            0: 13311
-            1: 1024
+            0: 12799
+            1: 32768
           0,-1:
-            0: 65527
-            1: 8
-          -2,-1:
-            1: 8
-            0: 34944
-          -1,-2:
+            0: 63094
+          -1,0:
+            0: 33018
+            1: 8192
+          0,1:
+            0: 3
+            1: 64
+          -1,1:
+            0: 8
+            1: 64
+          -1,-1:
+            0: 61644
             1: 16
-            0: 65518
-          -1,-3:
+          -1,-2:
+            1: 512
             0: 49152
-          -2,0:
-            0: 136
-          -1,1:
-            1: 2
-            0: 204
-          0,1:
-            0: 17
-            1: 2
-          0,-3:
-            0: 4096
           0,-2:
-            0: 30515
-            1: 64
+            0: 24576
+            1: 2048
+          1,-1:
+            1: 16
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -176,7 +267,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -191,1196 +282,1282 @@ entities:
           - 0
           - 0
         chunkSize: 4
-      type: GridAtmosphere
     - type: GasTileOverlay
     - type: RadiationGridResistance
-    - id: PTS
-      type: BecomesStation
-    - type: SpreaderGrid
-- proto: AirAlarm
+- proto: AirlockCommandGlass
   entities:
-  - uid: 68
+  - uid: 150
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,-3.5
-      parent: 8756
-      type: Transform
-    - ShutdownSubscribers:
-      - 33
-      - 34
-      type: DeviceNetwork
-    - devices:
-      - 33
-      - 34
-      type: DeviceList
-- proto: AirCanister
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 2
+- proto: AirlockEngineering
   entities:
-  - uid: 66
+  - uid: 114
     components:
-    - anchored: True
-      pos: -3.5,-0.5
-      parent: 8756
-      type: Transform
-    - bodyType: Static
-      type: Physics
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 2
 - proto: AirlockExternalGlass
   entities:
-  - uid: 8872
-    components:
-    - pos: -2.5,-1.5
-      parent: 8756
-      type: Transform
-  - uid: 8873
+  - uid: 151
     components:
-    - pos: -2.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 8874
-    components:
-    - pos: 1.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 8875
-    components:
-    - pos: 1.5,-1.5
-      parent: 8756
-      type: Transform
-- proto: AirlockGlass
-  entities:
-  - uid: 5
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 2
+  - uid: 152
     components:
-    - pos: -0.5,1.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 2
 - proto: AirlockGlassShuttle
   entities:
-  - uid: 1
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -4.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 2
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -4.5,-1.5
-      parent: 8756
-      type: Transform
-  - uid: 3
+  - uid: 51
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 4
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-0.5
+      parent: 2
+  - uid: 154
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,-1.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,1.5
+      parent: 2
 - proto: APCBasic
   entities:
-  - uid: 8819
+  - uid: 113
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,-5.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 2
 - proto: AtmosDeviceFanTiny
   entities:
-  - uid: 8868
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,-1.5
-      parent: 8756
-      type: Transform
-  - uid: 8869
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 8870
+  - uid: 53
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 8871
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 2
+  - uid: 188
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,-1.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 2
 - proto: AtmosFixBlockerMarker
   entities:
-  - uid: 39
+  - uid: 166
     components:
-    - pos: -4.5,-3.5
-      parent: 8756
-      type: Transform
-  - uid: 40
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 2
+  - uid: 167
     components:
-    - pos: -3.5,-6.5
-      parent: 8756
-      type: Transform
-  - uid: 41
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 2
+  - uid: 168
     components:
-    - pos: 2.5,-6.5
-      parent: 8756
-      type: Transform
-  - uid: 42
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 2
+  - uid: 169
     components:
-    - pos: 3.5,-3.5
-      parent: 8756
-      type: Transform
-  - uid: 43
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 2
+  - uid: 170
     components:
-    - pos: 2.5,2.5
-      parent: 8756
-      type: Transform
-  - uid: 44
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 2
+  - uid: 171
     components:
-    - pos: 1.5,4.5
-      parent: 8756
-      type: Transform
-  - uid: 45
+    - type: Transform
+      pos: -2.5,3.5
+      parent: 2
+  - uid: 172
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 2
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 2
+- proto: BenchSofaCorpCorner
+  entities:
+  - uid: 55
     components:
-    - pos: -2.5,4.5
-      parent: 8756
-      type: Transform
-  - uid: 46
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-0.5
+      parent: 2
+    - type: Physics
+      canCollide: False
+      bodyType: Static
+    - type: Fixtures
+      fixtures: {}
+- proto: BenchSofaCorpLeft
+  entities:
+  - uid: 58
     components:
-    - pos: -3.5,2.5
-      parent: 8756
-      type: Transform
-- proto: CableApcExtension
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-0.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+- proto: BenchSofaCorpMiddle
   entities:
-  - uid: 12
+  - uid: 56
     components:
-    - pos: -0.5,2.5
-      parent: 8756
-      type: Transform
-  - uid: 13
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,0.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+- proto: BenchSofaCorpRight
+  entities:
+  - uid: 54
     components:
-    - pos: -0.5,1.5
-      parent: 8756
-      type: Transform
-  - uid: 14
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+- proto: CableApcExtension
+  entities:
+  - uid: 132
     components:
-    - pos: -0.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 15
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 2
+  - uid: 133
     components:
-    - pos: -0.5,-0.5
-      parent: 8756
-      type: Transform
-  - uid: 16
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 2
+  - uid: 134
     components:
-    - pos: -0.5,-1.5
-      parent: 8756
-      type: Transform
-  - uid: 17
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 2
+  - uid: 135
     components:
-    - pos: -0.5,-2.5
-      parent: 8756
-      type: Transform
-  - uid: 18
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 2
+  - uid: 136
     components:
-    - pos: -0.5,-3.5
-      parent: 8756
-      type: Transform
-  - uid: 19
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 2
+  - uid: 137
     components:
-    - pos: -0.5,-4.5
-      parent: 8756
-      type: Transform
-  - uid: 20
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 2
+  - uid: 138
     components:
-    - pos: 0.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 21
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 2
+  - uid: 139
     components:
-    - pos: 1.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 22
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 2
+  - uid: 140
     components:
-    - pos: -1.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 23
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 2
+  - uid: 141
     components:
-    - pos: 2.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 24
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 2
+  - uid: 142
     components:
-    - pos: -2.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 25
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 2
+  - uid: 144
     components:
-    - pos: -1.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 26
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 2
+  - uid: 145
     components:
-    - pos: -3.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 27
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 2
+  - uid: 146
     components:
-    - pos: 0.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 28
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 2
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 2
+  - uid: 194
     components:
-    - pos: 1.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 8854
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 2
+  - uid: 196
     components:
-    - pos: -0.5,-5.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 2
 - proto: CableHV
   entities:
-  - uid: 8821
-    components:
-    - pos: 0.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 8822
-    components:
-    - pos: -0.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 8823
-    components:
-    - pos: -1.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 8824
+  - uid: 126
     components:
-    - pos: -2.5,-5.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 2
+  - uid: 127
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 2
+  - uid: 128
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 2
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 2
 - proto: CableMV
   entities:
-  - uid: 8825
-    components:
-    - pos: -2.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 8826
+  - uid: 130
     components:
-    - pos: -1.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 8827
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 2
+  - uid: 131
     components:
-    - pos: -0.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 8828
-    components:
-    - pos: 0.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 8829
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 2
+- proto: ChairFolding
+  entities:
+  - uid: 187
     components:
-    - pos: 1.5,-5.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-3.5
+      parent: 2
 - proto: ChairPilotSeat
   entities:
-  - uid: 8857
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,-3.5
-      parent: 8756
-      type: Transform
-  - uid: 8858
+  - uid: 161
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,-4.5
-      parent: 8756
-      type: Transform
-  - uid: 8859
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,-3.5
-      parent: 8756
-      type: Transform
-  - uid: 8860
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,3.5
+      parent: 2
+- proto: ComputerTabletopShuttle
+  entities:
+  - uid: 157
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,-4.5
-      parent: 8756
-      type: Transform
-  - uid: 8885
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 2
+- proto: ComputerTabletopStationRecords
+  entities:
+  - uid: 158
     components:
-    - pos: -0.5,-3.5
-      parent: 8756
-      type: Transform
-  - uid: 8895
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 2
+- proto: ComputerTelevision
+  entities:
+  - uid: 52
     components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,2.5
-      parent: 8756
-      type: Transform
-- proto: ClosetWallFireFilledRandom
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 2
+- proto: ComputerWallmountWithdrawBankATM
   entities:
-  - uid: 73
+  - uid: 153
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-1.5
+      parent: 2
+    - type: ContainerContainer
+      containers:
+        board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: Physics
+      canCollide: False
+    - type: ItemSlots
+- proto: CrateFreezer
+  entities:
+  - uid: 61
     components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,-2.5
-      parent: 8756
-      type: Transform
-- proto: ComputerFrame
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14923
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+- proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 8889
+  - uid: 185
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,2.5
-      parent: 8756
-      type: Transform
-- proto: ComputerTabletopShuttle
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 2
+- proto: DrinkChampagneBottleFull
   entities:
-  - uid: 29
+  - uid: 193
     components:
-    - pos: -0.5,3.5
-      parent: 8756
-      type: Transform
-- proto: ComputerTabletopStationRecords
+    - type: Transform
+      pos: 1.535899,-4.187701
+      parent: 2
+- proto: DrinkGlassCoupeShaped
   entities:
-  - uid: 30
+  - uid: 59
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,2.5
-      parent: 8756
-      type: Transform
-- proto: DefibrillatorCabinetFilled
+    - type: Transform
+      pos: 1.9004824,-4.062614
+      parent: 2
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 2.1296492,-4.302364
+      parent: 2
+- proto: EmergencyLight
   entities:
-  - uid: 74
+  - uid: 190
     components:
-    - pos: 2.5,1.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-0.5
+      parent: 2
+  - uid: 191
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 2
+  - uid: 192
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,3.5
+      parent: 2
 - proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 78
+  - uid: 125
     components:
-    - pos: -3.5,1.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 2
 - proto: FaxMachineShip
   entities:
-  - uid: 18175
+  - uid: 159
     components:
-    - pos: 0.5,3.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 2
 - proto: FirelockGlass
   entities:
-  - uid: 8
+  - uid: 97
     components:
-    - pos: -0.5,1.5
-      parent: 8756
-      type: Transform
-  - uid: 8861
-    components:
-    - pos: -1.5,-2.5
-      parent: 8756
-      type: Transform
-  - uid: 8862
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 2
+  - uid: 189
     components:
-    - pos: -0.5,-2.5
-      parent: 8756
-      type: Transform
-  - uid: 8863
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 2
+- proto: GasMixerOn
+  entities:
+  - uid: 43
     components:
-    - pos: 0.5,-2.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 2
+    - type: GasMixer
+      inletTwoConcentration: 0.79
+      inletOneConcentration: 0.21
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
-  - uid: 56
+  - uid: 81
     components:
-    - pos: 2.5,2.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: Transform
+      pos: -2.5,3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeBend
   entities:
-  - uid: 51
+  - uid: 44
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-1.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 65
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 84
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -0.5,-4.5
-      parent: 8756
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-- proto: GasPipeStraight
-  entities:
-  - uid: 35
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 88
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-3.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 36
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 103
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-2.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 47
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 108
     components:
-    - pos: 0.5,0.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 50
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 124
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-1.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 52
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 148
     components:
-    - pos: 0.5,1.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 54
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 82
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,1.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 55
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 83
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,0.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 57
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 85
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,-0.5
-      parent: 8756
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 59
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 87
     components:
-    - pos: 0.5,-0.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 60
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 90
     components:
-    - pos: -0.5,0.5
-      parent: 8756
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 61
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 93
     components:
-    - pos: -0.5,1.5
-      parent: 8756
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 62
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 95
     components:
-    - pos: -0.5,-1.5
-      parent: 8756
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 63
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 96
     components:
-    - pos: -0.5,-2.5
-      parent: 8756
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 64
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 98
     components:
-    - pos: -0.5,-3.5
-      parent: 8756
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-- proto: GasPipeTJunction
-  entities:
-  - uid: 11
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 100
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,-1.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 58
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 101
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -0.5,-0.5
-      parent: 8756
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-- proto: GasPort
-  entities:
-  - uid: 31
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 106
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,-0.5
-      parent: 8756
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-- proto: GasPressurePump
-  entities:
-  - uid: 32
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 109
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,-0.5
-      parent: 8756
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 53
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 110
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
       pos: 2.5,-0.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-- proto: GasVentPump
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeTJunction
   entities:
-  - uid: 34
+  - uid: 91
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 92
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 107
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPort
+  entities:
+  - uid: 46
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,-4.5
-      parent: 8756
-      type: Transform
-    - ShutdownSubscribers:
-      - 68
-      type: DeviceNetwork
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 49
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 47
     components:
-    - pos: -0.5,2.5
-      parent: 8756
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-- proto: GasVentScrubber
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasVentPump
   entities:
-  - uid: 33
+  - uid: 104
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-4.5
-      parent: 8756
-      type: Transform
-    - ShutdownSubscribers:
-      - 68
-      type: DeviceNetwork
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 48
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 105
     components:
-    - pos: 0.5,2.5
-      parent: 8756
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 86
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 89
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 99
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasVolumePumpOn
+  entities:
+  - uid: 94
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GravityGeneratorMini
   entities:
-  - uid: 8815
+  - uid: 183
     components:
-    - pos: -0.5,-5.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 2
 - proto: Grille
   entities:
-  - uid: 8757
+  - uid: 6
     components:
-    - rot: 3.141592653589793 rad
-      pos: -4.5,-0.5
-      parent: 8756
-      type: Transform
-  - uid: 8758
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 2
+  - uid: 11
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,-0.5
-      parent: 8756
-      type: Transform
-  - uid: 8759
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 2
+  - uid: 13
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,-0.5
-      parent: 8756
-      type: Transform
-  - uid: 8760
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 2
+  - uid: 26
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,-0.5
-      parent: 8756
-      type: Transform
-  - uid: 8777
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 2
+  - uid: 27
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,1.5
-      parent: 8756
-      type: Transform
-  - uid: 8778
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 2
+  - uid: 28
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,1.5
-      parent: 8756
-      type: Transform
-  - uid: 8783
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 2
+  - uid: 29
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,3.5
-      parent: 8756
-      type: Transform
-  - uid: 8784
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 2
+  - uid: 30
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,4.5
-      parent: 8756
-      type: Transform
-  - uid: 8785
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
+  - uid: 31
     components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,4.5
-      parent: 8756
-      type: Transform
-  - uid: 8786
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 2
+  - uid: 32
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,4.5
-      parent: 8756
-      type: Transform
-  - uid: 8787
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 2
+  - uid: 33
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,3.5
-      parent: 8756
-      type: Transform
-  - uid: 8802
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,-6.5
-      parent: 8756
-      type: Transform
-  - uid: 8809
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,-4.5
-      parent: 8756
-      type: Transform
-  - uid: 8810
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-4.5
-      parent: 8756
-      type: Transform
-  - uid: 8816
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 2
+  - uid: 35
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
-      parent: 8756
-      type: Transform
-  - uid: 8817
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 2
+  - uid: 36
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,-6.5
-      parent: 8756
-      type: Transform
-- proto: IntercomCommon
-  entities:
-  - uid: 8893
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 2
+  - uid: 48
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 2
+  - uid: 49
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
       pos: 1.5,2.5
-      parent: 8756
-      type: Transform
+      parent: 2
+  - uid: 50
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 2
+  - uid: 60
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 2
+- proto: GrilleDiagonal
+  entities:
+  - uid: 178
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 2
+  - uid: 180
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,5.5
+      parent: 2
+- proto: JukeboxWallmountShip
+  entities:
+  - uid: 102
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 2
+- proto: LockerPilotFilled
+  entities:
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 2
+- proto: NitrogenCanister
+  entities:
+  - uid: 80
+    components:
+    - type: Transform
+      anchored: True
+      pos: -1.5,-3.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 79
+    components:
+    - type: Transform
+      anchored: True
+      pos: -1.5,-2.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: Paper
   entities:
-  - uid: 76
+  - uid: 160
     components:
-    - pos: 0.73673934,3.451689
-      parent: 8756
-      type: Transform
-  - uid: 77
+    - type: Transform
+      pos: -0.30220816,4.429711
+      parent: 2
+  - uid: 181
     components:
-    - pos: 0.5388227,3.264189
-      parent: 8756
-      type: Transform
-- proto: PortableGeneratorPacman
+    - type: Transform
+      pos: -0.45423022,4.366728
+      parent: 2
+- proto: PortableGeneratorPacmanShuttle
   entities:
-  - uid: 8804
+  - uid: 182
     components:
-    - anchored: True
-      pos: 0.5,-5.5
-      parent: 8756
-      type: Transform
-    - storage:
-        Plasma: 3000
-      type: MaterialStorage
-    - bodyType: Static
-      type: Physics
-    - endTime: 0
-      type: InsertingMaterialStorage
-- proto: PowerCellRecharger
-  entities:
-  - uid: 8892
-    components:
-    - pos: -1.5,3.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 2
+    - type: FuelGenerator
+      on: False
+    - type: Physics
+      bodyType: Static
+- proto: PottedPlantRandom
+  entities:
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 2
 - proto: Poweredlight
   entities:
-  - uid: 10
+  - uid: 143
     components:
-    - pos: -3.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 81
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-0.5
+      parent: 2
+- proto: PoweredlightGreen
+  entities:
+  - uid: 162
     components:
-    - pos: 2.5,0.5
-      parent: 8756
-      type: Transform
-  - uid: 8878
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,3.5
+      parent: 2
+- proto: PoweredlightRed
+  entities:
+  - uid: 163
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,2.5
-      parent: 8756
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
-  - uid: 8879
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,3.5
+      parent: 2
+- proto: PoweredSmallLight
+  entities:
+  - uid: 155
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,-4.5
-      parent: 8756
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
-  - uid: 8880
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-0.5
+      parent: 2
+  - uid: 156
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,-4.5
-      parent: 8756
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-3.5
+      parent: 2
+  - uid: 175
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 2
+  - uid: 176
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,3.5
+      parent: 2
 - proto: SheetPlasma
   entities:
-  - uid: 9
+  - uid: 184
     components:
-    - pos: 0.7395834,-5.7157984
-      parent: 8756
-      type: Transform
-    - count: 15
-      type: Stack
-    - size: 15
-      type: Item
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 2
 - proto: ShuttleWindow
   entities:
-  - uid: 8761
+  - uid: 57
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,-0.5
-      parent: 8756
-      type: Transform
-  - uid: 8762
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 2
+  - uid: 63
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,-0.5
-      parent: 8756
-      type: Transform
-  - uid: 8764
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 2
+  - uid: 64
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,-0.5
-      parent: 8756
-      type: Transform
-  - uid: 8776
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 2
+  - uid: 65
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,1.5
-      parent: 8756
-      type: Transform
-  - uid: 8788
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 2
+  - uid: 66
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,3.5
-      parent: 8756
-      type: Transform
-  - uid: 8789
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
+  - uid: 67
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,4.5
-      parent: 8756
-      type: Transform
-  - uid: 8790
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 2
+  - uid: 68
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,4.5
-      parent: 8756
-      type: Transform
-  - uid: 8791
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 2
+  - uid: 69
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,4.5
-      parent: 8756
-      type: Transform
-  - uid: 8792
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 2
+  - uid: 70
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,3.5
-      parent: 8756
-      type: Transform
-  - uid: 8795
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 2
+  - uid: 71
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-0.5
-      parent: 8756
-      type: Transform
-  - uid: 8796
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 2
+  - uid: 72
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,1.5
-      parent: 8756
-      type: Transform
-  - uid: 8801
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,-6.5
-      parent: 8756
-      type: Transform
-  - uid: 8805
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,-6.5
-      parent: 8756
-      type: Transform
-  - uid: 8807
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
-      parent: 8756
-      type: Transform
-  - uid: 8812
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,-4.5
-      parent: 8756
-      type: Transform
-  - uid: 8814
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,-4.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 2
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 2
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 2
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 2
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 2
+  - uid: 77
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 2
+  - uid: 78
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 2
+- proto: ShuttleWindowDiagonal
+  entities:
+  - uid: 37
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 2
+  - uid: 38
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,5.5
+      parent: 2
 - proto: SmallGyroscope
   entities:
-  - uid: 69
+  - uid: 149
     components:
-    - pos: -1.5,-5.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 2
 - proto: SpawnPointLatejoin
   entities:
-  - uid: 6
+  - uid: 165
     components:
-    - pos: -0.5,-1.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 2
 - proto: SubstationWallBasic
   entities:
-  - uid: 8818
+  - uid: 112
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,-5.5
-      parent: 8756
-      type: Transform
-- proto: SuitStorageWallmountEVA
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 2
+- proto: SuitStorageWallmountPilot
   entities:
-  - uid: 80
+  - uid: 123
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-2.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 2
+- proto: TableFancyWhite
+  entities:
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 2
+  - uid: 179
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 2
 - proto: TableReinforced
   entities:
-  - uid: 37
+  - uid: 120
     components:
-    - pos: 0.5,2.5
-      parent: 8756
-      type: Transform
-  - uid: 38
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 2
+  - uid: 121
     components:
-    - pos: -0.5,3.5
-      parent: 8756
-      type: Transform
-  - uid: 8890
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 2
+  - uid: 122
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,3.5
-      parent: 8756
-      type: Transform
-  - uid: 8891
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 2
+- proto: TableWood
+  entities:
+  - uid: 186
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,3.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
 - proto: Thruster
   entities:
-  - uid: 8881
+  - uid: 115
     components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,-6.5
-      parent: 8756
-      type: Transform
-  - uid: 8882
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 2
+  - uid: 116
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-6.5
-      parent: 8756
-      type: Transform
-  - uid: 8883
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-2.5
+      parent: 2
+  - uid: 117
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,2.5
-      parent: 8756
-      type: Transform
-  - uid: 8884
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-2.5
+      parent: 2
+  - uid: 118
     components:
-    - pos: 2.5,2.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,3.5
+      parent: 2
 - proto: WallShuttle
   entities:
-  - uid: 75
+  - uid: 3
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,1.5
-      parent: 8756
-      type: Transform
-  - uid: 79
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 2
+  - uid: 4
     components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,1.5
-      parent: 8756
-      type: Transform
-  - uid: 8765
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 2
+  - uid: 5
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 8766
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 2
+  - uid: 7
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 8767
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,-6.5
-      parent: 8756
-      type: Transform
-  - uid: 8768
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-6.5
-      parent: 8756
-      type: Transform
-  - uid: 8771
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,2.5
-      parent: 8756
-      type: Transform
-  - uid: 8772
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 2
+  - uid: 8
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,1.5
-      parent: 8756
-      type: Transform
-  - uid: 8773
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 2
+  - uid: 9
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,1.5
-      parent: 8756
-      type: Transform
-  - uid: 8774
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 2
+  - uid: 12
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,-2.5
-      parent: 8756
-      type: Transform
-  - uid: 8779
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 2
+  - uid: 14
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 8780
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 2
+  - uid: 16
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,-2.5
-      parent: 8756
-      type: Transform
-  - uid: 8781
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 2
+  - uid: 17
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,-5.5
-      parent: 8756
-      type: Transform
-  - uid: 8782
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 2
+  - uid: 18
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 8756
-      type: Transform
-  - uid: 8797
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 2
+  - uid: 19
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,-2.5
-      parent: 8756
-      type: Transform
-  - uid: 8798
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 2
+  - uid: 20
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,-2.5
-      parent: 8756
-      type: Transform
-  - uid: 8799
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 2
+  - uid: 21
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 2
+  - uid: 22
+    components:
+    - type: Transform
       pos: -2.5,2.5
-      parent: 8756
-      type: Transform
-  - uid: 8800
+      parent: 2
+  - uid: 23
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,1.5
-      parent: 8756
-      type: Transform
-  - uid: 8806
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 2
+  - uid: 24
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,-2.5
-      parent: 8756
-      type: Transform
-  - uid: 8808
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 2
+  - uid: 25
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,1.5
-      parent: 8756
-      type: Transform
-  - uid: 8811
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 2
+  - uid: 34
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-3.5
-      parent: 8756
-      type: Transform
-  - uid: 8813
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,-3.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 2
+  - uid: 39
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 2
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 2
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 2
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 2
 - proto: WallShuttleDiagonal
   entities:
-  - uid: 8769
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,4.5
-      parent: 8756
-      type: Transform
-  - uid: 8770
+  - uid: 10
     components:
-    - pos: -2.5,4.5
-      parent: 8756
-      type: Transform
-  - uid: 8803
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-5.5
+      parent: 2
+  - uid: 15
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,-3.5
-      parent: 8756
-      type: Transform
-  - uid: 8886
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,-3.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-5.5
+      parent: 2
 - proto: WarpPointShip
   entities:
-  - uid: 18176
+  - uid: 164
     components:
-    - pos: -0.5,-0.5
-      parent: 8756
-      type: Transform
-    - location: Personal Transport Shuttle
-      type: WarpPoint
-- proto: WindoorSecure
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 2
+- proto: WaterCooler
   entities:
-  - uid: 71
-    components:
-    - pos: 0.5,-4.5
-      parent: 8756
-      type: Transform
-  - uid: 72
+  - uid: 147
     components:
-    - pos: -1.5,-4.5
-      parent: 8756
-      type: Transform
-- proto: WindowReinforcedDirectional
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 2
+- proto: Wrench
   entities:
-  - uid: 70
+  - uid: 45
     components:
-    - pos: -0.5,-4.5
-      parent: 8756
-      type: Transform
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 2
 ...
diff --git a/Resources/Prototypes/_NF/Shipyard/pts.yml b/Resources/Prototypes/_NF/Shipyard/pts.yml
index 04e0f2f58950..8b1275794678 100644
--- a/Resources/Prototypes/_NF/Shipyard/pts.yml
+++ b/Resources/Prototypes/_NF/Shipyard/pts.yml
@@ -1,18 +1,18 @@
 # Author Info
-# GitHub: ???
-# Discord: ???
+# GitHub: arimah
+# Discord: arimah
 
 # Maintainer Info
-# GitHub: ???
-# Discord: ???
+# GitHub: arimah
+# Discord: arimah
 
 # Shuttle Notes:
 #
 - type: vessel
   id: PTS
   name: NC Personal Transport
-  description: A small transport shuttle with space for 5 passengers.
-  price: 13900
+  description: A small transport shuttle with space for 4 passengers. Comes with the latest audio entertainment technology.
+  price: 13000 # $11594 after appraisal + $1406 (~12% markup)
   category: Small
   group: Civilian
   shuttlePath: /Maps/_NF/Shuttles/pts.yml

From 7d4a9e809e57113f9dbbf6679b7949ceac672fbb Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 21:59:40 +0000
Subject: [PATCH 11/39] Automatic Changelog (#1832)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c23a1e2c410e..3ad7a87bac32 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6237,3 +6237,9 @@ Entries:
         lasers.
   id: 5193
   time: '2024-08-12T19:58:34.0000000+00:00'
+- author: arimah
+  changes:
+    - type: Tweak
+      message: The Personal Transport has been reworked into a comfortable space taxi.
+  id: 5194
+  time: '2024-08-12T21:59:15.0000000+00:00'

From 3efa4440cd7385f1062b9f09e0fb863849f82ac9 Mon Sep 17 00:00:00 2001
From: Dvir <39403717+dvir001@users.noreply.github.com>
Date: Tue, 13 Aug 2024 01:00:47 +0300
Subject: [PATCH 12/39] Add NeedAllJobRequirement to job proto (#1841)

* NeedAllJobRequirement Draft

* Alternate requirement sets

* Cleanup, revert NFSD alternate sets

* Add alternative text, separators

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
---
 .../JobRequirementsManager.cs                 | 26 ++++++++++++++++++-
 Content.Shared/Roles/JobPrototype.cs          |  3 +++
 Content.Shared/Roles/SharedRoleSystem.cs      | 12 +++++++++
 .../Locale/en-US/_NF/job/role-timers.ftl      |  2 ++
 4 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Locale/en-US/_NF/job/role-timers.ftl

diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index ea250953422c..a5b71cfa7bfb 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -113,7 +113,31 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
     public bool CheckRoleTime(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         var reqs = _entManager.System<SharedRoleSystem>().GetJobRequirement(job);
-        return CheckRoleTime(reqs, out reason);
+
+        //return CheckRoleTime(reqs, out reason); // Frontier: old implementation
+
+        // Frontier: alternate role time checks
+        if (CheckRoleTime(reqs, out reason))
+            return true;
+
+        var altReqs = _entManager.System<SharedRoleSystem>().GetAlternateJobRequirements(job);
+        if (altReqs != null)
+        {
+            foreach (var alternateSet in altReqs.Values)
+            {
+                // Suppress reasons on alternate requirement sets
+                if (CheckRoleTime(alternateSet, out var altReason))
+                {
+                    return true;
+                }
+                reason.PushNewline();
+                reason.AddMarkupPermissive(Loc.GetString("role-requirement-alternative"));
+                reason.PushNewline();
+                reason.AddMarkupPermissive(altReason.ToMarkup());
+            }
+        }
+        return false;
+        // End Frontier: alternate role time checks
     }
 
     public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason)
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 84263f3790f0..c7e979e788d4 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -44,6 +44,9 @@ public sealed partial class JobPrototype : IPrototype
         [DataField, Access(typeof(SharedRoleSystem), Other = AccessPermissions.None)]
         public HashSet<JobRequirement>? Requirements;
 
+        [DataField, Access(typeof(SharedRoleSystem), Other = AccessPermissions.None)] // Frontier
+        public Dictionary<string, HashSet<JobRequirement>>? AlternateRequirementSets; // Frontier: sets of requirements - one must be matched in order to 
+
         [DataField("whitelistRequired")]
         public bool WhitelistRequired = false;
 
diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
index 81a360ebb7f7..a63b933fb2dc 100644
--- a/Content.Shared/Roles/SharedRoleSystem.cs
+++ b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -288,6 +288,18 @@ public void MindPlaySound(EntityUid mindId, SoundSpecifier? sound, MindComponent
         return _prototypes.Index(job).Requirements;
     }
 
+    // Frontier: alternate requirement sets
+    public Dictionary<string, HashSet<JobRequirement>>? GetAlternateJobRequirements(JobPrototype job)
+    {
+        return job.AlternateRequirementSets;
+    }
+
+    public Dictionary<string, HashSet<JobRequirement>>? GetAlternateJobRequirements(ProtoId<JobPrototype> job)
+    {
+        return _prototypes.Index(job).AlternateRequirementSets;
+    }
+    // End Frontier: alternate requirement sets
+
     public HashSet<JobRequirement>? GetAntagRequirement(ProtoId<AntagPrototype> antag)
     {
         if (_requirementOverride != null && _requirementOverride.Antags.TryGetValue(antag, out var req))
diff --git a/Resources/Locale/en-US/_NF/job/role-timers.ftl b/Resources/Locale/en-US/_NF/job/role-timers.ftl
new file mode 100644
index 000000000000..fba38b0cd75d
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/job/role-timers.ftl
@@ -0,0 +1,2 @@
+# A full line separating out requirement alternatives.
+role-requirement-alternative = [italic][color=gray]- or -[/color][/italic]
\ No newline at end of file

From 4557e8a34bbe73c84ea309f1c942af1ceb8a9b60 Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Tue, 13 Aug 2024 01:15:51 +0300
Subject: [PATCH 13/39] Mob/Turret Laser Reflect Chance (#1844)

* Mob/Turret Laser Reflect Chance

* forgot to add this to commander

* Update cache.yml

* some spawners

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
---
 Resources/Maps/_NF/Bluespace/cache.yml        | 829 +++++++-----------
 .../Entities/Objects/Weapons/Guns/turrets.yml |   3 +-
 .../Spawners/Conditional/turret_spawner.yml   |  47 +
 .../Entities/Mobs/NPCs/mob_hostile_base.yml   |   2 +-
 .../Mobs/NPCs/mob_hostile_bloodcultist.yml    |   7 +-
 ...mob_hostile_expeditions_aberrant_flesh.yml |   4 +-
 .../mob_hostile_expeditions_explorers.yml     |   1 +
 .../Mobs/NPCs/mob_hostile_rogue_ai.yml        |   1 +
 .../Mobs/NPCs/mob_hostile_syndicate.yml       |  34 +-
 .../NPCs/mob_hostile_wizardfederation.yml     |   4 +-
 .../Objects/Weapons/Guns/base_turret.yml      |   4 +-
 .../Entities/Objects/Weapons/Guns/turrets.yml |   2 +
 12 files changed, 422 insertions(+), 516 deletions(-)
 create mode 100644 Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/turret_spawner.yml

diff --git a/Resources/Maps/_NF/Bluespace/cache.yml b/Resources/Maps/_NF/Bluespace/cache.yml
index 418367df8400..eebf3db41018 100644
--- a/Resources/Maps/_NF/Bluespace/cache.yml
+++ b/Resources/Maps/_NF/Bluespace/cache.yml
@@ -25,19 +25,19 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: egAAAAAAIgAAAAABIgAAAAACIgAAAAADaQAAAAAAIwAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAADIgAAAAADIgAAAAABIgAAAAABegAAAAAAIwAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAIwAAAAACIwAAAAADIwAAAAABegAAAAAAegAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAJwAAAAAAJwAAAAACJwAAAAAAegAAAAAAegAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAACIgAAAAAAIgAAAAACJwAAAAACIwAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAACIgAAAAADIgAAAAABJwAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJwAAAAABJwAAAAADJwAAAAADJwAAAAAAIwAAAAABaQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAABegAAAAAAJwAAAAAAJwAAAAACegAAAAAAegAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: IwAAAAAAIwAAAAAAIwAAAAAAIgAAAAADaQAAAAAAIwAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIgAAAAABegAAAAAAIwAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAegAAAAAAegAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAJwAAAAAAJwAAAAACJwAAAAAAegAAAAAAegAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAACIgAAAAAAIgAAAAACJwAAAAACIwAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAACIgAAAAADIgAAAAABJwAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJwAAAAABJwAAAAADJwAAAAADJwAAAAAAIwAAAAABaQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAABegAAAAAAJwAAAAAAJwAAAAACegAAAAAAegAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAACegAAAAAAJwAAAAAAJwAAAAAAegAAAAAAegAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJwAAAAACJwAAAAADJwAAAAADJwAAAAAAIwAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAACdwAAAAADdwAAAAAAJwAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAACdwAAAAAAdwAAAAAAJwAAAAACIwAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAADdwAAAAADJwAAAAADegAAAAAAegAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAIwAAAAABIwAAAAAAIwAAAAAAegAAAAAAegAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAACIgAAAAABIgAAAAABIgAAAAADegAAAAAAIwAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAACegAAAAAAJwAAAAAAJwAAAAAAegAAAAAAegAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJwAAAAACJwAAAAADJwAAAAADJwAAAAAAIwAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAACdwAAAAADdwAAAAAAJwAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAACdwAAAAAAdwAAAAAAJwAAAAACIwAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAADdwAAAAADJwAAAAADegAAAAAAegAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAegAAAAAAegAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAACIwAAAAAAIwAAAAAAIgAAAAADegAAAAAAIwAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIwAAAAACaQAAAAAAIgAAAAABIgAAAAABIgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIwAAAAAAegAAAAAAIgAAAAAAIgAAAAACIgAAAAABIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAegAAAAAAegAAAAAAIwAAAAADIwAAAAAAIwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAegAAAAAAegAAAAAAJwAAAAABJwAAAAACegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAIwAAAAADegAAAAAAIgAAAAAAIgAAAAABIwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAJwAAAAABIgAAAAABIgAAAAAAIgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAIwAAAAACJwAAAAABJwAAAAACJwAAAAAAJwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAegAAAAAAegAAAAAAJwAAAAACJwAAAAAAegAAAAAAIwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIwAAAAACaQAAAAAAIgAAAAABIwAAAAAAIwAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIwAAAAAAegAAAAAAIgAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAegAAAAAAegAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAegAAAAAAegAAAAAAJwAAAAABJwAAAAACegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAIwAAAAADegAAAAAAIgAAAAAAIgAAAAABIwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAJwAAAAABIgAAAAABIgAAAAAAIgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAIwAAAAACJwAAAAABJwAAAAACJwAAAAAAJwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAegAAAAAAegAAAAAAJwAAAAACJwAAAAAAegAAAAAAIwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAegAAAAAAegAAAAAAJwAAAAADJwAAAAADegAAAAAAIwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAIwAAAAACJwAAAAABJwAAAAACJwAAAAABJwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAJwAAAAACdwAAAAADdwAAAAAAdwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAIwAAAAADJwAAAAACdwAAAAACdwAAAAACdwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAegAAAAAAegAAAAAAJwAAAAACdwAAAAACdwAAAAABdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAegAAAAAAegAAAAAAIwAAAAAAIwAAAAADIwAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIwAAAAADegAAAAAAIgAAAAADIgAAAAACIgAAAAADIwAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAegAAAAAAegAAAAAAJwAAAAADJwAAAAADegAAAAAAIwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAIwAAAAACJwAAAAABJwAAAAACJwAAAAABJwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAJwAAAAACdwAAAAADdwAAAAAAdwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAIwAAAAADJwAAAAACdwAAAAACdwAAAAACdwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAegAAAAAAegAAAAAAJwAAAAACdwAAAAACdwAAAAABdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAOgAAAAAAegAAAAAAegAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIwAAAAADegAAAAAAIgAAAAADIwAAAAAAIwAAAAAAIwAAAAAC
           version: 6
     - type: Broadphase
     - type: Physics
@@ -61,6 +61,28 @@ entities:
       chunkCollection:
         version: 2
         nodes:
+        - node:
+            color: '#B02E26FF'
+            id: Bot
+          decals:
+            188: -3,1
+            189: -2,1
+            190: -1,1
+            191: 0,1
+            192: 1,1
+            193: 2,1
+            194: 2,0
+            195: 2,-1
+            196: 1,-1
+            197: 0,-1
+            198: -1,-1
+            199: -2,-1
+            200: -3,-1
+            201: -3,0
+            202: -2,0
+            203: -1,0
+            204: 0,0
+            205: 1,0
         - node:
             color: '#FF0000FF'
             id: BotGreyscale
@@ -83,70 +105,66 @@ entities:
             61: 0,10
             62: -1,-10
             63: 0,-10
-            106: -1,1
-            107: 0,1
-            108: -1,-1
-            109: 0,-1
-            110: -1,7
-            111: 0,7
-            116: 3,-2
-            117: 2,-2
-            118: 1,-2
-            119: -2,-2
-            120: -3,-2
-            121: -4,-2
-            122: -4,2
-            123: -3,2
-            124: -2,2
-            125: 1,2
-            126: 2,2
-            127: 3,2
+            106: -1,7
+            107: 0,7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
           decals:
-            151: 2,8
-            166: 3,1
-            167: -2,1
+            113: 2,8
+            254: 3,2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
           decals:
-            150: -3,8
-            160: -4,1
-            161: 1,1
+            112: -3,8
+            253: -4,2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSe
           decals:
-            146: 2,7
-            147: -2,7
-            162: -2,-1
-            163: 3,-1
+            108: 2,7
+            109: -2,7
+            255: 3,-2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSw
           decals:
-            148: -3,7
-            149: 1,7
-            164: -4,-1
-            165: 1,-1
+            110: -3,7
+            111: 1,7
+            228: -4,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkInnerNe
+          decals:
+            262: -4,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkInnerNw
+          decals:
+            263: 3,-2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
           decals:
-            158: -2,8
+            120: -2,8
+            264: -4,2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
           decals:
-            159: 1,8
+            121: 1,8
+            265: 3,2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
           decals:
-            168: -2,0
-            169: 3,0
+            256: 3,-1
+            257: 3,0
+            258: 3,1
+            259: -4,1
+            260: -4,0
+            261: -4,-1
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -159,12 +177,22 @@ entities:
             77: -1,9
             78: 0,9
             79: 1,9
-            154: -2,8
-            155: -1,8
-            156: 0,8
-            157: 1,8
-            174: 2,1
-            175: -3,1
+            116: -2,8
+            117: -1,8
+            118: 0,8
+            119: 1,8
+            229: -3,2
+            230: -2,2
+            231: -1,2
+            232: 0,2
+            233: 1,2
+            234: 2,2
+            235: 2,-2
+            236: 1,-2
+            237: 0,-2
+            238: -1,-2
+            239: -2,-2
+            240: -3,-2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
@@ -177,16 +205,30 @@ entities:
             69: -1,-9
             70: 0,-9
             71: 1,-9
-            152: -1,8
-            153: 0,8
-            172: 2,-1
-            173: -3,-1
+            114: -1,8
+            115: 0,8
+            241: -3,-2
+            242: -2,-2
+            243: -1,-2
+            244: 0,-2
+            245: 1,-2
+            246: 2,-2
+            247: 2,2
+            248: 1,2
+            249: 0,2
+            250: -1,2
+            251: -2,2
+            252: -3,2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
           decals:
-            170: -4,0
-            171: 1,0
+            266: -4,-1
+            267: -4,0
+            268: -4,1
+            269: 3,1
+            270: 3,0
+            271: 3,-1
         - node:
             color: '#FF000093'
             id: BrickTileWhiteLineN
@@ -211,6 +253,32 @@ entities:
             93: 0,-9
             94: -1,-9
             95: -2,-9
+        - node:
+            color: '#B02E26FF'
+            id: MiniTileCheckerAOverlay
+          decals:
+            206: -4,-2
+            207: -3,-2
+            208: -2,-2
+            209: -1,-2
+            210: 0,-2
+            211: 1,-2
+            212: 2,-2
+            213: 3,-2
+            214: 3,-1
+            215: 3,0
+            216: 3,1
+            217: 3,2
+            218: 2,2
+            219: 1,2
+            220: 0,2
+            221: -1,2
+            222: -2,2
+            223: -3,2
+            224: -4,2
+            225: -4,1
+            226: -4,0
+            227: -4,-1
         - node:
             color: '#FF000093'
             id: MiniTileCheckerAOverlay
@@ -225,28 +293,6 @@ entities:
             103: 1,7
             104: 2,7
             105: 2,8
-        - node:
-            color: '#FF0000FF'
-            id: MiniTileCheckerAOverlay
-          decals:
-            128: -3,0
-            129: 2,0
-            130: -3,-1
-            131: -2,-1
-            132: -2,0
-            133: -2,1
-            134: -3,1
-            135: -4,1
-            136: -4,0
-            137: -4,-1
-            138: 1,-1
-            139: 1,0
-            140: 1,1
-            141: 2,1
-            142: 3,1
-            143: 3,0
-            144: 3,-1
-            145: 2,-1
         - node:
             angle: -1.5707963267948966 rad
             color: '#FF0000FF'
@@ -259,8 +305,6 @@ entities:
             49: -6,-1
             50: -5,-7
             51: -5,-9
-            112: -1,-1
-            113: -1,1
         - node:
             color: '#FF0000FF'
             id: StandClearGreyscale
@@ -279,8 +323,6 @@ entities:
             40: 5,-1
             41: 4,-9
             42: 4,-7
-            114: 0,-1
-            115: 0,1
         - node:
             angle: 3.141592653589793 rad
             color: '#FF0000FF'
@@ -336,164 +378,169 @@ entities:
             color: '#FFB5C7FF'
             id: WoodTrimThinInnerNe
           decals:
-            188: -4,-9
+            134: -4,-9
         - node:
             color: '#FFB5C7FF'
             id: WoodTrimThinInnerNw
           decals:
-            189: 3,-9
+            135: 3,-9
         - node:
             color: '#FFB5C7FF'
             id: WoodTrimThinLineE
           decals:
-            185: -4,-8
-            186: -4,-7
-            187: -4,-6
+            131: -4,-8
+            132: -4,-7
+            133: -4,-6
         - node:
             color: '#FFB5C7FF'
             id: WoodTrimThinLineN
           decals:
-            176: -3,-9
-            177: -2,-9
-            178: -1,-9
-            179: 0,-9
-            180: 1,-9
-            181: 2,-9
+            122: -3,-9
+            123: -2,-9
+            124: -1,-9
+            125: 0,-9
+            126: 1,-9
+            127: 2,-9
         - node:
             color: '#FFB5C7FF'
             id: WoodTrimThinLineW
           decals:
-            182: 3,-8
-            183: 3,-7
-            184: 3,-6
+            128: 3,-8
+            129: 3,-7
+            130: 3,-6
         - node:
             cleanable: True
             angle: 7.853981633974483 rad
             color: '#0096FF18'
             id: splatter
           decals:
-            205: -0.5974543,-8.267771
+            151: -0.5974543,-8.267771
         - node:
             cleanable: True
             angle: 4.71238898038469 rad
             color: '#0096FF2B'
             id: splatter
           decals:
-            204: -1.2432876,-8.049021
+            150: -1.2432876,-8.049021
         - node:
             cleanable: True
             angle: 6.283185307179586 rad
             color: '#0096FF2B'
             id: splatter
           decals:
-            203: -0.82662094,-7.830271
+            149: -0.82662094,-7.830271
         - node:
             cleanable: True
             angle: 3.141592653589793 rad
             color: '#0096FF31'
             id: splatter
           decals:
-            202: -1.2849543,-7.517771
+            148: -1.2849543,-7.517771
         - node:
             cleanable: True
             color: '#1D1D2173'
             id: splatter
           decals:
-            235: -4.0003366,6.008251
-            236: -3.39617,7.1436677
-            237: -1.5003366,8.247834
-            238: -1.5315866,6.7061677
-            239: -1.8961699,5.7061677
-            240: -1.8545032,6.320751
-            241: -1.0107532,7.1853347
+            181: -4.0003366,6.008251
+            182: -3.39617,7.1436677
+            183: -1.5003366,8.247834
+            184: -1.5315866,6.7061677
+            185: -1.8961699,5.7061677
+            186: -1.8545032,6.320751
+            187: -1.0107532,7.1853347
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#1D1D2173'
             id: splatter
           decals:
-            208: -3.73992,6.685334
-            209: -2.9795032,6.445751
-            210: -2.2190866,7.4353347
-            211: -1.7815866,8.185334
-            212: -1.6461699,7.227001
-            213: -2.9795032,6.122834
-            214: -4.0524197,6.789501
-            215: -4.2503366,8.456168
-            216: -3.3857532,8.456168
-            217: -3.9170032,7.654085
-            218: -3.4795032,6.445751
-            219: -3.98992,5.695751
-            220: -2.42742,6.029084
-            221: -1.6774199,6.4249177
+            154: -3.73992,6.685334
+            155: -2.9795032,6.445751
+            156: -2.2190866,7.4353347
+            157: -1.7815866,8.185334
+            158: -1.6461699,7.227001
+            159: -2.9795032,6.122834
+            160: -4.0524197,6.789501
+            161: -4.2503366,8.456168
+            162: -3.3857532,8.456168
+            163: -3.9170032,7.654085
+            164: -3.4795032,6.445751
+            165: -3.98992,5.695751
+            166: -2.42742,6.029084
+            167: -1.6774199,6.4249177
         - node:
             cleanable: True
             angle: 3.141592653589793 rad
             color: '#1D1D2173'
             id: splatter
           decals:
-            222: -3.2815866,7.164501
-            223: -1.5836699,6.6436677
-            224: -1.7190866,7.987418
-            225: -3.2920032,6.258251
-            226: -4.5524197,5.8624177
-            227: -2.70867,6.404084
-            228: -1.8857532,6.841584
-            229: -1.7086699,5.6749177
-            230: -3.5107532,6.310334
-            231: -3.9690866,7.2374177
-            232: -3.8857532,8.477001
-            233: -2.0107532,8.299918
-            234: -1.4065866,6.9561677
+            168: -3.2815866,7.164501
+            169: -1.5836699,6.6436677
+            170: -1.7190866,7.987418
+            171: -3.2920032,6.258251
+            172: -4.5524197,5.8624177
+            173: -2.70867,6.404084
+            174: -1.8857532,6.841584
+            175: -1.7086699,5.6749177
+            176: -3.5107532,6.310334
+            177: -3.9690866,7.2374177
+            178: -3.8857532,8.477001
+            179: -2.0107532,8.299918
+            180: -1.4065866,6.9561677
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FF000028'
             id: splatter
           decals:
-            207: -2.6495376,-6.407573
+            153: -2.6495376,-6.407573
         - node:
             cleanable: True
             angle: 7.853981633974483 rad
             color: '#FF000028'
             id: splatter
           decals:
-            206: -3.2120376,-6.0846567
+            152: -3.2120376,-6.0846567
         - node:
             cleanable: True
             color: '#FF00003B'
             id: splatter
           decals:
-            190: -0.43078756,-7.5057545
-            192: 1.4546292,-7.2557545
-            198: -2.607871,7.138191
+            136: -0.43078756,-7.5057545
+            138: 1.4546292,-7.2557545
+            144: -2.607871,7.138191
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FF00003B'
             id: splatter
           decals:
-            191: -2.6182876,-7.141171
-            195: -2.4412043,-8.3078375
-            196: -2.732871,7.888191
-            199: -2.951621,7.669441
-            200: -2.7120376,7.2736077
+            137: -2.6182876,-7.141171
+            141: -2.4412043,-8.3078375
+            142: -2.732871,7.888191
+            145: -2.951621,7.669441
+            146: -2.7120376,7.2736077
         - node:
             cleanable: True
             angle: 3.141592653589793 rad
             color: '#FF00003B'
             id: splatter
           decals:
-            193: -0.24328756,-6.0578375
-            194: 0.26712918,-6.297421
-            197: -3.2745376,7.4611077
-            201: -2.982871,7.1902742
+            139: -0.24328756,-6.0578375
+            140: 0.26712918,-6.297421
+            143: -3.2745376,7.4611077
+            147: -2.982871,7.1902742
     - type: GridAtmosphere
       version: 2
       data:
         tiles:
           0,0:
-            0: 3822
+            0: 4095
+          0,-1:
+            0: 65280
+            1: 1
+          -1,0:
+            0: 4095
           0,1:
             1: 1
             0: 65024
@@ -504,9 +551,6 @@ entities:
             0: 7423
           -1,2:
             0: 33791
-          0,-1:
-            0: 60928
-            1: 1
           1,1:
             1: 51371
             0: 8192
@@ -541,7 +585,7 @@ entities:
             0: 4095
           -1,-1:
             1: 8
-            0: 30464
+            0: 65280
           1,-3:
             1: 49184
             0: 8192
@@ -578,8 +622,6 @@ entities:
           -2,-1:
             1: 12637
             2: 546
-          -1,0:
-            0: 1911
           -3,-3:
             2: 34816
           -2,-3:
@@ -1684,26 +1726,6 @@ entities:
     - type: Transform
       pos: -4.5,-6.5
       parent: 1
-  - uid: 612
-    components:
-    - type: Transform
-      pos: -0.5,1.5
-      parent: 1
-  - uid: 613
-    components:
-    - type: Transform
-      pos: 0.5,1.5
-      parent: 1
-  - uid: 614
-    components:
-    - type: Transform
-      pos: -0.5,-0.5
-      parent: 1
-  - uid: 615
-    components:
-    - type: Transform
-      pos: 0.5,-0.5
-      parent: 1
 - proto: CableApcExtension
   entities:
   - uid: 468
@@ -3181,57 +3203,6 @@ entities:
       parent: 1
 - proto: Grille
   entities:
-  - uid: 37
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-2.5
-      parent: 1
-  - uid: 38
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 39
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 40
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 41
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 42
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-2.5
-      parent: 1
-  - uid: 48
-    components:
-    - type: Transform
-      pos: -3.5,3.5
-      parent: 1
-  - uid: 49
-    components:
-    - type: Transform
-      pos: -2.5,3.5
-      parent: 1
-  - uid: 50
-    components:
-    - type: Transform
-      pos: -1.5,3.5
-      parent: 1
   - uid: 80
     components:
     - type: Transform
@@ -3304,24 +3275,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,5.5
       parent: 1
-  - uid: 109
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,3.5
-      parent: 1
-  - uid: 110
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,3.5
-      parent: 1
-  - uid: 111
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,3.5
-      parent: 1
   - uid: 301
     components:
     - type: Transform
@@ -3566,111 +3519,13 @@ entities:
     - type: Transform
       pos: -2.7639015,7.472134
       parent: 1
-- proto: PlasmaReinforcedWindowDirectional
-  entities:
-  - uid: 616
-    components:
-    - type: Transform
-      pos: -3.5,2.5
-      parent: 1
-  - uid: 617
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 1
-  - uid: 618
-    components:
-    - type: Transform
-      pos: -1.5,2.5
-      parent: 1
-  - uid: 619
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-1.5
-      parent: 1
-  - uid: 620
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 621
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 622
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-1.5
-      parent: 1
-  - uid: 623
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-1.5
-      parent: 1
-  - uid: 624
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-1.5
-      parent: 1
-  - uid: 625
-    components:
-    - type: Transform
-      pos: 3.5,2.5
-      parent: 1
-  - uid: 626
-    components:
-    - type: Transform
-      pos: 2.5,2.5
-      parent: 1
-  - uid: 627
-    components:
-    - type: Transform
-      pos: 1.5,2.5
-      parent: 1
 - proto: PlastitaniumWindow
   entities:
-  - uid: 53
-    components:
-    - type: Transform
-      pos: -1.5,3.5
-      parent: 1
-  - uid: 54
-    components:
-    - type: Transform
-      pos: -3.5,3.5
-      parent: 1
-  - uid: 55
-    components:
-    - type: Transform
-      pos: -2.5,3.5
-      parent: 1
-  - uid: 56
-    components:
-    - type: Transform
-      pos: 1.5,3.5
-      parent: 1
-  - uid: 57
-    components:
-    - type: Transform
-      pos: 2.5,3.5
-      parent: 1
   - uid: 58
     components:
     - type: Transform
       pos: -1.5,5.5
       parent: 1
-  - uid: 59
-    components:
-    - type: Transform
-      pos: 3.5,3.5
-      parent: 1
   - uid: 60
     components:
     - type: Transform
@@ -3691,11 +3546,6 @@ entities:
     - type: Transform
       pos: 3.5,5.5
       parent: 1
-  - uid: 121
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 1
   - uid: 123
     components:
     - type: Transform
@@ -3706,26 +3556,6 @@ entities:
     - type: Transform
       pos: 2.5,-4.5
       parent: 1
-  - uid: 127
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 129
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 1
-  - uid: 130
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 134
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
   - uid: 135
     components:
     - type: Transform
@@ -3746,11 +3576,6 @@ entities:
     - type: Transform
       pos: -1.5,-4.5
       parent: 1
-  - uid: 161
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 1
   - uid: 824
     components:
     - type: Transform
@@ -3786,17 +3611,17 @@ entities:
       parent: 1
 - proto: PosterContrabandEnergySwords
   entities:
-  - uid: 711
+  - uid: 18
     components:
     - type: Transform
-      pos: -0.5,2.5
+      pos: -2.5,3.5
       parent: 1
 - proto: PosterContrabandEnlistGorlex
   entities:
-  - uid: 712
+  - uid: 19
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      pos: 2.5,-2.5
       parent: 1
 - proto: PosterContrabandFreeSyndicateEncryptionKey
   entities:
@@ -3821,35 +3646,35 @@ entities:
       parent: 1
 - proto: PoweredlightColoredBlack
   entities:
-  - uid: 429
+  - uid: 14
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,8.5
+      rot: 1.5707963267948966 rad
+      pos: -3.5,1.5
       parent: 1
-  - uid: 430
+  - uid: 15
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 3.5,-7.5
+      pos: 3.5,-0.5
       parent: 1
-  - uid: 431
+  - uid: 429
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,8.5
       parent: 1
-  - uid: 651
+  - uid: 430
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -1.5,0.5
+      pos: 3.5,-7.5
       parent: 1
-  - uid: 652
+  - uid: 431
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 1.5,0.5
+      pos: -3.5,-7.5
       parent: 1
 - proto: PoweredlightEmpty
   entities:
@@ -4545,65 +4370,65 @@ entities:
       parent: 1
 - proto: SpawnEventContrabandCrate
   entities:
-  - uid: 5
+  - uid: 3
     components:
     - type: Transform
-      pos: 2.5,2.5
+      pos: 0.5,1.5
       parent: 1
-  - uid: 6
+  - uid: 4
     components:
     - type: Transform
-      pos: 1.5,-1.5
+      pos: -0.5,1.5
       parent: 1
-  - uid: 7
+  - uid: 8
     components:
     - type: Transform
-      pos: -1.5,-1.5
+      pos: 1.5,1.5
       parent: 1
   - uid: 9
     components:
     - type: Transform
-      pos: -1.5,2.5
+      pos: 1.5,-0.5
       parent: 1
   - uid: 10
     components:
     - type: Transform
-      pos: 1.5,2.5
+      pos: 0.5,-0.5
       parent: 1
   - uid: 11
     components:
     - type: Transform
-      pos: 2.5,-1.5
+      pos: 2.5,1.5
       parent: 1
   - uid: 12
     components:
     - type: Transform
-      pos: -2.5,-1.5
+      pos: -2.5,1.5
       parent: 1
   - uid: 13
     components:
     - type: Transform
-      pos: -3.5,2.5
+      pos: 2.5,-0.5
       parent: 1
-  - uid: 14
+  - uid: 16
     components:
     - type: Transform
-      pos: -2.5,2.5
+      pos: -2.5,-0.5
       parent: 1
-  - uid: 15
+  - uid: 17
     components:
     - type: Transform
-      pos: 3.5,2.5
+      pos: -0.5,-0.5
       parent: 1
-  - uid: 16
+  - uid: 21
     components:
     - type: Transform
-      pos: 3.5,-1.5
+      pos: -1.5,-0.5
       parent: 1
-  - uid: 17
+  - uid: 27
     components:
     - type: Transform
-      pos: -3.5,-1.5
+      pos: -1.5,1.5
       parent: 1
 - proto: SpawnMobSyndicateNavalDeckhandVoid
   entities:
@@ -4631,15 +4456,15 @@ entities:
       parent: 1
 - proto: SpawnMobSyndicateNavalOperatorVoid
   entities:
-  - uid: 85
+  - uid: 5
     components:
     - type: Transform
-      pos: -2.5,0.5
+      pos: -2.5,2.5
       parent: 1
-  - uid: 93
+  - uid: 6
     components:
     - type: Transform
-      pos: 2.5,0.5
+      pos: 2.5,-1.5
       parent: 1
 - proto: SpawnMobSyndicateNavalSecondOfficerVoid
   entities:
@@ -4648,6 +4473,40 @@ entities:
     - type: Transform
       pos: 1.5,-8.5
       parent: 1
+- proto: SpawnMobWeaponTurretLaserSyndicateNF
+  entities:
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      pos: -7.5,0.5
+      parent: 1
+- proto: SpawnMobWeaponTurretSyndicate
+  entities:
+  - uid: 28
+    components:
+    - type: Transform
+      pos: -6.5,8.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: -6.5,-7.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 6.5,-7.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 1
 - proto: Stool
   entities:
   - uid: 371
@@ -4826,6 +4685,36 @@ entities:
     - type: Transform
       pos: -4.5,-10.5
       parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 1
+  - uid: 38
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
   - uid: 43
     components:
     - type: Transform
@@ -4841,6 +4730,21 @@ entities:
     - type: Transform
       pos: 1.5,-9.5
       parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: -2.5,3.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
   - uid: 51
     components:
     - type: Transform
@@ -4851,6 +4755,26 @@ entities:
     - type: Transform
       pos: 4.5,-9.5
       parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 1
   - uid: 61
     components:
     - type: Transform
@@ -5026,31 +4950,11 @@ entities:
     - type: Transform
       pos: 4.5,8.5
       parent: 1
-  - uid: 243
-    components:
-    - type: Transform
-      pos: -0.5,2.5
-      parent: 1
-  - uid: 287
-    components:
-    - type: Transform
-      pos: 0.5,2.5
-      parent: 1
   - uid: 288
     components:
     - type: Transform
       pos: -0.5,-2.5
       parent: 1
-  - uid: 320
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 321
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
   - uid: 322
     components:
     - type: Transform
@@ -5061,11 +4965,6 @@ entities:
     - type: Transform
       pos: 0.5,3.5
       parent: 1
-  - uid: 324
-    components:
-    - type: Transform
-      pos: -0.5,3.5
-      parent: 1
   - uid: 370
     components:
     - type: Transform
@@ -5209,18 +5108,6 @@ entities:
       parent: 1
 - proto: WallPlastitaniumIndestructible
   entities:
-  - uid: 72
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,0.5
-      parent: 1
-  - uid: 73
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,0.5
-      parent: 1
   - uid: 95
     components:
     - type: Transform
@@ -5229,61 +5116,11 @@ entities:
       parent: 1
 - proto: WarpPoint
   entities:
-  - uid: 645
+  - uid: 7
     components:
     - type: Transform
-      pos: 1.5,0.5
+      pos: 0.5,8.5
       parent: 1
     - type: WarpPoint
       location: Syndicate Weapons Cache
-- proto: WeaponTurretSyndicate
-  entities:
-  - uid: 3
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-1.5
-      parent: 1
-  - uid: 4
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-1.5
-      parent: 1
-  - uid: 8
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,2.5
-      parent: 1
-  - uid: 18
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,8.5
-      parent: 1
-  - uid: 19
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-7.5
-      parent: 1
-  - uid: 21
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,8.5
-      parent: 1
-  - uid: 27
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-7.5
-      parent: 1
-  - uid: 28
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,2.5
-      parent: 1
 ...
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
index c30b49d987d3..d1b5158f3d80 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
@@ -31,7 +31,7 @@
                   max: 4
 
 - type: entity
-  parent: BaseStructure
+  parent: [ BaseStructure, MobLaserReflect ]  # Frontier: added MobLaserReflect to prevent laser abuse from players, prototype is in \Resources\Prototypes\_NF\Entities\Mobs\NPCs\mob_hostile_base.yml
   id: BaseWeaponTurret
   name: ballistic turret
   abstract: true
@@ -124,6 +124,7 @@
   parent: BaseWeaponTurret
   id: WeaponTurretSyndicate
   suffix: Syndicate
+  noSpawn: true # Frontier
   components:
     - type: NpcFactionMember
       factions:
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/turret_spawner.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/turret_spawner.yml
new file mode 100644
index 000000000000..7feb1109eb32
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/turret_spawner.yml
@@ -0,0 +1,47 @@
+# Hostile
+- type: entity
+  id: SpawnMobWeaponTurretLaserSyndicateNF
+  parent: MarkerBase
+  name: syndicate laser turret spawner
+  suffix: Hostile, Frontier
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: _NF/Objects/Weapons/Guns/Turrets/laser.rsi
+      state: base
+  - type: ConditionalSpawner
+    prototypes:
+    - WeaponTurretLaserSyndicateNF
+
+- type: entity
+  id: SpawnMobWeaponTurretSyndicate
+  parent: MarkerBase
+  name: syndicate ballistic turret spawner
+  suffix: Hostile, Frontier
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Weapons/Guns/Turrets/turrets.rsi
+      state: syndie_lethal
+  - type: ConditionalSpawner
+    prototypes:
+    - WeaponTurretSyndicate
+
+# NT
+- type: entity
+  id: SpawnMobWeaponTurretLaserNanoTrasenDeployed
+  parent: MarkerBase
+  name: SLAT spawner
+  suffix: NT, Frontier
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+    - sprite: _NF/Objects/Weapons/Guns/Turrets/laser.rsi
+      state: base
+  - type: ConditionalSpawner
+    prototypes:
+    - WeaponTurretLaserNanoTrasenDeployed
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
index 6500297187f8..4cf19b84726e 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
@@ -66,7 +66,7 @@
   abstract: true
   components:
   - type: Reflect
-    reflectProb: 0.7
+    reflectProb: 0.8
     reflects:
       - Energy
 
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml
index 8c86c1a1a548..10eee38d8d93 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml
@@ -42,6 +42,7 @@
   parent:
   - MobBloodCultistBase
   - MobHumanoidHostileAISimpleRanged
+  - MobLaserReflect # Added to prevent laser abuse from players
   id: MobBloodCultistPriest
   description: Enlightened by the whispers of The Void That Is, these individuals are initiated into secret rituals. They lead the blood harvest and perform rites, bringing the day when Nar'Sie rises ever closer.
   noSpawn: true
@@ -75,6 +76,7 @@
   parent:
   - MobBloodCultistBase
   - MobHumanoidHostileAISimpleRanged
+  - MobLaserReflect # Added to prevent laser abuse from players
   id: MobBloodCultistJanitor
   description: The fate of blood cults on space stations hinges on the actions of a single individual - the station janitor. This humble worker serves as the primary line of defense against the presence of blood cults, but even the most resolute individuals can be swayed by corruption.
   noSpawn: true
@@ -109,6 +111,7 @@
   parent: 
   - MobBloodCultistBase
   - MobHumanoidHostileAISimpleMelee
+  - MobLaserReflect # Added to prevent laser abuse from players
   id: MobBloodCultistAcolyte
   description: |- 
    The acolyte - The most trusted cult follower and bodyguard of a priest, clad in the finest armor the cult has to offer and armed with the most vile weapons: eldrich blades and unholy halberds.
@@ -250,6 +253,7 @@
   parent:
   - MobNonHumanHostileBase
   - MobHumanoidHostileAIComplex
+  - MobLaserReflect # Added to prevent laser abuse from players
   #- MobBloodCultistTimedDespawn
   id: MobBloodCultistAscended
   components:
@@ -273,9 +277,6 @@
       path: /Audio/_NF/Effects/silence.ogg
   - type: Advertise
     pack: bloodcultisthumanoidchatter
-  - type: Reflect
-    reflectProb: .3
-    spread: 90
   - type: Sprite
     drawdepth: Mobs
     sprite: _NF/Mobs/BloodCult/ascended_cultist.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml
index c61140b4ebee..0ba03f915fe4 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml
@@ -150,7 +150,9 @@
         Base: dead
 
 - type: entity
-  parent: BaseMobFleshExpeditions
+  parent:
+  - BaseMobFleshExpeditions
+  - MobLaserReflect # Added to prevent laser abuse from players
   id: MobFleshAssimilatedMiner
   description: An unfortunate miner that was infected upon contact with aberrant flesh and has been slowly assimilated.
   noSpawn: true
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml
index 7fdfaca6ad96..458f047703ae 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml
@@ -358,6 +358,7 @@
   noSpawn: true
   parent:
   - MobExplorerBase
+  - MobLaserReflect # Added to prevent laser abuse from players
   id: MobExplorerHauler
   description: |- 
    Loaded with heavy equipment for industrial-scale looting. Pardon me, "asset recovery".
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml
index 5dc353c3aede..1c6ec2e1b5c8 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml
@@ -53,6 +53,7 @@
   - MobNonHumanHostileBase
   - MobHumanoidInvetorySimplified
   - MobRogueSiliconAISimpleRanged
+  - MobLaserReflect # Added to prevent laser abuse from players
   #- MobRogueSiliconTimedDespawn
   id: MobRogueSiliconBase
   components:
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml
index bb51694d1afa..d71895df0dbe 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml
@@ -321,13 +321,13 @@
         path: /Audio/_NF/Effects/silence.ogg
     - type: BasicEntityAmmoProvider
       proto: BulletPistol
-      capacity: 8
-      count: 8
+      capacity: 7
+      count: 7
     - type: Gun
       showExamineText: false
       minAngle: 10
       maxAngle: 30
-      fireRate: 8
+      fireRate: 5
       angleIncrease: 3
       angleDecay: 6
       selectedMode: FullAuto
@@ -512,7 +512,9 @@
 # Syndicate Commander, "armed" with AK
 - type: entity
   name: syndicate commander # Mega Fauna for Dungeons
-  parent: MobSyndicateNavalBase
+  parent:
+  - MobSyndicateNavalBase
+  - MobLaserReflect # Added to prevent laser abuse from players
   id: MobSyndicateNavalCommanderA
   description: A regional commander of Syndicate operations, this officer holds ultimate local command and responsibility. Armed with an assault rifle and heavily armored.
   noSpawn: true
@@ -728,7 +730,9 @@
 # Syndicate Captain, "armed" with Python
 - type: entity
   name: syndicate captain
-  parent: MobSyndicateNavalCaptainA
+  parent:
+  - MobSyndicateNavalCaptainA
+  - MobLaserReflect # Added to prevent laser abuse from players
   id: MobSyndicateNavalCaptainVoid
   noSpawn: true
   components:
@@ -742,7 +746,9 @@
 
 # Second Officer, "armed" with Advanced Laser Pistol
 - type: entity
-  parent: MobSyndicateNavalSecondOfficerA
+  parent:
+  - MobSyndicateNavalSecondOfficerA
+  - MobLaserReflect # Added to prevent laser abuse from players
   id: MobSyndicateNavalSecondOfficerVoid
   noSpawn: true
   components:
@@ -752,7 +758,9 @@
 
 # Syndicate Security Operative, "armed" with Atreides SMG
 - type: entity
-  parent: MobSyndicateNavalOperatorA
+  parent:
+  - MobSyndicateNavalOperatorA
+  - MobLaserReflect # Added to prevent laser abuse from players
   id: MobSyndicateNavalOperatorVoid
   noSpawn: true
   components:
@@ -762,7 +770,9 @@
 
 # Syndicate Engineer, "armed" with shotgun
 - type: entity
-  parent: MobSyndicateNavalEngineerA
+  parent:
+  - MobSyndicateNavalEngineerA
+  - MobLaserReflect # Added to prevent laser abuse from players
   id: MobSyndicateNavalEngineerVoid
   noSpawn: true
   components:
@@ -778,7 +788,9 @@
 
 # Syndicate Deckhand, "armed" with Viper
 - type: entity
-  parent: MobSyndicateNavalDeckhandA
+  parent:
+  - MobSyndicateNavalDeckhandA
+  - MobLaserReflect # Added to prevent laser abuse from players
   id: MobSyndicateNavalDeckhandVoid
   noSpawn: true
   components:
@@ -790,7 +802,9 @@
 
 # Syndicate Medic, "armed" poisoned darts
 - type: entity
-  parent: MobSyndicateNavalMedicA
+  parent:
+  - MobSyndicateNavalMedicA
+  - MobLaserReflect # Added to prevent laser abuse from players
   id: MobSyndicateNavalMedicVoid
   noSpawn: true
   components:
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml
index 6b600966fdec..0a9a5fbdf773 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml
@@ -14,6 +14,7 @@
   - MobPassiveRegen
   - MobHumanoidInvetory
   - MobHumanoidHostileAISimpleRanged
+  - MobLaserReflect # Added to prevent laser abuse from players
   #- MobWizFedTimedDespawn
   id: MobWizFedlBase
   components:
@@ -24,9 +25,6 @@
     rechargeCooldown: 3
     rechargeSound:
       path: /Audio/_NF/Effects/silence.ogg
-  - type: Reflect
-    reflectProb: .3
-    spread: 90
   - type: Flammable
     fireSpread: true
     canResistFire: true
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/base_turret.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/base_turret.yml
index 1619a05ff430..c98213cc9f7d 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/base_turret.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/base_turret.yml
@@ -1,6 +1,8 @@
 # BASE
 - type: entity # 'Gun', 'AmmoProvider' and 'ContainerContainer' components are not defined in this one
-  parent: BaseStructure
+  parent:
+  - BaseStructure
+  - MobLaserReflect # Preventing laser abuse from players, prototype is in \Resources\Prototypes\_NF\Entities\Mobs\NPCs\mob_hostile_base.yml
   id: BaseWeaponTurretNF
   name: turret
   suffix: Frontier
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml
index 2125ea1e1b43..83f27c4b2181 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml
@@ -83,6 +83,7 @@
   description: |-
    A Self-Recharging Laser Auto Turret (SLAT). A laser turret with built-in microreactor. Use screwdriver to disassemble.
   suffix: Frontier, NT
+  noSpawn: true
   components:
   - type: Sprite
     sprite: _NF/Objects/Weapons/Guns/Turrets/laser.rsi
@@ -151,6 +152,7 @@
   id: WeaponTurretLaserSyndicateNF
   name: laser turret
   suffix: Frontier, Syndicate
+  noSpawn: true
   components:
   - type: Sprite
     sprite: _NF/Objects/Weapons/Guns/Turrets/laser.rsi

From 5b74a8c42c9834e278bf0763d455001c8527c3fa Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 22:16:16 +0000
Subject: [PATCH 14/39] Automatic Changelog (#1844)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 3ad7a87bac32..78e15ac88a4e 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6243,3 +6243,11 @@ Entries:
       message: The Personal Transport has been reworked into a comfortable space taxi.
   id: 5194
   time: '2024-08-12T21:59:15.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Added to some hostile mobs (mostly the ones that wear some sort of space
+        suits) and all turrets a high chance of reflecting laser shots.
+  id: 5195
+  time: '2024-08-12T22:15:51.0000000+00:00'

From 8102c6b668740c543706d4922bd53ea42007caf1 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 12 Aug 2024 18:17:46 -0400
Subject: [PATCH 15/39] Add hovertaxibot (#1852)

---
 Content.Shared/Vehicle/SharedVehicleSystem.cs |  36 +++++++++++++-
 .../Components/VehicleHornComponent.cs        |  37 +++++++++++++++
 .../_NF/ghost/roles/ghost-role-component.ftl  |   9 ++--
 .../Prototypes/Entities/Mobs/NPCs/silicon.yml |   6 +++
 .../_NF/Entities/Mobs/NPCs/silicon.yml        |  44 ++++++++++++++++++
 .../Entities/Objects/Devices/production.yml   |   3 ++
 .../Crafting/Graphs/bots/hovertaxibot.yml     |  35 ++++++++++++++
 .../Prototypes/_NF/Recipes/Crafting/bots.yml  |  12 +++++
 Resources/Prototypes/_NF/tags.yml             |   3 ++
 .../Bots/hovertaxibot.rsi/engines.png         | Bin 0 -> 418 bytes
 .../Silicons/Bots/hovertaxibot.rsi/hull.png   | Bin 0 -> 1204 bytes
 .../Silicons/Bots/hovertaxibot.rsi/meta.json  |  37 +++++++++++++++
 .../Bots/hovertaxibot.rsi/unshaded.png        | Bin 0 -> 311 bytes
 13 files changed, 217 insertions(+), 5 deletions(-)
 create mode 100644 Content.Shared/_NF/Vehicle/Components/VehicleHornComponent.cs
 create mode 100644 Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Crafting/Graphs/bots/hovertaxibot.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Crafting/bots.yml
 create mode 100644 Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/engines.png
 create mode 100644 Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/hull.png
 create mode 100644 Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/unshaded.png

diff --git a/Content.Shared/Vehicle/SharedVehicleSystem.cs b/Content.Shared/Vehicle/SharedVehicleSystem.cs
index fc97130f700d..f56cb8bc5f4a 100644
--- a/Content.Shared/Vehicle/SharedVehicleSystem.cs
+++ b/Content.Shared/Vehicle/SharedVehicleSystem.cs
@@ -1,10 +1,10 @@
 using System.Numerics;
+using Content.Shared._NF.Vehicle.Components;
 using Content.Shared.Access.Components;
 using Content.Shared.Actions;
 using Content.Shared.Audio;
 using Content.Shared.Buckle;
 using Content.Shared.Buckle.Components;
-using Content.Shared.Hands;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Item;
 using Content.Shared.Light.Components;
@@ -13,7 +13,6 @@
 using Content.Shared.Popups;
 using Content.Shared.Tag;
 using Content.Shared.Vehicle.Components;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
@@ -64,6 +63,10 @@ public override void Initialize()
         SubscribeLocalEvent<VehicleComponent, GetAdditionalAccessEvent>(OnGetAdditionalAccess);
 
         SubscribeLocalEvent<InVehicleComponent, GettingPickedUpAttemptEvent>(OnGettingPickedUpAttempt);
+
+        SubscribeLocalEvent<VehicleHornComponent, ComponentInit>(OnVehicleHornInit);
+        SubscribeLocalEvent<VehicleHornComponent, ComponentShutdown>(OnVehicleHornShutdown);
+        SubscribeLocalEvent<VehicleHornComponent, HonkActionEvent>(OnHornHonkAction); // Frontier: for vehicles with innate horns (e.g. taxibot)
     }
 
     /// <summary>
@@ -352,6 +355,35 @@ private void UpdateAutoAnimate(EntityUid uid, bool autoAnimate)
     {
         Appearance.SetData(uid, VehicleVisuals.AutoAnimate, autoAnimate);
     }
+
+    /// Horn-only functions
+    private void OnVehicleHornShutdown(EntityUid uid, VehicleHornComponent component, ComponentShutdown args)
+    {
+        // Perf: If the entity is deleting itself, no reason to change these back.
+        if (Terminating(uid))
+            return;
+
+        _actionsSystem.RemoveAction(uid, component.ActionEntity);
+    }
+
+    private void OnVehicleHornInit(EntityUid uid, VehicleHornComponent component, ComponentInit args)
+    {
+        _actionsSystem.AddAction(uid, ref component.ActionEntity, out var _, component.Action);
+    }
+
+    /// <summary>
+    /// This fires when the vehicle entity presses the honk action
+    /// </summary>
+    private void OnHornHonkAction(EntityUid uid, VehicleHornComponent vehicle, HonkActionEvent args)
+    {
+        if (args.Handled || vehicle.HornSound == null)
+            return;
+
+        // TODO: Need audio refactor maybe, just some way to null it when the stream is over.
+        // For now better to just not loop to keep the code much cleaner.
+        vehicle.HonkPlayingStream = _audioSystem.PlayPredicted(vehicle.HornSound, uid, args.Performer)?.Entity;
+        args.Handled = true;
+    }
 }
 
 /// <summary>
diff --git a/Content.Shared/_NF/Vehicle/Components/VehicleHornComponent.cs b/Content.Shared/_NF/Vehicle/Components/VehicleHornComponent.cs
new file mode 100644
index 000000000000..1a373268ceff
--- /dev/null
+++ b/Content.Shared/_NF/Vehicle/Components/VehicleHornComponent.cs
@@ -0,0 +1,37 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Content.Shared.Vehicle;
+
+namespace Content.Shared._NF.Vehicle.Components;
+
+/// <summary>
+/// 
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedVehicleSystem))]
+public sealed partial class VehicleHornComponent : Component
+{
+    /// <summary>
+    /// The sound that the horn makes
+    /// </summary>
+    [DataField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public SoundSpecifier? HornSound = new SoundPathSpecifier("/Audio/Effects/Vehicle/carhorn.ogg")
+    {
+        Params = AudioParams.Default.WithVolume(-3f)
+    };
+
+    [ViewVariables]
+    public EntityUid? HonkPlayingStream;
+
+    [DataField]
+    public EntProtoId? Action = "ActionVehicleHorn";
+
+    /// <summary>
+    /// The action for the horn (if any)
+    /// </summary>
+    [DataField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public EntityUid? ActionEntity;
+}
diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
index 7f6faef394a5..7fa9ddf294a3 100644
--- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
@@ -24,12 +24,15 @@ ghost-role-information-mistake-description = Ymg' ph'nglui ah li.
 ghost-role-information-ert-mailcarrier-name = ERT Mail Carrier
 ghost-role-information-ert-mailcarrier-description = Assist with delivery efforts to resolve the station's issues.
 
-ghost-role-information-jerma-name = Jerma
-ghost-role-information-jerma-description = Pog moment
-
 ghost-role-information-baby-dragon-name = Baby space dragon
 ghost-role-information-baby-dragon-description = Hatch from your egg and go on incredible adventures with your mom and their crew!
 ghost-role-information-baby-dragon-rules = You are a [color=#6495ed][bold]Familiar[/bold][/color]. Serve the interests of your new mom, whatever those may be.
                                         You don't remember any of your previous life, and you don't remember anything you learned as a ghost.
                                         You are allowed to remember knowledge about the game in general, such as how to cook, how to use objects, etc.
                                         You are absolutely [color=red]NOT[/color] allowed to remember, say, the name, appearance, etc. of your previous character.
+
+ghost-role-information-taxibot-name = Taxibot
+ghost-role-information-taxibot-description = Drive passengers to where they need to go.
+
+ghost-role-information-hovertaxibot-name = Hovertaxibot
+ghost-role-information-hovertaxibot-description = Fly passengers to where they need to go, remember to check they can breathe!
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 1f062e5b2bdf..4c27841a4fa7 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -103,6 +103,7 @@
     - Robotics
   - type: Speech
     speechVerb: Robotic
+    speechSounds: Pai # Frontier: give robots beepy speech sounds
   - type: TypingIndicator
     proto: robot
   - type: ZombieImmune
@@ -141,12 +142,15 @@
   - type: GhostRole
     name: ghost-role-information-taxibot-name
     description: ghost-role-information-taxibot-description
+    rules: ghost-role-information-nonantagonist-rules # Frontier?
   - type: Strap
     buckleOffset: "0, 0"
+    unbuckleDistanceSquared: 0.09 # Frontier: (30 cm)^2 - seems unnecessary, but for consistency with vehicles
     # maxBuckleDistance: 1 # Umbra - buckling fix
   - type: Construction
     graph: TaxiBot
     node: bot
+  - type: VehicleHorn # Frontier: beep beep
 
 - type: entity
   parent: MobSiliconBase
@@ -365,6 +369,8 @@
     interactFailureString: petting-failure-mimebot
   - type: Inventory
     templateId: head
+  - type: Speech # Frontier: robots have beepy speech sounds, but not the mimebot
+    speechSounds: null # Frontier: robots have beepy speech sounds, but not the mimebot
 
 - type: entity
   parent: MobSiliconBase
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
new file mode 100644
index 000000000000..a46359578cdc
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
@@ -0,0 +1,44 @@
+- type: entity
+  parent: MobSiliconBaseVehicle
+  id: MobHoverTaxiBot
+  name: hovertaxibot
+  description: Give a ride? IN SPAAAAACE!
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Silicons/Bots/hovertaxibot.rsi
+    layers:
+    - state: hull
+    - state: engines
+      map: ["enum.VehicleVisualLayers.AutoAnimate"]
+      shader: unshaded
+    - state: unshaded
+      shader: unshaded
+  - type: GhostRole
+    name: ghost-role-information-hovertaxibot-name
+    description: ghost-role-information-hovertaxibot-description
+    rules: ghost-role-information-nonantagonist-rules
+  - type: MovementIgnoreGravity
+  - type: MovementAlwaysTouching
+  - type: CanMoveInAir
+  - type: Strap
+    buckleOffset: "0, 0"
+    unbuckleDistanceSquared: 0.09 # (30 cm)^2 - seems unnecessary, but for consistency with vehicles
+  - type: MovementSpeedModifier # Matches a hoverbike
+    acceleration: 2
+    friction: 1.5
+    baseWalkSpeed: 4.5
+    baseSprintSpeed: 7
+  - type: Construction
+    graph: HoverTaxiBot
+    node: bot
+  - type: UserInterface
+    interfaces:
+      enum.RadarConsoleUiKey.Key:
+        type: RadarConsoleBoundUserInterface
+  - type: IntrinsicUI
+    uis:
+      enum.RadarConsoleUiKey.Key:
+        toggleAction: ActionObserverShowRadar
+  - type: RadarConsole
+    followEntity: true
+  - type: VehicleHorn
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
index 094823f89948..4d89fa756c7f 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
@@ -95,6 +95,9 @@
       Steel: 5
   - type: StaticPrice
     price: 12.5
+  - type: Tag # Frontier
+    tags: # Frontier
+    - SmallThrusterMachineCircuitboard # Frontier
 
 # Gyroscope
 - type: entity
diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/bots/hovertaxibot.yml b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/bots/hovertaxibot.yml
new file mode 100644
index 000000000000..59fae2a5e15f
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/bots/hovertaxibot.yml
@@ -0,0 +1,35 @@
+- type: constructionGraph
+  id: HoverTaxiBot
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: bot
+      steps:
+      - tag: ProximitySensor
+        icon:
+          sprite: Objects/Misc/proximity_sensor.rsi
+          state: icon
+        name: proximity sensor
+      - tag: BorgHead
+        icon:
+          sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+          state: borg_head
+        name: borg head
+        doAfter: 1
+      - tag: BorgArm
+        icon:
+          sprite: Mobs/Silicon/drone.rsi
+          state: l_hand
+        name: borg arm
+        doAfter: 2
+      - tag: SmallThrusterMachineCircuitboard
+        icon:
+          sprite: Objects/Misc/module.rsi
+          state: generic
+        name: small thruster machine board
+        doAfter: 2
+      - material: Steel
+        amount: 10
+  - node: bot
+    entity: MobHoverTaxiBot
diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/bots.yml b/Resources/Prototypes/_NF/Recipes/Crafting/bots.yml
new file mode 100644
index 000000000000..ae181c32a7d7
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Crafting/bots.yml
@@ -0,0 +1,12 @@
+- type: construction
+  name: hovertaxibot
+  id: hovertaxibot
+  graph: HoverTaxiBot
+  startNode: start
+  targetNode: bot
+  category: construction-category-utilities
+  objectType: Item
+  description: This spacefaring bot takes people to their destination.
+  icon:
+    sprite: _NF/Mobs/Silicons/Bots/hovertaxibot.rsi
+    state: hull
diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml
index 7c22608307c9..99764d2d3805 100644
--- a/Resources/Prototypes/_NF/tags.yml
+++ b/Resources/Prototypes/_NF/tags.yml
@@ -93,3 +93,6 @@
 
 - type: Tag
   id: ClothingRobesGoblin
+
+- type: Tag
+  id: SmallThrusterMachineCircuitboard
diff --git a/Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/engines.png b/Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/engines.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8ae905a062956c50a4ba8ab9d1461c905e37bd9
GIT binary patch
literal 418
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV9fM%aSW-L^Y+fh+(Ql`3>TD{
zmvro55aBtbF!9nx)}&4i(`Ey9FGrPEBGbeRx;R)g4kX?`8d102>CyfFHIKFb^D_d?
zLVy>OFD}(jJDt1t|DHG>y<@SL)sEMMUY#F*-}9CKan~OewPFAH{ipM-7oU8wB*tWA
zb&{2yl=+8$-!AQ{n=RwKUf#)K@6rF2W-a%l4dO$4i?>+rzd5yZ)vwvHH#OX+|K*SB
zYk$^{unoit+903s;OkrVfd5v%8Q-u=$oxii5yOlAn?=#*!$WJc_gJgxnO*-m^X$5w
zRrT6H=ElDs-`95Do3Z0YjBj1>x_|ua!ADJR3Jd%`ko4%C?Adp}m|8C6{^wu#TD;)J
zS5#wPbWce>zw;aOk~s_Qrx(4mzh2ic=dV29vW}hV?;=j^{0?+RQCx$-uDAacOa3zP
bE&a#8=#h<c;<|HkAV+(;`njxgN@xNAV?U}J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/hull.png b/Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/hull.png
new file mode 100644
index 0000000000000000000000000000000000000000..7761f43d2e1b658a63cf0f9d7ead93835a3b5c9f
GIT binary patch
literal 1204
zcmV;l1WWsgP)<h;3K|Lk000e1NJLTq001BW004jp1^@s6YG!L1000DgNkl<Zc%1E<
zPiPxQ6vn>|ra8naIHb*Lb4W_jnwX^|OrR&_;7cjg<lq+CQV6~D;;NUPO>27YrEU&s
z4kb{iOYtGNP<l~7I)p+*jWIS^QGyPU7ZqZtm4kJe9!5JJjdo^dWfLFzejv2F^Jd=D
z{1N-UodpPjAP9mWP8qL=@skbk@bd7)2b%Q=08pLZ1`=^O?f|n3?(I4oO6R^fZ`LDx
z@b^CefM4HyO#}e|NwFZ#OyYd?P6fB>&t&<n`ZKKFsfZIF2rr8|Cl-LtwX0{bQoeve
zXMjOxfR*wET)TR9lBV3ci800>|JV{I$`EYs9?F2!Apn3IpE9&st=#sl25Hx?u2*pX
zw^wm+aNrUzN~IERzxOX{i|yR`U@TB)d~@e$w#R?koriBLt7A^|iY<sKYiqukaE-rS
z!TFhU*xaq4w$v77$+#_Gu<w{%*aH|kIX`m_&-Y&dSH>M?F=DR=s$pFPaR;a^wh>)P
zaP#^BYKv`ImUgrLt=q?zUk_O30Aq}+lWybNSRTuN!;FAa7QPJSalhY3x7*G1<+Kcg
zAdr75)6>&d+kU?<k4;Wh>~lcFr9ogcV1ghBf*=Tj$irD5V2ojJZx29j+U=FgWwctY
zV+EE;5CoiWL411JXL!Bn9kH`M5QZUtc(<Et_wa5PVHi3G;S>O4Og1R9A2sJov@)%Z
zjfwSvQmHgztCyXqJ^(;w!!G&&fRP?LmOkL(Ak$VoKbAh=1K+%1wKB5&6uJ6<bqIi?
zR6H-w*U{@09)gd*W;l*MF#G<fJ^*AdVbTW(f*=TjAWoe^PtRS^pEU#Uyw|gBol-Nt
z1@4;fWj$s0?_D(3%?*HWfx{O!n?;gNB*MA+lzpNA;tq0?i<C5%NN>-pbK7_@e+h%m
zz*xsR2fq8NGV+VR|JefoFOK6}+bq6VX^;7n7x<Q4`DpG$@?mryF1FrV%8!4tAtqTE
zhCH2c`f+0|lE*<1@E{1JIwI|R+4iP3WdO3lp~NzF+yif{MV$A*8DpF=Ca<eDX>cRg
z4Q)2oA})tO-yM_Lt@Y?=mxRkO)RkdS+f2j|{q*|`ez@QCrU2lV4@KGXQ|I>G$<Pfp
z*AK<xeJIOt`4P;^ErHlCl2~kpc1Xk~hU(n5u{Uc=ZQQ&rGVk#ru&}yb5gS$vGd%79
ze>|?>of~aq3a{GEF2M5up=b?7$d|@Y%=F}1bd}Xk3YRTD1VIo4K@k5BjJHL+C%ym_
z-mqQ-V|MJ{yU5d>vPCznrzzO60szFW`DQ(GPR~>4{eB<t^Alcc0E5l|59Tk8Y|jSV
zdm$aRJTk|0(p*0bLjd5Pf5dZb#{xK2eV~Xopz8r@Dqchz7#YgOT9lj5r;bv``t?*d
zP_=}-Hsug}cDu?yd3S$2qfL}9EvgNe?6tRXrU2mi{tImG9-=z08T%--1f9^f1DpXM
zw&E|fjTNeM+u|)6M}0tQ2?m?xM@Og5`hZLB-`o)|zNqgZ*xDm~;AQ$FjQj_XCfIsR
SYqGNd0000<MNUMnLSTXkkUC@l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/meta.json b/Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/meta.json
new file mode 100644
index 000000000000..7d0388e4e0a1
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/meta.json
@@ -0,0 +1,37 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "hull drawn by FillerVK, modified by Diebeck, modified by Whatstone (Discord), unshaded and engines by Whatstone (Discord)",
+  "states": [
+    {
+      "name": "engines",
+      "directions": 4,
+      "delays": [
+        [
+          0.2, 0.2, 0.2, 0.2
+        ],
+        [
+          0.2, 0.2, 0.2, 0.2
+        ],
+        [
+          0.2, 0.2, 0.2, 0.2
+        ],
+        [
+          0.2, 0.2, 0.2, 0.2
+        ]
+      ]
+    },
+    {
+      "name": "hull",
+      "directions": 4
+    },
+    {
+      "name": "unshaded",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/unshaded.png b/Resources/Textures/_NF/Mobs/Silicons/Bots/hovertaxibot.rsi/unshaded.png
new file mode 100644
index 0000000000000000000000000000000000000000..0486d8d6f57880116da17a118113ad6290cba29b
GIT binary patch
literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq001BW004jp1^@s6YG!L10002~Nkl<Zc%1Fp
zJ#NB45QgCoIz-`m3JSZ(4Je}&IRWA(T!vFvoPZ)q#{nqPq;O#=Qi>D^Dux2_BSB$%
zBQHPi<Hp78c(t~R-5Ci00003dzQ00pbeayd!n{}ZBuQ&qs~nV#b2Vm#xfK?)0=N(U
zJ9XbIE5GYH@!d)p`)|_fqw4eP#{&QW004lPDxGZQiG1{uo(8?XUybw6`SE`C^{w$=
z^HVqg007{z_)p{sgjU#tSYe(mvbY6qD(tvPhw^?`lD5Ot^F-}_spsYW?J(sx0RR91
zE<E?1UXrp!7PoPoJv~}gr*;3o?c4iXZpF_NdGsTJ=o0{L#tw!tT311xHJ$(f002ov
JPDHLkV1n<(hAjX9

literal 0
HcmV?d00001


From 2cc2c3ebb4de1c3f5f57cfdc4baa8b0c79b61905 Mon Sep 17 00:00:00 2001
From: Dvir <39403717+dvir001@users.noreply.github.com>
Date: Tue, 13 Aug 2024 01:18:58 +0300
Subject: [PATCH 16/39] Crescent (Update) (#1796)

* Update crescent.yml

* Update crescent.yml
---
 Resources/Maps/_NF/Shuttles/crescent.yml | 2559 +++-------------------
 1 file changed, 330 insertions(+), 2229 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml
index d4adb954d5b6..0b06692f79f4 100644
--- a/Resources/Maps/_NF/Shuttles/crescent.yml
+++ b/Resources/Maps/_NF/Shuttles/crescent.yml
@@ -668,332 +668,308 @@ entities:
       data:
         tiles:
           0,0:
-            0: 65535
-          0,1:
-            0: 65535
+            0: 61695
           0,-1:
-            0: 65521
+            0: 65280
+          -1,0:
+            0: 65279
+          0,1:
+            0: 61695
+          -1,1:
+            0: 62719
           0,2:
-            0: 65535
+            0: 14911
+          -1,2:
+            0: 35743
           0,3:
+            0: 48123
+          -1,3:
             0: 65535
+          0,4:
+            0: 43835
           1,0:
-            0: 65535
+            0: 63675
           1,1:
-            0: 65535
+            0: 61631
           1,2:
-            0: 65535
+            0: 2975
           1,3:
             0: 65535
+          1,-1:
+            0: 12288
+          1,4:
+            0: 47903
           2,0:
-            0: 65535
+            0: 64733
           2,1:
-            0: 65535
+            0: 62207
           2,2:
-            0: 65535
+            0: 3407
           2,3:
-            0: 65535
-          3,0:
-            0: 65535
+            0: 61166
+          2,4:
+            0: 65326
           3,1:
-            0: 65535
+            0: 30318
           3,2:
-            0: 65535
+            0: 26215
+          3,0:
+            0: 61152
           3,3:
-            0: 65535
-          1,-1:
-            0: 63248
-          2,-1:
-            0: 61440
-          3,-1:
+            0: 58982
+          3,4:
+            0: 30574
+          4,0:
+            0: 65392
+          4,1:
+            0: 62351
+          4,2:
+            0: 4095
+          4,3:
+            1: 17
             0: 61440
+            4: 68
+          -1,-1:
+            0: 65024
           -4,0:
-            0: 65535
+            0: 46072
+          -5,0:
+            0: 36736
           -4,1:
-            0: 65535
+            0: 61883
+          -5,1:
+            0: 48059
           -4,2:
-            0: 65535
+            0: 56783
+          -5,2:
+            0: 65327
           -4,3:
-            0: 65535
+            0: 64733
+          -5,3:
+            0: 61663
+            7: 32
+          -4,4:
+            0: 52431
+            1: 4096
+          -4,-1:
+            2: 8192
+            0: 32768
           -3,0:
-            0: 65535
+            0: 20667
           -3,1:
-            0: 65535
+            0: 62581
           -3,2:
-            0: 65535
+            0: 1615
           -3,3:
-            0: 4369
-            1: 61166
+            0: 256
+            3: 61166
+          -3,-1:
+            0: 8192
+          -3,4:
+            3: 14
+            0: 26112
           -2,0:
-            0: 65535
+            0: 62139
           -2,1:
-            0: 65535
+            0: 63743
           -2,2:
-            0: 65535
+            0: 2863
           -2,3:
-            0: 65535
-          -1,0:
-            0: 65535
-          -1,1:
-            0: 65535
-          -1,2:
-            0: 65535
-          -1,3:
-            0: 65535
-          -4,-1:
-            0: 49152
-            2: 8192
-          -3,-1:
-            0: 61440
+            0: 61166
+          -2,4:
+            0: 47886
           -2,-1:
-            0: 64512
-          -1,-1:
-            0: 65520
-          4,0:
-            0: 65535
-          4,1:
-            0: 65535
-          4,2:
-            0: 65535
-          4,3:
-            2: 17
-            0: 65450
-            3: 68
+            0: 32768
+          -1,4:
+            0: 48015
+          4,4:
+            0: 15
+            1: 4608
           5,0:
-            0: 65392
+            0: 29440
           5,1:
-            0: 65535
+            0: 61815
           5,2:
-            0: 65535
+            0: 4095
           5,3:
-            4: 17
-            0: 65450
-            5: 68
-          6,1:
-            0: 63251
-            2: 32
+            5: 17
+            0: 61440
+            6: 68
+          5,4:
+            0: 15
+            1: 16896
+          6,0:
+            2: 4096
           6,2:
-            0: 65535
+            0: 26230
           6,3:
-            0: 65535
+            0: 63239
+          6,1:
+            2: 32
+            0: 8192
+          6,4:
+            0: 65319
           7,2:
-            2: 4096
+            1: 4096
           7,3:
-            0: 13105
-            2: 52418
+            0: 12544
+            1: 2
+            2: 52416
+          7,4:
+            0: 4353
+            2: 204
           -8,3:
-            2: 26216
-            0: 34944
-          -7,2:
-            2: 4096
-            0: 61166
+            2: 26208
+            0: 32768
+            1: 8
+          -8,4:
+            2: 102
           -7,3:
-            0: 65535
+            0: 61900
+          -7,2:
+            1: 4096
+            0: 49356
+          -7,4:
+            0: 49037
           -7,1:
-            0: 60544
-            2: 8
-          -6,1:
-            0: 65535
+            0: 32768
+            1: 8
           -6,2:
-            0: 65535
+            0: 28286
           -6,3:
-            0: 65535
+            0: 62567
+          -6,1:
+            0: 61166
+          -6,4:
+            0: 4383
+            1: 18432
           -6,0:
-            0: 65216
-          -5,0:
-            0: 65534
-          -5,1:
-            0: 65535
-          -5,2:
-            0: 65535
-          -5,3:
-            0: 65535
-          -8,4:
-            2: 102
-            0: 34952
+            0: 34816
+          -5,4:
+            0: 15
+            1: 2048
           -8,5:
-            0: 52428
+            0: 34944
           -8,6:
-            0: 52428
+            0: 2184
           -8,7:
-            0: 52428
-          -7,4:
-            0: 65535
+            0: 34952
           -7,5:
-            0: 65535
+            0: 65529
           -7,6:
-            0: 65535
+            0: 5471
           -7,7:
-            0: 65535
-          -6,4:
-            0: 14335
-            2: 18432
+            0: 63965
+          -8,8:
+            0: 136
+          -7,8:
+            0: 55807
           -6,5:
-            0: 13107
+            0: 4369
           -6,6:
-            0: 13107
+            0: 273
           -6,7:
-            0: 13107
-          -5,4:
-            0: 255
-            2: 2048
-          4,4:
-            0: 511
-            2: 4608
-          5,4:
-            0: 36095
-            2: 16896
-          5,5:
-            0: 34952
-          5,6:
-            0: 34952
-          5,7:
-            0: 34952
-          6,4:
-            0: 65535
+            0: 4113
+          -6,8:
+            0: 12305
           6,5:
-            0: 65535
+            0: 30578
           6,6:
-            0: 65535
+            0: 32639
           6,7:
-            0: 65535
-          7,4:
-            0: 13107
-            2: 204
+            0: 28791
+          6,8:
+            0: 639
+            1: 12288
           7,5:
-            0: 30583
+            0: 9008
           7,6:
-            0: 30583
+            0: 13090
           7,7:
-            0: 30583
-          -8,8:
-            0: 36044
-          -8,9:
-            0: 8
-          -7,8:
-            0: 65535
+            0: 12595
+          7,8:
+            0: 4403
           -7,9:
-            0: 3839
+            0: 204
             2: 32768
-          -6,8:
-            0: 30515
           -6,9:
-            0: 1911
+            0: 51
             2: 28672
           -6,10:
             2: 18039
           -6,11:
             2: 68
           5,8:
-            0: 19592
-            2: 32768
+            1: 32768
           5,9:
-            0: 3140
-            2: 49288
+            1: 136
+            2: 49152
           5,10:
             2: 19660
           5,11:
             2: 68
-          6,8:
-            0: 53247
-            2: 12288
           6,9:
-            2: 12595
-            0: 3788
+            1: 51
+            2: 12288
           6,10:
             2: 17
-          7,8:
-            0: 14199
-          7,9:
-            0: 19
-          -4,4:
-            0: 61439
-            2: 4096
           -4,5:
-            0: 61166
-          -4,6:
-            0: 140
-          -3,4:
-            0: 65521
-            1: 14
+            0: 3276
           -3,5:
-            0: 65535
+            0: 4084
           -3,6:
-            0: 61439
-          -3,7:
-            0: 140
-          -2,4:
-            0: 65535
+            0: 36079
           -2,5:
-            0: 65535
+            0: 61426
           -2,6:
-            0: 65535
+            0: 61182
           -2,7:
-            0: 65535
-          -1,4:
-            0: 65535
+            0: 61166
+          -2,8:
+            0: 61166
           -1,5:
-            0: 65535
+            0: 65529
           -1,6:
-            0: 65535
+            0: 26191
           -1,7:
-            0: 4607
+            0: 6
             2: 28160
-          0,4:
-            0: 65535
+          -1,8:
+            2: 2
           0,5:
-            0: 65535
+            0: 16371
           0,6:
-            0: 65535
+            0: 48027
           0,7:
-            0: 36095
-          1,4:
-            0: 65535
+            0: 131
           1,5:
-            0: 65535
+            0: 8184
           1,6:
-            0: 65535
+            0: 43775
           1,7:
-            0: 65535
-          2,4:
-            0: 65535
+            0: 65528
           2,5:
-            0: 65535
+            0: 4095
           2,6:
-            0: 65535
+            0: 8895
           2,7:
-            0: 4919
-          3,4:
-            0: 65535
+            0: 16
           3,5:
-            0: 65535
+            0: 1911
           3,6:
-            0: 311
+            0: 1
           -3,9:
-            0: 34944
-          -3,10:
-            0: 136
-          -2,8:
-            0: 65535
+            0: 2048
           -2,9:
-            0: 65535
+            0: 65514
+          -3,10:
+            0: 8
           -2,10:
-            0: 4095
-          -1,8:
-            0: 4369
-            2: 2
+            0: 2799
           -1,9:
-            0: 13105
+            0: 4864
           -1,10:
-            0: 307
-          0,8:
-            0: 8
-          1,8:
-            0: 15
-          2,8:
-            0: 1
-          6,0:
-            2: 4096
+            0: 3
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -1011,14 +987,14 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 340
+          temperature: 293.15
           moles:
-          - 21.824879
-          - 82.10312
           - 0
           - 0
           - 0
-          - 82.10312
+          - 0
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -1026,7 +1002,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -1040,6 +1016,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 340
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -1085,6 +1076,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.6852
+          - 81.57766
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -1094,8 +1100,6 @@ entities:
   entities:
   - uid: 1130
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 2230
     - type: InstantAction
@@ -1104,79 +1108,57 @@ entities:
   entities:
   - uid: 2
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,25.5
       parent: 1
   - uid: 3
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,9.5
       parent: 1
   - uid: 4
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,9.5
       parent: 1
   - uid: 5
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,9.5
       parent: 1
   - uid: 6
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,9.5
       parent: 1
   - uid: 7
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,9.5
       parent: 1
   - uid: 8
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,20.5
       parent: 1
   - uid: 9
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,20.5
       parent: 1
   - uid: 10
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,20.5
       parent: 1
   - uid: 11
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,25.5
       parent: 1
   - uid: 13
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,6.5
       parent: 1
@@ -1184,8 +1166,6 @@ entities:
   entities:
   - uid: 12
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,6.5
       parent: 1
@@ -1193,23 +1173,18 @@ entities:
   entities:
   - uid: 14
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,17.5
       parent: 1
   - uid: 15
     components:
     - type: MetaData
-      flags: PvsPriority
       name: room of tranquility
     - type: Transform
       pos: 9.5,17.5
       parent: 1
   - uid: 31
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,13.5
@@ -1218,8 +1193,6 @@ entities:
   entities:
   - uid: 16
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5,25.5
@@ -1228,8 +1201,6 @@ entities:
   entities:
   - uid: 17
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,10.5
       parent: 1
@@ -1237,78 +1208,56 @@ entities:
   entities:
   - uid: 18
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,21.5
       parent: 1
   - uid: 19
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,22.5
       parent: 1
   - uid: 20
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,17.5
       parent: 1
   - uid: 21
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,17.5
       parent: 1
   - uid: 22
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,21.5
       parent: 1
   - uid: 23
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,22.5
       parent: 1
   - uid: 24
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,23.5
       parent: 1
   - uid: 25
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,28.5
       parent: 1
   - uid: 26
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,26.5
       parent: 1
   - uid: 27
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,26.5
       parent: 1
   - uid: 28
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,26.5
       parent: 1
@@ -1316,59 +1265,43 @@ entities:
   entities:
   - uid: 29
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,34.5
       parent: 1
   - uid: 30
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,34.5
       parent: 1
   - uid: 32
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,9.5
       parent: 1
   - uid: 33
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 10.5,24.5
       parent: 1
   - uid: 34
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,6.5
       parent: 1
   - uid: 35
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,4.5
       parent: 1
   - uid: 36
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 24.5,9.5
       parent: 1
   - uid: 2721
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,6.5
       parent: 1
@@ -1569,71 +1502,51 @@ entities:
   entities:
   - uid: 74
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,14.5
       parent: 1
   - uid: 75
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,20.5
       parent: 1
   - uid: 76
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,20.5
       parent: 1
   - uid: 77
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,20.5
       parent: 1
   - uid: 78
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,2.5
       parent: 1
   - uid: 79
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,3.5
       parent: 1
   - uid: 80
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,30.5
       parent: 1
   - uid: 81
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,34.5
       parent: 1
   - uid: 82
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,27.5
       parent: 1
   - uid: 83
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,12.5
       parent: 1
@@ -1648,45 +1561,33 @@ entities:
   entities:
   - uid: 84
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,30.5
       parent: 1
   - uid: 85
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,17.5
       parent: 1
   - uid: 86
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,34.5
       parent: 1
   - uid: 87
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,32.5
       parent: 1
   - uid: 88
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,26.5
       parent: 1
   - uid: 89
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 25.5,20.5
@@ -1695,8 +1596,6 @@ entities:
   entities:
   - uid: 90
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,23.5
       parent: 1
@@ -1716,12 +1615,14 @@ entities:
           showEnts: False
           occludes: True
           ent: 92
+        fuelSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 1174
 - proto: AmeJar
   entities:
   - uid: 92
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 91
     - type: Physics
@@ -1736,11 +1637,12 @@ entities:
     - type: Transform
       pos: 13.751163,2.6970534
       parent: 1
-  - uid: 1197
+  - uid: 1174
     components:
     - type: Transform
-      pos: 13.501163,2.7908034
-      parent: 1
+      parent: 91
+    - type: Physics
+      canCollide: False
 - proto: AmeShielding
   entities:
   - uid: 94
@@ -1850,8 +1752,6 @@ entities:
     - type: Transform
       pos: -3.5,17.5
       parent: 1
-- proto: APCBasic
-  entities:
   - uid: 113
     components:
     - type: Transform
@@ -1877,8 +1777,6 @@ entities:
     - type: Transform
       pos: 23.5,11.5
       parent: 1
-- proto: APCBasic
-  entities:
   - uid: 118
     components:
     - type: Transform
@@ -2510,8 +2408,6 @@ entities:
     - type: Transform
       pos: -19.5,12.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: Bed
   entities:
   - uid: 153
@@ -2778,8 +2674,6 @@ entities:
   entities:
   - uid: 196
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,38.5
       parent: 1
@@ -2827,15 +2721,12 @@ entities:
   entities:
   - uid: 202
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 201
     - type: SolutionContainerManager
       solutions:
         beaker:
           temperature: 293.15
-          canMix: True
           canReact: True
           maxVol: 300
           name: null
@@ -2856,8 +2747,6 @@ entities:
   entities:
   - uid: 203
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,22.5
       parent: 1
@@ -7450,13 +7339,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,30.5
       parent: 1
-- proto: chem_master
-  entities:
-  - uid: 1172
-    components:
-    - type: Transform
-      pos: -15.5,13.5
-      parent: 1
 - proto: ChemistryHotplate
   entities:
   - uid: 3692
@@ -7464,19 +7346,19 @@ entities:
     - type: Transform
       pos: -15.5,11.5
       parent: 1
-- proto: CigarGoldCase
+- proto: ChemMaster
   entities:
-  - uid: 2236
+  - uid: 1172
     components:
     - type: Transform
-      pos: 5.407282,14.104158
+      pos: -15.5,13.5
       parent: 1
-- proto: CloningPod
+- proto: CigarGoldCase
   entities:
-  - uid: 1174
+  - uid: 2236
     components:
     - type: Transform
-      pos: -23.5,37.5
+      pos: 5.407282,14.104158
       parent: 1
 - proto: ClosetL3ScienceFilled
   entities:
@@ -7503,13 +7385,6 @@ entities:
         - 0
         - 0
         - 0
-- proto: ClothingHeadHatCatEars
-  entities:
-  - uid: 1198
-    components:
-    - type: Transform
-      pos: -18.437984,6.194993
-      parent: 1
 - proto: ClothingHeadNurseHat
   entities:
   - uid: 1199
@@ -7576,14 +7451,6 @@ entities:
     - type: Transform
       pos: 24.5,33.5
       parent: 1
-- proto: ComputerCloningConsole
-  entities:
-  - uid: 1223
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -25.5,35.5
-      parent: 1
 - proto: ComputerPowerMonitoring
   entities:
   - uid: 1225
@@ -7651,13 +7518,18 @@ entities:
     - type: Transform
       pos: 0.5,2.5
       parent: 1
-    - type: Physics
-      canCollide: False
     - type: ContainerContainer
       containers:
         board: !type:Container
+          showEnts: False
+          occludes: True
           ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: Physics
+      canCollide: False
     - type: ItemSlots
   - uid: 1234
     components:
@@ -7665,26 +7537,36 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -17.5,6.5
       parent: 1
-    - type: Physics
-      canCollide: False
     - type: ContainerContainer
       containers:
         board: !type:Container
+          showEnts: False
+          occludes: True
           ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: Physics
+      canCollide: False
     - type: ItemSlots
   - uid: 1235
     components:
     - type: Transform
       pos: 26.5,17.5
       parent: 1
-    - type: Physics
-      canCollide: False
     - type: ContainerContainer
       containers:
         board: !type:Container
+          showEnts: False
+          occludes: True
           ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: Physics
+      canCollide: False
     - type: ItemSlots
 - proto: ComputerWithdrawBankATM
   entities:
@@ -7696,8 +7578,13 @@ entities:
     - type: ContainerContainer
       containers:
         board: !type:Container
+          showEnts: False
+          occludes: True
           ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
     - type: ItemSlots
 - proto: CrateArtifactContainer
   entities:
@@ -7706,95 +7593,13 @@ entities:
     - type: Transform
       pos: 25.5,31.5
       parent: 1
-- proto: CrateChemistryD
-  entities:
-  - uid: 1237
-    components:
-    - type: Transform
-      pos: -25.5,13.5
-      parent: 1
-- proto: CrateChemistryP
-  entities:
-  - uid: 1238
-    components:
-    - type: Transform
-      pos: -24.5,13.5
-      parent: 1
-- proto: CrateChemistryS
-  entities:
-  - uid: 1239
-    components:
-    - type: Transform
-      pos: -25.5,11.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-- proto: CrateChemistrySupplies
-  entities:
-  - uid: 1240
-    components:
-    - type: Transform
-      pos: -25.5,12.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-- proto: CrateEmergencyAdvancedKit
-  entities:
-  - uid: 1241
-    components:
-    - type: Transform
-      pos: -23.5,28.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+- proto: CrateChemistrySupplies
+  entities:
+  - uid: 1185
+    components:
+    - type: Transform
+      pos: -24.5,13.5
+      parent: 1
 - proto: CrateEngineeringSolar
   entities:
   - uid: 1242
@@ -7898,6 +7703,21 @@ entities:
       parent: 1
 - proto: CrateMedicalSecure
   entities:
+  - uid: 1192
+    components:
+    - type: Transform
+      pos: -25.5,11.5
+      parent: 1
+  - uid: 1197
+    components:
+    - type: Transform
+      pos: -25.5,13.5
+      parent: 1
+  - uid: 1198
+    components:
+    - type: Transform
+      pos: -25.5,12.5
+      parent: 1
   - uid: 1247
     components:
     - type: Transform
@@ -7909,8 +7729,8 @@ entities:
         immutable: False
         temperature: 293.1496
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -7970,8 +7790,6 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: DefibrillatorCabinet
   entities:
   - uid: 1249
@@ -9332,11 +9150,6 @@ entities:
       parent: 1
 - proto: DrinkWaterCup
   entities:
-  - uid: 1278
-    components:
-    - type: Transform
-      pos: 7.2262716,19.3515
-      parent: 1
   - uid: 1279
     components:
     - type: Transform
@@ -9347,11 +9160,6 @@ entities:
     - type: Transform
       pos: 7.6012716,19.7265
       parent: 1
-  - uid: 1281
-    components:
-    - type: Transform
-      pos: 7.4606466,19.234312
-      parent: 1
   - uid: 1282
     components:
     - type: Transform
@@ -9937,8 +9745,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 16.5,8.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasFilter
@@ -9949,8 +9755,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 23.5,9.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1386
@@ -9959,8 +9763,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 21.5,9.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1387
@@ -9969,8 +9771,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 19.5,9.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1388
@@ -9979,8 +9779,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,9.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasFilterFlipped
@@ -9991,8 +9789,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -28.5,30.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasMixer
   entities:
   - uid: 1390
@@ -10001,8 +9797,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,8.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#03FCD3FF'
 - proto: GasMixerFlipped
@@ -10013,8 +9807,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,9.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasOutletInjector
@@ -10025,8 +9817,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 18.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1393
@@ -10035,8 +9825,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1394
@@ -10045,8 +9833,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 22.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1395
@@ -10055,8 +9841,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 16.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasPassiveVent
@@ -10067,15 +9851,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 1396
     components:
     - type: Transform
       pos: 22.5,12.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#03FCD3FF'
   - uid: 1397
@@ -10083,8 +9863,6 @@ entities:
     - type: Transform
       pos: 20.5,12.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#03FCD3FF'
   - uid: 1398
@@ -10092,8 +9870,6 @@ entities:
     - type: Transform
       pos: 16.5,12.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#947507FF'
   - uid: 1399
@@ -10101,23 +9877,17 @@ entities:
     - type: Transform
       pos: -23.5,39.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 1400
     components:
     - type: Transform
       pos: 24.5,35.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 1401
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 25.5,5.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1403
@@ -10125,8 +9895,6 @@ entities:
     - type: Transform
       pos: 18.5,12.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#947507FF'
 - proto: GasPipeBend
@@ -11002,11 +10770,15 @@ entities:
   - uid: 1517
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: 15.5,7.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 1518
     components:
     - type: Transform
@@ -14606,32 +14378,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -8.5,16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 1993
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -26.5,33.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 1994
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 24.5,31.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 1995
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 18.5,9.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1996
@@ -14640,8 +14404,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 23.5,8.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2731
@@ -14650,8 +14412,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -19.5,11.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasPressurePump
   entities:
   - uid: 1997
@@ -14660,8 +14420,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 19.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1998
@@ -14670,8 +14428,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 21.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1999
@@ -14680,8 +14436,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 23.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2000
@@ -14690,8 +14444,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 16.5,7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2001
@@ -14699,8 +14451,6 @@ entities:
     - type: Transform
       pos: 16.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#947507FF'
   - uid: 2002
@@ -14708,8 +14458,6 @@ entities:
     - type: Transform
       pos: 20.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#03FCD3FF'
   - uid: 2003
@@ -14717,8 +14465,6 @@ entities:
     - type: Transform
       pos: 22.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#03FCD3FF'
   - uid: 2004
@@ -14726,15 +14472,11 @@ entities:
     - type: Transform
       pos: -27.5,32.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 2005
     components:
     - type: Transform
       pos: 18.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#947507FF'
   - uid: 2006
@@ -14743,8 +14485,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 17.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasThermoMachineFreezerEnabled
@@ -14757,18 +14497,17 @@ entities:
       parent: 1
     - type: GasThermoMachine
       targetTemperature: 0
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasThermoMachineHeaterEnabled
   entities:
   - uid: 190
     components:
     - type: Transform
+      anchored: False
       rot: -1.5707963267948966 rad
       pos: -9.5,16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
+    - type: Physics
+      bodyType: Dynamic
 - proto: GasValve
   entities:
   - uid: 2009
@@ -14779,8 +14518,6 @@ entities:
       parent: 1
     - type: GasValve
       open: False
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2010
@@ -14789,8 +14526,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,8.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CDFF'
   - uid: 2011
@@ -14799,8 +14534,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 18.5,7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2012
@@ -14811,8 +14544,6 @@ entities:
       parent: 1
     - type: GasValve
       open: False
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasVentPump
   entities:
   - uid: 897
@@ -14821,8 +14552,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,14.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2013
@@ -14831,8 +14560,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 14.5,14.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2014
@@ -14841,8 +14568,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -24.5,12.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2015
@@ -14851,8 +14576,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2016
@@ -14860,8 +14583,6 @@ entities:
     - type: Transform
       pos: -7.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2017
@@ -14870,8 +14591,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -7.5,19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2018
@@ -14880,8 +14599,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -17.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2019
@@ -14890,8 +14607,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -21.5,15.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2020
@@ -14900,8 +14615,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2021
@@ -14910,8 +14623,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -8.5,24.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2022
@@ -14920,8 +14631,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,29.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2023
@@ -14930,8 +14639,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,26.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2024
@@ -14940,8 +14647,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,24.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2025
@@ -14950,8 +14655,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.5,19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2026
@@ -14960,8 +14663,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -23.5,29.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2027
@@ -14969,8 +14670,6 @@ entities:
     - type: Transform
       pos: -24.5,35.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2028
@@ -14979,8 +14678,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,26.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2029
@@ -14989,8 +14686,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2030
@@ -14998,8 +14693,6 @@ entities:
     - type: Transform
       pos: -10.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2031
@@ -15007,8 +14700,6 @@ entities:
     - type: Transform
       pos: -27.5,28.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2032
@@ -15016,8 +14707,6 @@ entities:
     - type: Transform
       pos: -4.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2033
@@ -15025,8 +14714,6 @@ entities:
     - type: Transform
       pos: 7.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2034
@@ -15034,8 +14721,6 @@ entities:
     - type: Transform
       pos: 10.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2035
@@ -15044,8 +14729,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2036
@@ -15054,8 +14737,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 28.5,21.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2037
@@ -15064,8 +14745,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 29.5,26.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2038
@@ -15074,8 +14753,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 25.5,25.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2039
@@ -15084,8 +14761,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 29.5,31.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2040
@@ -15094,8 +14769,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,31.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2041
@@ -15103,8 +14776,6 @@ entities:
     - type: Transform
       pos: -4.5,39.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2042
@@ -15113,8 +14784,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -28.5,22.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2043
@@ -15123,8 +14792,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2044
@@ -15133,8 +14800,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -16.5,7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2045
@@ -15143,8 +14808,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,8.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2046
@@ -15153,8 +14816,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -12.5,5.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2047
@@ -15163,8 +14824,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2048
@@ -15172,8 +14831,6 @@ entities:
     - type: Transform
       pos: -1.5,5.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2049
@@ -15182,8 +14839,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2050
@@ -15192,8 +14847,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2051
@@ -15202,8 +14855,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2052
@@ -15212,8 +14863,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2053
@@ -15222,8 +14871,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.5,20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2054
@@ -15232,8 +14879,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2055
@@ -15241,8 +14886,6 @@ entities:
     - type: Transform
       pos: 3.5,29.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2056
@@ -15251,8 +14894,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -13.5,17.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2057
@@ -15261,8 +14902,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 2058
@@ -15270,8 +14909,6 @@ entities:
     - type: Transform
       pos: -11.5,22.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 3685
@@ -15279,8 +14916,6 @@ entities:
     - type: Transform
       pos: 4.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -15291,8 +14926,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,15.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1108
@@ -15300,8 +14933,6 @@ entities:
     - type: Transform
       pos: 15.5,16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2060
@@ -15310,8 +14941,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,28.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2061
@@ -15320,8 +14949,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,27.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2062
@@ -15330,8 +14957,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,25.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2063
@@ -15340,8 +14965,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2064
@@ -15349,8 +14972,6 @@ entities:
     - type: Transform
       pos: 4.5,29.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2065
@@ -15359,8 +14980,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 13.5,20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2066
@@ -15369,8 +14988,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2067
@@ -15379,8 +14996,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,26.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2068
@@ -15389,8 +15004,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -18.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2069
@@ -15399,8 +15012,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 28.5,22.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2070
@@ -15408,8 +15019,6 @@ entities:
     - type: Transform
       pos: 5.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2071
@@ -15417,8 +15026,6 @@ entities:
     - type: Transform
       pos: 8.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2072
@@ -15426,8 +15033,6 @@ entities:
     - type: Transform
       pos: 11.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2073
@@ -15436,8 +15041,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2074
@@ -15446,8 +15049,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -9.5,19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2075
@@ -15456,8 +15057,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2076
@@ -15466,8 +15065,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,2.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2077
@@ -15475,8 +15072,6 @@ entities:
     - type: Transform
       pos: -6.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2078
@@ -15484,8 +15079,6 @@ entities:
     - type: Transform
       pos: -9.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2079
@@ -15493,8 +15086,6 @@ entities:
     - type: Transform
       pos: -3.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2080
@@ -15503,8 +15094,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 28.5,27.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2081
@@ -15512,8 +15101,6 @@ entities:
     - type: Transform
       pos: 17.5,8.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2082
@@ -15522,8 +15109,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 14.5,3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2083
@@ -15532,8 +15117,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2084
@@ -15541,8 +15124,6 @@ entities:
     - type: Transform
       pos: -23.5,25.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2085
@@ -15550,8 +15131,6 @@ entities:
     - type: Transform
       pos: -9.5,24.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2086
@@ -15559,8 +15138,6 @@ entities:
     - type: Transform
       pos: -25.5,25.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2087
@@ -15569,8 +15146,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2088
@@ -15579,8 +15154,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,32.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2089
@@ -15589,8 +15162,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 28.5,32.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2090
@@ -15599,8 +15170,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2091
@@ -15609,8 +15178,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2092
@@ -15619,8 +15186,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -12.5,4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2093
@@ -15629,8 +15194,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2094
@@ -15639,8 +15202,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -15.5,6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2095
@@ -15649,8 +15210,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2096
@@ -15658,8 +15217,6 @@ entities:
     - type: Transform
       pos: -22.5,36.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2097
@@ -15667,8 +15224,6 @@ entities:
     - type: Transform
       pos: -28.5,28.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2098
@@ -15677,8 +15232,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,30.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2099
@@ -15686,8 +15239,6 @@ entities:
     - type: Transform
       pos: -6.5,39.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2100
@@ -15695,8 +15246,6 @@ entities:
     - type: Transform
       pos: 1.5,28.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2101
@@ -15705,8 +15254,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2102
@@ -15715,8 +15262,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -25.5,22.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2103
@@ -15725,8 +15270,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -25.5,15.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2104
@@ -15735,8 +15278,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,15.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2105
@@ -15745,8 +15286,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -26.5,19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2106
@@ -15755,8 +15294,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,11.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2107
@@ -15765,8 +15302,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -12.5,18.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2108
@@ -15774,8 +15309,6 @@ entities:
     - type: Transform
       pos: -4.5,8.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 2109
@@ -15784,8 +15317,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.5,21.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasVolumePump
@@ -15796,8 +15327,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 18.5,8.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0335FCFF'
 - proto: GeigerCounter
@@ -16258,10 +15787,10 @@ entities:
       parent: 1
 - proto: GunSafeShuttleCaptain
   entities:
-  - uid: 2514
+  - uid: 1223
     components:
     - type: Transform
-      pos: -12.5,4.5
+      pos: -12.5,3.5
       parent: 1
 - proto: Gyroscope
   entities:
@@ -16776,6 +16305,23 @@ entities:
     - type: Transform
       pos: -15.5,10.5
       parent: 1
+- proto: MachineFrame
+  entities:
+  - uid: 1178
+    components:
+    - type: Transform
+      pos: -24.5,37.5
+      parent: 1
+  - uid: 1184
+    components:
+    - type: Transform
+      pos: -25.5,35.5
+      parent: 1
+  - uid: 1200
+    components:
+    - type: Transform
+      pos: -23.5,37.5
+      parent: 1
 - proto: Matchbox
   entities:
   - uid: 2264
@@ -16814,25 +16360,6 @@ entities:
     - type: Transform
       pos: -28.5,31.5
       parent: 1
-- proto: MedicalScanner
-  entities:
-  - uid: 2253
-    components:
-    - type: Transform
-      pos: -24.5,37.5
-      parent: 1
-- proto: MedkitBurnFilled
-  entities:
-  - uid: 2254
-    components:
-    - type: Transform
-      pos: -26.76496,32.632736
-      parent: 1
-  - uid: 2255
-    components:
-    - type: Transform
-      pos: -26.249334,32.663986
-      parent: 1
 - proto: MicrophoneInstrument
   entities:
   - uid: 2256
@@ -16868,8 +16395,6 @@ entities:
     - type: Transform
       pos: 20.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: OxygenCanister
   entities:
   - uid: 2260
@@ -16877,15 +16402,11 @@ entities:
     - type: Transform
       pos: 22.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 2261
     components:
     - type: Transform
       pos: -26.5,33.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: PaperBin10
   entities:
   - uid: 1194
@@ -16956,8 +16477,6 @@ entities:
     - type: Transform
       pos: 18.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: Plunger
   entities:
   - uid: 2272
@@ -17002,10 +16521,7 @@ entities:
       pos: 23.5,8.5
       parent: 1
     - type: Physics
-      canCollide: True
       bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: PottedPlantRandom
   entities:
   - uid: 2277
@@ -17075,601 +16591,445 @@ entities:
   entities:
   - uid: 1286
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,5.5
       parent: 1
   - uid: 1501
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,3.5
       parent: 1
   - uid: 2291
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,13.5
       parent: 1
   - uid: 2292
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -27.5,18.5
       parent: 1
   - uid: 2293
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,22.5
       parent: 1
   - uid: 2294
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,16.5
       parent: 1
   - uid: 2295
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 20.5,15.5
       parent: 1
   - uid: 2296
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,16.5
       parent: 1
   - uid: 2297
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,16.5
       parent: 1
   - uid: 2298
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,14.5
       parent: 1
   - uid: 2299
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,12.5
       parent: 1
   - uid: 2300
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 16.5,9.5
       parent: 1
   - uid: 2301
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 23.5,9.5
       parent: 1
   - uid: 2302
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,4.5
       parent: 1
   - uid: 2303
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,5.5
       parent: 1
   - uid: 2304
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 13.5,1.5
       parent: 1
   - uid: 2305
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 14.5,8.5
       parent: 1
   - uid: 2306
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 7.5,7.5
       parent: 1
   - uid: 2307
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,8.5
       parent: 1
   - uid: 2308
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,7.5
       parent: 1
   - uid: 2309
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,8.5
       parent: 1
   - uid: 2310
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -12.5,4.5
       parent: 1
   - uid: 2311
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -10.5,1.5
       parent: 1
   - uid: 2312
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -8.5,1.5
       parent: 1
   - uid: 2313
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,4.5
       parent: 1
   - uid: 2314
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,2.5
       parent: 1
   - uid: 2315
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,1.5
       parent: 1
   - uid: 2316
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,0.5
       parent: 1
   - uid: 2317
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,0.5
       parent: 1
   - uid: 2320
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 11.5,2.5
       parent: 1
   - uid: 2321
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 8.5,0.5
       parent: 1
   - uid: 2322
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -15.5,12.5
       parent: 1
   - uid: 2323
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -18.5,6.5
       parent: 1
   - uid: 2324
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -25.5,8.5
       parent: 1
   - uid: 2325
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -24.5,11.5
       parent: 1
   - uid: 2326
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -24.5,15.5
       parent: 1
   - uid: 2327
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,16.5
       parent: 1
   - uid: 2328
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -13.5,12.5
       parent: 1
   - uid: 2329
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -12.5,19.5
       parent: 1
   - uid: 2330
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,22.5
       parent: 1
   - uid: 2331
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -7.5,21.5
       parent: 1
   - uid: 2332
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,24.5
       parent: 1
   - uid: 2333
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,20.5
       parent: 1
   - uid: 2334
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -6.5,29.5
       parent: 1
   - uid: 2335
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,35.5
       parent: 1
   - uid: 2336
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -5.5,37.5
       parent: 1
   - uid: 2337
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -28.5,26.5
       parent: 1
   - uid: 2338
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -28.5,29.5
       parent: 1
   - uid: 2339
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,33.5
       parent: 1
   - uid: 2340
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -23.5,35.5
       parent: 1
   - uid: 2341
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,29.5
       parent: 1
   - uid: 2342
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -25.5,21.5
       parent: 1
   - uid: 2343
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -23.5,22.5
       parent: 1
   - uid: 2344
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,16.5
       parent: 1
   - uid: 2345
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,12.5
       parent: 1
   - uid: 2346
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,21.5
       parent: 1
   - uid: 2347
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,25.5
       parent: 1
   - uid: 2348
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,27.5
       parent: 1
   - uid: 2349
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,29.5
       parent: 1
   - uid: 2350
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -14.5,2.5
       parent: 1
   - uid: 2351
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -19.5,2.5
       parent: 1
   - uid: 2352
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,13.5
       parent: 1
   - uid: 2353
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 26.5,18.5
       parent: 1
   - uid: 2354
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 24.5,22.5
       parent: 1
   - uid: 2355
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 24.5,26.5
       parent: 1
   - uid: 2356
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 29.5,28.5
       parent: 1
   - uid: 2357
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 29.5,32.5
       parent: 1
   - uid: 2358
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 25.5,31.5
       parent: 1
   - uid: 2359
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 23.5,35.5
       parent: 1
   - uid: 2360
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,13.5
       parent: 1
   - uid: 2361
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -21.5,11.5
       parent: 1
   - uid: 2362
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -9.5,12.5
       parent: 1
   - uid: 2363
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,16.5
       parent: 1
   - uid: 2366
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,-0.5
       parent: 1
   - uid: 2367
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,13.5
       parent: 1
   - uid: 2368
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,13.5
       parent: 1
   - uid: 2369
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 10.5,18.5
       parent: 1
   - uid: 2513
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 14.5,20.5
@@ -17678,16 +17038,12 @@ entities:
   entities:
   - uid: 1151
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 10.5,12.5
       parent: 1
   - uid: 1153
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,16.5
       parent: 1
@@ -17695,8 +17051,6 @@ entities:
   entities:
   - uid: 2370
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,16.5
       parent: 1
@@ -17704,8 +17058,6 @@ entities:
   entities:
   - uid: 2371
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -5.5,12.5
@@ -18479,8 +17831,6 @@ entities:
   entities:
   - uid: 2521
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,25.5
       parent: 1
@@ -18489,8 +17839,6 @@ entities:
       - 2606
   - uid: 2522
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,15.5
@@ -18500,8 +17848,6 @@ entities:
       - 2601
   - uid: 2523
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,16.5
@@ -19369,8 +18715,6 @@ entities:
   entities:
   - uid: 2803
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -18.5,9.5
       parent: 1
@@ -19396,7 +18740,7 @@ entities:
     - type: Transform
       pos: 20.5,2.5
       parent: 1
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 2635
     components:
@@ -19535,8 +18879,6 @@ entities:
     - type: Transform
       pos: 16.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: SubstationBasic
   entities:
   - uid: 2672
@@ -20235,8 +19577,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.5,14.5
       parent: 1
-    - type: Toilet
-      isSeatUp: True
 - proto: TomDrumsInstrument
   entities:
   - uid: 2781
@@ -20315,8 +19655,6 @@ entities:
   entities:
   - uid: 2784
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -8.5,1.5
       parent: 1
@@ -20331,24 +19669,13 @@ entities:
   entities:
   - uid: 2786
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -7.5,3.5
       parent: 1
-- proto: VendingMachineBountyVend
-  entities:
-  - uid: 2453
-    components:
-    - type: Transform
-      pos: -12.5,3.5
-      parent: 1
 - proto: VendingMachineCargoDrobe
   entities:
   - uid: 2787
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -3.5,24.5
       parent: 1
@@ -20370,8 +19697,6 @@ entities:
   entities:
   - uid: 2790
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -16.5,13.5
       parent: 1
@@ -20379,8 +19704,6 @@ entities:
   entities:
   - uid: 2791
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -19.5,13.5
       parent: 1
@@ -20445,8 +19768,6 @@ entities:
   entities:
   - uid: 2799
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -0.5,24.5
       parent: 1
@@ -20482,8 +19803,6 @@ entities:
   entities:
   - uid: 2802
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 24.5,21.5
       parent: 1
@@ -20501,8 +19820,6 @@ entities:
       parent: 1
   - uid: 2804
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -25.5,16.5
       parent: 1
@@ -20510,8 +19827,6 @@ entities:
   entities:
   - uid: 2806
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -4.5,18.5
       parent: 1
@@ -20519,8 +19834,6 @@ entities:
   entities:
   - uid: 2808
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -2.5,18.5
       parent: 1
@@ -20547,4378 +19860,3168 @@ entities:
   entities:
   - uid: 1259
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -14.5,18.5
       parent: 1
   - uid: 2811
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 24.5,8.5
       parent: 1
   - uid: 2812
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -23.5,13.5
       parent: 1
   - uid: 2813
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 24.5,11.5
       parent: 1
   - uid: 2814
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,22.5
       parent: 1
   - uid: 2815
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,15.5
       parent: 1
   - uid: 2816
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,14.5
       parent: 1
   - uid: 2817
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,13.5
       parent: 1
   - uid: 2819
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,25.5
       parent: 1
   - uid: 2820
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,26.5
       parent: 1
   - uid: 2821
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,32.5
       parent: 1
   - uid: 2822
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,31.5
       parent: 1
   - uid: 2823
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,30.5
       parent: 1
   - uid: 2824
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,29.5
       parent: 1
   - uid: 2825
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,28.5
       parent: 1
   - uid: 2826
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,27.5
       parent: 1
   - uid: 2827
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -28.5,18.5
       parent: 1
   - uid: 2828
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -28.5,34.5
       parent: 1
   - uid: 2829
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,24.5
       parent: 1
   - uid: 2830
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,33.5
       parent: 1
   - uid: 2831
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,30.5
       parent: 1
   - uid: 2832
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,27.5
       parent: 1
   - uid: 2833
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,25.5
       parent: 1
   - uid: 2834
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,26.5
       parent: 1
   - uid: 2835
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,21.5
       parent: 1
   - uid: 2836
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,22.5
       parent: 1
   - uid: 2837
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,19.5
       parent: 1
   - uid: 2838
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,20.5
       parent: 1
   - uid: 2839
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,34.5
       parent: 1
   - uid: 2840
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,18.5
       parent: 1
   - uid: 2841
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,33.5
       parent: 1
   - uid: 2842
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,32.5
       parent: 1
   - uid: 2843
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,31.5
       parent: 1
   - uid: 2844
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,23.5
       parent: 1
   - uid: 2845
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,22.5
       parent: 1
   - uid: 2846
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,35.5
       parent: 1
   - uid: 2847
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,37.5
       parent: 1
   - uid: 2848
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,38.5
       parent: 1
   - uid: 2849
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,38.5
       parent: 1
   - uid: 2850
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,38.5
       parent: 1
   - uid: 2851
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,38.5
       parent: 1
   - uid: 2852
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,38.5
       parent: 1
   - uid: 2853
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,34.5
       parent: 1
   - uid: 2854
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,17.5
       parent: 1
   - uid: 2855
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,17.5
       parent: 1
   - uid: 2856
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,13.5
       parent: 1
   - uid: 2857
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,13.5
       parent: 1
   - uid: 2858
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,12.5
       parent: 1
   - uid: 2859
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,12.5
       parent: 1
   - uid: 2860
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,11.5
       parent: 1
   - uid: 2861
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,10.5
       parent: 1
   - uid: 2862
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,9.5
       parent: 1
   - uid: 2863
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -25.5,6.5
       parent: 1
   - uid: 2864
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -25.5,7.5
       parent: 1
   - uid: 2865
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -26.5,7.5
       parent: 1
   - uid: 2866
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -26.5,8.5
       parent: 1
   - uid: 2867
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,6.5
       parent: 1
   - uid: 2868
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,6.5
       parent: 1
   - uid: 2869
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,5.5
       parent: 1
   - uid: 2871
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,3.5
       parent: 1
   - uid: 2872
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,2.5
       parent: 1
   - uid: 2873
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,2.5
       parent: 1
   - uid: 2874
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,1.5
       parent: 1
   - uid: 2875
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,1.5
       parent: 1
   - uid: 2876
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,1.5
       parent: 1
   - uid: 2877
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,1.5
       parent: 1
   - uid: 2878
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,0.5
       parent: 1
   - uid: 2879
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,0.5
       parent: 1
   - uid: 2880
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,0.5
       parent: 1
   - uid: 2881
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,0.5
       parent: 1
   - uid: 2882
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,0.5
       parent: 1
   - uid: 2883
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,0.5
       parent: 1
   - uid: 2884
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-0.5
       parent: 1
   - uid: 2885
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-0.5
       parent: 1
   - uid: 2886
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,2.5
       parent: 1
   - uid: 2887
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-0.5
       parent: 1
   - uid: 2888
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,-0.5
       parent: 1
   - uid: 2889
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-0.5
       parent: 1
   - uid: 2890
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-0.5
       parent: 1
   - uid: 2891
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-0.5
       parent: 1
   - uid: 2892
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-1.5
       parent: 1
   - uid: 2893
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,-1.5
       parent: 1
   - uid: 2894
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,-2.5
       parent: 1
   - uid: 2895
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,-2.5
       parent: 1
   - uid: 2896
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,19.5
       parent: 1
   - uid: 2897
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-2.5
       parent: 1
   - uid: 2898
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,18.5
       parent: 1
   - uid: 2899
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,17.5
       parent: 1
   - uid: 2900
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-2.5
       parent: 1
   - uid: 2901
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-1.5
       parent: 1
   - uid: 2902
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-1.5
       parent: 1
   - uid: 2903
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-0.5
       parent: 1
   - uid: 2904
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-0.5
       parent: 1
   - uid: 2905
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-0.5
       parent: 1
   - uid: 2906
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,-0.5
       parent: 1
   - uid: 2907
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-0.5
       parent: 1
   - uid: 2908
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-0.5
       parent: 1
   - uid: 2909
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,-0.5
       parent: 1
   - uid: 2910
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,0.5
       parent: 1
   - uid: 2911
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,0.5
       parent: 1
   - uid: 2912
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,0.5
       parent: 1
   - uid: 2913
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,0.5
       parent: 1
   - uid: 2914
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,0.5
       parent: 1
   - uid: 2915
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,0.5
       parent: 1
   - uid: 2916
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,0.5
       parent: 1
   - uid: 2917
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,0.5
       parent: 1
   - uid: 2918
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,1.5
       parent: 1
   - uid: 2919
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,2.5
       parent: 1
   - uid: 2920
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,2.5
       parent: 1
   - uid: 2921
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,3.5
       parent: 1
   - uid: 2922
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,4.5
       parent: 1
   - uid: 2923
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,5.5
       parent: 1
   - uid: 2924
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,6.5
       parent: 1
   - uid: 2925
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,6.5
       parent: 1
   - uid: 2926
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,7.5
       parent: 1
   - uid: 2927
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,7.5
       parent: 1
   - uid: 2928
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 26.5,6.5
       parent: 1
   - uid: 2929
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,10.5
       parent: 1
   - uid: 2930
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,11.5
       parent: 1
   - uid: 2931
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,12.5
       parent: 1
   - uid: 2932
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,12.5
       parent: 1
   - uid: 2933
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,13.5
       parent: 1
   - uid: 2934
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,13.5
       parent: 1
   - uid: 2935
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 29.5,17.5
       parent: 1
   - uid: 2936
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 28.5,17.5
       parent: 1
   - uid: 2937
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,21.5
       parent: 1
   - uid: 2938
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,20.5
       parent: 1
   - uid: 2939
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,23.5
       parent: 1
   - uid: 2940
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,22.5
       parent: 1
   - uid: 2941
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,25.5
       parent: 1
   - uid: 2942
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,24.5
       parent: 1
   - uid: 2943
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,27.5
       parent: 1
   - uid: 2944
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,26.5
       parent: 1
   - uid: 2945
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,29.5
       parent: 1
   - uid: 2946
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,28.5
       parent: 1
   - uid: 2947
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,31.5
       parent: 1
   - uid: 2948
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,30.5
       parent: 1
   - uid: 2949
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,32.5
       parent: 1
   - uid: 2950
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,36.5
       parent: 1
   - uid: 2951
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,36.5
       parent: 1
   - uid: 2952
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,36.5
       parent: 1
   - uid: 2953
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,37.5
       parent: 1
   - uid: 2954
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,34.5
       parent: 1
   - uid: 2955
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,38.5
       parent: 1
   - uid: 2956
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,38.5
       parent: 1
   - uid: 2957
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,38.5
       parent: 1
   - uid: 2958
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,34.5
       parent: 1
   - uid: 2959
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,34.5
       parent: 1
   - uid: 2960
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,33.5
       parent: 1
   - uid: 2961
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,32.5
       parent: 1
   - uid: 2962
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,31.5
       parent: 1
   - uid: 2963
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,30.5
       parent: 1
   - uid: 2964
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,29.5
       parent: 1
   - uid: 2965
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,28.5
       parent: 1
   - uid: 2966
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,27.5
       parent: 1
   - uid: 2967
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,26.5
       parent: 1
   - uid: 2968
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,25.5
       parent: 1
   - uid: 2969
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,24.5
       parent: 1
   - uid: 2970
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,23.5
       parent: 1
   - uid: 2971
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,22.5
       parent: 1
   - uid: 2972
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,21.5
       parent: 1
   - uid: 2973
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,20.5
       parent: 1
   - uid: 2974
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,19.5
       parent: 1
   - uid: 2975
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,18.5
       parent: 1
   - uid: 2976
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,17.5
       parent: 1
   - uid: 2977
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -15.5,18.5
       parent: 1
   - uid: 2978
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,26.5
       parent: 1
   - uid: 2979
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 29.5,20.5
       parent: 1
   - uid: 2980
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,28.5
       parent: 1
   - uid: 2981
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,23.5
       parent: 1
   - uid: 2982
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,23.5
       parent: 1
   - uid: 2983
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,23.5
       parent: 1
   - uid: 2984
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,23.5
       parent: 1
   - uid: 2985
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,17.5
       parent: 1
   - uid: 2986
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,11.5
       parent: 1
   - uid: 2987
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,17.5
       parent: 1
   - uid: 2988
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,11.5
       parent: 1
   - uid: 2989
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,15.5
       parent: 1
   - uid: 2990
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,12.5
       parent: 1
   - uid: 2991
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,16.5
       parent: 1
   - uid: 2992
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,17.5
       parent: 1
   - uid: 2993
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,17.5
       parent: 1
   - uid: 2994
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,11.5
       parent: 1
   - uid: 2995
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,17.5
       parent: 1
   - uid: 2996
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,23.5
       parent: 1
   - uid: 2997
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,18.5
       parent: 1
   - uid: 2998
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 16.5,18.5
       parent: 1
   - uid: 2999
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,13.5
       parent: 1
   - uid: 3000
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,13.5
       parent: 1
   - uid: 3001
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 9.5,10.5
       parent: 1
   - uid: 3002
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 9.5,9.5
       parent: 1
   - uid: 3003
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,10.5
       parent: 1
   - uid: 3004
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,30.5
       parent: 1
   - uid: 3005
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,36.5
       parent: 1
   - uid: 3006
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,36.5
       parent: 1
   - uid: 3007
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,30.5
       parent: 1
   - uid: 3008
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,35.5
       parent: 1
   - uid: 3009
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,35.5
       parent: 1
   - uid: 3010
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,29.5
       parent: 1
   - uid: 3011
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,23.5
       parent: 1
   - uid: 3012
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,29.5
       parent: 1
   - uid: 3013
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,29.5
       parent: 1
   - uid: 3014
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,29.5
       parent: 1
   - uid: 3015
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,29.5
       parent: 1
   - uid: 3016
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,29.5
       parent: 1
   - uid: 3017
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,9.5
       parent: 1
   - uid: 3018
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,14.5
       parent: 1
   - uid: 3019
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 8.5,9.5
       parent: 1
   - uid: 3020
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -5.5,10.5
       parent: 1
   - uid: 3021
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -5.5,9.5
       parent: 1
   - uid: 3022
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,9.5
       parent: 1
   - uid: 3023
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,9.5
       parent: 1
   - uid: 3024
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,9.5
       parent: 1
   - uid: 3025
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -8.5,9.5
       parent: 1
   - uid: 3026
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -8.5,10.5
       parent: 1
   - uid: 3027
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,24.5
       parent: 1
   - uid: 3028
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,18.5
       parent: 1
   - uid: 3029
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,19.5
       parent: 1
   - uid: 3030
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,28.5
       parent: 1
   - uid: 3031
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,11.5
       parent: 1
   - uid: 3032
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,11.5
       parent: 1
   - uid: 3033
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,17.5
       parent: 1
   - uid: 3034
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,16.5
       parent: 1
   - uid: 3035
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,11.5
       parent: 1
   - uid: 3036
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,11.5
       parent: 1
   - uid: 3037
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,11.5
       parent: 1
   - uid: 3038
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,12.5
       parent: 1
   - uid: 3039
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,11.5
       parent: 1
   - uid: 3040
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,11.5
       parent: 1
   - uid: 3041
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,11.5
       parent: 1
   - uid: 3042
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,11.5
       parent: 1
   - uid: 3043
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,26.5
       parent: 1
   - uid: 3044
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,25.5
       parent: 1
   - uid: 3045
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,18.5
       parent: 1
   - uid: 3046
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,18.5
       parent: 1
   - uid: 3047
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,17.5
       parent: 1
   - uid: 3048
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,20.5
       parent: 1
   - uid: 3049
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,19.5
       parent: 1
   - uid: 3050
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,18.5
       parent: 1
   - uid: 3051
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,19.5
       parent: 1
   - uid: 3052
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,20.5
       parent: 1
   - uid: 3053
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,28.5
       parent: 1
   - uid: 3054
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,19.5
       parent: 1
   - uid: 3055
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,2.5
       parent: 1
   - uid: 3056
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,17.5
       parent: 1
   - uid: 3057
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,37.5
       parent: 1
   - uid: 3058
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,20.5
       parent: 1
   - uid: 3059
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,17.5
       parent: 1
   - uid: 3060
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,17.5
       parent: 1
   - uid: 3061
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,20.5
       parent: 1
   - uid: 3062
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,20.5
       parent: 1
   - uid: 3063
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,20.5
       parent: 1
   - uid: 3064
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,12.5
       parent: 1
   - uid: 3065
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,17.5
       parent: 1
   - uid: 3066
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,28.5
       parent: 1
   - uid: 3067
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,11.5
       parent: 1
   - uid: 3068
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,28.5
       parent: 1
   - uid: 3069
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,30.5
       parent: 1
   - uid: 3070
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,36.5
       parent: 1
   - uid: 3071
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,35.5
       parent: 1
   - uid: 3072
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,36.5
       parent: 1
   - uid: 3073
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,17.5
       parent: 1
   - uid: 3074
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,11.5
       parent: 1
   - uid: 3075
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,20.5
       parent: 1
   - uid: 3076
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,2.5
       parent: 1
   - uid: 3077
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,17.5
       parent: 1
   - uid: 3078
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,11.5
       parent: 1
   - uid: 3079
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,17.5
       parent: 1
   - uid: 3080
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,17.5
       parent: 1
   - uid: 3081
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,11.5
       parent: 1
   - uid: 3082
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,17.5
       parent: 1
   - uid: 3083
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,28.5
       parent: 1
   - uid: 3084
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,17.5
       parent: 1
   - uid: 3085
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,11.5
       parent: 1
   - uid: 3086
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,13.5
       parent: 1
   - uid: 3087
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,11.5
       parent: 1
   - uid: 3088
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,28.5
       parent: 1
   - uid: 3089
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,17.5
       parent: 1
   - uid: 3090
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,15.5
       parent: 1
   - uid: 3091
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,0.5
       parent: 1
   - uid: 3092
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,1.5
       parent: 1
   - uid: 3093
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,2.5
       parent: 1
   - uid: 3094
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,1.5
       parent: 1
   - uid: 3095
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,2.5
       parent: 1
   - uid: 3096
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,2.5
       parent: 1
   - uid: 3097
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,6.5
       parent: 1
   - uid: 3098
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,2.5
       parent: 1
   - uid: 3099
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,2.5
       parent: 1
   - uid: 3100
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,3.5
       parent: 1
   - uid: 3101
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,6.5
       parent: 1
   - uid: 3102
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,6.5
       parent: 1
   - uid: 3103
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,5.5
       parent: 1
   - uid: 3104
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,11.5
       parent: 1
   - uid: 3105
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,17.5
       parent: 1
   - uid: 3106
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,2.5
       parent: 1
   - uid: 3107
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,1.5
       parent: 1
   - uid: 3108
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,0.5
       parent: 1
   - uid: 3109
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,6.5
       parent: 1
   - uid: 3111
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,6.5
       parent: 1
   - uid: 3112
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,4.5
       parent: 1
   - uid: 3113
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,5.5
       parent: 1
   - uid: 3114
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,6.5
       parent: 1
   - uid: 3115
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,6.5
       parent: 1
   - uid: 3116
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,6.5
       parent: 1
   - uid: 3117
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,6.5
       parent: 1
   - uid: 3118
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,6.5
       parent: 1
   - uid: 3119
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,6.5
       parent: 1
   - uid: 3120
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,6.5
       parent: 1
   - uid: 3121
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,6.5
       parent: 1
   - uid: 3122
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,6.5
       parent: 1
   - uid: 3123
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,6.5
       parent: 1
   - uid: 3124
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,6.5
       parent: 1
   - uid: 3125
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 15.5,7.5
       parent: 1
   - uid: 3126
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 15.5,8.5
       parent: 1
   - uid: 3127
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,6.5
       parent: 1
   - uid: 3128
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,6.5
       parent: 1
   - uid: 3129
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,14.5
       parent: 1
   - uid: 3130
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,14.5
       parent: 1
   - uid: 3131
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,7.5
       parent: 1
   - uid: 3132
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -14.5,9.5
       parent: 1
   - uid: 3133
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -14.5,10.5
       parent: 1
   - uid: 3134
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,10.5
       parent: 1
   - uid: 3135
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,9.5
       parent: 1
   - uid: 3136
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -1.5,10.5
       parent: 1
   - uid: 3137
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -1.5,9.5
       parent: 1
   - uid: 3138
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,25.5
       parent: 1
   - uid: 3139
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,14.5
       parent: 1
   - uid: 3140
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,14.5
       parent: 1
   - uid: 3141
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,14.5
       parent: 1
   - uid: 3142
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,13.5
       parent: 1
   - uid: 3143
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,26.5
       parent: 1
   - uid: 3144
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,11.5
       parent: 1
   - uid: 3145
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,10.5
       parent: 1
   - uid: 3146
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 23.5,12.5
       parent: 1
   - uid: 3147
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 11.5,9.5
       parent: 1
   - uid: 3148
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,9.5
       parent: 1
   - uid: 3149
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,9.5
       parent: 1
   - uid: 3150
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,10.5
       parent: 1
   - uid: 3151
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,23.5
       parent: 1
   - uid: 3152
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,18.5
       parent: 1
   - uid: 3153
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,19.5
       parent: 1
   - uid: 3154
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,23.5
       parent: 1
   - uid: 3155
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,23.5
       parent: 1
   - uid: 3156
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,28.5
       parent: 1
   - uid: 3157
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,23.5
       parent: 1
   - uid: 3158
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,30.5
       parent: 1
   - uid: 3159
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,30.5
       parent: 1
   - uid: 3160
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,30.5
       parent: 1
   - uid: 3161
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,23.5
       parent: 1
   - uid: 3162
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,23.5
       parent: 1
   - uid: 3163
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,26.5
       parent: 1
   - uid: 3164
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,25.5
       parent: 1
   - uid: 3165
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,23.5
       parent: 1
   - uid: 3166
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,27.5
       parent: 1
   - uid: 3167
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,24.5
       parent: 1
   - uid: 3168
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,25.5
       parent: 1
   - uid: 3169
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,20.5
       parent: 1
   - uid: 3170
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,20.5
       parent: 1
   - uid: 3171
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,28.5
       parent: 1
   - uid: 3172
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,14.5
       parent: 1
   - uid: 3173
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -21.5,17.5
       parent: 1
   - uid: 3174
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -20.5,17.5
       parent: 1
   - uid: 3175
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,23.5
       parent: 1
   - uid: 3176
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,23.5
       parent: 1
   - uid: 3177
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,17.5
       parent: 1
   - uid: 3178
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,17.5
       parent: 1
   - uid: 3179
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 22.5,17.5
       parent: 1
   - uid: 3180
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 21.5,17.5
       parent: 1
   - uid: 3181
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,11.5
       parent: 1
   - uid: 3182
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,20.5
       parent: 1
   - uid: 3183
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,23.5
       parent: 1
   - uid: 3184
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,30.5
       parent: 1
   - uid: 3185
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,29.5
       parent: 1
   - uid: 3186
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,29.5
       parent: 1
   - uid: 3187
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -28.5,16.5
       parent: 1
   - uid: 3188
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -28.5,14.5
       parent: 1
   - uid: 3189
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -26.5,17.5
       parent: 1
   - uid: 3190
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -26.5,13.5
       parent: 1
   - uid: 3191
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -26.5,16.5
       parent: 1
   - uid: 3192
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -26.5,14.5
       parent: 1
   - uid: 3193
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 29.5,16.5
       parent: 1
   - uid: 3194
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 29.5,14.5
       parent: 1
   - uid: 3195
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,17.5
       parent: 1
   - uid: 3196
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,13.5
       parent: 1
   - uid: 3197
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,14.5
       parent: 1
   - uid: 3198
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,21.5
       parent: 1
   - uid: 3199
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -29.5,20.5
       parent: 1
   - uid: 3200
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -28.5,20.5
       parent: 1
   - uid: 3201
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -28.5,19.5
       parent: 1
   - uid: 3202
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,33.5
       parent: 1
   - uid: 3203
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,34.5
       parent: 1
   - uid: 3204
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 29.5,34.5
       parent: 1
   - uid: 3205
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 29.5,35.5
       parent: 1
   - uid: 3206
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,20.5
       parent: 1
   - uid: 3207
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -25.5,17.5
       parent: 1
   - uid: 3208
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,20.5
       parent: 1
   - uid: 3209
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,3.5
       parent: 1
   - uid: 3210
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,2.5
       parent: 1
   - uid: 3211
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,1.5
       parent: 1
   - uid: 3212
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,2.5
       parent: 1
   - uid: 3213
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,2.5
       parent: 1
   - uid: 3214
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,2.5
       parent: 1
   - uid: 3215
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 5.5,2.5
       parent: 1
   - uid: 3216
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,2.5
       parent: 1
   - uid: 3217
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,2.5
       parent: 1
   - uid: 3219
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,13.5
       parent: 1
   - uid: 3220
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,5.5
       parent: 1
   - uid: 3221
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,11.5
       parent: 1
   - uid: 3222
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,17.5
       parent: 1
   - uid: 3223
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,28.5
       parent: 1
   - uid: 3224
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,27.5
       parent: 1
   - uid: 3225
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,23.5
       parent: 1
   - uid: 3226
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,11.5
       parent: 1
   - uid: 3227
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,14.5
       parent: 1
   - uid: 3228
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,14.5
       parent: 1
   - uid: 3229
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,14.5
       parent: 1
   - uid: 3230
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,27.5
       parent: 1
   - uid: 3231
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,13.5
       parent: 1
   - uid: 3232
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,14.5
       parent: 1
   - uid: 3233
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,11.5
       parent: 1
   - uid: 3234
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,9.5
       parent: 1
   - uid: 3235
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -7.5,9.5
       parent: 1
   - uid: 3236
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,24.5
       parent: 1
   - uid: 3237
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,11.5
       parent: 1
   - uid: 3238
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 15.5,9.5
       parent: 1
   - uid: 3239
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 15.5,10.5
       parent: 1
   - uid: 3240
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,11.5
       parent: 1
   - uid: 3241
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,13.5
       parent: 1
   - uid: 3242
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,24.5
       parent: 1
   - uid: 3243
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,34.5
       parent: 1
   - uid: 3244
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,33.5
       parent: 1
   - uid: 3245
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,35.5
       parent: 1
   - uid: 3246
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,17.5
       parent: 1
   - uid: 3247
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,17.5
       parent: 1
   - uid: 3249
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,19.5
       parent: 1
   - uid: 3250
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,17.5
       parent: 1
   - uid: 3251
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,20.5
       parent: 1
   - uid: 3252
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,23.5
       parent: 1
   - uid: 3253
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,26.5
       parent: 1
   - uid: 3254
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,26.5
       parent: 1
   - uid: 3255
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,27.5
       parent: 1
   - uid: 3256
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,27.5
       parent: 1
   - uid: 3257
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,28.5
       parent: 1
   - uid: 3258
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,17.5
       parent: 1
   - uid: 3259
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,16.5
       parent: 1
   - uid: 3260
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,20.5
       parent: 1
   - uid: 3261
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,20.5
       parent: 1
   - uid: 3262
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,12.5
       parent: 1
   - uid: 3263
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,11.5
       parent: 1
   - uid: 3264
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,13.5
       parent: 1
   - uid: 3265
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,12.5
       parent: 1
   - uid: 3266
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,23.5
       parent: 1
   - uid: 3267
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,23.5
       parent: 1
   - uid: 3268
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,24.5
       parent: 1
   - uid: 3269
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,24.5
       parent: 1
   - uid: 3270
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,25.5
       parent: 1
   - uid: 3271
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,25.5
       parent: 1
   - uid: 3272
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,17.5
       parent: 1
   - uid: 3273
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,16.5
       parent: 1
   - uid: 3274
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,12.5
       parent: 1
   - uid: 3275
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,14.5
       parent: 1
   - uid: 3276
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,14.5
       parent: 1
   - uid: 3277
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,14.5
       parent: 1
   - uid: 3278
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,23.5
       parent: 1
   - uid: 3279
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,20.5
       parent: 1
   - uid: 3280
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,19.5
       parent: 1
   - uid: 3281
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,18.5
       parent: 1
   - uid: 3282
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,17.5
       parent: 1
   - uid: 3283
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,14.5
       parent: 1
   - uid: 3284
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,13.5
       parent: 1
   - uid: 3285
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,14.5
       parent: 1
   - uid: 3286
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,14.5
       parent: 1
   - uid: 3287
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,12.5
       parent: 1
   - uid: 3288
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -10.5,9.5
       parent: 1
   - uid: 3289
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,14.5
       parent: 1
   - uid: 3290
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,14.5
       parent: 1
   - uid: 3291
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,14.5
       parent: 1
   - uid: 3292
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,14.5
       parent: 1
   - uid: 3293
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,14.5
       parent: 1
   - uid: 3294
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,6.5
       parent: 1
   - uid: 3295
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,4.5
       parent: 1
   - uid: 3296
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,5.5
       parent: 1
   - uid: 3297
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,0.5
       parent: 1
   - uid: 3298
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,6.5
       parent: 1
   - uid: 3299
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,29.5
       parent: 1
   - uid: 3300
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,26.5
       parent: 1
   - uid: 3301
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,25.5
       parent: 1
   - uid: 3302
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,20.5
       parent: 1
   - uid: 3303
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,34.5
       parent: 1
   - uid: 3304
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,34.5
       parent: 1
   - uid: 3305
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,16.5
       parent: 1
   - uid: 3306
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,3.5
       parent: 1
   - uid: 3307
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,12.5
       parent: 1
   - uid: 3308
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,13.5
       parent: 1
   - uid: 3309
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,12.5
       parent: 1
   - uid: 3310
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,13.5
       parent: 1
   - uid: 3311
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,12.5
       parent: 1
   - uid: 3312
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,11.5
       parent: 1
   - uid: 3313
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,5.5
       parent: 1
   - uid: 3314
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 15.5,5.5
       parent: 1
   - uid: 3315
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 16.5,5.5
       parent: 1
   - uid: 3316
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,1.5
       parent: 1
   - uid: 3317
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,1.5
       parent: 1
   - uid: 3318
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,0.5
       parent: 1
   - uid: 3319
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -17.5,6.5
       parent: 1
   - uid: 3320
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -17.5,5.5
       parent: 1
   - uid: 3321
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -17.5,4.5
       parent: 1
   - uid: 3322
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -17.5,1.5
       parent: 1
   - uid: 3323
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -17.5,9.5
       parent: 1
   - uid: 3324
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,25.5
       parent: 1
   - uid: 3325
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,3.5
       parent: 1
   - uid: 3326
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -19.5,9.5
       parent: 1
   - uid: 3327
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -20.5,9.5
       parent: 1
   - uid: 3328
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,3.5
       parent: 1
   - uid: 3329
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,8.5
       parent: 1
   - uid: 3330
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -17.5,3.5
       parent: 1
   - uid: 3331
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,13.5
       parent: 1
   - uid: 3332
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -20.5,11.5
       parent: 1
   - uid: 3333
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -20.5,12.5
       parent: 1
   - uid: 3334
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -23.5,11.5
       parent: 1
   - uid: 3335
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -23.5,10.5
       parent: 1
   - uid: 3336
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -24.5,10.5
       parent: 1
   - uid: 3337
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -25.5,10.5
       parent: 1
   - uid: 3338
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -13.5,2.5
       parent: 1
   - uid: 3339
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 24.5,10.5
       parent: 1
   - uid: 3340
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,25.5
       parent: 1
   - uid: 3341
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,25.5
       parent: 1
   - uid: 3342
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,23.5
       parent: 1
   - uid: 3343
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,36.5
       parent: 1
   - uid: 3344
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,37.5
       parent: 1
   - uid: 3345
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,35.5
       parent: 1
   - uid: 3346
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,34.5
       parent: 1
   - uid: 3347
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,26.5
       parent: 1
   - uid: 3348
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,38.5
       parent: 1
   - uid: 3349
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,30.5
       parent: 1
   - uid: 3350
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,6.5
       parent: 1
   - uid: 3351
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,25.5
       parent: 1
   - uid: 3352
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,26.5
       parent: 1
   - uid: 3353
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,7.5
       parent: 1
   - uid: 3355
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -21.5,3.5
       parent: 1
   - uid: 3356
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,28.5
       parent: 1
   - uid: 3357
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,28.5
       parent: 1
   - uid: 3358
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,27.5
       parent: 1
   - uid: 3359
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,26.5
       parent: 1
   - uid: 3360
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,36.5
       parent: 1
   - uid: 3361
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,24.5
       parent: 1
   - uid: 3362
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,29.5
       parent: 1
   - uid: 3363
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,36.5
       parent: 1
   - uid: 3364
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,36.5
       parent: 1
   - uid: 3365
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,35.5
       parent: 1
   - uid: 3366
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,37.5
       parent: 1
   - uid: 3367
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,38.5
       parent: 1
   - uid: 3368
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,38.5
       parent: 1
   - uid: 3369
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,37.5
       parent: 1
   - uid: 3370
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,27.5
       parent: 1
   - uid: 3371
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,27.5
       parent: 1
   - uid: 3372
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,27.5
       parent: 1
   - uid: 3373
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,27.5
       parent: 1
   - uid: 3374
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,27.5
       parent: 1
   - uid: 3375
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,26.5
       parent: 1
   - uid: 3376
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,27.5
       parent: 1
   - uid: 3377
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,26.5
       parent: 1
   - uid: 3378
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,27.5
       parent: 1
   - uid: 3379
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,26.5
       parent: 1
   - uid: 3380
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,6.5
       parent: 1
   - uid: 3381
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,6.5
       parent: 1
   - uid: 3382
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,6.5
       parent: 1
   - uid: 3383
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,6.5
       parent: 1
   - uid: 3384
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,30.5
       parent: 1
   - uid: 3385
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,29.5
       parent: 1
   - uid: 3386
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,28.5
       parent: 1
   - uid: 3387
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,30.5
       parent: 1
   - uid: 3388
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,30.5
       parent: 1
   - uid: 3389
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -13.5,5.5
       parent: 1
   - uid: 3390
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -13.5,4.5
       parent: 1
   - uid: 3391
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,3.5
       parent: 1
   - uid: 3392
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,34.5
       parent: 1
   - uid: 3393
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 24.5,30.5
       parent: 1
   - uid: 3394
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 25.5,30.5
       parent: 1
   - uid: 3395
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,30.5
       parent: 1
   - uid: 3396
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 28.5,20.5
       parent: 1
   - uid: 3397
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 27.5,20.5
       parent: 1
   - uid: 3398
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 27.5,23.5
       parent: 1
   - uid: 3399
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 28.5,23.5
       parent: 1
   - uid: 3400
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,24.5
       parent: 1
   - uid: 3401
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,25.5
       parent: 1
   - uid: 3402
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,25.5
       parent: 1
   - uid: 3403
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,31.5
       parent: 1
   - uid: 3404
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 26.5,20.5
       parent: 1
   - uid: 3405
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 24.5,20.5
       parent: 1
   - uid: 3406
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 27.5,27.5
       parent: 1
   - uid: 3407
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,27.5
       parent: 1
   - uid: 3408
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,4.5
       parent: 1
   - uid: 3409
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,1.5
       parent: 1
   - uid: 3410
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,1.5
       parent: 1
   - uid: 3411
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,18.5
       parent: 1
   - uid: 3412
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-0.5
       parent: 1
   - uid: 3413
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-0.5
       parent: 1
   - uid: 3414
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,5.5
       parent: 1
   - uid: 3415
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,4.5
       parent: 1
   - uid: 3416
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,3.5
       parent: 1
   - uid: 3417
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,4.5
       parent: 1
   - uid: 3418
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,4.5
       parent: 1
   - uid: 3419
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 24.5,5.5
       parent: 1
   - uid: 3420
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 15.5,-0.5
@@ -24994,8 +23097,6 @@ entities:
     - type: Transform
       pos: -8.5,16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: WeaponCapacitorRecharger
   entities:
   - uid: 3429

From cb7a54d5e66970410baf63ac928a15c935e56cb1 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 22:20:17 +0000
Subject: [PATCH 17/39] Automatic Changelog (#1852)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 78e15ac88a4e..3f35175d0507 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6251,3 +6251,11 @@ Entries:
         suits) and all turrets a high chance of reflecting laser shots.
   id: 5195
   time: '2024-08-12T22:15:51.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Add
+      message: >-
+        The Hovertaxibot, a spacefaring taxi robot with a ghost role, is now
+        craftable.
+  id: 5196
+  time: '2024-08-12T22:17:46.0000000+00:00'

From 424f724447a13281b297e3f079d64695bf105e65 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 22:23:29 +0000
Subject: [PATCH 18/39] Automatic Changelog (#1796)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 3f35175d0507..4a375844be22 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6259,3 +6259,9 @@ Entries:
         craftable.
   id: 5196
   time: '2024-08-12T22:17:46.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: Updated Crescent.
+  id: 5197
+  time: '2024-08-12T22:18:59.0000000+00:00'

From 766326642cc5ce8f30b6b59d18e008d9127d1237 Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Tue, 13 Aug 2024 01:40:53 +0300
Subject: [PATCH 19/39] Departmental EVA Suits (#1836)

* Departmental EVA Suits

* wall locker draft

* lathe eva recipes

* captain wall locker using generic visualizer

* chaplain and boxer eva

* wall eva lockers

* wall locker sprites, meta info fixes

* lathe, vendomats, mailpod and parcel fix

* more vendomats

* more decals for lockers, more empty lockers

* more lockers

* cap and sr helmet decals

* meta

* more files

* chapel/spdldr ordering, departmental EVA grammar

* Revert random crystal

* Multi Locker Drifting

* Update locker_wallmount.yml

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 Resources/Maps/_NF/Shuttles/mailpod.yml       |    2 +-
 Resources/Maps/_NF/Shuttles/parcel.yml        |    2 +-
 .../Inventories/cargodrobe.yml                |    2 +
 .../VendingMachines/Inventories/chapel.yml    |   33 +-
 .../VendingMachines/Inventories/chefdrobe.yml |    1 +
 .../VendingMachines/Inventories/engidrobe.yml |    2 +
 .../VendingMachines/Inventories/hydrobe.yml   |    1 +
 .../VendingMachines/Inventories/janidrobe.yml |    1 +
 .../VendingMachines/Inventories/medidrobe.yml |    1 +
 .../VendingMachines/Inventories/scidrobe.yml  |    1 +
 .../Entities/Structures/Machines/lathe.yml    |   26 +-
 .../Fills/Vending/Inventories/boxingdrobe.yml |    4 +
 .../Entities/Structures/Machines/lathe.yml    |   15 +-
 .../_NF/Catalog/Fills/Backpacks/duffelbag.yml |  139 ++
 .../Fills/Lockers/locker_wallmount.yml        |  179 +++
 .../Catalog/Fills/Lockers/suit_storage.yml    |  204 ++-
 .../Fills/Lockers/suit_storage_wallmount.yml  |  179 ++-
 .../StorageFillTemplates/departmental_eva.yml |  356 +++++
 .../Fills/StorageFillTemplates/materials.yml  |   81 ++
 .../VendingMachines/Inventories/astrovend.yml |    2 +
 .../Inventories/bountyvend.yml                |    2 +
 .../VendingMachines/Inventories/nfsddrobe.yml |    1 +
 .../Clothing/Head/softsuit-helmets.yml        |  559 +++++++-
 .../OuterClothing/goblin_outerclothing.yml    |    2 +-
 .../Clothing/OuterClothing/softsuits.yml      | 1152 ++++++++++++++++-
 .../Random/dungeon_items_engineering.yml      |    2 +
 .../Spawners/Random/dungeon_items_general.yml |   18 +-
 .../Random/dungeon_items_mercenary.yml        |    2 +
 .../Spawners/Random/dungeon_items_supply.yml  |    2 +
 .../Entities/Structures/Machines/lathe.yml    |    5 +-
 .../Storage/Closets/wall_lockers.yml          |  176 +++
 .../Closets/wall_lockers_department.yml       |  231 ++++
 .../Closets/wall_lockers_department_eva.yml   |  507 ++++++++
 .../Prototypes/_NF/Recipes/Lathes/eva.yml     |  190 +++
 .../Helmets/ert_mailcarrier.rsi/meta.json     |    2 +-
 .../eva_color.rsi/equipped-head-base.png      |  Bin 0 -> 472 bytes
 .../eva_color.rsi/equipped-head-decals-01.png |  Bin 0 -> 204 bytes
 .../eva_color.rsi/equipped-head-decals-02.png |  Bin 0 -> 279 bytes
 .../equipped-head-reinforced-points.png       |  Bin 0 -> 230 bytes
 .../eva_color.rsi/equipped-head-visor.png     |  Bin 0 -> 182 bytes
 .../Head/Helmets/eva_color.rsi/icon-base.png  |  Bin 0 -> 652 bytes
 .../Helmets/eva_color.rsi/icon-decals-01.png  |  Bin 0 -> 560 bytes
 .../Helmets/eva_color.rsi/icon-decals-02.png  |  Bin 0 -> 643 bytes
 .../eva_color.rsi/icon-reinforced-points.png  |  Bin 0 -> 560 bytes
 .../Head/Helmets/eva_color.rsi/icon-visor.png |  Bin 0 -> 558 bytes
 .../Head/Helmets/eva_color.rsi/meta.json      |   46 +
 .../Head/Helmets/eva_hydro.rsi/meta.json      |    2 +-
 .../Head/Helmets/eva_mailman.rsi/meta.json    |    2 +-
 .../Suits/eva_color.rsi/equipped-base.png     |  Bin 0 -> 1135 bytes
 .../eva_color.rsi/equipped-breathing-gear.png |  Bin 0 -> 399 bytes
 .../eva_color.rsi/equipped-decals-01.png      |  Bin 0 -> 301 bytes
 .../equipped-decals-02-boxer.png              |  Bin 0 -> 1313 bytes
 .../equipped-reinforced-points.png            |  Bin 0 -> 738 bytes
 .../Suits/eva_color.rsi/icon-base.png         |  Bin 0 -> 540 bytes
 .../eva_color.rsi/icon-breathing-gear.png     |  Bin 0 -> 201 bytes
 .../Suits/eva_color.rsi/icon-decals-01.png    |  Bin 0 -> 184 bytes
 .../eva_color.rsi/icon-decals-02-boxer.png    |  Bin 0 -> 509 bytes
 .../eva_color.rsi/icon-reinforced-points.png  |  Bin 0 -> 294 bytes
 .../Suits/eva_color.rsi/inhand-left-base.png  |  Bin 0 -> 504 bytes
 .../inhand-left-breathing-gear.png            |  Bin 0 -> 221 bytes
 .../eva_color.rsi/inhand-left-decals-01.png   |  Bin 0 -> 211 bytes
 .../inhand-left-reinforced-points.png         |  Bin 0 -> 162 bytes
 .../Suits/eva_color.rsi/inhand-right-base.png |  Bin 0 -> 454 bytes
 .../inhand-right-breathing-gear.png           |  Bin 0 -> 224 bytes
 .../eva_color.rsi/inhand-right-decals-01.png  |  Bin 0 -> 222 bytes
 .../inhand-right-reinforced-points.png        |  Bin 0 -> 163 bytes
 .../Suits/eva_color.rsi/meta.json             |   78 ++
 .../Storage/wall_locker_color.rsi/base.png    |  Bin 0 -> 230 bytes
 .../door-decal-captain-01.png                 |  Bin 0 -> 118 bytes
 .../door-decal-cargo-01.png                   |  Bin 0 -> 134 bytes
 .../door-decal-cargo-02.png                   |  Bin 0 -> 131 bytes
 .../door-decal-engi-01.png                    |  Bin 0 -> 154 bytes
 .../door-decal-engi-02.png                    |  Bin 0 -> 121 bytes
 .../door-decal-engi-03.png                    |  Bin 0 -> 127 bytes
 .../door-decal-eva-01.png                     |  Bin 0 -> 138 bytes
 .../door-decal-eva-02.png                     |  Bin 0 -> 154 bytes
 .../door-decal-fuel-ame.png                   |  Bin 0 -> 148 bytes
 .../door-decal-fuel-plasma.png                |  Bin 0 -> 136 bytes
 .../door-decal-fuel-uranium.png               |  Bin 0 -> 169 bytes
 .../door-decal-fuel-welding.png               |  Bin 0 -> 144 bytes
 .../door-decal-line-01.png                    |  Bin 0 -> 165 bytes
 .../door-decal-line-02.png                    |  Bin 0 -> 220 bytes
 .../door-decal-line-03.png                    |  Bin 0 -> 237 bytes
 .../door-decal-line-04.png                    |  Bin 0 -> 235 bytes
 .../door-decal-med-01.png                     |  Bin 0 -> 129 bytes
 .../wall_locker_color.rsi/door-decal-null.png |  Bin 0 -> 109 bytes
 .../Storage/wall_locker_color.rsi/door.png    |  Bin 0 -> 313 bytes
 .../Storage/wall_locker_color.rsi/locked.png  |  Bin 0 -> 137 bytes
 .../Storage/wall_locker_color.rsi/meta.json   |   83 ++
 .../Storage/wall_locker_color.rsi/open.png    |  Bin 0 -> 287 bytes
 .../wall_locker_color.rsi/unlocked.png        |  Bin 0 -> 146 bytes
 .../Storage/wall_locker_color.rsi/welded.png  |  Bin 0 -> 293 bytes
 92 files changed, 4168 insertions(+), 125 deletions(-)
 create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml
 create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/departmental_eva.yml
 create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/materials.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department_eva.yml
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-base.png
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-decals-01.png
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-decals-02.png
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-reinforced-points.png
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-visor.png
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-base.png
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-decals-01.png
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-decals-02.png
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-reinforced-points.png
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-visor.png
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-base.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-breathing-gear.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-decals-01.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-decals-02-boxer.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-reinforced-points.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-base.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-breathing-gear.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-decals-01.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-decals-02-boxer.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-reinforced-points.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-base.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-breathing-gear.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-decals-01.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-reinforced-points.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-base.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-breathing-gear.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-decals-01.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-reinforced-points.png
 create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/base.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-captain-01.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-cargo-01.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-cargo-02.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-01.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-02.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-03.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-eva-01.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-eva-02.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-ame.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-plasma.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-uranium.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-welding.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-01.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-02.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-03.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-04.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-med-01.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-null.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/locked.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/open.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/unlocked.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/welded.png

diff --git a/Resources/Maps/_NF/Shuttles/mailpod.yml b/Resources/Maps/_NF/Shuttles/mailpod.yml
index a8f7153eb48e..01585bb32aea 100644
--- a/Resources/Maps/_NF/Shuttles/mailpod.yml
+++ b/Resources/Maps/_NF/Shuttles/mailpod.yml
@@ -866,7 +866,7 @@ entities:
     - type: Transform
       pos: 2.5,1.5
       parent: 1
-- proto: SuitStorageWallmountMailCarrier
+- proto: LockerWallEVAColorMailFilled
   entities:
   - uid: 95
     components:
diff --git a/Resources/Maps/_NF/Shuttles/parcel.yml b/Resources/Maps/_NF/Shuttles/parcel.yml
index 46337f2932c7..4f03fabd5ee3 100644
--- a/Resources/Maps/_NF/Shuttles/parcel.yml
+++ b/Resources/Maps/_NF/Shuttles/parcel.yml
@@ -1504,7 +1504,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,1.5
       parent: 1
-- proto: SuitStorageWallmountMailCarrier
+- proto: LockerWallEVAColorMailFilled
   entities:
   - uid: 73
     components:
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
index 4809cec01c49..76d1ec313ce9 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelCargo: 3
     ClothingBackpackDuffelCargo: 3
     ClothingBackpackMessengerCargo: 3 # Frontier
+    ClothingOuterEVASuitCargo: 3 # Frontier
     ClothingUniformJumpsuitCargo: 3
     ClothingUniformJumpskirtCargo: 3
     ClothingShoesColorBlack: 3
@@ -21,6 +22,7 @@
     ClothingBackpackSatchelSalvage: 2
     ClothingBackpackDuffelSalvage: 2
     ClothingBackpackMessengerSalvage: 2 # Frontier
+    ClothingOuterEVASuitSalvage: 2 # Frontier
     ClothingBeltSalvageWebbing: 2
     ClothingUniformJumpsuitSalvageSpecialist: 2
     ClothingOuterWinterMiner: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
index 069aa036c643..e7837cbccc52 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -15,30 +15,31 @@
     ClothingHeadHatWitch1: 3
     ClothingOuterPlagueSuit: 3
     ClothingMaskPlague: 3
-    ClothingHeadHatKippah: 3
-    ClothingHeadHatWideBrimmed: 3
-    ClothingHeadHatPilgrim: 3
-    ClothingUniformJumpsuitChaplainPilgrimVest: 3
-    ClothingHeadHatBishopMitre: 3
-    ClothingOuterCoatBishop: 3
-    ClothingHeadHatCardinal: 3
-    ClothingOuterCoatCardinal: 3
-    ClothingHeadHatWitchhunter: 3
-    ClothingOuterCoatWitchHunter: 3
-    ClothingNeckScarfChaplainStole: 3
+    ClothingHeadHatKippah: 3 # Frontier
+    ClothingHeadHatWideBrimmed: 3 # Frontier
+    ClothingHeadHatPilgrim: 3 # Frontier
+    ClothingUniformJumpsuitChaplainPilgrimVest: 3 # Frontier
+    ClothingHeadHatBishopMitre: 3 # Frontier
+    ClothingOuterCoatBishop: 3 # Frontier
+    ClothingHeadHatCardinal: 3 # Frontier
+    ClothingOuterCoatCardinal: 3 # Frontier
+    ClothingHeadHatWitchhunter: 3 # Frontier
+    ClothingOuterCoatWitchHunter: 3 # Frontier
+    ClothingNeckScarfChaplainStole: 3 # Frontier
     ClothingNeckStoleChaplain: 3
-    ClothingBeltChaplainSash: 3
+    ClothingBeltChaplainSash: 3 # Frontier
     ClothingHeadsetService: 4
     RubberStampChaplain: 3
     Bible: 3
-    UrnMortuary: 4
-    Censer: 2
-    ClothingNeckCrucifix: 3
     BoxCandle: 2
     BoxCandleSmall: 2
     Urn: 5
+    UrnMortuary: 4 # Frontier
+    Censer: 2 # Frontier
+    ClothingNeckCrucifix: 3 # Frontier
+    ClothingOuterEVASuitChaplain: 3 # Frontier
   emaggedInventory:
-    WoodenStake: 6
+    WoodenStake: 6 # Frontier
     ClothingOuterArmorCult: 1
     ClothingHeadHelmetCult: 1
     ClothingOuterRobesCult: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
index c238e3961913..eefa26fab88c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
@@ -1,6 +1,7 @@
 - type: vendingMachineInventory
   id: ChefDrobeInventory
   startingInventory:
+    ClothingOuterEVASuitServiceWorker: 2 # Frontier
     ClothingHeadsetService: 2
     ClothingOuterApronChef: 3
     ClothingOuterWinterChef: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
index cad9c2eac383..7b25a12cef70 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelEngineering: 3
     ClothingBackpackEngineering: 3
     ClothingBackpackMessengerEngineering: 3 # Frontier
+    ClothingOuterEVASuitEngineer: 3 # Frontier
     ClothingUniformJumpsuitEngineering: 3
     ClothingUniformJumpskirtEngineering: 3
     ClothingUniformJumpsuitEngineeringHazard: 3
@@ -24,6 +25,7 @@
     ClothingBackpackSatchelAtmospherics: 2
     ClothingBackpackAtmospherics: 2
     ClothingBackpackMessengerAtmospherics: 2 # Frontier
+    ClothingOuterEVASuitAtmosTech: 2 # Frontier
     ClothingUniformJumpsuitAtmos: 3
     ClothingUniformJumpskirtAtmos: 3
     ClothingUniformJumpsuitAtmosCasual: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
index 0b342a1207c6..ceda3f4a8dc1 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelHydroponics: 3
     ClothingBackpackDuffelHydroponics: 3
     ClothingBackpackMessengerHydroponics: 3 # Frontier
+    ClothingOuterEVASuitHydro: 3 # Frontier
     ClothingBeltPlant: 3 # Frontier
     ClothingOuterApronBotanist: 3
     ClothingUniformOveralls: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
index 676b2ef2a06c..f52174815de7 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
@@ -14,6 +14,7 @@
     ClothingNeckScarfStripedPurple: 3
     ClothingHeadHatHoodBioJanitor: 1 # Frontier - Bio suit
     ClothingOuterBioJanitor: 1 # Frontier - Bio suit
+    ClothingOuterEVASuitJanitor: 1 # Frontier - EVA
   contrabandInventory: # Frontier - Hidden inventory
     ClothingUniformJumpskirtJanimaid: 2
     ClothingUniformJumpskirtJanimaidmini: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
index b894699f31d4..61609fe51733 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelMedical: 4
     ClothingBackpackDuffelMedical: 4
     ClothingBackpackMessengerMedical: 4 # Frontier
+    ClothingOuterEVASuitMedic: 4 # Frontier
     ClothingUniformJumpsuitMedicalDoctor: 4
     ClothingUniformJumpskirtMedicalDoctor: 4
     ClothingOuterWinterMed: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
index 3270f10d24c8..92e0de0b6b3e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelScience: 3
     ClothingBackpackDuffelScience: 3
     ClothingBackpackMessengerScience: 3 # Frontier
+    ClothingOuterEVASuitScientist: 3 # Frontier
     ClothingUniformJumpsuitScientist: 3
     ClothingUniformJumpskirtScientist: 3
     ClothingUniformJumpsuitScientistFormal: 3
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 567f52262499..b075a8f92d84 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -207,6 +207,8 @@
       - ClothingHeadHelmetEVA # Frontier
       - ClothingHeadHelmetEVALarge # Frontier
       - ClothingOuterHardsuitEVA # Frontier
+      - ClothingOuterEVASuitContractor # Frontier
+      - ClothingOuterEVASuitPilot # Frontier
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - BoxLethalshot
@@ -818,15 +820,14 @@
       - TargetHuman
       - TargetSyndicate
       - WeaponDisablerPractice
-      # Frontier Start
-      - ThrusterSecurityMachineCircuitboard
-      - ClothingOuterSuitEmergency
-      - ClothingHeadHelmetEVA
-      - ClothingHeadHelmetEVALarge
-      - ClothingOuterHardsuitEVAPrisoner
-      # Frontier End
       - WeaponLaserCarbinePractice
       - Zipties
+      - ThrusterSecurityMachineCircuitboard # Frontier
+      - ClothingOuterSuitEmergency # Frontier
+      - ClothingOuterEVASuitNfsd # Frontier
+      - ClothingHeadHelmetEVA # Frontier
+      - ClothingHeadHelmetEVALarge # Frontier
+      - ClothingOuterHardsuitEVAPrisoner # Frontier
     dynamicRecipes:
       - BoxBeanbag
       - BoxShotgunIncendiary
@@ -1006,11 +1007,10 @@
       - Saw
       - Hemostat
       - ClothingEyesGlassesChemical
-      # Frontier Start
-      - ClothingOuterSuitEmergency
-      - ClothingOuterHardsuitVoidParamed
-      # Frontier End
       - WhiteCane
+      - ClothingOuterEVASuitMedic # Frontier
+      - ClothingOuterSuitEmergency # Frontier
+      - ClothingOuterHardsuitVoidParamed # Frontier
     dynamicRecipes:
       - ChemicalPayload
       - CryostasisBeaker
@@ -1018,9 +1018,7 @@
       - SyringeBluespace
       - Jug
       - SyringeCryostasis
-      # Frontier Start
-      - ClothingOuterHardsuitMedical
-      # Frontier End
+      - ClothingOuterHardsuitMedical # Frontier
   - type: Machine
     board: MedicalTechFabCircuitboard
   - type: StealTarget
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/boxingdrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/boxingdrobe.yml
index 863cdb979e7f..415a7bfa4cb9 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/boxingdrobe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/boxingdrobe.yml
@@ -7,5 +7,9 @@
     ClothingHandsGlovesBoxingBlue: 2
     ClothingHandsGlovesBoxingGreen: 2
     ClothingHandsGlovesBoxingYellow: 2
+    ClothingOuterEVASuitBoxerRed: 2 # Frontier
+    ClothingOuterEVASuitBoxerGreen: 2 # Frontier
+    ClothingOuterEVASuitBoxerBlue: 2 # Frontier
+    ClothingOuterEVASuitBoxerYellow: 2 # Frontier
   emaggedInventory:
     UniformJabroni: 2
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
index 6e6e3d952ff1..90857ff282bd 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
@@ -23,6 +23,8 @@
   - type: Lathe
     idleState: icon
     runningState: icon
+    staticRecipes: #Frontier
+      - ClothingOuterEVASuitScientist #Frontier
     dynamicRecipes:
       - BluespaceBeaker
       - CryostasisBeaker
@@ -122,10 +124,15 @@
       - Beaker # Frontier
       - LargeBeaker # Frontier
       - ServiceSelectiveDropper # Frontier
-      - ClothingOuterSuitEmergency # Frontier
-      - ClothingHeadHelmetEVA # Frontier
-      - ClothingOuterHardsuitEVA # Frontier
       - ClothingOuterEVASuitHydro # Frontier
+      - ClothingOuterEVASuitJanitor # Frontier
+      - ClothingOuterEVASuitMailman # Frontier
+      - ClothingOuterEVASuitServiceWorker # Frontier
+      - ClothingOuterEVASuitChaplain # Frontier
+      - ClothingOuterEVASuitBoxerRed # Frontier
+      - ClothingOuterEVASuitBoxerGreen # Frontier
+      - ClothingOuterEVASuitBoxerBlue # Frontier
+      - ClothingOuterEVASuitBoxerYellow # Frontier
     dynamicRecipes:
       - Holoprojector
       - HydroponicsToolScythe
@@ -243,6 +250,8 @@
       - ClothingHeadHelmetEVA # Frontier
       - ClothingHeadHelmetEVALarge # Frontier
       - ClothingOuterHardsuitEVA # Frontier
+      - ClothingOuterEVASuitEngineer # Frontier
+      - ClothingOuterEVASuitAtmosTech # Frontier
       - WelderIndustrial # Frontier
       - WelderIndustrialAdvanced # Frontier
       # Engi fab has shuttle power and tech at base
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml
index 4428a35957c9..c3952c5e8adc 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml
@@ -82,3 +82,142 @@
         - id: Cutlass
         - id: WeaponRevolverPirate
         - id: ClothingEyesEyepatch
+
+#Departmental EVA bundles
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitContractor ]
+  id: ClothingBackpackDuffelEVABundleContractor
+  name: contractor EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelPilot, StorageFillEVASuitPilot ]
+  id: ClothingBackpackDuffelEVABundlePilot
+  name: pilot EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelCaptain, StorageFillEVASuitSr ]
+  id: ClothingBackpackDuffelEVABundleSr
+  name: station representative EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelCaptain, StorageFillEVASuitCaptain ]
+  id: ClothingBackpackDuffelEVABundleCaptain
+  name: captain EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelEngineering, StorageFillEVASuitEngineer ]
+  id: ClothingBackpackDuffelEVABundleEngineer
+  name: engineer EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelAtmospherics, StorageFillEVASuitAtmosTech ]
+  id: ClothingBackpackDuffelEVABundleAtmosTech
+  name: atmospheric technician EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelCargo, StorageFillEVASuitCargo ]
+  id: ClothingBackpackDuffelEVABundleCargo
+  name: cargo technician EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelSalvage, StorageFillEVASuitSalvage ]
+  id: ClothingBackpackDuffelEVABundleSalvage
+  name: salvage specialist EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelMedical, StorageFillEVASuitMedic ]
+  id: ClothingBackpackDuffelEVABundleMedical
+  name: medical specialist EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelScience, StorageFillEVASuitScientist ]
+  id: ClothingBackpackDuffelEVABundleScientist
+  name: scientist EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitJanitor ]
+  id: ClothingBackpackDuffelEVABundleJanitor
+  name: janitor EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitServiceWorker ]
+  id: ClothingBackpackDuffelEVABundleServiceWorker
+  name: service worker EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitChaplain ]
+  id: ClothingBackpackDuffelEVABundleChaplain
+  name: chaplain EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerRed ]
+  id: ClothingBackpackDuffelEVABundleBoxerRed
+  name: boxer EVA bundle
+  suffix: Filled, Red
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerGreen ]
+  id: ClothingBackpackDuffelEVABundleBoxerGreen
+  name: boxer EVA bundle
+  suffix: Filled, Green
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerBlue ]
+  id: ClothingBackpackDuffelEVABundleBoxerBlue
+  name: boxer EVA bundle
+  suffix: Filled, Blue
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerYellow ]
+  id: ClothingBackpackDuffelEVABundleBoxerYellow
+  name: boxer EVA bundle
+  suffix: Filled, Yellow
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerRandom ]
+  id: ClothingBackpackDuffelEVABundleBoxerRandom
+  name: boxer EVA bundle
+  suffix: Filled, Random
+
+- type: entity
+  parent: [ ClothingBackpackDuffelHydroponics, StorageFillEVASuitHydro ]
+  id: ClothingBackpackDuffelEVABundleHydro
+  name: botanist EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitMail ]
+  id: ClothingBackpackDuffelEVABundleMail
+  name: mail carrier EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelMercenary, StorageFillEVASuitMercenary ]
+  id: ClothingBackpackDuffelEVABundleMercenary
+  name: mercenary EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitPrivateSec ]
+  id: ClothingBackpackDuffelEVABundlePrivateSec
+  name: private security EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelNfsdBrown, StorageFillEVASuitNfsd ]
+  id: ClothingBackpackDuffelEVABundleNfsd
+  name: nfsd EVA bundle
+  suffix: Filled
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml
new file mode 100644
index 000000000000..fab31edc58a2
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml
@@ -0,0 +1,179 @@
+#FUEL
+- type: entity
+  parent: [ LockerWallColorFuelPlasma, StorageFillMaterialsFuelPlasma ]
+  id: LockerWallMaterialsFuelPlasmaFilled
+  suffix: Filled, Plasma
+
+- type: entity
+  parent: [ LockerWallColorUranium, StorageFillMaterialsFuelUranium ]
+  id: LockerWallMaterialsFuelUraniumFilled
+  suffix: Filled, Uranium
+
+- type: entity
+  parent: [ LockerWallColorFuelPlasma, StorageFillMaterialsFuelPlasma2 ]
+  id: LockerWallMaterialsFuelPlasmaFilled2
+  suffix: Filled, Plasma (x2 Generators)
+
+- type: entity
+  parent: [ LockerWallColorUranium, StorageFillMaterialsFuelUranium2 ]
+  id: LockerWallMaterialsFuelUraniumFilled2
+  suffix: Filled, Uranium (x2 Generators)
+
+- type: entity
+  parent: [ LockerWallColorBananium, StorageFillMaterialsFuelBananium ]
+  id: LockerWallMaterialsFuelBananiumFilled
+  suffix: Filled, Bananium
+
+- type: entity
+  parent: [ LockerWallColorAme, StorageFillMaterialsFuelAmeJar ]
+  id: LockerWallMaterialsFuelAmeJarFilled
+  suffix: Filled, AME Jar (x2)
+
+- type: entity
+  parent: [ LockerWallColorWelding, StorageFillMaterialsFuelWelding ]
+  id: LockerWallMaterialsFuelWeldingFilled
+  suffix: Filled, Welding Fuel (x2)
+
+#MATERIALS
+- type: entity
+  parent: [ LockerWallColorMaterials, StorageFillMaterialsBasic ]
+  id: LockerWallMaterialsBasicFilled
+  suffix: Filled, Basic Materials (full)
+
+- type: entity
+  parent: [ LockerWallColorMaterials, StorageFillMaterialsBasic10 ]
+  id: LockerWallMaterialsBasic10Filled
+  suffix: Filled, Basic Materials (10)
+
+#SOFTSUITS
+- type: entity
+  parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitGoblin ]
+  id: LockerWallEVAColorGoblinFilled
+  name: goblin EVA locker
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorContractor, StorageFillEVASuitContractor ]
+  id: LockerWallEVAColorContractorFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorPilot, StorageFillEVASuitPilot ]
+  id: LockerWallEVAColorPilotFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorSr, StorageFillEVASuitSr ]
+  id: LockerWallEVAColorSrFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorCaptain, StorageFillEVASuitCaptain ]
+  id: LockerWallEVAColorCaptainFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorEngineer, StorageFillEVASuitEngineer ]
+  id: LockerWallEVAColorEngineerFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorAtmosTech, StorageFillEVASuitAtmosTech ]
+  id: LockerWallEVAColorAtmosTechFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorCargo, StorageFillEVASuitCargo ]
+  id: LockerWallEVAColorCargoFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorSalvage, StorageFillEVASuitSalvage ]
+  id: LockerWallEVAColorSalvageFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorMedical, StorageFillEVASuitMedic ]
+  id: LockerWallEVAColorMedicalFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorMedical, StorageFillEVASuitParamedic ]
+  id: LockerWallEVAColorParamedicFilled
+  name: paramedic voidsuit wall locker
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorScientist, StorageFillEVASuitScientist ]
+  id: LockerWallEVAColorScientistFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorJanitor, StorageFillEVASuitJanitor ]
+  id: LockerWallEVAColorJanitorFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorServiceWorker, StorageFillEVASuitServiceWorker ]
+  id: LockerWallEVAColorServiceWorkerFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorChaplain, StorageFillEVASuitChaplain ]
+  id: LockerWallEVAColorChaplainFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitBoxerRed ]
+  id: LockerWallEVAColorBoxerRedFilled
+  name: boxer EVA locker
+  suffix: Filled, Red
+
+- type: entity
+  parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitBoxerGreen ]
+  id: LockerWallEVAColorBoxerGreenFilled
+  name: boxer EVA locker
+  suffix: Filled, Green
+
+- type: entity
+  parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitBoxerBlue ]
+  id: LockerWallEVAColorBoxerBlueFilled
+  name: boxer EVA locker
+  suffix: Filled, Blue
+
+- type: entity
+  parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitBoxerYellow ]
+  id: LockerWallEVAColorBoxerYellowFilled
+  name: boxer EVA locker
+  suffix: Filled, Yellow
+
+- type: entity
+  parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitBoxerRandom ]
+  id: LockerWallEVAColorBoxerRandomFilled
+  name: boxer EVA locker
+  suffix: Filled, Random
+
+- type: entity
+  parent: [ LockerWallEVAColorHydroponics, StorageFillEVASuitHydro ]
+  id: LockerWallEVAColorHydroponicsFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorMail, StorageFillEVASuitMail ]
+  id: LockerWallEVAColorMailFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorMercenary, StorageFillEVASuitMercenary ]
+  id: LockerWallEVAColorMercenaryFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorPrivateSec, StorageFillEVASuitPrivateSec ]
+  id: LockerWallEVAColorPrivateSecFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorNfsd, StorageFillEVASuitNfsd ]
+  id: LockerWallEVAColorNfsdFilled
+  suffix: Filled
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
index 2915629f93ea..1495f5d65d5c 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -1,65 +1,181 @@
 #SOFTSUITS
-#Paramedic's voidsuit
 - type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitGoblin ]
+  id: SuitStorageEVAGoblin
+  suffix: EVA, Goblin
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitContractor ]
+  id: SuitStorageEVAContractor
+  suffix: EVA, Contractor
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitPilot ]
+  id: SuitStorageEVAPilot
+  suffix: EVA, Pilot
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitSr ]
+  id: SuitStorageEVASr
+  suffix: EVA, Station Representative
+  components:
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitCaptain ]
+  id: SuitStorageEVACaptain
+  suffix: EVA, Captain
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitEngineer ]
+  id: SuitStorageEVAEngineer
+  suffix: EVA, Engineer
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitAtmosTech ]
+  id: SuitStorageEVAAtmosTech
+  suffix: EVA, Atmospherics Technician
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitCargo ]
+  id: SuitStorageEVACargo
+  suffix: EVA, Cargo Technician
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitSalvage ]
+  id: SuitStorageEVASalvage
+  suffix: EVA, Salvage Specialist
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitMedic ]
+  id: SuitStorageEVAMedical
+  suffix: EVA, Medical Doctor
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitParamedic ]
   id: SuitStorageParamedic
-  parent: SuitStorageBase
-  suffix: Paramedic
+  suffix: EVA, Paramedic
   components:
-  - type: StorageFill
-    contents:
-        - id: AirTankFilled
-        - id: ClothingOuterHardsuitVoidParamed
-        - id: ClothingMaskBreathMedical
-        - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
-#Hydroponics EVA
 - type: entity
-  id: SuitStorageHydro
-  parent: SuitStorageBase
-  suffix: Hydroponics
+  parent: [ SuitStorageBase, StorageFillEVASuitScientist ]
+  id: SuitStorageEVAScientist
+  suffix: EVA, Scientist
   components:
-  - type: StorageFill
-    contents:
-        - id: AirTankFilled
-        - id: ClothingOuterEVASuitHydro
-        - id: ClothingMaskBreath
-        - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
-#Mail Carrier EVA
 - type: entity
-  id: SuitStorageMailCarrier
-  parent: SuitStorageBase
-  suffix: Mail Carrier
+  parent: [ SuitStorageBase, StorageFillEVASuitJanitor ]
+  id: SuitStorageEVAJanitor
+  suffix: EVA, Janitor
   components:
-  - type: StorageFill
-    contents:
-        - id: AirTankFilled
-        - id: ClothingOuterEVASuitMailman
-        - id: ClothingMaskBreath
-        - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
-    access: [["Mail"]]
 
-#Goblin EVA
 - type: entity
-  id: SuitStorageGoblin
-  parent: SuitStorageBase
-  suffix: Goblin
+  parent: [ SuitStorageBase, StorageFillEVASuitServiceWorker ]
+  id: SuitStorageEVAServiceWorker
+  suffix: EVA, Service Worker
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitChaplain ]
+  id: SuitStorageEVAChaplain
+  suffix: EVA, Chaplain
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitBoxerRed ]
+  id: SuitStorageEVABoxerRed
+  suffix: EVA, Boxer, Red
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitBoxerGreen ]
+  id: SuitStorageEVABoxerGreen
+  suffix: EVA, Boxer, Green
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitBoxerBlue ]
+  id: SuitStorageEVABoxerBlue
+  suffix: EVA, Boxer, Blue
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitBoxerYellow ]
+  id: SuitStorageEVABoxerYellow
+  suffix: EVA, Boxer, Yellow
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitBoxerRandom ]
+  id: SuitStorageEVABoxerRandom
+  suffix: EVA, Boxer, Random
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitHydro ]
+  id: SuitStorageEVAHydro
+  suffix: EVA, Hydroponics
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitMail ]
+  id: SuitStorageEVAMail
+  suffix: EVA, Mail Carrier
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitMercenary ]
+  id: SuitStorageEVAMercenary
+  suffix: EVA, Mercenary
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitPrivateSec ]
+  id: SuitStorageEVAPrivateSec
+  suffix: EVA, Private Security
   components:
-  - type: StorageFill
-    contents:
-        - id: AirTankFilled
-        - id: ClothingOuterEVASuitGoblin
-        - id: ClothingMaskBreath
-        - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitNfsd ]
+  id: SuitStorageEVANfsd
+  suffix: EVA, NFSD
+  components:
+  - type: AccessReader
+    access: [["Security"]]
+
 #HARDSUITS
 #Quartermaster hardsuit
 - type: entity
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
index 2993b1a8b35c..88caeb174ec4 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
@@ -1,23 +1,180 @@
 #SOFTSUITS
-#Paramedic's Voidsuit
 - type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitGoblin ]
+  id: SuitStorageWallmountEVAGoblin
+  suffix: EVA, Goblin
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitContractor ]
+  id: SuitStorageWallmountEVAContractor
+  suffix: EVA, Contractor
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitPilot ]
+  id: SuitStorageWallmountEVAPilot
+  suffix: EVA, Pilot
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitSr ]
+  id: SuitStorageWallmountEVASr
+  suffix: EVA, Station Representative
+  components:
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitCaptain ]
+  id: SuitStorageWallmountEVACaptain
+  suffix: EVA, Captain
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitEngineer ]
+  id: SuitStorageWallmountEVAEngineer
+  suffix: EVA, Engineer
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitAtmosTech ]
+  id: SuitStorageWallmountEVAAtmosTech
+  suffix: EVA, Atmospherics Technician
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitCargo ]
+  id: SuitStorageWallmountEVACargo
+  suffix: EVA, Cargo Technician
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitSalvage ]
+  id: SuitStorageWallmountEVASalvage
+  suffix: EVA, Salvage Specialist
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitMedic ]
+  id: SuitStorageWallmountEVAMedical
+  suffix: EVA, Medical Doctor
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitParamedic ]
   id: SuitStorageWallmountParamedic
-  parent: [SuitStorageWallmount, SuitStorageParamedic]
+  suffix: EVA, Paramedic
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitScientist ]
+  id: SuitStorageWallmountEVAScientist
+  suffix: EVA, Scientist
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitJanitor ]
+  id: SuitStorageWallmountEVAJanitor
+  suffix: EVA, Janitor
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitServiceWorker ]
+  id: SuitStorageWallmountEVAServiceWorker
+  suffix: EVA, Service Worker
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitChaplain ]
+  id: SuitStorageWallmountEVAChaplain
+  suffix: EVA, Chaplain
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitBoxerRed ]
+  id: SuitStorageWallmountEVABoxerRed
+  suffix: EVA, Boxer, Red
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitBoxerGreen ]
+  id: SuitStorageWallmountEVABoxerGreen
+  suffix: EVA, Boxer, Green
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitBoxerBlue ]
+  id: SuitStorageWallmountEVABoxerBlue
+  suffix: EVA, Boxer, Blue
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitBoxerYellow ]
+  id: SuitStorageWallmountEVABoxerYellow
+  suffix: EVA, Boxer, Yellow
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitBoxerRandom ]
+  id: SuitStorageWallmountEVABoxerRandom
+  suffix: EVA, Boxer, Random
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitHydro ]
+  id: SuitStorageWallmountEVAHydro
+  suffix: EVA, Hydroponics
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitMail ]
+  id: SuitStorageWallmountEVAMail
+  suffix: EVA, Mail Carrier
+  components:
+  - type: AccessReader
 
-#Hydroponics EVA
 - type: entity
-  id: SuitStorageWallmountHydro
-  parent: [SuitStorageWallmount, SuitStorageHydro]
+  parent: [ SuitStorageWallmount, StorageFillEVASuitMercenary ]
+  id: SuitStorageWallmountEVAMercenary
+  suffix: EVA, Mercenary
+  components:
+  - type: AccessReader
 
-#Mail Carrier EVA
 - type: entity
-  id: SuitStorageWallmountMailCarrier
-  parent: [SuitStorageWallmount, SuitStorageMailCarrier]
+  parent: [ SuitStorageWallmount, StorageFillEVASuitPrivateSec ]
+  id: SuitStorageWallmountEVAPrivateSec
+  suffix: EVA, Private Security
+  components:
+  - type: AccessReader
 
-#Goblin EVA
 - type: entity
-  id: SuitStorageWallmountGoblin
-  parent: [SuitStorageWallmount, SuitStorageGoblin]
+  parent: [ SuitStorageWallmount, StorageFillEVASuitNfsd ]
+  id: SuitStorageWallmountEVANfsd
+  suffix: EVA, NFSD
+  components:
+  - type: AccessReader
+    access: [["Security"]]
 
 #HARDSUITS
 #Quartermaster hardsuit
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/departmental_eva.yml b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/departmental_eva.yml
new file mode 100644
index 000000000000..26bd2bb2525e
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/departmental_eva.yml
@@ -0,0 +1,356 @@
+# Departmental EVA suits
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitContractor
+  description: Contains a standard issue contractor EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitContractor
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitPilot
+  description: Contains a standard issue pilot EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitPilot
+    - id: ClothingMaskPilot
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitSr
+  description: Contains a standard issue station representative EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitSr
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitCaptain
+  description: Contains a standard issue captain EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitCaptain
+    - id: ClothingMaskGasCaptain
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitEngineer
+  description: Contains a standard issue engineer EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitEngineer
+    - id: ClothingMaskGas
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitAtmosTech
+  description: Contains a standard issue atmospheric technician EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitAtmosTech
+    - id: ClothingMaskGasAtmos
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitCargo
+  description: Contains a standard issue cargo technician EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitCargo
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitSalvage
+  description: Contains a standard issue salvage specialist EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitSalvage
+    - id: ClothingMaskGasExplorer
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitMedic
+  description: Contains a standard issue medical specialist EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitMedic
+    - id: ClothingMaskBreathMedical
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitParamedic
+  description: Contains a standard issue paramedic voidsuit kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterHardsuitVoidParamed
+    - id: ClothingMaskBreathMedical
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitScientist
+  description: Contains a standard issue scientist EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitScientist
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitJanitor
+  description: Contains a standard issue janitor EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitJanitor
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitServiceWorker
+  description: Contains a standard issue service worker EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitServiceWorker
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitChaplain
+  description: Contains a standard issue chaplain EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitChaplain
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: Lantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitBoxerRed
+  description: Contains a red boxer EVA suit and standard issue EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitBoxerRed
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: ClothingHandsGlovesBoxingRed
+    - id: ShardCrystalRed
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitBoxerGreen
+  description: Contains a green boxer EVA suit and standard issue EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitBoxerGreen
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: ClothingHandsGlovesBoxingGreen
+    - id: ShardCrystalGreen
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitBoxerBlue
+  description: Contains a blue boxer EVA suit and standard issue EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitBoxerBlue
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: ClothingHandsGlovesBoxingBlue
+    - id: ShardCrystalBlue
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitBoxerYellow
+  description: Contains a yellow boxer EVA suit and standard issue EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitBoxerYellow
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: ClothingHandsGlovesBoxingYellow
+    - id: ShardCrystalOrange
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitBoxerRandom
+  description: Contains a boxer EVA suit and standard issue EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitBoxerRandom
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: ClothingHandsGlovesBoxingBlue
+    - id: ShardCrystalBlue
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitHydro
+  description: Contains a standard issue botanist EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitHydro
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitMail
+  description: Contains a standard issue mail carrier EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitMailman
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitMercenary
+  description: Contains a standard issue mercenary EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: DoubleEmergencyAirTankFilled
+    - id: ClothingOuterEVASuitMercenary
+    - id: ClothingMaskGasMercenary
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightSeclite
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitPrivateSec
+  description: Contains a standard issue private security EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: DoubleEmergencyAirTankFilled
+    - id: ClothingOuterEVASuitPrivateSec
+    - id: ClothingMaskGasSecurity
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightSeclite
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitNfsd
+  description: Contains a standard issue NFSD EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: DoubleEmergencyAirTankFilled
+    - id: ClothingOuterEVASuitNfsd
+    - id: ClothingMaskGasNfsd
+    - id: JetpackNfsdFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightNfsdLite
+
+# Other EVA Suits
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitGoblin
+  description: Contains a traditional goblin EVA suit and standard EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitGoblin
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: Lantern
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/materials.yml b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/materials.yml
new file mode 100644
index 000000000000..26b5da59489a
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/materials.yml
@@ -0,0 +1,81 @@
+# Fuel
+- type: entity # Full stack
+  abstract: true
+  id: StorageFillMaterialsFuelPlasma
+  components:
+  - type: StorageFill
+    contents:
+    - id: SheetPlasma
+
+- type: entity # Full stack
+  abstract: true
+  id: StorageFillMaterialsFuelUranium
+  components:
+  - type: StorageFill
+    contents:
+    - id: SheetUranium
+
+- type: entity # Full stack
+  abstract: true
+  id: StorageFillMaterialsFuelPlasma2
+  components:
+  - type: StorageFill
+    contents:
+    - id: SheetPlasma
+      amount: 2
+
+- type: entity # Full stack
+  abstract: true
+  id: StorageFillMaterialsFuelUranium2
+  components:
+  - type: StorageFill
+    contents:
+    - id: SheetUranium
+      amount: 2
+
+- type: entity # Full stack
+  abstract: true
+  id: StorageFillMaterialsFuelBananium
+  components:
+  - type: StorageFill
+    contents:
+    - id: MaterialBananium
+
+- type: entity
+  abstract: true
+  id: StorageFillMaterialsFuelAmeJar
+  components:
+  - type: StorageFill
+    contents:
+    - id: AmeJar
+      amount: 2
+
+- type: entity
+  abstract: true
+  id: StorageFillMaterialsFuelWelding
+  components:
+  - type: StorageFill
+    contents:
+    - id: JerryCanWeldingFuel
+      amount: 2
+
+# Basic Materials
+- type: entity # Full stacks
+  abstract: true
+  id: StorageFillMaterialsBasic
+  components:
+  - type: StorageFill
+    contents:
+    - id: SheetSteel
+    - id: SheetGlass
+    - id: SheetPlastic
+
+- type: entity # Stacks of 10
+  abstract: true
+  id: StorageFillMaterialsBasic10
+  components:
+  - type: StorageFill
+    contents:
+    - id: SheetSteel10
+    - id: SheetGlass10
+    - id: SheetPlastic10
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
index 80448b3d5258..c91d239d5ffe 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
@@ -3,6 +3,7 @@
   startingInventory:
     ClothingOuterHardsuitSpatio: 5
     ClothingShoesBootsMag: 15
+    ClothingOuterEVASuitContractor: 10
     ClothingOuterHardsuitBasic: 5
     ClothingOuterHardsuitEVA: 10
     ClothingHeadHelmetEVA: 15
@@ -27,5 +28,6 @@
     ClothingHandsGlovesPilot: 3
     ClothingHeadHatPilot: 3
     ClothingNeckScarfPilot: 3
+    ClothingOuterEVASuitPilot: 5
     ClothingOuterHardsuitPilot: 3
     ClothingShoesBootsPilot: 3
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
index 85876fddcd51..8bd355b98101 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
@@ -14,6 +14,8 @@
     LogProbeCartridge: 3
     ContrabandAppraisalTool: 10
 #Bounty hunter
+    ClothingOuterEVASuitMercenary: 4
+    ClothingOuterEVASuitPrivateSec: 4
     ClothingUniformJumpsuitBH: 3
     ClothingUniformJumpskirtBH: 3
     ClothingUniformJumpsuitBHGrey: 2
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml
index 44dc9120e0e3..764a942414de 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml
@@ -37,5 +37,6 @@
     ClothingShoesBootsNfsdBrown: 6
     ClothingShoesBootsNfsdCream: 6
     ClothingShoesBootsMagNfsd: 3
+    ClothingOuterEVASuitNfsd: 6
   contrabandInventory:
     ClothingUniformJumpskirtOfLife: 3
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml
index e956ba593999..e35879114c2c 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml
@@ -1,19 +1,16 @@
+# BASE
+
+# DEPARTMENTAL
 - type: entity
   parent: ClothingHeadEVAHelmetBase
   id: ClothingHeadEVAHelmetHydro
   name: botanist EVA helmet
   noSpawn: true
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: _NF/Clothing/Head/Helmets/eva_hydro.rsi
   - type: Clothing
     sprite: _NF/Clothing/Head/Helmets/eva_hydro.rsi
-  - type: Tag
-    tags:
-    - HelmetEVA
-    - HidesHair
-    - WhitelistChameleon
 
 - type: entity
   parent: ClothingHeadEVAHelmetBase
@@ -21,13 +18,551 @@
   name: mailcarrier EVA helmet
   noSpawn: true
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: _NF/Clothing/Head/Helmets/eva_mailman.rsi
   - type: Clothing
     sprite: _NF/Clothing/Head/Helmets/eva_mailman.rsi
-  - type: Tag
-    tags:
-    - HelmetEVA
-    - HidesHair
-    - WhitelistChameleon
+
+# COLORED DEPARTMENTAL
+## CONTRACTORS
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetContractor
+  name: contractor EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#fff4e2"
+      - state: equipped-head-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-head-visor
+
+## COMMAND
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetSr
+  name: station representative EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#194214"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-decals-02
+      color: "#f2b833"
+    - state: icon-visor
+      color: "#fbe6b8"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#194214"
+      - state: equipped-head-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-head-decals-02
+        color: "#f2b833"
+      - state: equipped-head-visor
+        color: "#fbe6b8"
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetCaptain
+  name: captain EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#2d4c5e"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-decals-02
+      color: "#ffce5b"
+    - state: icon-visor
+      color: "#2572bf"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#2d4c5e"
+      - state: equipped-head-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-head-decals-02
+        color: "#ffce5b"
+      - state: equipped-head-visor
+        color: "#2572bf"
+
+## ENGINEERING
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetEngineer
+  name: engineer EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#ffee00"
+    - state: icon-reinforced-points
+      color: "#ff7f00"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#ffee00"
+      - state: equipped-head-reinforced-points
+        color: "#ff7f00"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetAtmosTech
+  name: atmospheric technician EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#ffee00"
+    - state: icon-reinforced-points
+      color: "#00a5ff"
+    - state: icon-visor
+      color: "#e1b537"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#ffee00"
+      - state: equipped-head-reinforced-points
+        color: "#00a5ff"
+      - state: equipped-head-visor
+        color: "#e1b537"
+
+## SUPPLY
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetCargo
+  name: cargo EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#deb733"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#deb733"
+      - state: equipped-head-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetSalvage
+  name: salvage specialist EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#deb733"
+    - state: icon-reinforced-points
+      color: "#ad2aea"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#deb733"
+      - state: equipped-head-reinforced-points
+        color: "#ad2aea"
+      - state: equipped-head-visor
+
+## MEDICAL
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetMedic
+  name: medic EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#d6e6f3"
+    - state: icon-reinforced-points
+      color: "#5a96bb"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#d6e6f3"
+      - state: equipped-head-reinforced-points
+        color: "#5a96bb"
+      - state: equipped-head-visor
+
+## SCIENCE
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetScientist
+  name: scientist EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#edeaea"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-visor
+      color: "#2accff"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#edeaea"
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+        color: "#2accff"
+
+## SERVICE
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetJanitor
+  name: janitor EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#cac4c3"
+    - state: icon-reinforced-points
+      color: "#ebdc36"
+    - state: icon-visor
+      color: "#bb5cc9"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#cac4c3"
+      - state: equipped-head-reinforced-points
+        color: "#ebdc36"
+      - state: equipped-head-visor
+        color: "#bb5cc9"
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetServiceWorker
+  name: service worker EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#fff4e2"
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetChaplain
+  name: chaplain EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#a42424"
+    - state: icon-reinforced-points
+      color: "#a42424"
+    - state: icon-visor
+      color: "#ffce5b"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#a42424"
+      - state: equipped-head-reinforced-points
+        color: "#a42424"
+      - state: equipped-head-visor
+        color: "#ffce5b"
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetBoxerRed
+  name: boxer EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#d1502c"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#d1502c"
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetBoxerGreen
+  name: boxer EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#4cd339"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#4cd339"
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetBoxerBlue
+  name: boxer EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#23a0bb"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#23a0bb"
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetBoxerYellow
+  name: boxer EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#d9be15"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#d9be15"
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetBoxerRandom
+  name: boxer EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: equipped-head-base
+      map: [ "EVA_helmet_decal_boxing" ]
+    - state: equipped-head-reinforced-points
+      color: "#606275"
+    - state: equipped-head-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        map: [ "EVA_helmet_decal_boxing" ]
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+  - type: RandomSprite
+    available:
+      - EVA_helmet_decal_boxing:
+          equipped-head-base: Sixteen # CyberpunkNeon
+
+## WILDCARDS
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetPilot
+  name: pilot EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#496ea0"
+    - state: icon-reinforced-points
+      color: "#784f1e"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#496ea0"
+      - state: equipped-head-reinforced-points
+        color: "#784f1e"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetMercenary
+  name: mercenary EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#7b7b3f"
+    - state: icon-reinforced-points
+      color: "#27272e"
+    - state: icon-visor
+      color: "#f5fc95"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#7b7b3f"
+      - state: equipped-head-reinforced-points
+        color: "#27272e"
+      - state: equipped-head-visor
+        color: "#f5fc95"
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetPrivateSec
+  name: private security EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#935c3f"
+    - state: icon-reinforced-points
+      color: "#2286bd"
+    - state: icon-visor
+      color: "#ffd600"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#935c3f"
+      - state: equipped-head-reinforced-points
+        color: "#2286bd"
+      - state: equipped-head-visor
+        color: "#ffd600"
+
+## NFSD
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetNfsd
+  name: nfsd EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#a9947d"
+    - state: icon-reinforced-points
+      color: "#384d2f"
+    - state: icon-visor
+      color: "#52843f"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#a9947d"
+      - state: equipped-head-reinforced-points
+        color: "#384d2f"
+      - state: equipped-head-visor
+        color: "#52843f"
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml
index 72c8642d09e9..fc7ac21b4089 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml
@@ -19,7 +19,7 @@
     node: ClothingOuterCoatRobesGoblinNode
 
 - type: entity
-  parent: ClothingOuterEVASuitBase
+  parent: ClothingOuterEVASuitBaseNF
   id: ClothingOuterEVASuitGoblin
   name: goblin EVA suit
   description: Traditional robes of goblinkind made EVA-capable. Very regal.
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml
index ecb96d4636af..52ef05351a49 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml
@@ -1,13 +1,40 @@
+# BASE
 - type: entity
-  parent: ClothingOuterEVASuitBase
-  id: ClothingOuterEVASuitHydro
-  name: botanist EVA suit
-  description: An emergency EVA suit with a built-in helmet commonly issued to hydroponics workers.
+  abstract: true
+  parent:
+  - ClothingOuterStorageBase # Added pockets to make this suit somewhat viable alternative to hardsuits
+  - ClothingOuterEVASuitBase
+  - GeigerCounterClothing
+  id: ClothingOuterEVASuitBaseNF
   components:
+  - type: Item
+    shape:
+    - 0,0,3,2
+  - type: ClothingSpeedModifier # Changed to 5% because the suit doesn't provide any protection other than from low pressure
+    walkModifier: 0.95
+    sprintModifier: 0.95
+  - type: HeldSpeedModifier
+  - type: Clothing
+    # For immersion
+    equipSound: /Audio/Mecha/mechmove03.ogg
+    unequipSound: /Audio/Mecha/mechmove03.ogg
+    equipDelay: 2
+    unequipDelay: 2
   - type: Tag
     tags:
     - SuitEVA
     - WhitelistChameleon
+    - HidesHarpyWings
+  - type: StaticPrice
+    price: 95
+
+# DEPARTMENTAL
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitHydro
+  name: botanist EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to hydroponics workers.
+  components:
   - type: Sprite
     sprite: _NF/Clothing/OuterClothing/Suits/eva_hydro.rsi
   - type: Clothing
@@ -18,19 +45,13 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
-  - type: StaticPrice
-    price: 65
 
 - type: entity
-  parent: ClothingOuterEVASuitBase
+  parent: ClothingOuterEVASuitBaseNF
   id: ClothingOuterEVASuitMailman
   name: mailcarrier EVA suit
-  description: An emergency EVA suit with a built-in helmet commonly issued to hydroponics workers.
+  description: An EVA suit with a built-in helmet commonly issued to hydroponics workers.
   components:
-  - type: Tag
-    tags:
-    - SuitEVA
-    - WhitelistChameleon
   - type: Sprite
     sprite: _NF/Clothing/OuterClothing/Suits/eva_mailman.rsi
   - type: Clothing
@@ -41,5 +62,1108 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
-  - type: StaticPrice
-    price: 65
+
+# COLORED DEPARTMENTAL
+## CONTRACTORS
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitContractor
+  name: contractor EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to contractors.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-decals-01
+      color: "#3e3e48"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+        color: "#3e3e48"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+        color: "#3e3e48"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-decals-01
+        color: "#3e3e48"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetContractor
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## COMMAND
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitSr
+  name: station representative EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to station representatives.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#194214"
+    - state: icon-decals-01
+      color: "#f2b833"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#194214"
+      - state: inhand-left-decals-01
+        color: "#f2b833"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#194214"
+      - state: inhand-right-decals-01
+        color: "#f2b833"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#194214"
+      - state: equipped-decals-01
+        color: "#f2b833"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetSr
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitCaptain
+  name: captain EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to captains.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#3a6781"
+    - state: icon-decals-01
+      color: "#ffce5b"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#3a6781"
+      - state: inhand-left-decals-01
+        color: "#ffce5b"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#3a6781"
+      - state: inhand-right-decals-01
+        color: "#ffce5b"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#3a6781"
+      - state: equipped-decals-01
+        color: "#ffce5b"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetCaptain
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## ENGINEERING
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitEngineer
+  name: engineer EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to engineers.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#ffee00"
+    - state: icon-decals-01
+      color: "#ff7f00"
+    - state: icon-reinforced-points
+      color: "#ff7f00"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#ffee00"
+      - state: inhand-left-decals-01
+        color: "#ff7f00"
+      - state: inhand-left-reinforced-points
+        color: "#ff7f00"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#ffee00"
+      - state: inhand-right-decals-01
+        color: "#ff7f00"
+      - state: inhand-right-reinforced-points
+        color: "#ff7f00"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#ffee00"
+      - state: equipped-decals-01
+        color: "#ff7f00"
+      - state: equipped-reinforced-points
+        color: "#ff7f00"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetEngineer
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitAtmosTech
+  name: atmospheric technician EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to atmospheric technicians.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#ffee00"
+    - state: icon-decals-01
+      color: "#00a5ff"
+    - state: icon-reinforced-points
+      color: "#ff7f00"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#ffee00"
+      - state: inhand-left-decals-01
+        color: "#00a5ff"
+      - state: inhand-left-reinforced-points
+        color: "#ff7f00"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#ffee00"
+      - state: inhand-right-decals-01
+        color: "#00a5ff"
+      - state: inhand-right-reinforced-points
+        color: "#ff7f00"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#ffee00"
+      - state: equipped-decals-01
+        color: "#00a5ff"
+      - state: equipped-reinforced-points
+        color: "#ff7f00"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetAtmosTech
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## SUPPLY
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitCargo
+  name: cargo technician EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to cargo technicians.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#deb733"
+    - state: icon-decals-01
+      color: "#c0c0c0"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#deb733"
+      - state: inhand-left-decals-01
+        color: "#c0c0c0"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#deb733"
+      - state: inhand-right-decals-01
+        color: "#c0c0c0"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#deb733"
+      - state: equipped-decals-01
+        color: "#c0c0c0"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetCargo
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitSalvage
+  name: salvage specialist EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to salvage specialists.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#deb733"
+    - state: icon-decals-01
+      color: "#ad2aea"
+    - state: icon-reinforced-points
+      color: "#786243"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#deb733"
+      - state: inhand-left-decals-01
+        color: "#ad2aea"
+      - state: inhand-left-reinforced-points
+        color: "#786243"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#deb733"
+      - state: inhand-right-decals-01
+        color: "#ad2aea"
+      - state: inhand-right-reinforced-points
+        color: "#786243"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#deb733"
+      - state: equipped-decals-01
+        color: "#ad2aea"
+      - state: equipped-reinforced-points
+        color: "#786243"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetSalvage
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## MEDICAL
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitMedic
+  name: medical specialist EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to medical specialists.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#5a96bb"
+    - state: icon-decals-01
+      color: "#d6e6f3"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#5a96bb"
+      - state: inhand-left-decals-01
+        color: "#d6e6f3"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#5a96bb"
+      - state: inhand-right-decals-01
+        color: "#d6e6f3"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#5a96bb"
+      - state: equipped-decals-01
+        color: "#d6e6f3"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetMedic
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## SCIENCE
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitScientist
+  name: scientist EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to scientists.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#edeaea"
+    - state: icon-decals-01
+      color: "#9c0de1"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#edeaea"
+      - state: inhand-left-decals-01
+        color: "#9c0de1"
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#edeaea"
+      - state: inhand-right-decals-01
+        color: "#9c0de1"
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#edeaea"
+      - state: equipped-decals-01
+        color: "#9c0de1"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetScientist
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## SERVICE
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitJanitor
+  name: janitor EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to janitors.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#cac4c3"
+    - state: icon-decals-01
+      color: "#bb5cc9"
+    - state: icon-reinforced-points
+      color: "#ebdc36"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#cac4c3"
+      - state: inhand-left-decals-01
+        color: "#bb5cc9"
+      - state: inhand-left-reinforced-points
+        color: "#ebdc36"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#cac4c3"
+      - state: inhand-right-decals-01
+        color: "#bb5cc9"
+      - state: inhand-right-reinforced-points
+        color: "#ebdc36"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#cac4c3"
+      - state: equipped-decals-01
+        color: "#bb5cc9"
+      - state: equipped-reinforced-points
+        color: "#ebdc36"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetJanitor
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitServiceWorker
+  name: service worker EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to service workers.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-decals-01
+      color: "#9FED58"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+        color: "#9FED58"
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+        color: "#9FED58"
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-decals-01
+        color: "#9FED58"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetServiceWorker
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitChaplain
+  name: chaplain EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to chaplains.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#3e3e48"
+    - state: icon-decals-01
+      color: "#ffce5b"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#3e3e48"
+      - state: inhand-left-decals-01
+        color: "#ffce5b"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#3e3e48"
+      - state: inhand-right-decals-01
+        color: "#ffce5b"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#3e3e48"
+      - state: equipped-decals-01
+        color: "#ffce5b"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetChaplain
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## Boxing
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitBoxerRed
+  name: boxer EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to boxers in the red corner.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-decals-02-boxer
+      color: "#d1502c"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+        color: "#d1502c"
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+        color: "#d1502c"
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-decals-02-boxer
+        color: "#d1502c"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetBoxerRed
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitBoxerGreen
+  name: boxer EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to boxers in the green corner.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-decals-02-boxer
+      color: "#4cd339"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+        color: "#4cd339"
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+        color: "#4cd339"
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-decals-02-boxer
+        color: "#4cd339"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetBoxerGreen
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitBoxerBlue
+  name: boxer EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to boxers in the blue corner.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-decals-02-boxer
+      color: "#23a0bb"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+        color: "#23a0bb"
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+        color: "#23a0bb"
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-decals-02-boxer
+        color: "#23a0bb"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetBoxerBlue
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitBoxerYellow
+  name: boxer EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to boxers in the yellow corner.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-decals-02-boxer
+      color: "#d9be15"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+        color: "#d9be15"
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+        color: "#d9be15"
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-decals-02-boxer
+        color: "#d9be15"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetBoxerYellow
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitBoxerRandom
+  name: boxer EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to boxers in the random corner.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: equipped-base
+      color: "#fff4e2"
+    - state: equipped-reinforced-points
+      color: "#606275"
+    - state: equipped-decals-02-boxer
+      map: [ "eva_decal_boxing" ]
+    - state: equipped-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-decals-02-boxer
+        map: [ "eva_decal_boxing" ]
+      - state: equipped-breathing-gear
+  - type: RandomSprite
+    available:
+    - eva_decal_boxing:
+        equipped-decals-02-boxer: Cyberpunk
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetBoxerRandom
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## WILDCARDS
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitPilot
+  name: pilot EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to pilots.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#496ea0"
+    - state: icon-decals-01
+      color: "#784f1e"
+    - state: icon-reinforced-points
+      color: "#784f1e"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#496ea0"
+      - state: inhand-left-decals-01
+        color: "#784f1e"
+      - state: inhand-left-reinforced-points
+        color: "#784f1e"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#496ea0"
+      - state: inhand-right-decals-01
+        color: "#784f1e"
+      - state: inhand-right-reinforced-points
+        color: "#784f1e"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#496ea0"
+      - state: equipped-decals-01
+        color: "#784f1e"
+      - state: equipped-reinforced-points
+        color: "#784f1e"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetPilot
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitMercenary
+  name: mercenary EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to mercenaries.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#7b7b3f"
+    - state: icon-decals-01
+      color: "#b8b873"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#7b7b3f"
+      - state: inhand-left-decals-01
+        color: "#b8b873"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#7b7b3f"
+      - state: inhand-right-decals-01
+        color: "#b8b873"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#7b7b3f"
+      - state: equipped-decals-01
+        color: "#b8b873"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetMercenary
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitPrivateSec
+  name: private security EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to private security.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#2286bd"
+    - state: icon-decals-01
+      color: "#9d1c1c"
+    - state: icon-reinforced-points
+      color: "#935c3f"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#2286bd"
+      - state: inhand-left-decals-01
+        color: "#9d1c1c"
+      - state: inhand-left-reinforced-points
+        color: "#935c3f"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#2286bd"
+      - state: inhand-right-decals-01
+        color: "#9d1c1c"
+      - state: inhand-right-reinforced-points
+        color: "#935c3f"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#2286bd"
+      - state: equipped-decals-01
+        color: "#9d1c1c"
+      - state: equipped-reinforced-points
+        color: "#935c3f"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetPrivateSec
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## NFSD
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitNfsd
+  name: nfsd EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to NFSD personnel.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#a9947d"
+    - state: icon-decals-01
+      color: "#384d2f"
+    - state: icon-reinforced-points
+      color: "#493926"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#a9947d"
+      - state: inhand-left-decals-01
+        color: "#384d2f"
+      - state: inhand-left-reinforced-points
+        color: "#493926"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#a9947d"
+      - state: inhand-right-decals-01
+        color: "#384d2f"
+      - state: inhand-right-reinforced-points
+        color: "#493926"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#a9947d"
+      - state: equipped-decals-01
+        color: "#384d2f"
+      - state: equipped-reinforced-points
+        color: "#493926"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetNfsd
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
index 9be0aa9c8fb9..81c486b9732d 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
@@ -228,6 +228,8 @@
     prototypes:
     - SuitStorageBase
     - SuitStorageEVAAlternate
+    - SuitStorageEVAEngineer
+    - SuitStorageEVAAtmosTech
     - SuitStorageBasic
     - SuitStorageEngi
     - SuitStorageAtmos
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
index d3791e8860ee..ace8c156c610 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
@@ -153,8 +153,22 @@
     prototypes:
     - SuitStorageBase
     - SuitStorageEVAAlternate
-    - SuitStorageHydro
-    - SuitStorageMailCarrier
+    - SuitStorageEVAContractor
+    - SuitStorageEVAPilot
+    - SuitStorageEVAEngineer
+    - SuitStorageEVAAtmosTech
+    - SuitStorageEVACargo
+    - SuitStorageEVASalvage
+    - SuitStorageEVAMedical
+    - SuitStorageEVAScientist
+    - SuitStorageEVAJanitor
+    - SuitStorageEVAServiceWorker
+    - SuitStorageEVAChaplain
+    - SuitStorageEVABoxerBlue
+    - SuitStorageEVAMercenary
+    - SuitStorageEVAPrivateSec
+    - SuitStorageEVAHydro
+    - SuitStorageEVAMail
     - SuitStorageBasic
     - SuitStoragePilot
     - SuitStorageParamedic
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
index 174cd4675045..839b1c46a9e9 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
@@ -386,6 +386,8 @@
     prototypes:
     - SuitStorageMercenary
     - SuitStoragePrivateSecurity
+    - SuitStorageEVAMercenary
+    - SuitStorageEVAPrivateSec
     chance: 1
     offset: 0.0
     rarePrototypes:
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml
index a64b43bad1fb..cc0dbbd1cb70 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml
@@ -182,6 +182,8 @@
     - SuitStorageBase
     - SuitStorageBasic
     - SuitStorageSalv
+    - SuitStorageEVACargo
+    - SuitStorageEVASalvage
     chance: 1
     offset: 0.0
     rarePrototypes:
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index ddad2058bf83..2bc17f53564b 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -260,9 +260,8 @@
       #- SheetGlass30
       #- SheetRGlass
       #- SheetPlastic
-      - ClothingOuterSuitEmergency
-      - ClothingHeadHelmetEVA
-      - ClothingOuterHardsuitEVA
+      - ClothingOuterEVASuitCargo
+      - ClothingOuterEVASuitSalvage
       - Wirecutter
       - Signaller
       - Screwdriver
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
index db14ecb4c819..6da7a2772c98 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
@@ -1,4 +1,5 @@
 # Frontier-specific parent for turning regular objects into wallmounts to avoid redefining upstream prototypes.
+# Base
 - type: entity
   parent: BaseStructureUnanchorable
   id: BaseWallmount
@@ -15,6 +16,181 @@
     fixtures: {}
   - type: WallMount
 
+- type: entity # Base for yml-colored lockers
+  abstract: true
+  id: LockerWallColorBase
+  parent: [ BaseWallCloset, BaseWallmount ]
+  suffix: Frontier
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Storage/wall_locker_color.rsi
+  - type: Lock
+  - type: LockVisuals
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBase: base
+    stateDoorOpen: open
+    stateDoorClosed: door
+  - type: GenericVisualizer
+    visuals:
+      enum.StorageVisuals.Open:
+        decal1:
+          True: { visible: false }
+          False: { visible: true }
+        decal2:
+          True: { visible: false }
+          False: { visible: true }
+
+# Fuel / materials storage
+- type: entity
+  id: LockerWallColorFuelPlasma
+  parent: LockerWallColorBase
+  name: plasma fuel wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#b97644"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#b97644"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#fff4e2"
+    - state: door-decal-fuel-plasma
+      map: [ decal2 ]
+      color: "#fff4e2"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorUranium
+  parent: LockerWallColorBase
+  name: uranium fuel wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#287529"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#287529"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#f4d81e"
+    - state: door-decal-fuel-uranium
+      map: [ decal2 ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorWelding
+  parent: LockerWallColorBase
+  name: welding fuel wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#ae2023"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#ae2023"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#dba124"
+    - state: door-decal-fuel-welding
+      map: [ decal2 ]
+      color: "#dba124"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorAme
+  parent: LockerWallColorBase
+  name: AME fuel wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#b97644"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#b97644"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#fff4e2"
+    - state: door-decal-fuel-ame
+      map: [ decal2 ]
+      color: "#fff4e2"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorBananium
+  parent: LockerWallColorBase
+  name: bananium fuel wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#c67421"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#c67421"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#ac221c"
+    - state: door-decal-fuel-uranium
+      map: [ decal2 ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorMaterials
+  parent: LockerWallColorBase
+  name: materials wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#707070"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#707070"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#ad8c27"
+    - state: door-decal-engi-01
+      map: [ decal2 ]
+      color: "#ad8c27"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+# Other: Chemistry wall locker
 - type: entity
   id: LockerWallChemistry
   parent: [LockerWallMedical, BaseWallmount]
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department.yml
new file mode 100644
index 000000000000..79f4afac5d69
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department.yml
@@ -0,0 +1,231 @@
+# DEPARTMENTS
+## Command
+- type: entity
+  id: LockerWallColorCaptain
+  parent: LockerWallColorBase
+  name: captain wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#42658d"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#42658d"
+    - state: door-decal-line-03
+      map: [ decal1 ]
+      color: "#cbbd60"
+    - state: door-decal-captain-01
+      map: [ decal2 ]
+      color: "#cbbd60"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Engineering
+- type: entity
+  id: LockerWallColorEngineer
+  parent: LockerWallColorBase
+  name: engineer wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#ead152"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#ead152"
+    - state: door-decal-line-03
+      map: [ decal1 ]
+      color: "#a7333b"
+    - state: door-decal-engi-03
+      map: [ decal2 ]
+      color: "#a7333b"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorAtmosTech
+  parent: LockerWallColorBase
+  name: atmospheric technician wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#ead152"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#ead152"
+    - state: door-decal-line-03
+      map: [ decal1 ]
+      color: "#00a5ff"
+    - state: door-decal-engi-02
+      map: [ decal2 ]
+      color: "#00a5ff"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Supply
+- type: entity
+  id: LockerWallColorCargo
+  parent: LockerWallColorBase
+  name: cargo technician wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#b3863c"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#b3863c"
+    - state: door-decal-line-03
+      map: [ decal1 ]
+      color: "#707070"
+    - state: door-decal-cargo-01
+      map: [ decal2 ]
+      color: "#707070"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorSalvage
+  parent: LockerWallColorBase
+  name: salvage specialist wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#b3863c"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#b3863c"
+    - state: door-decal-line-04
+      map: [ decal1 ]
+      color: "#76417b"
+    - state: door-decal-cargo-02
+      map: [ decal2 ]
+      color: "#76417b"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Medical
+- type: entity
+  id: LockerWallColorMedical
+  parent: LockerWallColorBase
+  name: medical wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#fff4e2"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#fff4e2"
+    - state: door-decal-line-04
+      map: [ decal1 ]
+      color: "#5995ba"
+    - state: door-decal-med-01
+      map: [ decal2 ]
+      color: "#5995ba"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorChemistry
+  parent: LockerWallColorBase
+  name: chemistry wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#fff4e2"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#fff4e2"
+    - state: door-decal-line-04
+      map: [ decal1 ]
+      color: "#cc5100"
+    - state: door-decal-med-01
+      map: [ decal2 ]
+      color: "#cc5100"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Service
+- type: entity
+  id: LockerWallColorServiceWorker
+  parent: LockerWallColorBase
+  name: service worker wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#707070"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#707070"
+    - state: door-decal-line-02
+      map: [ decal1 ]
+      color: "#7ca862"
+    - state: door-decal-null
+      map: [ decal2 ]
+      color: "#7ca862"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Generic
+- type: entity
+  id: LockerWallColorGeneric
+  parent: LockerWallColorBase
+  name: wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#707070"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#707070"
+    - state: door-decal-line-02
+      map: [ decal1 ]
+      color: "#fff4e2"
+    - state: door-decal-null
+      map: [ decal2 ]
+      color: "#fff4e2"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department_eva.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department_eva.yml
new file mode 100644
index 000000000000..246af5c0dacd
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department_eva.yml
@@ -0,0 +1,507 @@
+# DEPARTMENTS
+## Command
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorCaptain
+  parent: LockerWallColorBase
+  name: captain EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#42658d"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#42658d"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#cbbd60"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#cbbd60"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorSr
+  parent: LockerWallColorBase
+  name: station representative EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#09300b"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#09300b"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#f2b833"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#f2b833"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+
+## Engineering
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorEngineer
+  parent: LockerWallColorBase
+  name: engineer EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#ead152"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#ead152"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#a7333b"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#a7333b"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorAtmosTech
+  parent: LockerWallColorBase
+  name: atmospheric technician EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#ead152"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#ead152"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#00a5ff"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#00a5ff"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Supply
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorCargo
+  parent: LockerWallColorBase
+  name: cargo technician EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#b3863c"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#b3863c"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#707070"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#707070"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorSalvage
+  parent: LockerWallColorBase
+  name: salvage specialist EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#b3863c"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#b3863c"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#76417b"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#76417b"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Medical
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorMedical
+  parent: LockerWallColorBase
+  name: doctor EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#5a96bb"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#5a96bb"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#d6e6f3"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#d6e6f3"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Research
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorScientist
+  parent: LockerWallColorBase
+  name: scientist EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#edeaea"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#edeaea"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#9c0de1"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#9c0de1"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Service
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorJanitor
+  parent: LockerWallColorBase
+  name: janitor EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#7100a4"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#7100a4"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#fff4e2"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#fff4e2"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorMail
+  parent: LockerWallColorBase
+  name: mail carrier EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#0080b8"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#0080b8"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#cfefff"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#cfefff"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorHydroponics
+  parent: LockerWallColorBase
+  name: botanist EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#5fa31e"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#5fa31e"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#074dd1"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#074dd1"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorServiceWorker
+  parent: LockerWallColorBase
+  name: service worker EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#707070"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#707070"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#7ca862"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#7ca862"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorChaplain
+  parent: LockerWallColorBase
+  name: chaplain EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#3e3e48"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#3e3e48"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#ffce5b"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#ffce5b"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## NFSD / Security
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorNfsd
+  parent: LockerWallColorBase
+  name: nfsd EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#a9947d"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#a9947d"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#384d2f"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#384d2f"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+  - type: AccessReader
+    access: [["Security"]]
+
+## Wildcards
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorContractor
+  parent: LockerWallColorBase
+  name: contractor EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#fff4e2"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#fff4e2"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#3e3e48"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#3e3e48"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorPilot
+  parent: LockerWallColorBase
+  name: pilot EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#496ea0"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#496ea0"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#ea6400"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#ea6400"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorMercenary
+  parent: LockerWallColorBase
+  name: mercenary EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#7b7b3f"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#7b7b3f"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#b8b873"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#b8b873"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorPrivateSec
+  parent: LockerWallColorBase
+  name: private security EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#935c3f"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#935c3f"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#2286bd"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#2286bd"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Generic
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorGeneric
+  parent: LockerWallColorBase
+  name: EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#707070"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#707070"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#fff4e2"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#fff4e2"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml
index e18dab710dce..8fd1cdaef18f 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml
@@ -135,6 +135,196 @@
     Cloth: 300
     Durathread: 600
 
+- type: latheRecipe
+  id: ClothingOuterEVASuitContractor
+  result: ClothingOuterEVASuitContractor
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitCaptain
+  result: ClothingOuterEVASuitCaptain
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitEngineer
+  result: ClothingOuterEVASuitEngineer
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitAtmosTech
+  result: ClothingOuterEVASuitAtmosTech
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitCargo
+  result: ClothingOuterEVASuitCargo
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitSalvage
+  result: ClothingOuterEVASuitSalvage
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitMedic
+  result: ClothingOuterEVASuitMedic
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitScientist
+  result: ClothingOuterEVASuitScientist
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitJanitor
+  result: ClothingOuterEVASuitJanitor
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitServiceWorker
+  result: ClothingOuterEVASuitServiceWorker
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitPilot
+  result: ClothingOuterEVASuitPilot
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitMercenary
+  result: ClothingOuterEVASuitMercenary
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitPrivateSec
+  result: ClothingOuterEVASuitPrivateSec
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitNfsd
+  result: ClothingOuterEVASuitNfsd
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitChaplain
+  result: ClothingOuterEVASuitChaplain
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitBoxerRed
+  result: ClothingOuterEVASuitBoxerRed
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitBoxerGreen
+  result: ClothingOuterEVASuitBoxerGreen
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitBoxerBlue
+  result: ClothingOuterEVASuitBoxerBlue
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitBoxerYellow
+  result: ClothingOuterEVASuitBoxerYellow
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
 # Basic hardsuits (T1 research)
 - type: latheRecipe
   id: ClothingOuterHardsuitBasic
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/ert_mailcarrier.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Helmets/ert_mailcarrier.rsi/meta.json
index 1e453a28c782..b3ad1ef52eed 100644
--- a/Resources/Textures/_NF/Clothing/Head/Helmets/ert_mailcarrier.rsi/meta.json
+++ b/Resources/Textures/_NF/Clothing/Head/Helmets/ert_mailcarrier.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37, Edited by erhardsteinhauer (Discord)",
+  "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37 | Edited by erhardsteinhauer (Discord)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-base.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-base.png
new file mode 100644
index 0000000000000000000000000000000000000000..99ae08c7510d2ecc9180523331961c8b817a1929
GIT binary patch
literal 472
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zCwaO!hE&XX
zd&@BIkbwx>gZZnHcQQnFo{HG$Dzoqrmx;Cbg7*xX;tv>}a0$AvxDjw%!K#=sy`23O
zhhxCTPUj{6?zcHVn*RL8>1u|H`>z%5^mO_1GGda7-}znN|6DWg?3m}bTw@9oL(Tg#
zhKBQBcTH63=%}0RbL#%~bNQvsl|PRr6_(|SxZazb@XY*GM2q`vg(ig^7LHe!zq}m0
zz1vCi%i#?^O>5g{C4X8MuqvkV!2}kD7wro#e_kWJ;q2#Aq5DkYwx`aD>ivH-i~G+z
z{k><4bB*%Dl4mZv$A3`8(<*JYsMpl!2P$?-NMKb^bbZ6a-B!Wh@A&;?T&%&wu!pDp
z>5sydze;VsO==09mKn@qy3~^4$E_TO9aE35{mp#l^lS&aXP-C!|5~;8)_xYji@*Q=
z%lT7l#(W`Qaa+d=ppFLtynT;%T&!!*DwN3%o*9=qbKBd%f_MBCay(JNoqJWqp0k)-
z<uB-sPAarxxn03lVb8K!CjGu?NA_Gb`HbsfDscB@?UlECek1fRN1GQgsu(<7{an^L
HB{Ts5WKGh6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-decals-01.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-decals-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b71bad337d7105477cfecfe6aa3819c3c404c9f
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|+B{txLn`LH
zy}7aQuz`T<!DLCDNvtufXZl??^}IiF&iCfxg-h<r9FUeV3Sne8u)efBP0iED_~pBr
zOFx0Sf#8E?+Ox9y!t;4vlWxZxDnI?XYEOgtrkL0ZcO$QFUA1ak?&{P?z4ssQ*Db4`
vm;Uy5-OA_ZKYA9)xZ6q<T$N=98?mQPf2FXO;|l&HW)R=g)z4*}Q$iB}?#oYA

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-decals-02.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-decals-02.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b27de66fe742cb7bba10233ccd4eb27f5de5b5e
GIT binary patch
literal 279
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|E_%8+hE&XX
zd+Q+YVFezCz*~{CGFRz5*{b8#5uq5mi`zD|izSzrX_m)-S=r-k>gEM}KVEHISNNoQ
zajdTA&a)jJUseUWOiH&k%U>IL>$XY5^KGe*w`Xddve#WNwKvP?rvJv6Jx8UYp6#9a
zkKy^8XeW=P@0I%^K1FS~ru#Nu${}yD?q^1zGr*vM`KG+J{Kq%-Cw}R)7Jp}r+IZ#N
zzrs3M`|7JVUN^NYEq}f5e{RTvGT&#v8LPcHV(Y&KDG6o2R}JBXnZWR%CvL{q#<eY)
Q#-boGPgg&ebxsLQ07PSNMF0Q*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-reinforced-points.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-reinforced-points.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef6e90e029214016332c8350ea504605ad0b2f25
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|7I?ZihE&XX
zd()Tqh=PdQ#r!K1*jOiPIWTx#Xk_IHaS)xLrNEmt<LsI=_t{_4tIo^qU@Y@zVqiF6
zymy-pm!e7bTDIgZ*H#5}CH2hyw(Idvppg)8Ab81?TQ_<4_vK}IpPRn3CI57x?Vkqw
zOSZw^@0mZJqmpUh_P)@jRB!*2JJ+IAJwMxI&sw%_-rbMY%vG^(8KH*UInC~H%Y|)w
R-wPv<h^MQc%Q~loCID%RRR910

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-visor.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-visor.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2c3963f6c914c0f98f86b96b85604095099ea77
GIT binary patch
literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|3OrpLLn`LH
zy|q!WL4k+izzcz%M^firN%b8P*(MgX!sXoO{ZBb8C+T%EJlNm1T0Cp*>6?+7sddxN
z{XTY&^Gn%IW~IK}54x|i1C0WLAHC6+AMV{;+j#Brqc!E5zA-Obvg2%O?SWY$;$Zn5
Z`OGI*2y)HK(D@DGd%F6$taD0e0sxXSMnM1o

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-base.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-base.png
new file mode 100644
index 0000000000000000000000000000000000000000..43d6f3cf63624f644faa047fd7754b0583871b1f
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKp2MKrj?4cIM_kNAwzX)K~%(1s#pXIrLEAagUO|T(4-+r
zad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(q|hS9JC1vJ?|WbFz5|3-jj3i}0#G%}
z$RrbDzOX6=U*Si9W(;A8nR+U_n1ko|x`&VNcX6KOUH9h*D@Bt5K9P8i>4rtTK|Hf*
z>74h8Bdj7R#OK5@gDyz?$aUG}H_l~;1)do(a+!JJ2(ei1VY!D{#ZZZ-iKB|DQNECO
zS>e3JS*<l#=brq9p`x~u<vOiVB(a1P(hwn|fhuaS5T{)u#YBeA6CVB%$DbybOs*;z
zITlcd3d!+<|H1Fxnx&~pHz||=`d)1NV+;uH0_~=4e;?a+`vmYm16NwtUvB}kpQJat
zTJ#7Q+y*YLyPCWQT<!qFPr77Cj^w8$luE$+8GTa$7`g=p*4(~z&T;wx<fvE6H^9Lm
zFkYtYb&q%V_xA1Inoj?I06rLUl9sw@{r~^~!bwCyR9J=WmCX&qAPj|Ht4_c;nSr}!
z<n9?5hZX3da#SIH9;sASs=s6Of<F>$0LS@vZdYCsk=lEnQrcecai#Ea8~}h2LK~^O
zB6Lthsug~xBLP*VC8*G-_)LbCSO(bQJrPFY&KA!((*mjr0EjUT53E5Q!kn}1WV)DP
z*%;$8yVV7|ZB|NIW~RU38@PZAEW03tV6&f^^X+}{u|Oknij3Hun$#!;UQ^9r`r9Vw
m>WgjNhHRE8>^P3|Gduy9;Z7!8rAW2_0000<MNUMnLSTXmJ1BGj

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-decals-01.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-decals-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..3660d8548aa92ad616f3b9ec6650a9474e498a0d
GIT binary patch
literal 560
zcmV-00?+-4P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKp2MKrj?4cIM_kNAwzX)K~%(1s#pXIrLEAagUO|T(4-+r
zad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(q|hS9JC1vJ?|WbFz5|3-jj3i}0#G%}
z$RrbDzOX6=U*Si9W(;A8nR+U_n1ko|x`&VNcX6KOUH9h*D@Bt5K9P8i>4rtTK|Hf*
z>74h8Bdj7R#OK5@gDyz?$aUG}H_l~;1)do(a+!JJ2(ei1VY!D{#ZZZ-iKB|DQNECO
zS>e3JS*<l#=brq9p`x~u<vOiVB(a1P(hwn|fhuaS5T{)u#YBeA6CVB%$DbybOs*;z
zITlcd3d!+<|H1Fxnx&~pHz||=`d)1NV+;uH0_~=4e;?a+`vmYm16NwtUvB}kpQJat
zTJ#7Q+y*YLyPCWQT<!qFPr77Cj^w8$luE$+8GTa$7`g=p*4(~z&T;wx<fvE6H^9Lm
zFkYtYb&q%V_xA1Inoj?I06rLUl9sw@{r~^~W=TXrR9J=W(7_FWAPj}!nz%%#VWZxe
zfO|J$8phBQBxnMfX!P)Zrv}2Ktq1@B0Ptrq#_jElb#$q!Eg+?|Jo#}o4Xr_{+MS0G
yTAgz~y(^`N$h`64295#lerYN*yR|I<pV|Q)0~;ykSRqdU0000<MNUMnLSTXqNBUy`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-decals-02.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-decals-02.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a9439708ea92b4c3898a5d480f69229b1620004
GIT binary patch
literal 643
zcmV-}0(||6P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKp2MKrj?4cIM_kNAwzX)K~%(1s#pXIrLEAagUO|T(4-+r
zad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(q|hS9JC1vJ?|WbFz5|3-jj3i}0#G%}
z$RrbDzOX6=U*Si9W(;A8nR+U_n1ko|x`&VNcX6KOUH9h*D@Bt5K9P8i>4rtTK|Hf*
z>74h8Bdj7R#OK5@gDyz?$aUG}H_l~;1)do(a+!JJ2(ei1VY!D{#ZZZ-iKB|DQNECO
zS>e3JS*<l#=brq9p`x~u<vOiVB(a1P(hwn|fhuaS5T{)u#YBeA6CVB%$DbybOs*;z
zITlcd3d!+<|H1Fxnx&~pHz||=`d)1NV+;uH0_~=4e;?a+`vmYm16NwtUvB}kpQJat
zTJ#7Q+y*YLyPCWQT<!qFPr77Cj^w8$luE$+8GTa$7`g=p*4(~z&T;wx<fvE6H^9Lm
zFkYtYb&q%V_xA1Inoj?I06rLUl9sw@{r~^~xk*GpR9J=Wl*<jnAP__+QA#n2Td-0>
z<c78Y8nRph+7=u+y^u?Yz@LcN1bo<chM8d&00iO9V;F1+uX8TbHI5Y^#~7v_m#soX
zWN%Fa05HtZTA#M)>>5F(6e^|mNZ^y&ujX3UQK#v<&H})_ZKKvNdCUSl#}U7X#^S=d
z#$1441kT*wkkWkW5d`pSH_R~1sr+YpzE|;oAb5su?nLyL|6u7}6>ngblr4PII&K4k
dAP9nxix)-nOTZpkEI<GN002ovPDHLkV1hI7Bf<ax

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-reinforced-points.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-reinforced-points.png
new file mode 100644
index 0000000000000000000000000000000000000000..3660d8548aa92ad616f3b9ec6650a9474e498a0d
GIT binary patch
literal 560
zcmV-00?+-4P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKp2MKrj?4cIM_kNAwzX)K~%(1s#pXIrLEAagUO|T(4-+r
zad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(q|hS9JC1vJ?|WbFz5|3-jj3i}0#G%}
z$RrbDzOX6=U*Si9W(;A8nR+U_n1ko|x`&VNcX6KOUH9h*D@Bt5K9P8i>4rtTK|Hf*
z>74h8Bdj7R#OK5@gDyz?$aUG}H_l~;1)do(a+!JJ2(ei1VY!D{#ZZZ-iKB|DQNECO
zS>e3JS*<l#=brq9p`x~u<vOiVB(a1P(hwn|fhuaS5T{)u#YBeA6CVB%$DbybOs*;z
zITlcd3d!+<|H1Fxnx&~pHz||=`d)1NV+;uH0_~=4e;?a+`vmYm16NwtUvB}kpQJat
zTJ#7Q+y*YLyPCWQT<!qFPr77Cj^w8$luE$+8GTa$7`g=p*4(~z&T;wx<fvE6H^9Lm
zFkYtYb&q%V_xA1Inoj?I06rLUl9sw@{r~^~W=TXrR9J=W(7_FWAPj}!nz%%#VWZxe
zfO|J$8phBQBxnMfX!P)Zrv}2Ktq1@B0Ptrq#_jElb#$q!Eg+?|Jo#}o4Xr_{+MS0G
yTAgz~y(^`N$h`64295#lerYN*yR|I<pV|Q)0~;ykSRqdU0000<MNUMnLSTXqNBUy`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-visor.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-visor.png
new file mode 100644
index 0000000000000000000000000000000000000000..46ed6820aa3d520eb865420a6548ff7ecec68ae9
GIT binary patch
literal 558
zcmV+}0@3}6P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKp2MKrj?4cIM_kNAwzX)K~%(1s#pXIrLEAagUO|T(4-+r
zad8w}3l9D)RvlcNb#-tR1i>E=X9p)m7b)?(q|hS9JC1vJ?|WbFz5|3-jj3i}0#G%}
z$RrbDzOX6=U*Si9W(;A8nR+U_n1ko|x`&VNcX6KOUH9h*D@Bt5K9P8i>4rtTK|Hf*
z>74h8Bdj7R#OK5@gDyz?$aUG}H_l~;1)do(a+!JJ2(ei1VY!D{#ZZZ-iKB|DQNECO
zS>e3JS*<l#=brq9p`x~u<vOiVB(a1P(hwn|fhuaS5T{)u#YBeA6CVB%$DbybOs*;z
zITlcd3d!+<|H1Fxnx&~pHz||=`d)1NV+;uH0_~=4e;?a+`vmYm16NwtUvB}kpQJat
zTJ#7Q+y*YLyPCWQT<!qFPr77Cj^w8$luE$+8GTa$7`g=p*4(~z&T;wx<fvE6H^9Lm
zFkYtYb&q%V_xA1Inoj?I06rLUl9sw@{r~^~WJyFpR9J=W(!mjcFbD)dbSy+|D3p3M
zq;_In`RXMTez$MJTmUl>5fRe4A8$tOmKB1v&T52!A<+G9VGG&cBVb<KuIHwDPn*D~
wt^mx4y?9;#FFv&AFZ2yGf49KyUPMHsseUmTSGbi%?f?J)07*qoM6N<$f<12eo&W#<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/meta.json
new file mode 100644
index 000000000000..ce22282d093d
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | Grayscaled and split into layers by erhardsteinhauer (discord/github) | equipped-head-decals-02 and icon-head-decals-02 are based on sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by Emisse for SS14. Vox states by Flareguy for SS14 that were grayscaled and further modified by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon-base"
+    },
+    {
+      "name": "icon-decals-01"
+    },
+    {
+      "name": "icon-decals-02"
+    },
+    {
+      "name": "icon-reinforced-points"
+    },
+    {
+      "name": "icon-visor"
+    },
+    {
+      "name": "equipped-head-base",
+      "directions": 4
+    },
+    {
+      "name": "equipped-head-decals-01",
+      "directions": 4
+    },
+    {
+      "name": "equipped-head-decals-02",
+      "directions": 4
+    },
+    {
+      "name": "equipped-head-reinforced-points",
+      "directions": 4
+    },
+    {
+      "name": "equipped-head-visor",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_hydro.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_hydro.rsi/meta.json
index 90c6d89f347a..732faf41d165 100644
--- a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_hydro.rsi/meta.json
+++ b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_hydro.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | Recolored by erhardsteinhauer (discord/github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_mailman.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_mailman.rsi/meta.json
index 90c6d89f347a..732faf41d165 100644
--- a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_mailman.rsi/meta.json
+++ b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_mailman.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | Recolored by erhardsteinhauer (discord/github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-base.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-base.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2150b790827c6397f15db3820911a8c41690ee3
GIT binary patch
literal 1135
zcmV-#1d#iQP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(DM>^@RCt{2o3U==I1q+^9j>(Mg}`91iE&#l(iv&o2X6EL+42_18|VS_1_qqc
zdH^?s`ZS9)f#6bx(`*nzNG<ie!aKULVn?PdI=g%PfFPkw>8FM>B*kF>hr{7;I2?}u
zDV|B?+u2Ny$7B5c>C>z0R(Y=P?(Xo<*RMwRG}S*70w00^{$NmlURD)eiUQ9{8S5Wh
zIf^1pe_xJ9I3Er%@O@NeiO2OC-|p}0x^W!$ZUkHUMh#7+)Xz%c`_t2_@BaGu5obc+
zYBI6r0XFoFDl4TlFE6tU=fmMvon7J47dG_&c<W2<cB?$sMNwcnono0~D2f8WCjK7R
zYs`}bkLxua9v<|r>$`9Y{Xg3(D5Z2&mME(Vi^T$A7$OJ)0KiL8AowvLoezhYCkZY`
zBdqdV1He2<%%8f0eh>tm^;_LVDW!{|z+$n$m+R{-7fYqoJmyj<^|$+bgkcDOFz6*5
zn)(CZufJPn89rZJY?XV{kD^GYQf|2rS(a#izpLCe4EE_OrRtwl%2#Dm{nijz<+<k5
zj8aMqAv~p&US?Tcrg~8n>C4dwAA$fcKjQQln)*VBEstxKP4(Y2Kyym@a(&&}o6R}+
zn1PV%^ZSs|sl3W_&E0+9bw^_w0(}xik){v;HbzLL)YPU`p6f0l_vSRX3*G<{=D&Y6
z4mJQ;mRwH=;ayE89=RU<?$zaX(57#Skq3|ncehkZO^Xkk%V1mj#uw1&&tE?1<;3PP
z*p|ML2c%N!sx0d=AMwkovN{Ob(l;Ih%Bni3Uf<Z#Z(Rs+_RX)>=G_zM8yVnsHmh&W
z-^urV-ZwV%jSMgzj{yLW>-Cn<nGp4Rc^_|pKdZjO;cz${4u`|xaQrrO+QOoDZrX|h
zHg9OQ_XLSlO3ig?d#ua3grghW%-q;G9KmTC|JZ#<<GcVzDWwO#kMrRWm!r`!w=#mC
z5NVznFvWOJ5ZFBUD$h0L>bVhYZi!Lej~;%RWtdK<;2EQ4TiY<+6{dXsJV_9SVV#~P
zBiM!>9soXHTp$cX%##FFSz=d)xQ&Ci#3;78rRk&=PgL5@4Dpy(N@;#t3@}fQ9Bcq`
zKmM=)^v%tUiC*u_lLT=bdvP2C`0tR$p@Z>JgCNmNl-h(ejvf36BLnbs6kvbKJA`H%
znr&>u$N>8un8M-|xk1usgkp_pr}P>EwsV7A<6S~v7eWY+dgByJVbb8bCx!PiUx1`i
zYM!F9#qDgSxfk$(*J^ec*i402lZi)Xa|XT-A%yqV8Q#A6{`7=rrRo!61K+O?Ok7PS
zp6zwWtA!5rymjG58@MOzYuh0hB}WN5w+{f+^QW8=<2bH+nvBrZ13MX@`A-R_?ESvm
z(b)rd`4q8ls~w#TK<@wEIeC6w0C>NSa5#Qp{sonBiuYcP;*9_R002ovPDHLkV1hfJ
BBd`Df

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-breathing-gear.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-breathing-gear.png
new file mode 100644
index 0000000000000000000000000000000000000000..21edf990dfcd356d8b4eb0ecd7afdfa05da8bec0
GIT binary patch
literal 399
zcmV;A0dW3_P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$Nl8RORCt{2+A(f}Fcik|M+Z*O$%{DvLsWU|9dZT6j-7jgo`JDfVC~$Eu?Gl4
zlRI>ACn^#_Q%BDjlK*e9EP>yX^^%281ONa40Dzm5g}z{_+UKT}@BOFj-=4D5eT*h!
zx(j_FH>KRaKTB@P(fv(u&iTLgF`26N#mk2`Rqe<2p@JtMwcM1ldwtA?6FA&Q*I4VF
zbH1_Gi-_2w@y<DKi)OYd(44^F3D|aBHe9>i_GrC&Q@1_W|A2P=vlDRX!CDuRy8h8Y
z=MD{db}jXP5Bu+dA<wR*J^%m!00000;997B&YCkLpj}Jl>+qZzfyL$#=KL6;S!;Fq
z0Bu1R@UYp8-h7`G=+~I~9Kuu{VXDU|Did&;8Hh<cj}UYLUx$N6&8VXGm^vJ>h+a}A
t#A5Vv(eG$jsBPP%*`Ou$0sz3u`~cS+rJ?{4)2ILd002ovPDHLkV1h1kxw-%V

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-decals-01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-decals-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..66f8da5e02199bbc14c475a7ffd2950defde84e2
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|o_o4DhE&XX
zd+Q-@vw}d|!|daQ?9U3-o+Y+NAOEMc(oNb=!0)%+{)zma7MvPPKn)K(dI|%tE?u&A
zm7d|TMcd>)-B*36*mCKgi;GH&!dkV&l6@<(KEAnb^Vsx%edM*f6K7Q!Sk+(cT)Noi
z!!_@O5W9x->baE~;xnd9dg6P^#CQ3xU7`Qhzq+;f6W`hGHEr`|@B{4t0-KhfDy7x2
zcR!m{od52a;pO?P(yaIRl^eHDr*EB{!1bx-<%`;y@7Esf+t;rBFEHw)@WYo(haS&h
wxa0h_E%A5ij;i7-*5}`x^75I=&cKlIg1LATr_ndFVp)*cp00i_>zopr0IGe3r~m)}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-decals-02-boxer.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-decals-02-boxer.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8b8987267c2483a04e3c02de88a07015ddbc611
GIT binary patch
literal 1313
zcmV++1>X9JP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(+et)0RCt{2n$IsgPaMV{Ulog$ermNG8lt2d+i3g<BCJRpxVSkuI!OEh{s#xq
zTQ5y|*rSV+i;F~15;WqVvMV7PK_yK!Xr#n`Pi@-j)=d3apM2((h-P<YpXdG9nW>!x
z7z_r3!C){L42BVbKtPW~B05RiNF<^M0s*47zd`>$5^-6UNv{V0kYyQP6@uCNh(sd9
z>3^orZ`J>Ip&55Zd}coQDg6qg6Bid3O@6=s766`}p3u|N15p$W+h<T!RgcHx;5ZJ|
z)z$ELJRkNkVr^|rudS^`DwTrU?IzaW-rj~JNr*<Hn3<WW7#kZiY;QOT`u+Y}S(ee)
z*9VWsLnICW%gf8nH8nMGyWJQV7{KoCZdrfDjg1Yxv$GSaR0^?Jj96b3#R{J1!EqcW
zCMK}5vQkptFo5y#aab%C#9}d=o}OZ9X^E(i-rnBZv$Hc?Uti<?{+^^uQEWCF{`~oa
zSS$tr2nK^h`oUmOe|&tz&CLyTUB~F?Xvy{#qZ6rA3W6Y@uC5L*FE40lXdp6PRaKS!
z{Pgq$r_)K)uaM{GXB;0Nm(};><pno4H#j^zL}g`V$+m_893LNJdU_fjj|VQ73yPv(
zb#+y5ZEXbrIGs+6jErDsX9rhTR{(&^%S!-2cXu}&4hQUZJHp{GT3TADi-^bL5Cj3k
z!@~%LLIChiKSQB@RaF%vNkVgTGxqoQOX?VotIf^L>?Cw?aRH0Pg8KUU4~;)OJmB^9
z6+F+QuC5MKQ&VM6g27-=_jo)wIXTJd4-XF;whx6uczAe#AP8t|Y(y%R!ua@j$w{ze
z0J$iNqEAjv<{i^C4Q{tP@7VhKI%a2Q%P!i8&*+y5z;Fl{p=lZb;QahN``hJm0l+&m
z-@#YwfB3&ZG4TwANf(~~YQ96C_zp-U5(tOG#K*sy@6sop1O8^p`X>0VzydJafZ4DB
z%r;;)EC90&m<<cSYy)P)0x;Wv*{}f2Hefa^0J9C44GVy_gQ}{!!{NyOe1|C-a=oak
zO6`X#0994<_UiBM?!Nr#FD<zqWLXAn2vkpnGsXXg!gI;^aX1{hEX%mNyCd#P6~J#R
zypVGI5f6dP*ryfvX=vvH;yXYT#frtnMIC_7^E~nU0zZMOs`}B<5gs2O0RVGzbHu)g
z?|{tqbX!{+>~?$6O$gF0?9Wh4L(??a?RK=awNd+^UIyFS+u`+k(bd)UPH1#=wCoom
zNZ8%o)eHCggTbKQ)zt;B*NgV{cIs;q2avg~(&;pKp2y(eAS6l3Yr}CIL{X$RL5e7f
z;5aVtm?TLU92^AC^GK)Dd0t5%o&$V7pKi5U!Sg(9HXD-3B%;wMG)>dv@i+irYHAAU
zbQ*#nkY1LGL?VH=w>S8FJ{<rAK>){bNG6l8*=$H85?QYc3kyUcP%VSWWD?<U7~yaj
zu~-brWD@=T{cyQl&@>HOTU&6u-RS7(pe~Mt>+5T1ng*-Yn%xOLI5>dc??+QpQ`RF5
zRI~W(?CiVoox5khzP^s3p&`uA&wtD65C{bHy}iA6nuREe^7X4gA(NAnMU8w{@wwN|
zExOPLEmQ#%OIFjg?2<^6e7R&aa&<rQSPJSlL^2e<sqquVXHXQSqS$a`Fc=I5gO2|J
Xl>1umfW}SG00000NkvXXu0mjf4P$A?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-reinforced-points.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-reinforced-points.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a4cc2d21dad3f0b7c010d3db685988c3ab067e4
GIT binary patch
literal 738
zcmV<80v-K{P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%oJmAMRCt{2o4;$@KorNnDg7f1q8)As6k<a)8f91TkmdFi?$7X)!u<h(to{$Q
zbO_FF$f$xHD9&(0i=k^F`*jFUJ<IxavedZl`%JR#^xjt|TlenWGr%wm!!Qi<pK{{U
zSt(_O5SUJ<JJ)HgtuY3(+04tP4_a#r0AUznG#qB<m#Y=hGzEY{ZB=-Sr9mJO<h<{j
zS4vqr7DDW_8)LF#A0533?h|(~h&~6OVHk!vRw}0snr?&;jpuoa6KG!EXL@q|`vf=?
zlr{1Hrp_1zJyOa>&ZU$H!>}+|X#@H9!N>pGCY>nKYeJGFo!$I;y~fYY1`msc*LAly
zHvoWN&(HgdP)gaN$gAsX%7~)KMp5KttIahG!!WfdrR;n@-+956oj*4J%rVj^yrf(l
z@DgRYDKIxhMtM2FKR4IJKShLP{;AE!e{CeFwYHzGt^i;w|K~!VbID5E#UPM>H}P2n
zwK*CZ`LFG8Il0K5{`Vi7t+ubr<;lm<XzRuE{#}qAf4Q6QJph-J3!C>_<=@rOg@1-&
z7=~dO=2&SJD!Tc4cM;O%0;meDwaqV#0Nx^J7=~edX<a7wuvp;k{{A4Qok<+q@%eeH
zQoY*k@jNv54}t)bI4(>_jmP88^YdjkCvj{CLC|_j-fIBd8?LGs7@nPZ3#p^ZrmLmw
zp_JkM4KT)J8Q4J(6!uv?KKh!irOYO2@Tp;N@%p_8AuIrVI6Vabe0zF=G3Hg@140Pv
z>H*NdCLx5S!8imCO%KByJG3AF+I#YcqJ#ODX|)yr{)EIyl4NavD<$QA-KCU!rNtUm
zisqr1J55taDYt3@`W^(Ol>K~t4Pg7vQf_^+58h&n_T#&*38<o~UIBQi8St_98$b<v
UAgX4%<p2Nx07*qoM6N<$g2^mkYybcN

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-base.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-base.png
new file mode 100644
index 0000000000000000000000000000000000000000..efbcb61ce0c715ad7f73fb7467290449168e70fd
GIT binary patch
literal 540
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$)=5M`R9J=WmN9O^FcgOWRvlrkqC|8dYR9Tu#1SeM4$$7i2jB)sVI&7&i8w;V
zVnvKWVQGbBb+&hRsEizw5GSbWl5auA#_#9(f6oSbdU`stjAOOWb5%9B&vUhm<H|Xk
zn=Zi#A*anJQG{_AVlW&+3V}mW;A6Wzt)0*37h`l1005gbRY%6~`So=+_b?hE@O`{a
zr;Yn}7Qh%QrFfTR7>8kL&EwNk<Nmj<0nN1U^IUPxu~;my%QA4z0RTcu9Et*~B*CF5
zKq*yKzc;ya6#)GHYbgYTlvuCVn9XMJJP!cy%{e^J!*DRbI1I5$5=^29+Ni4}X%nhm
z0HstBLe45+lcr~5LWrW2)>ex%gb-y1a1l@?$llx813IX=kv5|Jsl{pGrWb6SJz$sA
z``cS%TJ0WCXT(mlJ%Tz~9f3_<>aR9k6IE4UQ)fDx&Kb~M&NQZJIF~jIT+xbw-_-B2
ztaSP4%gLn;16O2Vlcq`vaT=SB7gGMM3H8|uDV^3`qSaksVxF-XsP6kt0+w;C0^dK4
zkBmW&^?Lw7=}ln1gsR>OtpotT^UDhWfOC!`V`t;Q_e+5S-^ab@;hS?O0asOlO;yU9
eo@6~e|IQCUi9&G(@(=+40000<MNUMnLSTYW&+YmE

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-breathing-gear.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-breathing-gear.png
new file mode 100644
index 0000000000000000000000000000000000000000..197efec21fcc85c545217e2d3bc3a85d6028622e
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}&7LlfArY;~
z2@<S}6GVEN0u3%PDyz;~`Y8Qh`s7QAKfb=<I=s2{WzUP6q%#SNjxgo~S@9_C{w#T8
zNy&y!FPVINeEvOtEX*X*%3#Xi%6CIW|G)gqY2i0ooG!BlNU?@&og?EuL4@_mufD8>
tO*sOJ&YpqZo0L0DCx~o?T35u#&?RZCa^lO|=|JZ&c)I$ztaD0e0sx@|Npt`J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-decals-01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-decals-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf8ff0d3308272d4425b7e9818810f4cbc1821bc
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}MV>B>ArY-_
zuN>rUFyLSfC|TL2d$a4$%2%C>xsrr^|LxuuAeG_T(b07#hiS&ly$s7{#=g6|x_xz)
zs!K@dyDksr3Hxf*pH*ws+E1R@9x};mk;b3@x(lXm%WIM_D4+gg$uWtydtNrrU$;GE
h-os5w9UU)p*<W1_k_kL@v<YZCgQu&X%Q~loCII^+N(}%2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-decals-02-boxer.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-decals-02-boxer.png
new file mode 100644
index 0000000000000000000000000000000000000000..7694ab202b3d1f90d1d3273262de085437314aef
GIT binary patch
literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$w@E}nR9J=Wl|8HCKoo`_mxx!Rji7gnfM5}XG@>8`6$EQLe}IL*#wtbZ^9QVK
zEG<MxA!sEi7z7cm6eMXBvegRW*SOo<B2P16=Dc&>Ip;tiARr*%Lkz?4ZQJ%mVr|>@
z4a0aD`|H!>x~_jBLDzNOnGnXdZQ<AdkLKs`N#CFGY#u@)V#jg5P1D=~xUNesmm{Cg
zztv8sQ{VGEzP`SQL?URK7OK^1H!(s(Xqx7(TCGwn7SS|KC^<m4+x;DlMp0FjQmMpv
zJie=dkb!!=jwDI!_j~5^Ih{^Ns2znuVYgf^*>1NSkH?2GLIym~LzZP^S>}8`lT0Q>
zWQ4=v>$mH=D2j3yBZ*uzo6Tr8n`oLwHk-w=EPB13pUGqZP!xqqrNU@5Vzb!*uwJhL
z$mjE<(`izv6qCv1?rx!84u?bf{k|WI#c&)4Ns>q;5^r^<(}~OFLOdQvmSq}^#@!GK
zRREyTXk5)&mgSer<(u=xVu7lvH+zG@fOfn6@{z&@9<f*~09dV7*EO5X0^FH-#z+5x
zN6G)vYPCYI&Y$s56*wFY4+rYmen3D#z>nq+wo9%`?s@=}00000NkvXXu0mjfJ38pl

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-reinforced-points.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-reinforced-points.png
new file mode 100644
index 0000000000000000000000000000000000000000..f90f4294a2046096335a94bdd6d22447cfd75ab7
GIT binary patch
literal 294
zcmV+>0oneEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#;7LS5R9J=W)=dh+Fc1acr+5buVYVW32yx*eTX9Y@_vr<CfSx4&Yy%>mBCc9W
zO*OS52=ndIB+V3>#{kBd4~a-r)tH)7)hHs#xvt6BB8UjgjP+`T)8zv1Jwga5%W~Aa
zjWIuyeOK#XA)@SiUgtyz0RWPFrUQya9Xigrto6=0Ff)j#cg<`_0RWn$%TZO;%fkl~
zk?f2gv&Wb$A`*+Dc>2Nmo|`_saoX<pm>J%CbjROly^=|&s`0Sj13=T~b;r4B_)fC=
s-FDM_{q=Uoaxq7H+;%*lt@-?K4}c16YjcGT>i_@%07*qoM6N<$f=;!88vp<R

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-base.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-base.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd1623206c74c021d88f8956e20cd6de25e325db
GIT binary patch
literal 504
zcmV<U0SEqxP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$vPnciRCt{2+CgrEFc1aMPt`kAk*~o9<yx$K04{{GWrxfHp<Kd3oWfmHPN_v&
zj0aHL|5jD143l9(7XAPc5fKp)5fKs5W?E}^b`P;$B#T{(;#UqqgtgXLYhB;>E_@A$
z-wyx2y(Mpe*4kNX-F+AU0GG?<%m44g5cOf^_2%!}Yan7@fz}u(r81>dcB^X#07|K>
zH72PZ0Nm=@`M;%!4B)5cVw>OV!!8jSfM3tP?;qd!`ST!leV^5n=rttzE0E`T=I@?T
zD$Dac=}w0ABzg=b51^{5N0ZMspe##tUAL-U*L5h%5=-?`dtD;B0RS+LBU)oHj^pFC
zX`0Y9&8j=tG)*>5)3@~`iLTYsZ+%r&o39bpOQ}UfL_|bHL_|bHM1N82DYW>xz?rnx
z?phRQxAEbKpu{|X0DPV##bgphH^5r!ZguVU4mX6E1kYy^VloM$14zjOY_XIfi0xsQ
zXTTBX`%;+%u>qvy0k&QbNY5mQ4L~9fu!VFcVKYDdBV%$}Yv(t>KYU|*c$I2quk-u0
u*KUo$TaZv&Lu_6A)Q>*Hm(C;*{WI?(HB0R5-JS#h0000<MNUMnLSTX+x#Fb&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-breathing-gear.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-breathing-gear.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7be8a84d05bf48144f4423fc0b5b8157683e013
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rhB?LhE&XX
zd&^Le$xy`gqPa+i$7Iol<yRZ0Y~3hV(7@($p=F-YPgdhO$`783YvwZn^)N65->U0*
z`%l7i(_Q(+Z;!9IvwFwJ+e?ey+{&xmKhJa0_t!JCcTauy@%6cT$8Y}jn6z*1;{4~A
zw*S4idWRrbJ43?FEPjLE&%7oFTw~wzS7Np8fu2`tjgg{Ynz5n&6QkyT_bbBFeL&7;
N@O1TaS?83{1ORMATlW9}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-decals-01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-decals-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b136b75cb5a5670ee0fa9d54d367506ad6201fb
GIT binary patch
literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|dOcknLn`LH
zz2(T)tRTP|@HWxn`kZFwg4|uN&fREOyz$#!)nvA|Bck<@K*bCRUM^oIe!W?DGfvW1
zY0>l`v+Si)9wvVKb=S}3%e7nY8t%VZ{P#hcQGMgg_lzL*3=bX}8F6a<Y*1#m*yQe}
z_HYWfh4q~elKZah%DbAq_Vsxdor*=;_r7m7=43eVzmhp{ueF2Xrk`g)T0LF;T-G@y
GGywoybyUj$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-reinforced-points.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-reinforced-points.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8bb1821ee307a838cb6248a9a0e83abcc6dc186
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Vmw_OLn`LH
zy>*b6L6L*SA$u|RFMSv54;Ln!RyF^8Z^53MhCo$7us}sAE$v*ansK^Ij<Nb@yXToZ
zUwztM36W&T2(yfx|AjH{|Am{L8Q+f`zB`xY!F;i7Ze_bI6V-2m6nVP(xvX<aXaWE+
C*EZe&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-base.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-base.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee5d446a3ddb69e9d4395fa0612cbfe71ac1f0db
GIT binary patch
literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$fJsC_RCt{2+RKf@AP@%NVYNN1tZ9Qww4G6a%kjl>36?L&N)w1O*h{e3#1BYF
zz|#MnA`&s<0m8vU1ONa4000000I*3Z<x1y}+gI!ll~V5aa(QPibuq>`W6ZMRT5A`M
zon<#1<@>M$lv2(Z<F51kZ@g(5A|krZGlhkzO_-a1j=g+0kH9!h#LR+-Xy|*#%z~N4
zI8Avo&WxGG(D%-NKFW8s0RF-Ef;^pJ0ektb7Qk;AfA0O5*4l;N*C;jL-CICPDSY*q
zSx70XU-{I09}3X6?efrDJAj!*+qP8}BQ@XeqY16GG)@!!+-`x|rRKZ4ifeagtt;={
z=UjWf0000000000008H5mbb)PqWc53pl9HOJp-Yr9Z<Swz{el@-sO&ybOcKG421D>
zi7r6to`IP8pE-ij1t{G!uogdu<XfP0&p;Ue<CId)uYmtU(ptMu{riXUbIp0!AF!r$
w&w#Zy+gwQnxV>v%s^4{8IR19`@d4mvf1wUKP*cB_!vFvP07*qoM6N<$f~q~$)c^nh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-breathing-gear.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-breathing-gear.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e9269ade87751f97a4d0d8673f6ecf279a689a7
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_h|ehE&XX
zdut=_AqN4L1EP)HKc2)kR2RwWwVK^wmJMj`R;UbON@+3Jq<eOW_?=fvPMa|T^)WQ4
zcuKBcJ3mj?^ViF3rz&!*(|<j=y=VH?#PBwoY1NaSY`k-MYU1Px|4X**Ic|3S*0ZSS
zNmuIfw$A7O&y;?e8)O0lgUpqCa~s!wU;B;u-p$>{7p5kDR{qet*P40#Z^j4a{_1+}
Um-&>orh!y?y85}Sb4q9e0JM5rKL7v#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-decals-01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-decals-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..be1105091954c570306fb0a353e00f0f3619d3a2
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_Y?dhE&XX
zd+Q+YAp;%;hv|t%;m<xWMDE`6V@iutXomK?d3`dL(>`rd1}bJyP*TcT``KvP%wqkz
zwCu0<+&q^~SzeKytF?4ZT$P&q_2}%m(b@XK*Up`Pmi4vBA|9lNfuX_PT*^2;GiKkF
zyZkRC-}1QR%s80;VeRkxSqC0}oN4*>oN=*~X*&P<S^V}zU(Pj1+B0m}ZXIH1@34O6
R{3Rd*JYD@<);T3K0RU09RO<i$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-reinforced-points.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-reinforced-points.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd2a308547b5896cc54b6a957e7db468add74bff
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Vm)0PLn`LH
zy|tV7fB^@qLs~NTH~E&3OxfidWVFk_3eT5P0;&RnA1lwiS@kM#*(xjJ_L=&Xw(o;~
zEP1MYZnii?x<R+>KhK#j`-`=I`HRNaHkUtU58J_@l&x&HYuO7!kQz@{KbLh*2~7Z7
Co;Gp-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/meta.json
new file mode 100644
index 000000000000..586d06a59176
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/meta.json
@@ -0,0 +1,78 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34 | Grayscaled and split onto layers by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon-base"
+    },
+    {
+      "name": "icon-breathing-gear"
+    },
+    {
+      "name": "icon-decals-01"
+    },
+    {
+      "name": "icon-decals-02-boxer"
+    },
+    {
+      "name": "icon-reinforced-points"
+    },
+    {
+      "name": "equipped-base",
+      "directions": 4
+    },
+    {
+      "name": "equipped-breathing-gear",
+      "directions": 4
+    },
+    {
+      "name": "equipped-decals-01",
+      "directions": 4
+    },
+    {
+      "name": "equipped-decals-02-boxer",
+      "directions": 4
+    },
+    {
+      "name": "equipped-reinforced-points",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-base",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-breathing-gear",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-decals-01",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-reinforced-points",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-base",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-breathing-gear",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-decals-01",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-reinforced-points",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf83b4692bcc6bad0431e0599f0e24a1cd0865f2
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}3p`yMLn2z=
zPBY{>pdi3vu9&cJLHy^Xc1PKNFj;f|UcwdeQc|hC;BuN}d+;=drUPd#{(iA{|9(C`
z#gg>>F^e76mi{V8=CQOEVPJSJQ<<RII)}BPSZgoCCAKL+r&(^8AJB8y#kBUTQKPL{
z!rG^zKb&qa+8d_Axn#;RzWm$8SGxAwA2OR=EcfiDyyEVLFATdGss-O}Y?M%*f8fmj
dxe7TanbjDiM3#ycm;&9(;OXk;vd$@?2>@iAR)YWl

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-captain-01.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-captain-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..e33cff9c15fea05ca37c269e3803820ab2b8b2d4
GIT binary patch
literal 118
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}2A(dCArY-_
z&oy!~DDbdseDp8-pUkdikyR6P3c^_n6i>?a_xqN#U)NUte}s|YMHz$iCNXh=-UIi6
PdKo-j{an^LB{Ts57Xu^V

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-cargo-01.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-cargo-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..4866ed8c6d7c891e1065b8dce5f216c14569ee53
GIT binary patch
literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}4xTQKArY-_
zFBoz$DDXI6d}UhnfALotE72osqY6IkU+L|!LbBoh)|>-(-S14g^fT6;GgKs=H)8*X
e6rg5?fJ~;j-5eZV)89-3aXnrAT-G@yGywn~0xS{$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-cargo-02.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-cargo-02.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a26efce6ec739e4d937632f778c1a168e470080
GIT binary patch
literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ww^AIArY-_
zFI?ngP~c$>EbV<~fA;J}%U67%0#EMMdz_G%bcI1Az~4RP*;K*R!c1C9&oV1de}1j%
dIqAz>-j$vrk7uXrEC3qB;OXk;vd$@?2>@+3D^~yj

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-01.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fce3c0362b18a75abedce753db1f25ee7593268
GIT binary patch
literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}A)YRdArY-_
z&u`>C;K1P=sLd+8;lI;5i9^K`w3zQqd?9jjz59KJv~TXAS10|t(O~}g`n$wXQ-%pL
zy^(SsSd4{Ltd-RMe%-NTUftfe8F$VA!M-BquxDEOmE!$TK=T<qUHx3vIVCg!0Exjk
AdH?_b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-02.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-02.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f6ead03b4a21e317d5aed2567f9ef0b2146e58f
GIT binary patch
literal 121
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}#-1*YArY-_
z&oOc`DDW^G%<TQzzfI<rV{79b(I5Q`76GBFZU1E@-SgSPoAN9}mVx1cwzT|te!=@o
SHm?L~XYh3Ob6Mw<&;$U5ASG@9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-03.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-03.png
new file mode 100644
index 0000000000000000000000000000000000000000..79e6ea19bdb313185120929924118b4286dd13d6
GIT binary patch
literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY-_
zFKpywP!M2tnEUv<{M+Xjyf)Ns5q!VOq;bNvhWlT$6pfFc5)6DNf1CZzgU0W23=9vp
ZasHDLPAE{7UJf*b!PC{xWt~$(696<kD_#Hq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-eva-01.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-eva-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..de9acf5e365d2aac7b6a814a06d51afd8517570d
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E}kxqArY-_
zFKrYAs&Wo2?0sV&_3Xm6&6g|EKgTokPH4Ku@L<B*kAHu}3EN6e3(4%zXn3o*a*}Mg
i`}KdX{edPtXys(wta!XyLG&Jw$KdJe=d#Wzp$PyowJ*N_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-eva-02.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-eva-02.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4c58ebd66291a158db2df535bf4065b4625182a
GIT binary patch
literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}A)YRdArY-_
zFC64#P~>q5+??z4f2ptRJI@KOP9iO~f7peb`6Mq%F^JrF_qexi-TnVl8CKhIhkSk0
zazboQ+yWVgAdjw`I@1F+jGl?R=j*XDFdSIFNAIhH{zIF$+koaXc)I$ztaD0e0syQ<
BG>ZTL

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-ame.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-ame.png
new file mode 100644
index 0000000000000000000000000000000000000000..711c2e6dfb2d5a80c4e25710c4b504d5c73185b2
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ex5FlArY-_
zFFA4nRk>VzC3WwA#=OO0jvfm|-~DU$Fqjb;!o|R{GHd(is`Hbj>bU-J=51G16I@yL
sKS(9!0NcB7_hzqWns>z>XjX#{Gsgn^yB&Aa<^XvNp00i_>zopr0J2;%W&i*H

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-plasma.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-plasma.png
new file mode 100644
index 0000000000000000000000000000000000000000..75dd654f4a3ea09dd593024e8538db803091672b
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}PM$7~ArY-_
z&u<h2s&Wo2;r%AxYq`bCxxK>ub3C&sXBtC*fS`Nu?}*Ml{jKHRZ>}r7+h=t!$ZnGT
ezfcyS0m*vYX{sgcn-{SIISihzelF{r5}E*k3n)7P

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-uranium.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-uranium.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bc65e0f030e6df5ece557ab223c6432f461434a
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}$(}BbArY;~
z2@<S}6GV6n5>!GDPnRzGpO_=p>#p+Jo!w_i)Vjxv7Z*J~*z!nXmNmo8B8dfU$`Kxc
zHL1t#cN{e^TiUS1!iB$8+xlPN96mN1!M>(I11`6N8eju^ni$y`0uq&kzDA~51Fd85
MboFyt=akR{01)Oh*#H0l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-welding.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-welding.png
new file mode 100644
index 0000000000000000000000000000000000000000..58a918f171fa82b5440ecad548bc05590ba85e9e
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY-_
zFF0}mRk>X3>U;Fp-=uuy+8x5J9RF^=?&)KE;6BOk`ns=1HoliWvRa*5VlNQt{YHFY
o+)w6EV{3u+=9|Cp0S&4UU*#YxXgyQH9>`(vboFyt=akR{01iGcE&u=k

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-01.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..29c2810f477d7e066e9d82998d94963b68ca397c
GIT binary patch
literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}@t!V@ArY-_
z&u!#ApdjEJsNUsrHi74$fRB^=VLhD^)6h+hevVy1PxjwRpU=X;(9oY7x8Qr-vMDCd
zOHMm+tlGM2>$0G(q@Gij_w(NH&#OK9koAmDa?jEt<LF(?4fQ)2)MQ0oY%WWv2U^A8
M>FVdQ&MBb@0C2!M>;M1&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-02.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-02.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f1349079d15038ab40b4424d445be1d7347a89f
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(>z@qLn2z=
zUR}uRtSG?tAp0`QS+?zrlQbom4l}5%X*`&Cqt!Eyxyfbks<3Y>Dk?Lp<~#lQ({9Dk
zBJe25TyH|Loj~F42^|W@PJG*Evx7mYX=~YU#{0YGU(;z3*xz*b=Gv`?E!nemxA|zY
zE)`j^)ya!<%e4o4|64qs5-Q`=VEH_3+TWgI5*MoP%jNY{&hO0lJx}0Ky)9$jGR4Tw
Tm{3We3mH6J{an^LB{Ts5DKA!~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-03.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-03.png
new file mode 100644
index 0000000000000000000000000000000000000000..f789b5ea3e9aab6cb8f3cb779b8563a21acc9b26
GIT binary patch
literal 237
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}%ROBjLn2z=
zUfsxhSV4gG!h8*(t>!y;HEdaVrFVQ}@Q6FiE8A<Hz@fI2S3q@YuxgjcQ3cn)B~Rj5
zch$#~GdOX4OkEz95PN-Y2Lr>kTgz*D3hVb68_y{|Tb{4CmO(I4=J@oli=+BKN8bf1
z<(_3-eS6zoiRP&6&xT7y_I&41Oo$ZYIoyyri!Z$<MfCjVo*=LAZ9gTS&Y2kWN^afO
jee-AT-0jctasRrDi&Xz<WjVV5oy_3r>gTe~DWM4fOI2D$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-04.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-04.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bc88ebb5bb2c38a38171ac4050db638b609478e
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}OFdm2Ln2z=
zUfsxhSV4gG!hDTM*=7mM(|sHt^JYjKm~?%?!o?ricn+%MG-#~!cp5U1Ke9_n_4}&H
zKgzGmG9>rZ-t6VFc)n|j5W@zY)3<ASHp-WtlYG5vQZYZjmcr7OpjRf&d*|<rf0xp;
zG2Zdso7(%kuSu;nExKXi`{AB)OGEB$g_Z`xXC=qo{WfkD+j?!G&QHmyK@)<c;_S|U
jUVYAz|GVL_f7gW%y;A*mkL#)i(7_Czu6{1-oD!M<Wd>oC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-med-01.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-med-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..f170fb601ca0ad0914b74a1fef11c214b0880ca3
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R})}AhoArY-_
zFK!eBs&Wo2>3w4#_3Xg3uqWr9?bl=VbYx*Lx#4%)^5Ryj$EM!9-mUm{`lI<|eV|ST
XzU*&8dzPhywSzdGu6{1-oD!M<H99Jv

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-null.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-null.png
new file mode 100644
index 0000000000000000000000000000000000000000..2975c479be7566a6c59a7aca4e20778aa850feb7
GIT binary patch
literal 109
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)ID7sLn`LH
rJ;=xl<Q-b@-9MMld;yS&3>wOr9UK@K`#+rw1POb(`njxgN@xNA?@buF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bdf1a1e11c11160243caa31690fd9a150d66fca
GIT binary patch
literal 313
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}pFLe1Ln2z=
zPT9!YY#`uT?^LBSOS*wEk4r3pqb-R;EP+)jt)SRMfz83M(ZQ4Dhm4YH*B`CZzyAG`
z`NhW6*uebS^Zxg1$Nw)AyjseuRP<`sI_GJrcHbYb63o<#FF9;bW7e>Kq5dk)7KVCR
zhfwE)bvNX0O`8LBU+(R^cgCNCIkMNXK4Vk$EV2|`kSQe~=#mnytdz}=%+q7oF8rBm
z!+|rqg>N)<gecBol-u7ob8cH`=-SsNzH_V6xtC=Y&Ds+*P4$sQSmyq?!}s|GTqkbN
z3>1+#9=P;t6}!ok%6;oh*9QJ&%3Xfna`CK&4jDU_Mu!JH<r~r(KJfRScL#c(!PC{x
JWt~$(69AIJcbxzL

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa739390e75cae82550d4622b04bdba214019361
GIT binary patch
literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}&YmugArY-_
z&mH7FpdfI>!8!WjD*H=ePMjy1TUu=Lv$raEPFiyI)SH9qkC?13WIg+P_4-YA2CrxD
j%T6|$Cmmg*BAdl9U7UkW*|4_)XdHv5tDnm{r-UW|`718`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json
new file mode 100644
index 000000000000..95b67b2cbdab
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json
@@ -0,0 +1,83 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh | Edited, grayscaled and split into layers added decal sprites by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "door"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "door-decal-line-01"
+    },
+    {
+      "name": "door-decal-line-02"
+    },
+    {
+      "name": "door-decal-line-03"
+    },
+    {
+      "name": "door-decal-line-04"
+    },
+    {
+      "name": "door-decal-captain-01"
+    },
+    {
+      "name": "door-decal-cargo-01"
+    },
+    {
+      "name": "door-decal-cargo-02"
+    },
+    {
+      "name": "door-decal-engi-01"
+    },
+    {
+      "name": "door-decal-engi-02"
+    },
+    {
+      "name": "door-decal-engi-03"
+    },
+    {
+      "name": "door-decal-eva-01"
+    },
+    {
+      "name": "door-decal-eva-02"
+    },
+    {
+      "name": "door-decal-med-01"
+    },
+    {
+      "name": "door-decal-fuel-plasma"
+    },
+    {
+      "name": "door-decal-fuel-uranium"
+    },
+    {
+      "name": "door-decal-fuel-welding"
+    },
+    {
+      "name": "door-decal-fuel-ame"
+    },
+    {
+      "name": "door-decal-null"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1055a1e361431020f7deb3dfac269e8b5c27ca8
GIT binary patch
literal 287
zcmV+)0pR|LP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#*-1n}R9J=WmLU#<Fc?PP7BuN0s*nf-hX7T_@o=~v;ui=`z#&L4z!U@qL#>5n
zJlT-Ehv=8W&CShKF~*F>n9;ZAu_p$ostSOzEH~eLljvPOiMy`z>D><iaL&>9eGoao
zGnnZo1GLuX1*B<;wf39<tu=LBdzXI<u-1}g*?9pId7g(0m_{g$V*uK=Wf%tU0nt)E
ztzS_T06_+6UP9;GeE6SB7~;+!2AsuVfKn=4K$0XYu~G^V!S}0Zz6Hy_6%hcMrt$h3
lS_Om_ZvsRlsQBhGya4_nM_yZ)DbfG{002ovPDHLkV1k_Ab6o%c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..e89987d0af897ace61dd8ac5b0ff69762b4a812a
GIT binary patch
literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}KAtX)ArY-_
z&u!#wP+(xa$b9^g<(<Z3i8(hKElYGbl@k~Z4ZpuSeV*NOl1i;kkDSfCEllDY=6dg|
su9c}}Sa9UeuDL}C>obq7QTZFfT&c{#_M5YR8_-+^Pgg&ebxsLQ05WhfNdN!<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..92386c4759de16c1089f664bda7d948df8234cec
GIT binary patch
literal 293
zcmV+=0owkFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#-$_J4R9J=Wm9Y+jFcd{E#)T$GaAok<@C%wa5C#*=+JRq?Ut?gEAW0ePKulbe
z*1TFnIP+`YN!!~8tgH}I3ZZT4H`L7|#=to@mLL_l2oVfQ;gF`rYe)r-S*8Ktl;?pL
zfn6Nq)^(Iy+GBJ70PzWY1G&IHN&E^#jG>a!PYj<lZEIXhE@0FACzL|yb5U3&gOs^g
zE-!|!aL)DIT-dr4xc5DpnVMx^0RTi{=uhBU*TFE3{se$&HhhYr(?<wQvms*4b({Ch
reMC-AppsG#O1W%dCgIm$<==S#?}$A2E<DJ;00000NkvXXu0mjfPl9>m

literal 0
HcmV?d00001


From cb60f83680e3dfae4cca78c01008760b75d199fc Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 12 Aug 2024 22:41:22 +0000
Subject: [PATCH 20/39] Automatic Changelog (#1836)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 4a375844be22..99b8e66dd20b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6265,3 +6265,11 @@ Entries:
       message: Updated Crescent.
   id: 5197
   time: '2024-08-12T22:18:59.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added EVA suits in departmental colors.
+    - type: Add
+      message: Added new wall lockers for EVA suits, fuel and materials.
+  id: 5198
+  time: '2024-08-12T22:40:54.0000000+00:00'

From b23740349b9a6014941132bf7c657e33ac828ba0 Mon Sep 17 00:00:00 2001
From: ThatOneGoblin25 <145570657+ThatOneGoblin25@users.noreply.github.com>
Date: Wed, 14 Aug 2024 02:59:42 +1000
Subject: [PATCH 21/39] KC Anchor (Update) (#1685)

* anchorreworkpull

* vaccum markers

* anchorreworkrevised

* turns out ship only needs one core AME because no more vendors

* Lowered price

It sells for slightly less than 90000, adding +15% brings it to 103k. Made it 110k.

* swapped arcade spot for TV

* fixes and more minor decals

* Increased price

Grid sells for slightly less than 90k ingame, 90k plus 30% is 117k.

* removed metadata of named entities

* Updated anchor with feedback

---------

Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 .../Maps/_NF/Shuttles/Expedition/anchor.yml   | 12122 +++++++++-------
 .../_NF/Shipyard/Expedition/anchor.yml        |    66 +-
 2 files changed, 6747 insertions(+), 5441 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
index d74b98ef6488..0e36b1cb0170 100644
--- a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
+++ b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
@@ -4,15 +4,22 @@ meta:
 tilemap:
   0: Space
   14: FloorBar
+  7: FloorBlue
+  5: FloorBoxing
+  3: FloorBrokenWood
   30: FloorDark
+  1: FloorDarkDiagonal
   33: FloorDarkHerringbone
+  2: FloorDarkMono
   37: FloorDarkPavement
   45: FloorFreezer
   46: FloorGlass
   61: FloorKitchen
+  6: FloorLaundry
   63: FloorLino
   65: FloorMetalDiamond
   90: FloorSteel
+  4: FloorSteelDiagonal
   97: FloorSteelDirty
   104: FloorSteelPavementVertical
   105: FloorTechMaint
@@ -34,51 +41,51 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: HgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAACHgAAAAABLgAAAAAAHgAAAAAAHgAAAAADHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAADLgAAAAAAHgAAAAABHgAAAAADHgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAABHgAAAAABHgAAAAADHgAAAAACHgAAAAABLgAAAAAAHgAAAAACHgAAAAADHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADHgAAAAAAHgAAAAADHgAAAAAAHgAAAAADLgAAAAAAHgAAAAADHgAAAAABHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABHgAAAAACHgAAAAADHgAAAAADHgAAAAAALgAAAAAAHgAAAAABHgAAAAACHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAADHgAAAAACHgAAAAABHgAAAAAAHgAAAAAALgAAAAAAHgAAAAABHgAAAAABHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAADgAAAAAADgAAAAAADgAAAAAAHgAAAAAAHgAAAAABLgAAAAAAHgAAAAACHgAAAAAAHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAADgAAAAAADgAAAAAADgAAAAAAHgAAAAADHgAAAAACLgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAADgAAAAAADgAAAAAADgAAAAAAegAAAAAAHgAAAAAALgAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAegAAAAAAHgAAAAAALgAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAHgAAAAADHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAADHgAAAAAAHgAAAAAAHgAAAAADHgAAAAAAHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAABHgAAAAAAHgAAAAABHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAADegAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACHgAAAAADHgAAAAAAHgAAAAABegAAAAAAHgAAAAADHgAAAAAA
+          tiles: aAAAAAABHgAAAAADHgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAABHgAAAAADLgAAAAABaAAAAAADHgAAAAABHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAADgAAAAACDgAAAAAADgAAAAABHgAAAAAAHgAAAAAALgAAAAAAegAAAAAAHgAAAAABHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAADgAAAAACDgAAAAABDgAAAAAAHgAAAAABHgAAAAABLgAAAAABHgAAAAAAHgAAAAAAHgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAADgAAAAABDgAAAAABDgAAAAAAHgAAAAABHgAAAAADLgAAAAACHgAAAAADHgAAAAABHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAADgAAAAABDgAAAAADDgAAAAAAHgAAAAABHgAAAAACLgAAAAACHgAAAAACHgAAAAABHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAADgAAAAADDgAAAAACegAAAAAAHgAAAAAAHgAAAAABLgAAAAABHgAAAAACHgAAAAADHgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAADgAAAAAADgAAAAACDgAAAAACegAAAAAAHgAAAAABLgAAAAAAHgAAAAAAHgAAAAACHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAADgAAAAABDgAAAAACDgAAAAABAgAAAAABHgAAAAABLgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAADgAAAAABDgAAAAADDgAAAAACegAAAAAAHgAAAAADLgAAAAABAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAADgAAAAADDgAAAAABDgAAAAADDgAAAAAAegAAAAAAHgAAAAACLgAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAADgAAAAABDgAAAAADDgAAAAACDgAAAAADegAAAAAAHgAAAAACHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAABLgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAABegAAAAAAHgAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAABAQAAAAABAQAAAAACAQAAAAABAgAAAAAAHgAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAAAAQAAAAACAQAAAAADAQAAAAADegAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAegAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAdwAAAAABdwAAAAACdwAAAAABdwAAAAADegAAAAAALgAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAAAdwAAAAADdwAAAAAAdwAAAAAAegAAAAAALgAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAAAdwAAAAACdwAAAAACdwAAAAADdwAAAAAALgAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAACdwAAAAABdwAAAAABdwAAAAAAegAAAAAAdwAAAAACdwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAJQAAAAAAIQAAAAACdwAAAAACdwAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAdwAAAAAAdwAAAAABdwAAAAABdwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAADdwAAAAABdwAAAAADdwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAdwAAAAACdwAAAAAAdwAAAAABdwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAdwAAAAADdwAAAAADdwAAAAABdwAAAAAAegAAAAAALgAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAADdwAAAAAAdwAAAAACdwAAAAAAegAAAAAALgAAAAADLgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAABAwAAAAAFdwAAAAACdwAAAAAAAgAAAAACLgAAAAACLgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAABdwAAAAABdwAAAAAAdwAAAAACegAAAAAAegAAAAAAAgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAIQAAAAACdwAAAAABdwAAAAAAdwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAdwAAAAAAdwAAAAADdwAAAAACdwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAACdwAAAAABdwAAAAABdwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAdwAAAAACdwAAAAAAdwAAAAACdwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: HgAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACHgAAAAADdgAAAAADdgAAAAADHgAAAAADHgAAAAADHgAAAAABHgAAAAADHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAAAdgAAAAADdgAAAAABHgAAAAAAHgAAAAABHgAAAAACHgAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAAAHgAAAAACHgAAAAABHgAAAAABHgAAAAAAHgAAAAACHgAAAAABHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAADHgAAAAABHgAAAAADHgAAAAADHgAAAAABHgAAAAADHgAAAAABHgAAAAADHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAADHgAAAAADHgAAAAADHgAAAAAAHgAAAAADHgAAAAAAHgAAAAAAHgAAAAADHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAADHgAAAAABHgAAAAACHgAAAAACHgAAAAABHgAAAAABPQAAAAAAPQAAAAAAPQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAADHgAAAAABHgAAAAABHgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABHgAAAAACHgAAAAAAHgAAAAAAHgAAAAADegAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAABegAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAHgAAAAADegAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAACLQAAAAAAHgAAAAACegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAABLQAAAAAALQAAAAAALQAAAAAALQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADLQAAAAAALQAAAAAALQAAAAAALQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAALQAAAAAALQAAAAAALQAAAAAALQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAACHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: HgAAAAAAHgAAAAADHgAAAAAAHgAAAAADHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAADdgAAAAACLgAAAAACHgAAAAABHgAAAAABAQAAAAACAQAAAAACAQAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAAAdgAAAAAAdgAAAAAAHgAAAAADHgAAAAACAQAAAAABAQAAAAAAAQAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAHgAAAAAAHgAAAAABAQAAAAACAQAAAAABAQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAABHgAAAAABHgAAAAAAegAAAAAAAgAAAAACegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABHgAAAAADHgAAAAACHgAAAAADHgAAAAADegAAAAAAHgAAAAACHgAAAAAAHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABHgAAAAAAHgAAAAADHgAAAAADHgAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAACHgAAAAABAgAAAAAAHgAAAAAAHgAAAAAAHgAAAAACegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAABHgAAAAABHgAAAAADegAAAAAAegAAAAAAAgAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAADegAAAAAABAAAAAABBAAAAAACBAAAAAADBAAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAHgAAAAABegAAAAAABAAAAAADBAAAAAADBAAAAAAABAAAAAACegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABegAAAAAABQAAAAABBQAAAAADBQAAAAAABQAAAAADegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADegAAAAAABQAAAAABegAAAAAAegAAAAAABQAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADegAAAAAABQAAAAADBQAAAAADegAAAAAABQAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAegAAAAAABQAAAAAAegAAAAAABQAAAAABBQAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,0:
           ind: 0,0
-          tiles: LgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAABdwAAAAAAdwAAAAACdwAAAAADdwAAAAAAdwAAAAABegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAACdwAAAAABHgAAAAABHgAAAAAAdwAAAAABegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAACdwAAAAADdwAAAAABegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAACdwAAAAADegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAABdwAAAAABdwAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: LgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAgAAAAABegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAABegAAAAAABgAAAAAABgAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAAAdwAAAAABegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAACdwAAAAABdwAAAAACegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAABdwAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAHgAAAAABHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAADHgAAAAABegAAAAAAHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAWgAAAAACWgAAAAABHgAAAAABHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAABaQAAAAAAegAAAAAAWgAAAAABWgAAAAADHgAAAAACHgAAAAADHgAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAYQAAAAAAWgAAAAADHgAAAAAAHgAAAAADLgAAAAAAAAAAAAAAHgAAAAAAHgAAAAADegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAADLgAAAAAAHgAAAAADHgAAAAABHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAABLgAAAAAAHgAAAAAALgAAAAAALgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAHgAAAAAAHgAAAAACHgAAAAACHgAAAAAALgAAAAAAHgAAAAADLgAAAAAALgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAACLgAAAAAAHgAAAAAALgAAAAAALgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAADHgAAAAABLgAAAAAAHgAAAAABHgAAAAADHgAAAAACHgAAAAADHgAAAAACHgAAAAABHgAAAAAAHgAAAAABHgAAAAABHgAAAAADHgAAAAADHgAAAAAAHgAAAAABHgAAAAACHgAAAAACLgAAAAAAHgAAAAADHgAAAAACHgAAAAACHgAAAAABHgAAAAACHgAAAAADHgAAAAADHgAAAAACHgAAAAACHgAAAAADHgAAAAADHgAAAAABHgAAAAACHgAAAAAAHgAAAAAALgAAAAAAHgAAAAAAHgAAAAACHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAAAHgAAAAACLgAAAAAALgAAAAAALgAAAAAAHgAAAAAAHgAAAAADHgAAAAADegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAAAHgAAAAABHgAAAAADLgAAAAAALgAAAAAALgAAAAAAHgAAAAAAHgAAAAABHgAAAAADegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAABLgAAAAAALgAAAAAALgAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAQAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAAQAAAAACAQAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAWgAAAAABWgAAAAABegAAAAAAHgAAAAADLgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAaQAAAAAAegAAAAAAWgAAAAABWgAAAAABegAAAAAAHgAAAAACHgAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAaQAAAAAAegAAAAAAWgAAAAACWgAAAAADAgAAAAABHgAAAAABLgAAAAADAAAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAADLgAAAAADegAAAAAAegAAAAAAHgAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAdwAAAAABdwAAAAADegAAAAAAHgAAAAACLgAAAAACegAAAAAALgAAAAABLgAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAdwAAAAAAAwAAAAAAAgAAAAABHgAAAAAALgAAAAAAegAAAAAALgAAAAABLgAAAAABegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAdwAAAAAAdwAAAAACHgAAAAADHgAAAAABLgAAAAADegAAAAAALgAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAgAAAAACAgAAAAACegAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAACLgAAAAAAegAAAAAAHgAAAAABHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAABHgAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAABHgAAAAABHgAAAAADLgAAAAACAgAAAAABHgAAAAADHgAAAAACHgAAAAABHgAAAAADHgAAAAAAHgAAAAACHgAAAAABHgAAAAADHgAAAAABHgAAAAABHgAAAAAAHgAAAAADHgAAAAAAHgAAAAADLgAAAAACegAAAAAAHgAAAAACHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAALgAAAAAALgAAAAADLgAAAAACegAAAAAAHgAAAAACHgAAAAACegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAAALgAAAAACHgAAAAAALgAAAAADLgAAAAACLgAAAAAAaAAAAAADHgAAAAADHgAAAAACegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABHgAAAAAAHgAAAAADLgAAAAACLgAAAAABLgAAAAAB
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: HgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABHgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAACegAAAAAAHgAAAAADegAAAAAAegAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAABegAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAADHgAAAAADHgAAAAADegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAADegAAAAAAHgAAAAADHgAAAAABHgAAAAADHgAAAAACHgAAAAACHgAAAAAAegAAAAAAHgAAAAACHgAAAAADAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABHgAAAAADHgAAAAACegAAAAAAHgAAAAACHgAAAAADHgAAAAADHgAAAAAAHgAAAAACHgAAAAADegAAAAAAHgAAAAABHgAAAAACHgAAAAADAAAAAAAAHgAAAAACHgAAAAABHgAAAAADHgAAAAACQQAAAAAAHgAAAAAAHgAAAAABHgAAAAADHgAAAAADHgAAAAABHgAAAAADegAAAAAAHgAAAAAAHgAAAAABHgAAAAACeQAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAACHgAAAAACHgAAAAADegAAAAAAHgAAAAAAHgAAAAABHgAAAAABegAAAAAAHgAAAAABHgAAAAAAegAAAAAAegAAAAAAQQAAAAAAHgAAAAAAHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAABHgAAAAAAHgAAAAACdgAAAAACHgAAAAACHgAAAAACHgAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAADHgAAAAADHgAAAAACHgAAAAADHgAAAAACHgAAAAACHgAAAAAAHgAAAAADdgAAAAADHgAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAAAHgAAAAABHgAAAAADHgAAAAAAHgAAAAADHgAAAAADHgAAAAACHgAAAAADHgAAAAABHgAAAAABdgAAAAAALgAAAAAALgAAAAAAHgAAAAACHgAAAAAAHgAAAAABHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAACdgAAAAABLgAAAAAALgAAAAAAHgAAAAADHgAAAAADHgAAAAADegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAAAHgAAAAACHgAAAAACdgAAAAABLgAAAAAALgAAAAAAHgAAAAADHgAAAAABHgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAADHgAAAAABdgAAAAACdgAAAAAD
+          tiles: AQAAAAADegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAADegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACegAAAAAAHgAAAAABHgAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAegAAAAAAHgAAAAABHgAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADAgAAAAAAHgAAAAACHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAegAAAAAABwAAAAAABwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAALgAAAAADegAAAAAAegAAAAAAAAAAAAAAHgAAAAAAAgAAAAAABwAAAAAABwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAQAAAAABAQAAAAADegAAAAAAeQAAAAAAHgAAAAADegAAAAAABwAAAAAABwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAQAAAAAAAQAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAABegAAAAAAegAAAAAAegAAAAAAAgAAAAABAgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAgAAAAADegAAAAAAegAAAAAAdgAAAAABHgAAAAACHgAAAAABHgAAAAACHgAAAAADHgAAAAABHgAAAAADHgAAAAADHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAADHgAAAAAAHgAAAAAAHgAAAAADdgAAAAADHgAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAADHgAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAADHgAAAAADHgAAAAAAHgAAAAABHgAAAAAAHgAAAAADdgAAAAACLgAAAAABLgAAAAADHgAAAAADHgAAAAABHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAABHgAAAAACHgAAAAACdgAAAAABLgAAAAADLgAAAAADHgAAAAAALgAAAAAAHgAAAAACegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAADHgAAAAACHgAAAAADdgAAAAAALgAAAAAALgAAAAABHgAAAAACHgAAAAABHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAAAHgAAAAADdgAAAAABdgAAAAAD
           version: 6
         -2,-2:
           ind: -2,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAADHgAAAAABaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAaAAAAAAAHgAAAAABaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACaAAAAAAAaAAAAAAAaAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaAAAAAAAaAAAAAABaAAAAAAB
           version: 6
         -2,-1:
           ind: -2,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADegAAAAAAHgAAAAABHgAAAAAAHgAAAAADHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACHgAAAAABHgAAAAABHgAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAACHgAAAAACHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaAAAAAADaAAAAAAAaAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaAAAAAAAaAAAAAADaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAQAAAAACAQAAAAAAegAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAADAQAAAAAAAQAAAAABAQAAAAACAgAAAAABHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAACAQAAAAABAQAAAAAAegAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAACAQAAAAACAQAAAAACAQAAAAAAAgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,-2:
           ind: 1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAADHgAAAAADHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdgAAAAABHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAADdgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdgAAAAADHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAADdgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAACdgAAAAADHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAADdgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAADdgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAACdgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAACdgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-3:
           ind: 0,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: dgAAAAACdgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADHgAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAACHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAADHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADHgAAAAACHgAAAAACHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAAAHgAAAAABHgAAAAADHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: dgAAAAAAdgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAABdgAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAADAQAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAQAAAAACAQAAAAACAQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAACAQAAAAABAQAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAQAAAAABAQAAAAAAAQAAAAADAgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-3:
           ind: -1,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADHgAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAQAAAAABHgAAAAAD
           version: 6
     - type: Broadphase
     - type: Physics
@@ -100,734 +107,930 @@ entities:
         version: 2
         nodes:
         - node:
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: Arrows
-          decals:
-            44: 14,-10
-            45: 14,-12
-        - node:
-            angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
-            id: Arrows
+            id: Box
           decals:
-            46: 11.966288,-14.393062
+            288: -9,-24
         - node:
             color: '#FFFFFFFF'
-            id: Bot
-          decals:
-            34: 12,-9
-            35: 13,-9
-            36: 13,-10
-            37: 12,-10
-            38: 12,-11
-            39: 13,-11
-            40: 13,-12
-            41: 12,-12
-            42: 12,-13
-            43: 13,-13
-        - node:
-            angle: 3.141592653589793 rad
-            color: '#0000B4FF'
             id: BoxGreyscale
           decals:
-            47: 8,-23
-            48: 9,-23
-            49: 10,-23
+            237: -1,5
+            238: -3,6
+            239: 1,6
         - node:
-            angle: 3.141592653589793 rad
-            color: '#7C0000FF'
-            id: BoxGreyscale
+            color: '#FFFFFFFF'
+            id: BrickTileDarkBox
           decals:
-            50: 5,-25
-            51: 5,-26
-            52: 5,-27
+            74: -5,-18
+            75: 3,-18
+            76: -1,-29
+            77: -1,-3
+            189: -1,-5
         - node:
-            color: '#CDCDCDCC'
+            color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
           decals:
-            95: -2,-20
+            1: 0,2
+            124: 4,-16
+            297: 14,-20
         - node:
-            color: '#CDCDCDCC'
+            color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
           decals:
-            96: 0,-20
-        - node:
-            color: '#CDCDCDCC'
-            id: BrickTileDarkCornerSe
-          decals:
-            93: -2,-16
+            0: -2,2
+            16: 1,2
+            123: -6,-16
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSe
           decals:
-            5: -4,4
+            152: 14,-21
+            157: 15,-14
+            195: 0,0
         - node:
-            color: '#CDCDCDCC'
+            color: '#FFFFFFFF'
             id: BrickTileDarkCornerSw
           decals:
-            94: 0,-16
+            2: -2,0
+            17: 1,0
         - node:
-            color: '#CDCDCDCC'
+            color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
           decals:
-            102: -4,-20
-            145: -2,-28
+            111: 1,-16
+            131: 4,-20
+            134: -7,-20
+            188: 0,-6
+            298: 13,-20
         - node:
-            color: '#CDCDCDCC'
+            color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
           decals:
-            103: 2,-20
-            146: 0,-28
-        - node:
-            color: '#CDCDCDCC'
-            id: BrickTileDarkInnerSe
-          decals:
-            100: -4,-16
-            120: -2,-6
+            110: -3,-16
+            130: -6,-20
+            135: 5,-20
+            179: -15,-21
+            211: -2,-6
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
           decals:
-            6: -4,5
+            147: 13,-14
+            148: 10,-21
+            158: 15,-13
+            171: -9,-21
+            172: 4,-21
+            201: 0,-2
         - node:
-            color: '#CDCDCDCC'
+            color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
           decals:
-            101: 2,-16
-            119: 0,-6
+            173: 7,-21
+            174: -6,-21
+            180: -15,-19
+            212: -2,-2
         - node:
-            color: '#0066BDFF'
+            color: '#FFFFFFFF'
             id: BrickTileDarkLineE
           decals:
-            89: 0.49825978,2.0046659
-            90: 0.49825978,1.0202909
-            91: 0.49825978,0.020290852
+            24: 5,1
+            105: 4,-19
+            106: 4,-18
+            107: 4,-17
+            112: 1,-15
+            113: 1,-14
+            114: 1,-13
+            115: 1,-12
+            153: 13,-16
+            154: 13,-15
+            185: 0,-5
+            186: 0,-4
+            187: 0,-3
+            197: 0,1
+            227: -16,-17
+            228: -16,-16
+            229: -16,-15
+            294: 13,-17
+            295: 13,-18
+            296: 13,-19
         - node:
-            color: '#1B99FBFF'
-            id: BrickTileDarkLineE
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineN
           decals:
-            86: 0.25239444,2.0046659
-            87: 0.25239444,1.0202909
-            88: 0.25239444,0.020290852
+            21: 2,2
+            22: 3,2
+            23: 4,2
+            108: 3,-16
+            109: 2,-16
+            121: -4,-16
+            122: -5,-16
+            192: -1,2
         - node:
-            color: '#CDCDCDCC'
-            id: BrickTileDarkLineE
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineS
           decals:
-            92: -2,-15
-            97: -4,-19
-            98: -4,-18
-            99: -4,-17
-            111: -2,-14
-            112: -2,-13
-            113: -2,-12
-            114: -2,-11
-            115: -2,-10
-            116: -2,-9
-            117: -2,-8
-            118: -2,-7
-            138: -2,-21
-            139: -2,-22
-            140: -2,-23
-            141: -2,-24
-            142: -2,-25
-            143: -2,-26
-            144: -2,-27
+            18: 2,0
+            19: 3,0
+            20: 4,0
+            146: 14,-14
+            149: 11,-21
+            150: 12,-21
+            151: 13,-21
+            167: 5,-21
+            168: 6,-21
+            169: -7,-21
+            170: -8,-21
+            190: -1,0
         - node:
-            color: '#CDCDCDCC'
-            id: BrickTileDarkLineN
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineW
           decals:
-            109: -3,-20
-            110: 1,-20
-            147: -1,-28
+            116: -3,-15
+            117: -3,-14
+            118: -3,-13
+            119: -3,-12
+            120: -3,-11
+            125: -6,-17
+            126: -6,-18
+            127: -6,-19
+            178: -15,-20
+            191: -2,1
+            196: 1,1
+            208: -2,-3
+            209: -2,-4
+            210: -2,-5
         - node:
             color: '#FFFFFFFF'
-            id: BrickTileDarkLineN
+            id: BrickTileSteelCornerNe
           decals:
-            7: -3,7
-            8: -2,7
-            9: -1,7
-            10: 0,7
-            11: 1,7
+            7: 5,-2
         - node:
-            color: '#CDCDCDCC'
-            id: BrickTileDarkLineS
+            color: '#FFFFFFFF'
+            id: BrickTileSteelCornerNw
           decals:
-            104: -3,-16
-            105: 1,-16
-            121: -1,-6
+            6: 2,-2
         - node:
             color: '#FFFFFFFF'
-            id: BrickTileDarkLineS
+            id: BrickTileSteelCornerSe
           decals:
-            4: -5,4
+            15: 5,-5
         - node:
-            color: '#CDCDCDCC'
-            id: BrickTileDarkLineW
+            color: '#FFFFFFFF'
+            id: BrickTileSteelCornerSw
           decals:
-            106: 2,-19
-            107: 2,-18
-            108: 2,-17
-            122: 0,-7
-            123: 0,-8
-            124: 0,-9
-            125: 0,-10
-            126: 0,-11
-            127: 0,-12
-            128: 0,-13
-            129: 0,-14
-            130: 0,-15
-            131: 0,-21
-            132: 0,-22
-            133: 0,-23
-            134: 0,-24
-            135: 0,-25
-            136: 0,-26
-            137: 0,-27
+            8: 2,-5
         - node:
             color: '#FFFFFFFF'
-            id: BrickTileSteelBox
+            id: BrickTileSteelLineE
           decals:
-            187: -14,-25
+            12: 5,-3
+            13: 5,-4
         - node:
-            color: '#254C9599'
-            id: BrickTileSteelCornerNe
+            color: '#FFFFFFFF'
+            id: BrickTileSteelLineN
           decals:
-            57: 0,2
+            10: 3,-2
+            11: 4,-2
         - node:
-            color: '#254C9599'
-            id: BrickTileSteelCornerNw
+            color: '#FFFFFFFF'
+            id: BrickTileSteelLineS
           decals:
-            58: -2,2
+            9: 3,-5
+            14: 4,-5
         - node:
-            color: '#254C9599'
-            id: BrickTileSteelCornerSe
+            color: '#FFFFFFFF'
+            id: BrickTileSteelLineW
           decals:
-            59: 0,0
+            4: 2,-4
+            5: 2,-3
         - node:
-            color: '#254C9599'
-            id: BrickTileSteelCornerSw
+            color: '#FFFFFFFF'
+            id: BrickTileWhiteBox
           decals:
-            60: -2,0
+            136: 15,-16
         - node:
-            color: '#254C9599'
-            id: BrickTileSteelLineE
+            color: '#FFFFFFFF'
+            id: Caution
           decals:
-            53: 0,1
+            233: -10,-26
+            234: -11,-26
+            256: -12,-26
         - node:
-            color: '#8C8C8CCC'
-            id: BrickTileSteelLineN
+            color: '#FFFFFFFF'
+            id: DeliveryGreyscale
           decals:
-            156: -6.005792,-11.450896
-            157: -5.021417,-11.450896
-            158: 3.0095334,-11.491488
-            159: 3.9939084,-11.491488
+            3: -11,-27
+            78: -10,-27
+            240: -7,-2
+            251: -20,-13
+            252: -19,-13
+            253: 18,-13
+            254: 17,-13
+            255: -12,-27
+            286: -4,6
+            287: 2,6
         - node:
-            color: '#B4B4B4CC'
-            id: BrickTileSteelLineN
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Dirt
           decals:
-            151: -6.006692,-11.216935
-            152: -5.022317,-11.216935
-            153: 3.008933,-11.26381
-            154: 3.993308,-11.26381
+            283: -12,-26
+            284: -7,-29
+            285: -7,-28
         - node:
-            color: '#C8C8C8CC'
-            id: BrickTileSteelLineN
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavy
           decals:
-            155: -5.022317,-10.98256
+            259: 3,-9
+            263: 4,-10
+            264: 4,-11
+            282: -6,-12
         - node:
-            color: '#CDCDCDCC'
-            id: BrickTileSteelLineN
+            cleanable: True
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: DirtHeavy
           decals:
-            148: -6.006692,-10.98256
-            149: 3.008933,-11.01381
-            150: 3.993308,-11.01381
+            265: 3,-11
+            266: 2,-10
+            276: -6,-7
+            277: -6,-9
         - node:
+            cleanable: True
+            angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
-            id: BrickTileSteelLineS
+            id: DirtHeavy
           decals:
-            185: -15,-21
-            186: -14,-21
+            267: 2,-11
         - node:
-            color: '#254C9599'
-            id: BrickTileSteelLineW
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
           decals:
-            54: -2,1
+            268: 3,-6
+            274: -5,-7
         - node:
+            cleanable: True
             angle: 1.5707963267948966 rad
-            color: '#254C9599'
-            id: BrickTileSteelLineW
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
           decals:
-            55: -1,0
+            275: -5,-8
         - node:
-            angle: 4.71238898038469 rad
-            color: '#254C9599'
-            id: BrickTileSteelLineW
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtLight
           decals:
-            56: -1,2
+            260: 3,-10
+            262: 2,-9
+            269: 3,-7
+            270: 4,-7
+            271: 4,-6
+            272: 5,-3
+            273: -6,-8
+            280: -5,-10
+            281: -6,-13
         - node:
-            color: '#82000099'
-            id: BrickTileWhiteCornerNe
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtMedium
           decals:
-            63: -4,-2
+            261: 2,-10
+            278: -6,-10
+            279: -5,-9
         - node:
-            color: '#1B99FB99'
-            id: BrickTileWhiteCornerNw
+            color: '#E6E6E6FF'
+            id: FullTileOverlayGreyscale
           decals:
-            79: 14,-15
+            235: -4,-29
+            236: -5,-29
         - node:
-            color: '#82000099'
-            id: BrickTileWhiteCornerNw
+            color: '#9FED5896'
+            id: HalfTileOverlayGreyscale
           decals:
-            69: -7,-2
+            86: -5,-16
+            87: -4,-16
+            102: 2,-16
+            103: 3,-16
         - node:
-            color: '#334E6DC8'
-            id: BrickTileWhiteCornerSe
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale180
           decals:
-            13: -4,4
+            140: 13,-21
+            141: 14,-14
+            143: 12,-21
+            144: 11,-21
         - node:
-            color: '#82000099'
-            id: BrickTileWhiteCornerSe
+            color: '#EFB34196'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            159: -8,-21
+            160: -7,-21
+            161: 5,-21
+            162: 6,-21
+        - node:
+            color: '#5E7C1696'
+            id: HalfTileOverlayGreyscale270
           decals:
-            64: -4,-4
+            203: -2,-4
+            204: -2,-3
+            205: -2,-5
         - node:
-            color: '#82000099'
-            id: BrickTileWhiteCornerSw
+            color: '#8C347F96'
+            id: HalfTileOverlayGreyscale270
           decals:
-            67: -7,-4
+            175: -15,-20
         - node:
-            color: '#0066DCCC'
-            id: BrickTileWhiteInnerSe
+            color: '#9FED5896'
+            id: HalfTileOverlayGreyscale270
           decals:
-            173: 4,-21
+            82: -6,-19
+            83: -6,-18
+            84: -6,-17
+            89: -3,-15
+            90: -3,-14
+            91: -3,-13
+            92: -3,-12
+            93: -3,-11
         - node:
             color: '#334E6DC8'
-            id: BrickTileWhiteInnerSe
+            id: HalfTileOverlayGreyscale90
+          decals:
+            181: 0,-5
+            182: 0,-4
+            183: 0,-3
+        - node:
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale90
           decals:
-            12: -4,5
+            137: 13,-15
+            138: 13,-16
+            290: 13,-17
+            291: 13,-18
+            292: 13,-19
         - node:
-            color: '#B79C0099'
-            id: BrickTileWhiteInnerSe
+            color: '#9FED5896'
+            id: HalfTileOverlayGreyscale90
           decals:
-            76: -9,-21
+            94: 4,-19
+            95: 4,-18
+            96: 4,-17
+            97: 1,-15
+            98: 1,-14
+            99: 1,-13
+            100: 1,-12
         - node:
-            color: '#0066DCCC'
-            id: BrickTileWhiteInnerSw
+            color: '#FFFFFFFF'
+            id: LoadingArea
           decals:
-            172: 7,-21
+            304: 12,-11
         - node:
-            color: '#B79C0099'
-            id: BrickTileWhiteInnerSw
+            angle: 3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: LoadingArea
           decals:
-            75: -6,-21
+            305: 13,-11
         - node:
-            color: '#505050FF'
-            id: BrickTileWhiteLineE
+            color: '#FFFFFFFF'
+            id: MiniTileDarkCornerNe
           decals:
-            26: 13.247913,-17.99221
-            27: 13.247913,-18.976585
+            49: 1,-17
         - node:
-            color: '#6F6F6FFF'
-            id: BrickTileWhiteLineE
+            color: '#FFFFFFFF'
+            id: MiniTileDarkCornerNw
           decals:
-            24: 13.493418,-17.993195
-            25: 13.493418,-18.97757
+            50: -3,-17
         - node:
-            color: '#82000099'
-            id: BrickTileWhiteLineE
+            color: '#FFFFFFFF'
+            id: MiniTileDarkCornerSe
           decals:
-            61: -4,-3
+            46: 1,-19
         - node:
-            angle: 1.5707963267948966 rad
-            color: '#82000099'
-            id: BrickTileWhiteLineE
+            color: '#FFFFFFFF'
+            id: MiniTileDarkCornerSw
           decals:
-            62: -5,-2
+            45: -3,-19
         - node:
-            color: '#9E9F9EFF'
-            id: BrickTileWhiteLineE
+            color: '#FFFFFFFF'
+            id: MiniTileDarkEndN
           decals:
-            22: 13.743418,-17.993195
-            23: 13.743418,-18.97757
+            73: -1,-7
         - node:
-            color: '#E3E5E9FF'
-            id: BrickTileWhiteLineE
+            color: '#FFFFFFFF'
+            id: MiniTileDarkEndS
           decals:
-            20: 13.993418,-17.993195
-            21: 13.993418,-18.97757
+            31: -1,-27
         - node:
-            color: '#0066DCCC'
-            id: BrickTileWhiteLineN
+            color: '#FFFFFFFF'
+            id: MiniTileDarkInnerNe
           decals:
-            174: 5,-23
-            175: 6,-23
+            54: -1,-17
         - node:
-            color: '#1B99FB99'
-            id: BrickTileWhiteLineN
+            color: '#FFFFFFFF'
+            id: MiniTileDarkInnerNw
           decals:
-            80: 15,-15
-            81: 16,-15
-            82: 17,-15
+            53: -1,-17
         - node:
-            color: '#334E6DC8'
-            id: BrickTileWhiteLineN
+            color: '#FFFFFFFF'
+            id: MiniTileDarkInnerSe
+          decals:
+            42: -1,-19
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkInnerSw
+          decals:
+            41: -1,-19
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkLineE
+          decals:
+            26: -1,-22
+            27: -1,-23
+            28: -1,-24
+            29: -1,-25
+            30: -1,-26
+            39: -1,-21
+            40: -1,-20
+            47: 1,-18
+            64: -1,-16
+            65: -1,-15
+            66: -1,-14
+            67: -1,-13
+            68: -1,-12
+            69: -1,-11
+            70: -1,-10
+            71: -1,-9
+            72: -1,-8
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkLineN
           decals:
-            15: -3,7
-            16: -2,7
-            17: -1,7
-            18: 0,7
-            19: 1,7
+            51: -2,-17
+            52: 0,-17
         - node:
-            color: '#82000099'
-            id: BrickTileWhiteLineN
+            color: '#FFFFFFFF'
+            id: MiniTileDarkLineS
+          decals:
+            43: -2,-19
+            44: 0,-19
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkLineW
           decals:
-            70: -6,-2
+            32: -1,-26
+            33: -1,-25
+            34: -1,-24
+            35: -1,-23
+            36: -1,-22
+            37: -1,-21
+            38: -1,-20
+            48: -3,-18
+            55: -1,-16
+            56: -1,-15
+            57: -1,-14
+            58: -1,-13
+            59: -1,-12
+            60: -1,-11
+            61: -1,-10
+            62: -1,-9
+            63: -1,-8
         - node:
-            color: '#B79C0099'
-            id: BrickTileWhiteLineN
+            color: '#5E7C1696'
+            id: QuarterTileOverlayGreyscale
           decals:
-            73: -8,-23
-            74: -7,-23
+            207: -2,-6
         - node:
-            color: '#0066DCCC'
-            id: BrickTileWhiteLineS
+            color: '#8C347F96'
+            id: QuarterTileOverlayGreyscale
           decals:
-            170: 5,-21
-            171: 6,-21
+            177: -15,-21
+        - node:
+            color: '#9FED5896'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            88: -3,-16
+            129: -6,-20
+            132: 5,-20
         - node:
             color: '#334E6DC8'
-            id: BrickTileWhiteLineS
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            200: 0,-2
+        - node:
+            color: '#52B4E996'
+            id: QuarterTileOverlayGreyscale180
           decals:
-            14: -5,4
+            142: 13,-14
+            145: 10,-21
+            156: 15,-13
         - node:
-            color: '#82000099'
-            id: BrickTileWhiteLineS
+            color: '#EFB34196'
+            id: QuarterTileOverlayGreyscale180
           decals:
-            65: -5,-4
-            66: -6,-4
+            163: 4,-21
+            164: -9,-21
         - node:
-            color: '#B79C0099'
-            id: BrickTileWhiteLineS
+            color: '#5E7C1696'
+            id: QuarterTileOverlayGreyscale270
           decals:
-            71: -8,-21
-            72: -7,-21
+            206: -2,-2
         - node:
-            color: '#1B99FB99'
-            id: BrickTileWhiteLineW
+            color: '#8C347F96'
+            id: QuarterTileOverlayGreyscale270
           decals:
-            77: 14,-17
-            78: 14,-16
-            83: 15,-20
-            84: 15,-21
-            85: 15,-22
+            176: -15,-19
         - node:
-            color: '#646464CC'
-            id: BrickTileWhiteLineW
+            color: '#EFB34196'
+            id: QuarterTileOverlayGreyscale270
           decals:
-            163: -15.780144,-15.000807
-            164: -15.780143,-16.000807
-            165: -15.747205,-19.019861
-            166: -15.747205,-18.004236
-            167: -15.76283,-17.004236
+            165: -6,-21
+            166: 7,-21
         - node:
-            color: '#787878CC'
-            id: BrickTileWhiteLineW
+            color: '#334E6DC8'
+            id: QuarterTileOverlayGreyscale90
           decals:
-            160: -16,-15
-            161: -16,-16
-            162: -16,-18
-            168: -16,-19
-            169: -16,-17
+            184: 0,-6
         - node:
-            color: '#82000099'
-            id: BrickTileWhiteLineW
+            color: '#52B4E996'
+            id: QuarterTileOverlayGreyscale90
           decals:
-            68: -7,-3
+            293: 13,-20
         - node:
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: StandClear
+            color: '#9FED5896'
+            id: QuarterTileOverlayGreyscale90
           decals:
-            28: -20,-10
-            29: -20,-12
+            101: 1,-16
+            128: 4,-20
+            133: -7,-20
         - node:
-            angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            30: -2,-32
-            31: 0,-32
+            303: 14,-9
+        - node:
+            color: '#9FED5896'
+            id: ThreeQuarterTileOverlayGreyscale
+          decals:
+            85: -6,-16
+        - node:
+            color: '#52B4E996'
+            id: ThreeQuarterTileOverlayGreyscale180
+          decals:
+            139: 14,-21
+            155: 15,-14
+        - node:
+            color: '#52B4E996'
+            id: ThreeQuarterTileOverlayGreyscale90
+          decals:
+            289: 14,-20
+        - node:
+            color: '#9FED5896'
+            id: ThreeQuarterTileOverlayGreyscale90
+          decals:
+            104: 4,-16
         - node:
-            angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
-            id: StandClear
+            id: WarnCornerSmallNW
           decals:
-            32: 18,-10
-            33: 18,-12
+            249: -9,-26
+        - node:
+            color: '#334E6DC8'
+            id: WarnLineGreyscaleE
+          decals:
+            217: -4,2
+        - node:
+            color: '#52B4E996'
+            id: WarnLineGreyscaleE
+          decals:
+            301: 13,-19
+            302: 13,-18
+        - node:
+            color: '#5E7C1696'
+            id: WarnLineGreyscaleE
+          decals:
+            202: -4,-3
+        - node:
+            color: '#9FED5896'
+            id: WarnLineGreyscaleE
+          decals:
+            219: 0,-9
+            220: -4,-9
+        - node:
+            color: '#334E6DC8'
+            id: WarnLineGreyscaleN
+          decals:
+            193: -1,2
+            214: 0,-2
+            215: -2,-2
+        - node:
+            color: '#52B4E996'
+            id: WarnLineGreyscaleN
+          decals:
+            300: 12,-23
         - node:
             color: '#EFB34196'
-            id: WarnLineS
+            id: WarnLineGreyscaleN
+          decals:
+            226: -7,-23
+            246: -8,-23
+        - node:
+            color: '#334E6DC8'
+            id: WarnLineGreyscaleS
+          decals:
+            198: -2,0
+            199: 0,0
+            216: -1,4
+        - node:
+            color: '#3EB38896'
+            id: WarnLineGreyscaleS
+          decals:
+            224: 6,-21
+            225: 5,-21
+        - node:
+            color: '#52B4E996'
+            id: WarnLineGreyscaleS
+          decals:
+            299: 12,-21
+        - node:
+            color: '#EFB34196'
+            id: WarnLineGreyscaleS
+          decals:
+            221: -8,-21
+            222: -7,-21
+        - node:
+            color: '#334E6DC8'
+            id: WarnLineGreyscaleW
+          decals:
+            194: -2,2
+        - node:
+            color: '#5E7C1696'
+            id: WarnLineGreyscaleW
+          decals:
+            213: -2,-3
+        - node:
+            color: '#8C347F96'
+            id: WarnLineGreyscaleW
           decals:
-            0: -2,-1
+            223: -15,-20
+        - node:
+            color: '#9FED5896'
+            id: WarnLineGreyscaleW
+          decals:
+            218: -2,-9
+            258: 2,-9
         - node:
             color: '#FFFFFFFF'
-            id: WoodTrimThinBox
+            id: WarnLineS
           decals:
-            176: -1,5
+            247: -9,-23
+            248: -9,-25
+            250: -9,-24
         - node:
             color: '#FFFFFFFF'
-            id: WoodTrimThinInnerNe
+            id: WarnLineW
           decals:
-            177: -0.86669874,5.1252174
+            25: 12,-25
+            79: -10,-26
+            80: -11,-26
+            257: -12,-26
         - node:
+            cleanable: True
             color: '#FFFFFFFF'
-            id: WoodTrimThinInnerNw
+            id: body
           decals:
-            178: -1.1375321,5.1252174
+            81: 3,-28
         - node:
+            cleanable: True
             color: '#FFFFFFFF'
-            id: WoodTrimThinInnerSe
+            id: bottle
           decals:
-            180: -0.86669874,4.8543844
+            242: 2,-4
         - node:
+            cleanable: True
             color: '#FFFFFFFF'
-            id: WoodTrimThinInnerSw
+            id: end
           decals:
-            179: -1.1166987,4.8752174
+            243: -4,-2
         - node:
+            cleanable: True
             color: '#FFFFFFFF'
-            id: WoodTrimThinLineN
+            id: engie
           decals:
-            1: -2,3
-            2: -1,3
-            3: 0,3
+            241: -7,-27
         - node:
+            cleanable: True
             color: '#FFFFFFFF'
-            id: WoodTrimThinLineS
+            id: ghost
           decals:
-            183: -0.99169874,4.8543844
-            184: -1.0021155,5.958551
+            244: 12,-24
         - node:
+            cleanable: True
             color: '#FFFFFFFF'
-            id: WoodTrimThinLineW
+            id: peace
+          decals:
+            245: 15,-9
+        - node:
+            cleanable: True
+            angle: -3.141592653589793 rad
+            color: '#1D1D2172'
+            id: splatter
+          decals:
+            231: 12.693383,-23.568222
+        - node:
+            cleanable: True
+            angle: -1.5707963267948966 rad
+            color: '#1D1D2172'
+            id: splatter
+          decals:
+            230: 12.401744,-23.958847
+        - node:
+            cleanable: True
+            color: '#1D1D2172'
+            id: splatter
           decals:
-            181: -1.1271155,4.989801
-            182: -0.022948742,4.989801
+            232: 12.302758,-23.146347
     - type: GridAtmosphere
       version: 2
       data:
         tiles:
-          -1,-1:
-            0: 65279
-            1: 256
-          -1,0:
-            0: 65535
-          -1,1:
-            0: 65535
-          -3,-1:
-            0: 52428
+          -4,-4:
+            0: 30327
+          -4,-5:
+            0: 30319
+          -5,-4:
+            0: 45294
+          -4,-3:
+            0: 30583
+          -5,-3:
+            0: 36799
+          -4,-2:
+            1: 36064
+          -4,-1:
+            1: 2184
           -3,-2:
-            0: 34952
+            1: 34952
           -2,-3:
-            0: 65262
+            1: 4096
+            0: 52428
           -2,-2:
-            0: 65023
-            1: 512
+            0: 3820
           -2,-1:
-            0: 65535
+            0: 3822
           -2,-4:
+            0: 52428
+          -2,0:
             0: 61166
+          -2,-5:
+            0: 52431
+            1: 256
           -1,-4:
             0: 65535
           -1,-3:
-            0: 65535
+            0: 65007
           -1,-2:
+            0: 52701
+          -1,-1:
+            0: 19965
+          -1,-5:
+            0: 65535
+          -1,0:
+            0: 40925
+          0,-4:
             0: 65535
+          0,-3:
+            0: 64987
+          0,-2:
+            0: 56793
+          0,-1:
+            0: 7645
           -3,0:
-            0: 34956
+            1: 34944
           -3,1:
-            0: 8
-          -2,0:
-            0: 65531
-            2: 4
+            1: 8
           -2,1:
-            0: 36079
+            1: 1056
+          -1,1:
+            0: 65534
           -2,2:
-            0: 8
+            1: 8
           -1,2:
-            0: 255
-          0,-4:
-            0: 65535
-          0,-3:
-            0: 65535
-          0,-2:
+            1: 240
+          0,0:
+            0: 4095
+          0,1:
+            0: 30587
+          0,2:
+            1: 120
+          0,-5:
             0: 65535
-          0,-1:
-            0: 65471
-            1: 64
           1,-4:
-            0: 13107
+            0: 4369
           1,-3:
-            0: 29491
+            0: 4368
+            1: 16384
           1,-2:
-            0: 65535
+            0: 13104
+            1: 34952
           1,-1:
-            0: 65533
-            1: 2
-          2,-1:
-            0: 6553
-          0,0:
+            0: 819
+          1,-5:
+            0: 4383
+            1: 1024
+          1,0:
+            0: 4915
+            1: 34944
+          3,-4:
             0: 65535
-          0,1:
+          3,-3:
             0: 65535
-          0,2:
-            0: 127
-          1,0:
+          2,-2:
+            1: 34944
+          3,-2:
+            1: 304
+          2,-1:
+            1: 2184
+          3,-5:
             0: 65535
+          4,-4:
+            0: 24627
+          4,-3:
+            0: 4079
           1,1:
-            0: 319
-          2,0:
             0: 1
+            1: 296
+          -4,-6:
+            2: 102
+            0: 57856
+          -5,-6:
+            1: 8
+            0: 57344
+          -5,-5:
+            0: 57582
+          -4,-7:
+            1: 96
+            2: 16384
           -3,-7:
-            0: 65407
-            1: 128
+            0: 65528
           -3,-6:
-            0: 65535
+            0: 61695
           -3,-5:
-            0: 4607
+            0: 15
+            1: 4352
           -2,-7:
-            0: 32767
-            3: 32768
+            0: 46011
           -2,-6:
-            0: 65535
-          -2,-5:
-            0: 65535
+            0: 62395
+          -2,-8:
+            1: 240
+            0: 40960
+          -1,-8:
+            0: 54508
           -1,-7:
-            0: 65535
+            0: 56573
           -1,-6:
-            0: 65535
-          -1,-5:
-            0: 65535
-          0,-6:
-            0: 65535
-          0,-5:
-            0: 65535
+            0: 65247
+          -1,-9:
+            0: 16384
+          0,-8:
+            0: 53553
+            1: 128
           0,-7:
-            0: 65535
-          1,-7:
-            0: 65535
+            0: 53757
+          0,-6:
+            0: 62431
+          0,-9:
+            0: 4096
+          1,-8:
+            1: 112
           1,-6:
-            0: 65535
-          1,-5:
-            0: 30719
+            0: 63214
+          1,-7:
+            3: 34
+            0: 57344
+            4: 136
           2,-7:
-            0: 65535
+            0: 30304
           2,-6:
-            0: 65535
+            0: 61559
           2,-5:
-            0: 52479
-          -4,-4:
-            0: 65535
-          2,-4:
-            0: 34952
-          3,-4:
-            0: 65535
-          -4,-8:
-            0: 65535
-          -4,-7:
-            0: 65535
-          -4,-6:
-            0: 65535
-          -4,-5:
-            0: 65535
-          -2,-8:
-            0: 65520
-          -1,-8:
-            0: 65535
-          0,-8:
-            0: 65527
-          2,-8:
-            0: 55432
-          3,-8:
-            0: 65535
+            0: 15
+            1: 17408
           3,-7:
-            0: 65535
+            1: 48
+            0: 4096
           3,-6:
-            0: 32767
-            1: 32768
-          3,-5:
-            0: 65527
+            0: 63795
             1: 8
-          -5,-8:
-            0: 34952
-          -5,-7:
-            0: 34952
-          -5,-6:
-            0: 65512
-          -5,-5:
-            0: 65535
-          -5,-4:
-            0: 65535
-          -4,-10:
-            0: 61440
-          -4,-9:
-            0: 65535
-          -5,-10:
-            0: 32768
-          -5,-9:
-            0: 34952
-          2,-10:
-            0: 32768
-          2,-9:
-            0: 34952
-          3,-10:
-            0: 61440
-          3,-9:
-            0: 65535
-          -4,-3:
-            0: 65535
-          -4,-2:
-            0: 36079
-          -4,-1:
-            0: 2184
-          2,-3:
-            0: 34952
-          2,-2:
-            0: 34952
-          3,-3:
-            0: 65535
-          3,-2:
-            0: 319
-          -3,-8:
-            0: 49152
-          1,-8:
-            0: 63344
-          -6,-4:
-            0: 51200
-          -6,-3:
-            0: 52428
-          -5,-3:
-            0: 65535
-          -5,-2:
-            0: 12
           4,-6:
-            0: 30512
+            0: 12544
           4,-5:
-            0: 30583
-          0,-9:
-            0: 12288
-          4,-4:
-            0: 65399
-          4,-3:
-            0: 65535
-          4,-2:
-            0: 1
-          -1,-9:
-            0: 57344
-          5,-4:
-            0: 4096
+            0: 13107
+          -6,-3:
+            0: 3212
           5,-3:
-            0: 4369
+            0: 257
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -845,10 +1048,8 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14996
+          immutable: True
           moles:
-          - 20.078888
-          - 75.53487
           - 0
           - 0
           - 0
@@ -859,11 +1060,28 @@ entities:
           - 0
           - 0
           - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 340
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
-          temperature: 293.1499
+          temperature: 293.15
           moles:
-          - 18.472576
-          - 69.49208
+          - 2500
+          - 0
           - 0
           - 0
           - 0
@@ -875,10 +1093,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14996
+          temperature: 293.15
           moles:
-          - 21.824879
-          - 82.10312
+          - 0
+          - 2500
           - 0
           - 0
           - 0
@@ -897,91 +1115,238 @@ entities:
     - type: GasTileOverlay
     - type: BecomesStation
       id: Anchor
+- proto: AirAlarm
+  entities:
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 8.5,-21.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 15
+      - 573
+      - 578
+  - uid: 571
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-17.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 754
+      - 755
+      - 1756
+      - 1023
+      - 1024
+      - 1025
+      - 1030
+      - 1093
+      - 1094
+      - 1757
+      - 762
+      - 763
+      - 764
+      - 765
+  - uid: 698
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-17.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 756
+      - 757
+      - 636
+      - 1463
+      - 1500
+      - 1499
+      - 767
+      - 766
+      - 1614
+      - 1615
+  - uid: 730
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-6.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 968
+      - 1231
+      - 1229
+      - 1760
+      - 1763
+      - 628
+      - 1276
+      - 1275
+      - 987
+      - 988
+      - 577
+      - 576
+  - uid: 871
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-17.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 968
+      - 754
+      - 755
+      - 756
+      - 757
+      - 579
+      - 581
+      - 578
+      - 573
+      - 991
+      - 992
+      - 993
+      - 1648
+      - 1144
+      - 1146
+      - 1160
+      - 1110
+      - 1113
+      - 1229
+      - 987
+      - 988
+      - 1234
+  - uid: 1216
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 1326
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 576
+      - 577
+      - 575
+      - 574
+      - 1325
+      - 1324
+      - 1317
+      - 1284
+  - uid: 1747
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-24.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 993
+      - 992
+      - 991
+      - 1734
+      - 1738
+      - 1739
+      - 1735
+      - 1718
+      - 1720
+      - 1721
+      - 1712
+  - uid: 1758
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-23.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 1344
+      - 1345
+      - 579
+      - 581
 - proto: Airlock
   entities:
-  - uid: 2
+  - uid: 6
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -16.5,-19.5
+      pos: -2.5,-23.5
       parent: 1
-  - uid: 3
+  - uid: 32
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -18.5,-19.5
+      pos: 4.5,3.5
+      parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      pos: -2.5,-26.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      pos: 1.5,-26.5
+      parent: 1
+  - uid: 36
+    components:
+    - type: Transform
+      pos: 1.5,-23.5
+      parent: 1
+  - uid: 831
+    components:
+    - type: Transform
+      pos: -15.5,-19.5
       parent: 1
 - proto: AirlockAtmospherics
   entities:
   - uid: 4
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-21.5
       parent: 1
   - uid: 5
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,-21.5
       parent: 1
-- proto: AirlockCargo
-  entities:
-  - uid: 6
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-26.5
-      parent: 1
 - proto: AirlockCommand
   entities:
   - uid: 7
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,3.5
       parent: 1
   - uid: 8
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,2.5
       parent: 1
-  - uid: 9
+- proto: AirlockCommandGlass
+  entities:
+  - uid: 985
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -1.5,-0.5
+      pos: 0.5,-0.5
       parent: 1
-  - uid: 10
+  - uid: 986
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: 0.5,-0.5
+      pos: -1.5,-0.5
       parent: 1
 - proto: AirlockEngineering
   entities:
   - uid: 11
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-21.5
       parent: 1
   - uid: 12
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-21.5
       parent: 1
@@ -997,25 +1362,27 @@ entities:
     - type: Transform
       pos: -17.5,-11.5
       parent: 1
-  - uid: 15
+  - uid: 17
     components:
     - type: Transform
-      pos: -1.5,-29.5
+      pos: 16.5,-11.5
       parent: 1
-  - uid: 16
+  - uid: 18
     components:
     - type: Transform
-      pos: 0.5,-29.5
+      pos: 16.5,-9.5
       parent: 1
-  - uid: 17
+  - uid: 1754
     components:
     - type: Transform
-      pos: 16.5,-11.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-29.5
       parent: 1
-  - uid: 18
+  - uid: 1755
     components:
     - type: Transform
-      pos: 16.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-29.5
       parent: 1
 - proto: AirlockGlass
   entities:
@@ -1039,23 +1406,26 @@ entities:
     - type: Transform
       pos: -12.5,-19.5
       parent: 1
-  - uid: 23
+  - uid: 24
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
+      pos: -2.5,-8.5
+      parent: 1
+  - uid: 713
+    components:
+    - type: Transform
       pos: 1.5,-8.5
       parent: 1
-  - uid: 24
+  - uid: 793
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-8.5
+      pos: 3.5,-7.5
       parent: 1
-  - uid: 25
+  - uid: 834
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-4.5
+      pos: 3.5,-11.5
       parent: 1
 - proto: AirlockGlassShuttle
   entities:
@@ -1093,98 +1463,69 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -21.5,-11.5
       parent: 1
-- proto: AirlockMaint
-  entities:
-  - uid: 32
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,3.5
-      parent: 1
 - proto: AirlockMedical
   entities:
-  - uid: 33
+  - uid: 2
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: 13.5,-21.5
+      pos: 12.5,-21.5
       parent: 1
-- proto: AirlockMercenaryLocked
+- proto: AirlockMercenary
   entities:
   - uid: 34
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-2.5
       parent: 1
-- proto: AirlockVirology
+- proto: AirSensor
   entities:
-  - uid: 35
+  - uid: 1648
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-26.5
+      pos: -1.5,-17.5
       parent: 1
-  - uid: 36
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+  - uid: 1757
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-23.5
+      pos: 17.5,-14.5
       parent: 1
-  - uid: 37
+    - type: DeviceNetwork
+      deviceLists:
+      - 571
+- proto: AltarSpawner
+  entities:
+  - uid: 801
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-23.5
-      parent: 1
-- proto: AltarSpawner
-  entities:
-  - uid: 38
-    components:
-    - type: Transform
-      pos: -17.5,-15.5
+      pos: -18.5,-15.5
       parent: 1
 - proto: AmeController
   entities:
-  - uid: 39
+  - uid: 53
     components:
     - type: Transform
-      pos: -7.5,-23.5
+      pos: -8.5,-23.5
       parent: 1
     - type: AmeController
-      injectionAmount: 4
       injecting: True
     - type: ContainerContainer
       containers:
-        AmeFuel: !type:ContainerSlot
+        fuelSlot: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ent: 40
+          ent: 104
 - proto: AmeJar
   entities:
-  - uid: 40
+  - uid: 104
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
-      parent: 39
+      parent: 53
     - type: Physics
       canCollide: False
-  - uid: 41
-    components:
-    - type: Transform
-      pos: -6.4750996,-27.367401
-      parent: 1
 - proto: AmeShielding
   entities:
   - uid: 42
@@ -1199,7 +1540,6 @@ entities:
       parent: 1
     - type: PointLight
       radius: 2
-      enabled: True
   - uid: 44
     components:
     - type: Transform
@@ -1238,41 +1578,59 @@ entities:
     - type: Transform
       pos: -11.5,-22.5
       parent: 1
-  - uid: 51
+- proto: APCBasic
+  entities:
+  - uid: 55
     components:
     - type: Transform
-      pos: -8.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-25.5
       parent: 1
-  - uid: 52
+  - uid: 56
     components:
     - type: Transform
-      pos: -8.5,-22.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,3.5
       parent: 1
-  - uid: 53
+  - uid: 102
     components:
     - type: Transform
-      pos: -8.5,-24.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,0.5
       parent: 1
-- proto: APCBasic
-  entities:
-  - uid: 54
+  - uid: 169
+    components:
+    - type: Transform
+      pos: -16.5,-13.5
+      parent: 1
+  - uid: 214
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 1.5,-9.5
+      pos: 1.5,-25.5
       parent: 1
-  - uid: 55
+  - uid: 274
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-14.5
+      parent: 1
+  - uid: 333
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -5.5,-25.5
+      pos: 5.5,-8.5
       parent: 1
-- proto: APCBasic
-  entities:
-  - uid: 56
+  - uid: 334
     components:
     - type: Transform
-      pos: 0.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-8.5
+      parent: 1
+  - uid: 503
+    components:
+    - type: Transform
+      pos: 9.5,-21.5
       parent: 1
 - proto: AtmosDeviceFanTiny
   entities:
@@ -1311,10095 +1669,11023 @@ entities:
     - type: Transform
       pos: -14.5,-21.5
       parent: 1
-- proto: AtmosFixSaunaMarker
+- proto: AtmosFixBlockerMarker
   entities:
-  - uid: 631
+  - uid: 175
     components:
     - type: Transform
-      pos: -13.5,-23.5
+      pos: 3.5,8.5
       parent: 1
-  - uid: 633
+  - uid: 1823
     components:
     - type: Transform
-      pos: -13.5,-24.5
+      pos: 7.5,-4.5
       parent: 1
-  - uid: 641
+  - uid: 1824
     components:
     - type: Transform
-      pos: -14.5,-22.5
+      pos: -3.5,9.5
       parent: 1
-  - uid: 650
+  - uid: 1825
     components:
     - type: Transform
-      pos: -14.5,-23.5
+      pos: -2.5,9.5
       parent: 1
-  - uid: 656
+  - uid: 1826
     components:
     - type: Transform
-      pos: -13.5,-22.5
+      pos: -1.5,9.5
       parent: 1
-- proto: BarSign
-  entities:
-  - uid: 63
+  - uid: 1827
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-10.5
+      pos: 0.5,9.5
       parent: 1
-- proto: Bed
-  entities:
-  - uid: 64
+  - uid: 1828
     components:
     - type: Transform
-      pos: -3.5,0.5
+      pos: -0.5,9.5
       parent: 1
-  - uid: 65
+  - uid: 1829
     components:
     - type: Transform
-      pos: 3.5,-22.5
+      pos: 1.5,9.5
       parent: 1
-  - uid: 66
+  - uid: 1830
     components:
     - type: Transform
-      pos: 3.5,-26.5
+      pos: 2.5,9.5
       parent: 1
-  - uid: 67
+  - uid: 1832
     components:
     - type: Transform
-      pos: -4.5,-22.5
+      pos: 4.5,6.5
       parent: 1
-- proto: BedsheetSpawner
-  entities:
-  - uid: 68
+  - uid: 1833
     components:
     - type: Transform
-      pos: 17.5,-15.5
+      pos: 5.5,5.5
       parent: 1
-  - uid: 69
+  - uid: 1834
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,-17.5
+      pos: 7.5,4.5
       parent: 1
-- proto: BedsheetNT
-  entities:
-  - uid: 70
+  - uid: 1835
     components:
     - type: Transform
-      pos: -3.5,0.5
+      pos: 7.5,3.5
       parent: 1
-- proto: BedsheetSpawner
-  entities:
-  - uid: 71
+  - uid: 1836
     components:
     - type: Transform
-      pos: -4.5,-22.5
+      pos: 7.5,2.5
       parent: 1
-  - uid: 72
+  - uid: 1837
     components:
     - type: Transform
-      pos: 3.5,-26.5
+      pos: 7.5,1.5
       parent: 1
-  - uid: 73
+  - uid: 1838
     components:
     - type: Transform
-      pos: 3.5,-22.5
+      pos: 7.5,-5.5
       parent: 1
-- proto: BenchPewLeft
-  entities:
-  - uid: 74
+  - uid: 1839
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-17.5
+      pos: 7.5,-6.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-- proto: BenchPewMiddle
-  entities:
-  - uid: 75
+  - uid: 1840
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.5,-17.5
+      pos: 7.5,-7.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-- proto: BenchPewRight
-  entities:
-  - uid: 76
+  - uid: 1841
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-17.5
+      pos: 6.5,-8.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-- proto: BenchSofaCorpLeft
-  entities:
-  - uid: 77
+  - uid: 1842
     components:
     - type: Transform
-      pos: 0.5,-16.5
+      pos: 6.5,-17.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 78
+  - uid: 1843
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-17.5
+      pos: 10.5,-16.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 79
+  - uid: 1844
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-18.5
+      pos: 10.5,-17.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-- proto: BenchSofaCorpMiddle
-  entities:
-  - uid: 80
+  - uid: 1845
     components:
     - type: Transform
-      pos: -0.5,-16.5
+      pos: 11.5,-1.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-- proto: BenchSofaCorpRight
-  entities:
-  - uid: 81
+  - uid: 1846
     components:
     - type: Transform
-      pos: -1.5,-16.5
+      pos: 11.5,-2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 82
+  - uid: 1847
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-18.5
+      pos: 11.5,-3.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 83
+  - uid: 1848
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-17.5
+      pos: 11.5,-4.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-- proto: BlastDoorOpen
-  entities:
-  - uid: 84
+  - uid: 1849
     components:
     - type: Transform
-      pos: 1.5,8.5
+      pos: 11.5,-5.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1246
-  - uid: 85
+  - uid: 1850
     components:
     - type: Transform
-      pos: 0.5,8.5
+      pos: 11.5,-6.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1246
-  - uid: 86
+  - uid: 1851
     components:
     - type: Transform
-      pos: -0.5,8.5
+      pos: 12.5,-6.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1246
-  - uid: 87
+  - uid: 1852
     components:
     - type: Transform
-      pos: -1.5,8.5
+      pos: 12.5,-5.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1246
-  - uid: 88
+  - uid: 1853
     components:
     - type: Transform
-      pos: -2.5,8.5
+      pos: 13.5,-6.5
       parent: 1
-    - type: DeviceLinkSink
-      invokeCounter: 2
-      links:
-      - 1246
-- proto: BookRandom
-  entities:
-  - uid: 89
+  - uid: 1854
     components:
     - type: Transform
-      pos: 0.34862417,-18.29124
+      pos: 5.5,-30.5
       parent: 1
-  - uid: 90
+  - uid: 1855
     components:
     - type: Transform
-      pos: -1.2216883,-17.494366
+      pos: 15.5,-23.5
       parent: 1
-  - uid: 91
+  - uid: 1856
     components:
     - type: Transform
-      pos: -1.5029383,-18.267803
+      pos: 13.5,-26.5
       parent: 1
-  - uid: 92
+  - uid: 1857
     components:
     - type: Transform
-      pos: -13.607726,-8.476817
+      pos: 12.5,-26.5
       parent: 1
-- proto: BookshelfFilled
-  entities:
-  - uid: 93
+  - uid: 1858
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -16.5,-8.5
+      pos: 6.5,-30.5
       parent: 1
-  - uid: 94
+  - uid: 1859
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -15.5,-8.5
+      pos: 4.5,-30.5
       parent: 1
-  - uid: 95
+  - uid: 1860
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -16.5,-12.5
+      pos: 3.5,-30.5
       parent: 1
-  - uid: 96
+  - uid: 1861
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -15.5,-12.5
+      pos: -16.5,-23.5
       parent: 1
-- proto: BoozeDispenser
-  entities:
-  - uid: 97
+  - uid: 1862
     components:
     - type: Transform
-      pos: -4.5,-5.5
+      pos: -4.5,-30.5
       parent: 1
-- proto: BoxBodyBag
-  entities:
-  - uid: 98
+  - uid: 1863
     components:
     - type: Transform
-      pos: 17.63137,-20.525381
+      pos: -5.5,-30.5
       parent: 1
-- proto: BoxMRE
-  entities:
-  - uid: 99
+  - uid: 1864
     components:
     - type: Transform
-      pos: -5.796024,-3.4417071
+      pos: -6.5,-30.5
       parent: 1
-- proto: BoxPillCanister
-  entities:
-  - uid: 100
+  - uid: 1865
     components:
     - type: Transform
-      pos: 17.303503,-20.40484
+      pos: -7.5,-30.5
       parent: 1
-- proto: CableApcExtension
-  entities:
-  - uid: 101
+  - uid: 1866
     components:
     - type: Transform
-      pos: -15.5,-18.5
+      pos: -13.5,-26.5
       parent: 1
-  - uid: 102
+  - uid: 1867
     components:
     - type: Transform
-      pos: -1.5,5.5
+      pos: -14.5,-26.5
       parent: 1
-  - uid: 103
+  - uid: 1868
     components:
     - type: Transform
-      pos: -1.5,6.5
+      pos: -12.5,-6.5
       parent: 1
-  - uid: 104
+  - uid: 1869
     components:
     - type: Transform
-      pos: -1.5,7.5
+      pos: -11.5,-16.5
       parent: 1
-  - uid: 105
+  - uid: 1870
     components:
     - type: Transform
-      pos: -2.5,7.5
+      pos: -11.5,-17.5
       parent: 1
-  - uid: 106
+  - uid: 1871
     components:
     - type: Transform
-      pos: -0.5,7.5
+      pos: -7.5,-17.5
       parent: 1
-  - uid: 107
+  - uid: 1872
     components:
     - type: Transform
-      pos: 0.5,7.5
+      pos: -12.5,-5.5
       parent: 1
-  - uid: 108
+  - uid: 1873
     components:
     - type: Transform
-      pos: 1.5,7.5
+      pos: -12.5,-4.5
       parent: 1
-  - uid: 109
+  - uid: 1874
     components:
     - type: Transform
-      pos: -2.5,5.5
+      pos: -12.5,-3.5
       parent: 1
-  - uid: 110
+  - uid: 1875
     components:
     - type: Transform
-      pos: -3.5,5.5
+      pos: -12.5,-2.5
       parent: 1
-  - uid: 111
+  - uid: 1876
     components:
     - type: Transform
-      pos: -0.5,5.5
+      pos: -12.5,-1.5
       parent: 1
-  - uid: 112
+  - uid: 1877
     components:
     - type: Transform
-      pos: 0.5,5.5
+      pos: -13.5,-5.5
       parent: 1
-  - uid: 113
+  - uid: 1878
     components:
     - type: Transform
-      pos: 1.5,5.5
+      pos: -13.5,-6.5
       parent: 1
-  - uid: 114
+  - uid: 1879
     components:
     - type: Transform
-      pos: 2.5,5.5
+      pos: -14.5,-6.5
       parent: 1
-  - uid: 115
+  - uid: 1880
     components:
     - type: Transform
-      pos: -7.5,3.5
+      pos: -7.5,-8.5
       parent: 1
-  - uid: 116
+  - uid: 1881
     components:
     - type: Transform
-      pos: 5.5,3.5
+      pos: -8.5,-7.5
       parent: 1
-  - uid: 117
+  - uid: 1882
     components:
     - type: Transform
-      pos: 6.5,3.5
+      pos: -8.5,-6.5
       parent: 1
-  - uid: 118
+  - uid: 1883
     components:
     - type: Transform
-      pos: 12.5,-16.5
+      pos: -8.5,-5.5
       parent: 1
-  - uid: 119
+  - uid: 1884
     components:
     - type: Transform
-      pos: 10.5,-16.5
+      pos: -8.5,-4.5
       parent: 1
-  - uid: 120
+  - uid: 1885
     components:
     - type: Transform
-      pos: -14.5,-19.5
+      pos: -8.5,1.5
       parent: 1
-  - uid: 121
+  - uid: 1886
     components:
     - type: Transform
-      pos: 0.5,4.5
+      pos: -8.5,2.5
       parent: 1
-  - uid: 122
+  - uid: 1887
     components:
     - type: Transform
-      pos: 0.5,3.5
+      pos: -8.5,3.5
       parent: 1
-  - uid: 123
+  - uid: 1888
     components:
     - type: Transform
-      pos: 0.5,1.5
+      pos: -8.5,4.5
       parent: 1
-  - uid: 124
+  - uid: 1889
     components:
     - type: Transform
-      pos: 0.5,0.5
+      pos: -6.5,5.5
       parent: 1
-  - uid: 125
+  - uid: 1890
     components:
     - type: Transform
-      pos: 0.5,-0.5
+      pos: -5.5,6.5
       parent: 1
-  - uid: 126
+  - uid: 1891
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      pos: -4.5,8.5
       parent: 1
-  - uid: 127
+- proto: AtmosFixSaunaMarker
+  entities:
+  - uid: 117
     components:
     - type: Transform
-      pos: 0.5,-2.5
+      pos: -13.5,-22.5
       parent: 1
-  - uid: 128
+  - uid: 305
     components:
     - type: Transform
-      pos: 0.5,-3.5
+      pos: -13.5,-24.5
       parent: 1
-  - uid: 129
+  - uid: 607
     components:
     - type: Transform
-      pos: 0.5,-4.5
+      pos: -14.5,-22.5
       parent: 1
-  - uid: 130
+  - uid: 1197
     components:
     - type: Transform
-      pos: 0.5,-5.5
+      pos: -14.5,-23.5
       parent: 1
-  - uid: 131
+  - uid: 1366
     components:
     - type: Transform
-      pos: 0.5,-6.5
+      pos: -13.5,-23.5
       parent: 1
-  - uid: 132
+- proto: AtmosFixShuttleNitrogenMarker
+  entities:
+  - uid: 559
     components:
     - type: Transform
-      pos: 0.5,-7.5
+      pos: 7.5,-26.5
       parent: 1
-  - uid: 133
+  - uid: 560
     components:
     - type: Transform
-      pos: 0.5,-8.5
+      pos: 7.5,-27.5
       parent: 1
-  - uid: 134
+- proto: AtmosFixShuttleOxygenMarker
+  entities:
+  - uid: 561
     components:
     - type: Transform
-      pos: 0.5,-9.5
+      pos: 5.5,-26.5
       parent: 1
-  - uid: 135
+  - uid: 562
     components:
     - type: Transform
-      pos: 0.5,-10.5
+      pos: 5.5,-27.5
       parent: 1
-  - uid: 136
+- proto: BarberScissors
+  entities:
+  - uid: 1768
     components:
     - type: Transform
-      pos: 0.5,-11.5
+      pos: 3.5,-22.5
       parent: 1
-  - uid: 137
+- proto: BarSign
+  entities:
+  - uid: 63
     components:
     - type: Transform
-      pos: 0.5,-12.5
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-10.5
       parent: 1
-  - uid: 138
+- proto: Bed
+  entities:
+  - uid: 64
     components:
     - type: Transform
-      pos: 0.5,-13.5
+      pos: -3.5,0.5
       parent: 1
-  - uid: 139
+  - uid: 67
     components:
     - type: Transform
-      pos: 0.5,-14.5
+      pos: -4.5,-22.5
       parent: 1
-  - uid: 140
+  - uid: 75
     components:
     - type: Transform
-      pos: 0.5,-15.5
+      pos: 3.5,-28.5
       parent: 1
-  - uid: 141
+  - uid: 443
     components:
     - type: Transform
-      pos: 0.5,-16.5
+      pos: 17.5,-14.5
       parent: 1
-  - uid: 142
+  - uid: 506
     components:
     - type: Transform
-      pos: 0.5,-17.5
+      pos: 17.5,-16.5
       parent: 1
-  - uid: 143
+  - uid: 693
     components:
     - type: Transform
-      pos: 0.5,-18.5
+      pos: 17.5,-15.5
       parent: 1
-  - uid: 144
+  - uid: 728
     components:
     - type: Transform
-      pos: 0.5,-19.5
+      pos: 3.5,-24.5
       parent: 1
-  - uid: 145
+- proto: BedsheetCaptain
+  entities:
+  - uid: 73
     components:
     - type: Transform
-      pos: 0.5,-20.5
+      pos: -3.5,0.5
       parent: 1
-  - uid: 146
+- proto: BedsheetMedical
+  entities:
+  - uid: 68
     components:
     - type: Transform
-      pos: 0.5,-9.5
+      pos: 17.5,-14.5
       parent: 1
-  - uid: 147
+  - uid: 288
     components:
     - type: Transform
-      pos: 1.5,-9.5
+      pos: 17.5,-16.5
       parent: 1
-  - uid: 148
+  - uid: 543
     components:
     - type: Transform
-      pos: -0.5,-9.5
+      pos: 17.5,-15.5
       parent: 1
-  - uid: 149
+- proto: BedsheetSpawner
+  entities:
+  - uid: 71
     components:
     - type: Transform
-      pos: -1.5,-9.5
+      pos: -4.5,-22.5
       parent: 1
-  - uid: 150
+  - uid: 72
     components:
     - type: Transform
-      pos: -1.5,-8.5
+      pos: 3.5,-28.5
       parent: 1
-  - uid: 151
+  - uid: 712
     components:
     - type: Transform
-      pos: -2.5,-8.5
+      pos: 3.5,-24.5
       parent: 1
-  - uid: 152
+- proto: BenchSofaCorpLeft
+  entities:
+  - uid: 77
     components:
     - type: Transform
-      pos: -3.5,-8.5
+      pos: 0.5,-16.5
       parent: 1
-  - uid: 153
+    - type: Physics
+      bodyType: Static
+  - uid: 78
     components:
     - type: Transform
-      pos: -4.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-17.5
       parent: 1
-  - uid: 154
+    - type: Physics
+      bodyType: Static
+  - uid: 79
     components:
     - type: Transform
-      pos: -4.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-18.5
       parent: 1
-  - uid: 155
+    - type: Physics
+      bodyType: Static
+- proto: BenchSofaCorpMiddle
+  entities:
+  - uid: 80
     components:
     - type: Transform
-      pos: -4.5,-6.5
+      pos: -0.5,-16.5
       parent: 1
-  - uid: 156
+    - type: Physics
+      bodyType: Static
+- proto: BenchSofaCorpRight
+  entities:
+  - uid: 81
     components:
     - type: Transform
-      pos: 1.5,-8.5
+      pos: -1.5,-16.5
       parent: 1
-  - uid: 157
+    - type: Physics
+      bodyType: Static
+  - uid: 82
     components:
     - type: Transform
-      pos: 2.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-18.5
       parent: 1
-  - uid: 158
+    - type: Physics
+      bodyType: Static
+  - uid: 83
     components:
     - type: Transform
-      pos: 3.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-17.5
       parent: 1
-  - uid: 159
+    - type: Physics
+      bodyType: Static
+- proto: BlastDoor
+  entities:
+  - uid: 872
     components:
     - type: Transform
-      pos: 3.5,-7.5
+      pos: -17.5,-22.5
       parent: 1
-  - uid: 160
+- proto: BlockGameArcade
+  entities:
+  - uid: 1787
     components:
     - type: Transform
-      pos: 3.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-10.5
       parent: 1
-  - uid: 161
+- proto: BookRandom
+  entities:
+  - uid: 89
     components:
     - type: Transform
-      pos: 4.5,-6.5
+      pos: 0.34862417,-18.29124
       parent: 1
-  - uid: 162
+  - uid: 90
     components:
     - type: Transform
-      pos: 4.5,-5.5
+      pos: -1.2216883,-17.494366
       parent: 1
-  - uid: 163
+  - uid: 91
     components:
     - type: Transform
-      pos: 4.5,-4.5
+      pos: -1.5029383,-18.267803
       parent: 1
-  - uid: 164
+  - uid: 92
     components:
     - type: Transform
-      pos: 4.5,-3.5
+      pos: -13.607726,-8.476817
       parent: 1
-  - uid: 165
+- proto: Bookshelf
+  entities:
+  - uid: 93
     components:
     - type: Transform
-      pos: -0.5,-20.5
+      pos: -16.5,-12.5
       parent: 1
-  - uid: 166
+  - uid: 95
     components:
     - type: Transform
-      pos: -1.5,-20.5
+      pos: -16.5,-8.5
       parent: 1
-  - uid: 167
+- proto: BookshelfFilled
+  entities:
+  - uid: 94
     components:
     - type: Transform
-      pos: -2.5,-20.5
+      pos: -15.5,-8.5
       parent: 1
-  - uid: 168
-    components:
+- proto: BoxCandle
+  entities:
+  - uid: 749
+    components:
     - type: Transform
-      pos: -3.5,-20.5
+      pos: -18.5,-16.5
       parent: 1
-  - uid: 169
+- proto: BoxingBell
+  entities:
+  - uid: 807
     components:
     - type: Transform
-      pos: -4.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-5.5
       parent: 1
-  - uid: 170
+- proto: BoxPaperCaptainsThoughts
+  entities:
+  - uid: 570
     components:
     - type: Transform
-      pos: -5.5,-20.5
+      pos: -4.5,3.5
       parent: 1
-  - uid: 171
+- proto: BrokenBottle
+  entities:
+  - uid: 127
     components:
     - type: Transform
-      pos: -6.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-2.5
       parent: 1
-  - uid: 172
+- proto: ButtonFrameCaution
+  entities:
+  - uid: 715
     components:
     - type: Transform
-      pos: -7.5,-20.5
+      pos: -0.5,6.5
       parent: 1
-  - uid: 173
+  - uid: 865
     components:
     - type: Transform
-      pos: -8.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-20.5
       parent: 1
-  - uid: 174
+- proto: CableApcExtension
+  entities:
+  - uid: 25
     components:
     - type: Transform
-      pos: -9.5,-20.5
+      pos: 3.5,-4.5
       parent: 1
-  - uid: 175
+  - uid: 54
     components:
     - type: Transform
-      pos: -10.5,-20.5
+      pos: -6.5,-8.5
       parent: 1
-  - uid: 176
+  - uid: 108
     components:
     - type: Transform
-      pos: -11.5,-20.5
+      pos: -14.5,-18.5
       parent: 1
-  - uid: 177
+  - uid: 109
     components:
     - type: Transform
-      pos: -12.5,-20.5
+      pos: -1.5,-0.5
       parent: 1
-  - uid: 178
+  - uid: 113
     components:
     - type: Transform
-      pos: -13.5,-20.5
+      pos: -14.5,-17.5
       parent: 1
-  - uid: 179
+  - uid: 114
     components:
     - type: Transform
-      pos: -14.5,-20.5
+      pos: -14.5,-19.5
       parent: 1
-  - uid: 180
+  - uid: 115
     components:
     - type: Transform
-      pos: -14.5,-18.5
+      pos: -11.5,-25.5
       parent: 1
-  - uid: 181
+  - uid: 157
     components:
     - type: Transform
-      pos: -14.5,-17.5
+      pos: -5.5,-25.5
       parent: 1
-  - uid: 182
+  - uid: 158
     components:
     - type: Transform
-      pos: -14.5,-16.5
+      pos: -6.5,-25.5
       parent: 1
-  - uid: 183
+  - uid: 159
     components:
     - type: Transform
-      pos: -14.5,-15.5
+      pos: -7.5,-25.5
       parent: 1
-  - uid: 184
+  - uid: 160
     components:
     - type: Transform
-      pos: -14.5,-14.5
+      pos: -8.5,-25.5
       parent: 1
-  - uid: 185
+  - uid: 161
     components:
     - type: Transform
-      pos: -14.5,-13.5
+      pos: -9.5,-25.5
       parent: 1
-  - uid: 186
+  - uid: 162
     components:
     - type: Transform
-      pos: -14.5,-12.5
+      pos: -10.5,-25.5
       parent: 1
-  - uid: 187
+  - uid: 164
     components:
     - type: Transform
-      pos: -14.5,-11.5
+      pos: -7.5,-24.5
       parent: 1
-  - uid: 188
+  - uid: 165
     components:
     - type: Transform
-      pos: -14.5,-10.5
+      pos: -7.5,-23.5
       parent: 1
-  - uid: 189
+  - uid: 166
     components:
     - type: Transform
-      pos: -15.5,-10.5
+      pos: -7.5,-22.5
       parent: 1
-  - uid: 190
+  - uid: 167
     components:
     - type: Transform
-      pos: -16.5,-10.5
+      pos: -7.5,-21.5
       parent: 1
-  - uid: 191
+  - uid: 168
     components:
     - type: Transform
-      pos: -17.5,-10.5
+      pos: -7.5,-20.5
       parent: 1
-  - uid: 192
+  - uid: 170
     components:
     - type: Transform
-      pos: -18.5,-10.5
+      pos: -16.5,-13.5
       parent: 1
-  - uid: 193
+  - uid: 171
     components:
     - type: Transform
-      pos: 13.5,-19.5
+      pos: -16.5,-14.5
       parent: 1
-  - uid: 194
+  - uid: 172
     components:
     - type: Transform
-      pos: 1.5,-20.5
+      pos: -15.5,-14.5
       parent: 1
-  - uid: 195
+  - uid: 173
     components:
     - type: Transform
-      pos: 2.5,-20.5
+      pos: -14.5,-14.5
       parent: 1
-  - uid: 196
+  - uid: 177
     components:
     - type: Transform
-      pos: 3.5,-20.5
+      pos: 15.5,-20.5
       parent: 1
-  - uid: 197
+  - uid: 178
     components:
     - type: Transform
-      pos: 4.5,-20.5
+      pos: 15.5,-19.5
       parent: 1
-  - uid: 198
+  - uid: 179
     components:
     - type: Transform
-      pos: 5.5,-20.5
+      pos: -14.5,-23.5
       parent: 1
-  - uid: 199
+  - uid: 180
     components:
     - type: Transform
-      pos: 6.5,-20.5
+      pos: 15.5,-21.5
       parent: 1
-  - uid: 200
+  - uid: 183
     components:
     - type: Transform
-      pos: 7.5,-20.5
+      pos: -14.5,-20.5
       parent: 1
-  - uid: 201
+  - uid: 184
     components:
     - type: Transform
-      pos: 8.5,-20.5
+      pos: -14.5,-21.5
       parent: 1
-  - uid: 202
+  - uid: 185
     components:
     - type: Transform
-      pos: 9.5,-20.5
+      pos: -14.5,-22.5
       parent: 1
-  - uid: 203
+  - uid: 186
     components:
     - type: Transform
-      pos: 10.5,-20.5
+      pos: -13.5,-14.5
       parent: 1
-  - uid: 204
+  - uid: 187
     components:
     - type: Transform
-      pos: 11.5,-20.5
+      pos: -14.5,-15.5
       parent: 1
-  - uid: 205
+  - uid: 188
     components:
     - type: Transform
-      pos: 12.5,-20.5
+      pos: -13.5,-13.5
       parent: 1
-  - uid: 206
+  - uid: 189
     components:
     - type: Transform
-      pos: 13.5,-20.5
+      pos: -13.5,-12.5
       parent: 1
-  - uid: 207
+  - uid: 190
     components:
     - type: Transform
-      pos: 13.5,-18.5
+      pos: -14.5,-16.5
       parent: 1
-  - uid: 208
+  - uid: 191
     components:
     - type: Transform
-      pos: 13.5,-17.5
+      pos: -13.5,-11.5
       parent: 1
-  - uid: 209
+  - uid: 192
     components:
     - type: Transform
-      pos: 13.5,-16.5
+      pos: -14.5,-11.5
       parent: 1
-  - uid: 210
+  - uid: 193
     components:
     - type: Transform
-      pos: 13.5,-15.5
+      pos: -15.5,-11.5
       parent: 1
-  - uid: 211
+  - uid: 194
     components:
     - type: Transform
-      pos: 13.5,-14.5
+      pos: -16.5,-11.5
       parent: 1
-  - uid: 212
+  - uid: 195
     components:
     - type: Transform
-      pos: 13.5,-13.5
+      pos: -17.5,-11.5
       parent: 1
-  - uid: 213
+  - uid: 196
     components:
     - type: Transform
-      pos: 13.5,-12.5
+      pos: -18.5,-11.5
       parent: 1
-  - uid: 214
+  - uid: 197
     components:
     - type: Transform
-      pos: 13.5,-11.5
+      pos: -19.5,-11.5
+      parent: 1
+  - uid: 199
+    components:
+    - type: Transform
+      pos: -13.5,-10.5
       parent: 1
   - uid: 215
     components:
     - type: Transform
-      pos: 13.5,-10.5
+      pos: 1.5,-25.5
       parent: 1
   - uid: 216
     components:
     - type: Transform
-      pos: 14.5,-10.5
+      pos: 0.5,-25.5
       parent: 1
   - uid: 217
     components:
     - type: Transform
-      pos: 15.5,-10.5
+      pos: -0.5,-25.5
       parent: 1
   - uid: 218
     components:
     - type: Transform
-      pos: 16.5,-10.5
+      pos: -0.5,-26.5
       parent: 1
   - uid: 219
     components:
     - type: Transform
-      pos: 17.5,-10.5
+      pos: -1.5,-26.5
       parent: 1
   - uid: 220
     components:
     - type: Transform
-      pos: 6.5,-20.5
+      pos: 1.5,-26.5
       parent: 1
   - uid: 221
     components:
     - type: Transform
-      pos: 6.5,-21.5
+      pos: 2.5,-26.5
       parent: 1
   - uid: 222
     components:
     - type: Transform
-      pos: 6.5,-22.5
+      pos: -2.5,-30.5
       parent: 1
   - uid: 223
     components:
     - type: Transform
-      pos: 6.5,-23.5
+      pos: -2.5,-26.5
       parent: 1
   - uid: 224
     components:
     - type: Transform
-      pos: 7.5,-23.5
+      pos: -3.5,-26.5
       parent: 1
   - uid: 225
     components:
     - type: Transform
-      pos: 7.5,-24.5
+      pos: 0.5,-30.5
       parent: 1
   - uid: 226
     components:
     - type: Transform
-      pos: 7.5,-25.5
+      pos: -0.5,-24.5
       parent: 1
   - uid: 227
     components:
     - type: Transform
-      pos: -0.5,-21.5
+      pos: -0.5,-23.5
       parent: 1
   - uid: 228
     components:
     - type: Transform
-      pos: 10.5,-25.5
+      pos: 0.5,-23.5
       parent: 1
   - uid: 229
     components:
     - type: Transform
-      pos: -0.5,-22.5
+      pos: 1.5,-23.5
       parent: 1
   - uid: 230
     components:
     - type: Transform
-      pos: -0.5,-24.5
+      pos: 2.5,-23.5
       parent: 1
   - uid: 231
     components:
     - type: Transform
-      pos: -0.5,-23.5
+      pos: -1.5,-23.5
       parent: 1
   - uid: 232
     components:
     - type: Transform
-      pos: 9.5,-25.5
+      pos: -2.5,-23.5
       parent: 1
   - uid: 233
     components:
     - type: Transform
-      pos: 8.5,-25.5
+      pos: -3.5,-23.5
       parent: 1
   - uid: 234
     components:
     - type: Transform
-      pos: -0.5,-25.5
+      pos: -1.5,-27.5
       parent: 1
   - uid: 235
     components:
     - type: Transform
-      pos: -0.5,-26.5
+      pos: -1.5,-28.5
       parent: 1
   - uid: 236
     components:
     - type: Transform
-      pos: -0.5,-27.5
+      pos: -1.5,-29.5
       parent: 1
   - uid: 237
     components:
     - type: Transform
-      pos: -1.5,-27.5
+      pos: -1.5,-30.5
       parent: 1
   - uid: 238
     components:
     - type: Transform
-      pos: -2.5,-27.5
-      parent: 1
-  - uid: 239
-    components:
-    - type: Transform
-      pos: -3.5,-27.5
+      pos: -0.5,-30.5
       parent: 1
   - uid: 240
     components:
     - type: Transform
-      pos: 0.5,-27.5
+      pos: 1.5,-30.5
       parent: 1
   - uid: 241
     components:
     - type: Transform
-      pos: 1.5,-27.5
+      pos: 13.5,-19.5
       parent: 1
   - uid: 242
     components:
     - type: Transform
-      pos: -1.5,-23.5
+      pos: -3.5,-30.5
       parent: 1
   - uid: 243
     components:
     - type: Transform
-      pos: -2.5,-23.5
+      pos: 2.5,-30.5
       parent: 1
-  - uid: 244
+  - uid: 252
     components:
     - type: Transform
-      pos: -3.5,-23.5
+      pos: 9.5,-22.5
       parent: 1
-  - uid: 245
+  - uid: 256
     components:
     - type: Transform
-      pos: 0.5,-23.5
+      pos: 7.5,-20.5
       parent: 1
-  - uid: 246
+  - uid: 260
     components:
     - type: Transform
-      pos: 1.5,-23.5
+      pos: 16.5,-19.5
       parent: 1
-  - uid: 247
+  - uid: 263
     components:
     - type: Transform
-      pos: 2.5,-23.5
+      pos: 6.5,-20.5
       parent: 1
-  - uid: 248
+  - uid: 275
     components:
     - type: Transform
-      pos: -6.5,-21.5
+      pos: 11.5,-14.5
       parent: 1
-  - uid: 249
+  - uid: 278
     components:
     - type: Transform
-      pos: -6.5,-22.5
+      pos: 12.5,-14.5
       parent: 1
-  - uid: 250
+  - uid: 279
     components:
     - type: Transform
-      pos: -6.5,-23.5
+      pos: 13.5,-14.5
       parent: 1
-  - uid: 251
+  - uid: 280
     components:
     - type: Transform
-      pos: -6.5,-24.5
+      pos: 13.5,-15.5
       parent: 1
-  - uid: 252
+  - uid: 281
     components:
     - type: Transform
-      pos: -6.5,-25.5
+      pos: 13.5,-16.5
       parent: 1
-  - uid: 253
+  - uid: 282
     components:
     - type: Transform
-      pos: -5.5,-25.5
+      pos: 13.5,-17.5
       parent: 1
-  - uid: 254
+  - uid: 283
     components:
     - type: Transform
-      pos: -0.5,-28.5
+      pos: 13.5,-18.5
       parent: 1
-  - uid: 255
+  - uid: 289
     components:
     - type: Transform
-      pos: -0.5,-29.5
+      pos: 4.5,4.5
       parent: 1
-  - uid: 256
+  - uid: 290
     components:
     - type: Transform
-      pos: -0.5,-30.5
+      pos: 3.5,-7.5
       parent: 1
-  - uid: 257
+  - uid: 291
     components:
     - type: Transform
-      pos: -0.5,-31.5
+      pos: 16.5,-18.5
       parent: 1
-  - uid: 258
+  - uid: 292
     components:
     - type: Transform
-      pos: -0.5,2.5
+      pos: 16.5,-17.5
       parent: 1
-  - uid: 259
+  - uid: 293
     components:
     - type: Transform
-      pos: -1.5,2.5
+      pos: 16.5,-16.5
       parent: 1
-  - uid: 260
+  - uid: 295
     components:
     - type: Transform
-      pos: -2.5,2.5
+      pos: 13.5,-13.5
       parent: 1
-  - uid: 261
+  - uid: 296
     components:
     - type: Transform
-      pos: -3.5,2.5
+      pos: 13.5,-12.5
       parent: 1
-  - uid: 262
+  - uid: 297
     components:
     - type: Transform
-      pos: -4.5,2.5
+      pos: 13.5,-11.5
       parent: 1
-  - uid: 263
+  - uid: 298
     components:
     - type: Transform
-      pos: -5.5,2.5
+      pos: 13.5,-10.5
       parent: 1
-  - uid: 264
+  - uid: 299
     components:
     - type: Transform
-      pos: 0.5,2.5
+      pos: 13.5,-9.5
       parent: 1
-  - uid: 265
+  - uid: 300
     components:
     - type: Transform
-      pos: 1.5,2.5
+      pos: 14.5,-11.5
       parent: 1
-  - uid: 266
+  - uid: 301
     components:
     - type: Transform
-      pos: 2.5,2.5
+      pos: 15.5,-11.5
       parent: 1
-  - uid: 267
+  - uid: 302
     components:
     - type: Transform
-      pos: 3.5,2.5
+      pos: 16.5,-11.5
       parent: 1
-  - uid: 268
+  - uid: 303
     components:
     - type: Transform
-      pos: 4.5,2.5
+      pos: 17.5,-11.5
       parent: 1
-  - uid: 269
+  - uid: 304
     components:
     - type: Transform
-      pos: -14.5,-21.5
+      pos: 18.5,-11.5
       parent: 1
-  - uid: 270
+  - uid: 335
     components:
     - type: Transform
-      pos: -14.5,-22.5
+      pos: -5.5,-8.5
       parent: 1
-  - uid: 271
+  - uid: 336
     components:
     - type: Transform
-      pos: -14.5,-23.5
+      pos: -5.5,-7.5
       parent: 1
-  - uid: 272
+  - uid: 337
     components:
     - type: Transform
-      pos: -13.5,-23.5
+      pos: -5.5,-6.5
       parent: 1
-  - uid: 273
+  - uid: 338
     components:
     - type: Transform
-      pos: -13.5,-24.5
+      pos: -6.5,-6.5
       parent: 1
-  - uid: 274
+  - uid: 339
     components:
     - type: Transform
-      pos: 13.5,-21.5
+      pos: -6.5,-5.5
       parent: 1
-  - uid: 275
+  - uid: 340
     components:
     - type: Transform
-      pos: 13.5,-22.5
+      pos: 5.5,-8.5
       parent: 1
-  - uid: 276
+  - uid: 341
     components:
     - type: Transform
-      pos: 13.5,-23.5
+      pos: 4.5,-8.5
       parent: 1
-  - uid: 277
+  - uid: 346
     components:
     - type: Transform
-      pos: 12.5,-23.5
+      pos: 3.5,-8.5
       parent: 1
-  - uid: 278
+  - uid: 347
     components:
     - type: Transform
-      pos: 12.5,-24.5
+      pos: -4.5,-8.5
       parent: 1
-  - uid: 279
+  - uid: 348
     components:
     - type: Transform
-      pos: 14.5,-15.5
+      pos: -4.5,-9.5
       parent: 1
-  - uid: 280
+  - uid: 349
     components:
     - type: Transform
-      pos: 15.5,-15.5
+      pos: -4.5,-10.5
       parent: 1
-  - uid: 281
+  - uid: 350
     components:
     - type: Transform
-      pos: 16.5,-15.5
+      pos: -4.5,-11.5
       parent: 1
-  - uid: 282
+  - uid: 351
     components:
     - type: Transform
-      pos: 17.5,-15.5
+      pos: -4.5,-12.5
       parent: 1
-  - uid: 283
+  - uid: 352
     components:
     - type: Transform
-      pos: -6.5,-26.5
+      pos: -4.5,-13.5
       parent: 1
-  - uid: 284
+  - uid: 353
     components:
     - type: Transform
-      pos: -6.5,-27.5
+      pos: -4.5,-14.5
       parent: 1
-  - uid: 285
+  - uid: 354
     components:
     - type: Transform
-      pos: -5.5,-27.5
+      pos: -4.5,-15.5
       parent: 1
-  - uid: 286
+  - uid: 355
     components:
     - type: Transform
-      pos: -5.5,-28.5
+      pos: -4.5,-16.5
       parent: 1
-  - uid: 287
+  - uid: 356
     components:
     - type: Transform
-      pos: -5.5,-29.5
+      pos: -3.5,-15.5
       parent: 1
-  - uid: 288
+  - uid: 357
     components:
     - type: Transform
-      pos: -5.5,-30.5
+      pos: -2.5,-15.5
       parent: 1
-  - uid: 289
+  - uid: 358
     components:
     - type: Transform
-      pos: -4.5,-30.5
+      pos: 1.5,-15.5
       parent: 1
-  - uid: 290
+  - uid: 359
     components:
     - type: Transform
-      pos: 7.5,-26.5
+      pos: 3.5,-15.5
       parent: 1
-  - uid: 291
+  - uid: 360
     components:
     - type: Transform
-      pos: 7.5,-26.5
+      pos: 2.5,-15.5
       parent: 1
-  - uid: 292
+  - uid: 361
     components:
     - type: Transform
-      pos: 7.5,-28.5
+      pos: 3.5,-16.5
       parent: 1
-  - uid: 293
+  - uid: 362
     components:
     - type: Transform
-      pos: 7.5,-27.5
+      pos: -0.5,-22.5
       parent: 1
-  - uid: 294
+  - uid: 363
     components:
     - type: Transform
-      pos: 6.5,-28.5
+      pos: -0.5,-21.5
       parent: 1
-  - uid: 295
+  - uid: 364
     components:
     - type: Transform
-      pos: 6.5,-29.5
+      pos: -0.5,-20.5
       parent: 1
-  - uid: 296
+  - uid: 365
     components:
     - type: Transform
-      pos: 5.5,-29.5
+      pos: -0.5,-19.5
       parent: 1
-  - uid: 297
+  - uid: 366
     components:
     - type: Transform
-      pos: 4.5,-29.5
+      pos: 3.5,-14.5
       parent: 1
-  - uid: 298
+  - uid: 367
     components:
     - type: Transform
-      pos: 4.5,-30.5
+      pos: 3.5,-13.5
       parent: 1
-  - uid: 299
+  - uid: 368
     components:
     - type: Transform
-      pos: 3.5,-30.5
+      pos: 3.5,-12.5
       parent: 1
-  - uid: 300
+  - uid: 369
     components:
     - type: Transform
-      pos: -15.5,-23.5
+      pos: 3.5,-11.5
       parent: 1
-  - uid: 301
+  - uid: 370
     components:
     - type: Transform
-      pos: -16.5,-23.5
+      pos: 3.5,-10.5
       parent: 1
-  - uid: 302
+  - uid: 371
     components:
     - type: Transform
-      pos: 14.5,-23.5
+      pos: 3.5,-9.5
       parent: 1
-  - uid: 303
+  - uid: 380
     components:
     - type: Transform
-      pos: 15.5,-23.5
+      pos: 0.5,3.5
       parent: 1
-  - uid: 304
+  - uid: 381
     components:
     - type: Transform
-      pos: 11.5,-16.5
+      pos: 0.5,4.5
       parent: 1
-  - uid: 305
+  - uid: 382
     components:
     - type: Transform
-      pos: -13.5,-16.5
+      pos: 0.5,5.5
       parent: 1
-  - uid: 306
+  - uid: 383
     components:
     - type: Transform
-      pos: -12.5,-16.5
+      pos: 0.5,6.5
       parent: 1
-  - uid: 307
+  - uid: 384
     components:
     - type: Transform
-      pos: -11.5,-16.5
+      pos: -0.5,6.5
       parent: 1
-  - uid: 308
+  - uid: 385
     components:
     - type: Transform
-      pos: -7.5,-25.5
+      pos: -1.5,6.5
       parent: 1
-  - uid: 309
+  - uid: 386
     components:
     - type: Transform
-      pos: -8.5,-25.5
+      pos: -2.5,6.5
       parent: 1
-  - uid: 310
+  - uid: 387
     components:
     - type: Transform
-      pos: -10.5,-25.5
+      pos: -3.5,6.5
       parent: 1
-  - uid: 311
+  - uid: 388
     components:
     - type: Transform
-      pos: -9.5,-25.5
+      pos: 1.5,6.5
       parent: 1
-  - uid: 312
+  - uid: 389
     components:
     - type: Transform
-      pos: -19.5,-10.5
+      pos: 2.5,6.5
       parent: 1
-  - uid: 313
+  - uid: 390
     components:
     - type: Transform
-      pos: -20.5,-10.5
+      pos: -2.5,0.5
       parent: 1
-  - uid: 314
+  - uid: 391
     components:
     - type: Transform
-      pos: -20.5,-9.5
+      pos: -1.5,0.5
       parent: 1
-  - uid: 315
+  - uid: 392
     components:
     - type: Transform
-      pos: -20.5,-11.5
+      pos: -3.5,0.5
       parent: 1
-  - uid: 316
+  - uid: 393
     components:
     - type: Transform
-      pos: 18.5,-10.5
+      pos: -4.5,0.5
       parent: 1
-  - uid: 317
+  - uid: 394
     components:
     - type: Transform
-      pos: 19.5,-10.5
+      pos: -5.5,0.5
       parent: 1
-  - uid: 318
+  - uid: 397
     components:
     - type: Transform
-      pos: 19.5,-9.5
+      pos: -6.5,0.5
       parent: 1
-  - uid: 319
+  - uid: 398
     components:
     - type: Transform
-      pos: 19.5,-11.5
+      pos: -6.5,1.5
       parent: 1
-  - uid: 320
+  - uid: 399
     components:
     - type: Transform
-      pos: 15.5,-16.5
+      pos: -6.5,2.5
       parent: 1
-  - uid: 321
+  - uid: 400
     components:
     - type: Transform
-      pos: 15.5,-17.5
+      pos: -6.5,3.5
       parent: 1
-  - uid: 322
+  - uid: 401
     components:
     - type: Transform
-      pos: 15.5,-18.5
+      pos: -0.5,0.5
       parent: 1
-  - uid: 323
+  - uid: 404
     components:
     - type: Transform
-      pos: 15.5,-19.5
+      pos: 1.5,1.5
       parent: 1
-  - uid: 324
+  - uid: 405
     components:
     - type: Transform
-      pos: 15.5,-20.5
+      pos: 2.5,1.5
       parent: 1
-  - uid: 325
+  - uid: 406
     components:
     - type: Transform
-      pos: 16.5,-18.5
+      pos: 3.5,1.5
       parent: 1
-  - uid: 326
+  - uid: 407
     components:
     - type: Transform
-      pos: 17.5,-18.5
+      pos: 4.5,1.5
       parent: 1
-  - uid: 327
+  - uid: 408
     components:
     - type: Transform
-      pos: 2.5,-27.5
+      pos: 5.5,1.5
       parent: 1
-  - uid: 328
+  - uid: 410
     components:
     - type: Transform
-      pos: 3.5,-27.5
+      pos: -1.5,-4.5
       parent: 1
-  - uid: 329
+  - uid: 411
     components:
     - type: Transform
-      pos: -0.5,-16.5
+      pos: -1.5,-2.5
       parent: 1
-  - uid: 330
+  - uid: 412
     components:
     - type: Transform
-      pos: -1.5,-16.5
+      pos: -1.5,-1.5
       parent: 1
-  - uid: 331
+  - uid: 413
     components:
     - type: Transform
-      pos: -3.5,-16.5
+      pos: -2.5,-2.5
       parent: 1
-  - uid: 332
+  - uid: 414
     components:
     - type: Transform
-      pos: -2.5,-16.5
+      pos: -3.5,-2.5
       parent: 1
-  - uid: 333
+  - uid: 415
     components:
     - type: Transform
-      pos: -4.5,-16.5
+      pos: -1.5,-3.5
       parent: 1
-  - uid: 334
+  - uid: 416
     components:
     - type: Transform
-      pos: -5.5,-16.5
+      pos: -1.5,-5.5
       parent: 1
-  - uid: 335
+  - uid: 418
     components:
     - type: Transform
-      pos: -5.5,-15.5
+      pos: -4.5,-17.5
       parent: 1
-  - uid: 336
+  - uid: 419
     components:
     - type: Transform
-      pos: -5.5,-14.5
+      pos: 3.5,-17.5
       parent: 1
-  - uid: 337
+  - uid: 435
     components:
     - type: Transform
-      pos: -5.5,-13.5
+      pos: -1.5,-20.5
       parent: 1
-  - uid: 338
+  - uid: 473
     components:
     - type: Transform
-      pos: -5.5,-12.5
+      pos: -2.5,-20.5
       parent: 1
-  - uid: 339
+  - uid: 474
     components:
     - type: Transform
-      pos: -5.5,-11.5
+      pos: 0.5,-20.5
       parent: 1
-  - uid: 340
+  - uid: 475
     components:
     - type: Transform
-      pos: 1.5,-16.5
+      pos: 1.5,-20.5
       parent: 1
-  - uid: 341
+  - uid: 477
     components:
     - type: Transform
-      pos: 2.5,-16.5
+      pos: 8.5,-23.5
       parent: 1
-  - uid: 342
+  - uid: 480
     components:
     - type: Transform
-      pos: 4.5,-16.5
+      pos: 9.5,-23.5
       parent: 1
-  - uid: 343
+  - uid: 481
     components:
     - type: Transform
-      pos: 3.5,-16.5
+      pos: 9.5,-24.5
       parent: 1
-  - uid: 344
+  - uid: 482
     components:
     - type: Transform
-      pos: 4.5,-15.5
+      pos: 9.5,-25.5
       parent: 1
-  - uid: 345
+  - uid: 483
     components:
     - type: Transform
-      pos: 4.5,-14.5
+      pos: 9.5,-26.5
       parent: 1
-  - uid: 346
+  - uid: 484
     components:
     - type: Transform
-      pos: 4.5,-13.5
+      pos: 10.5,-26.5
       parent: 1
-  - uid: 347
+  - uid: 499
     components:
     - type: Transform
-      pos: 4.5,-12.5
+      pos: 8.5,-20.5
       parent: 1
-  - uid: 348
+  - uid: 500
     components:
     - type: Transform
-      pos: 4.5,-11.5
+      pos: 9.5,-20.5
       parent: 1
-  - uid: 349
+  - uid: 504
     components:
     - type: Transform
-      pos: 4.5,-10.5
+      pos: 9.5,-21.5
       parent: 1
-  - uid: 350
+  - uid: 515
     components:
     - type: Transform
-      pos: 4.5,-9.5
+      pos: 4.5,3.5
       parent: 1
-  - uid: 351
+  - uid: 518
     components:
     - type: Transform
-      pos: 4.5,-8.5
+      pos: 12.5,-20.5
       parent: 1
-  - uid: 352
+  - uid: 519
     components:
     - type: Transform
-      pos: -5.5,-10.5
+      pos: 12.5,-21.5
       parent: 1
-  - uid: 353
+  - uid: 520
     components:
     - type: Transform
-      pos: -5.5,-8.5
+      pos: 12.5,-19.5
       parent: 1
-  - uid: 354
+  - uid: 521
     components:
     - type: Transform
-      pos: -5.5,-9.5
+      pos: 12.5,-22.5
       parent: 1
-  - uid: 355
+  - uid: 523
     components:
     - type: Transform
-      pos: -0.5,-2.5
+      pos: 14.5,-19.5
       parent: 1
-  - uid: 356
+  - uid: 531
     components:
     - type: Transform
-      pos: -1.5,-2.5
+      pos: 4.5,2.5
       parent: 1
-  - uid: 357
+  - uid: 552
     components:
     - type: Transform
-      pos: -2.5,-2.5
+      pos: 0.5,1.5
       parent: 1
-  - uid: 358
+  - uid: 584
     components:
     - type: Transform
-      pos: -4.5,-2.5
+      pos: -10.5,-20.5
       parent: 1
-  - uid: 359
+  - uid: 599
     components:
     - type: Transform
-      pos: -3.5,-2.5
+      pos: 4.5,-4.5
       parent: 1
-  - uid: 360
+  - uid: 600
     components:
     - type: Transform
-      pos: -5.5,-2.5
+      pos: 5.5,-4.5
       parent: 1
-  - uid: 361
+  - uid: 637
     components:
     - type: Transform
-      pos: -0.5,0.5
+      pos: 18.5,-10.5
       parent: 1
-  - uid: 362
+  - uid: 639
     components:
     - type: Transform
-      pos: -1.5,0.5
+      pos: -19.5,-10.5
       parent: 1
-  - uid: 363
+  - uid: 687
     components:
     - type: Transform
-      pos: -1.5,-0.5
+      pos: -9.5,-20.5
       parent: 1
-  - uid: 364
+  - uid: 725
     components:
     - type: Transform
-      pos: -6.5,2.5
+      pos: -13.5,-8.5
       parent: 1
-  - uid: 365
+  - uid: 729
     components:
     - type: Transform
-      pos: -7.5,2.5
+      pos: -8.5,-20.5
       parent: 1
-  - uid: 366
+  - uid: 737
     components:
     - type: Transform
-      pos: -8.5,2.5
+      pos: 13.5,-8.5
       parent: 1
-  - uid: 367
+  - uid: 750
     components:
     - type: Transform
-      pos: -8.5,3.5
+      pos: 3.5,-5.5
       parent: 1
-  - uid: 368
+  - uid: 753
     components:
     - type: Transform
-      pos: -8.5,4.5
+      pos: -1.5,-6.5
       parent: 1
-  - uid: 369
+  - uid: 776
     components:
     - type: Transform
-      pos: 5.5,2.5
+      pos: 12.5,-8.5
       parent: 1
-  - uid: 370
+  - uid: 794
     components:
     - type: Transform
-      pos: 6.5,2.5
+      pos: -13.5,-9.5
       parent: 1
-  - uid: 371
+  - uid: 819
     components:
     - type: Transform
-      pos: 7.5,2.5
+      pos: -0.5,1.5
       parent: 1
-  - uid: 372
+  - uid: 843
     components:
     - type: Transform
-      pos: 7.5,3.5
+      pos: 3.5,-6.5
       parent: 1
-  - uid: 373
+  - uid: 864
     components:
     - type: Transform
-      pos: 7.5,4.5
+      pos: -0.5,-18.5
       parent: 1
-  - uid: 374
+  - uid: 877
     components:
     - type: Transform
-      pos: 7.5,1.5
+      pos: -15.5,-19.5
       parent: 1
-  - uid: 375
+  - uid: 878
     components:
     - type: Transform
-      pos: 5.5,-6.5
+      pos: -16.5,-19.5
       parent: 1
-  - uid: 376
+  - uid: 960
     components:
     - type: Transform
-      pos: 6.5,-6.5
+      pos: -11.5,-26.5
       parent: 1
-  - uid: 377
+  - uid: 1191
     components:
     - type: Transform
-      pos: 7.5,-6.5
+      pos: -2.5,-14.5
       parent: 1
-  - uid: 378
+  - uid: 1201
     components:
     - type: Transform
-      pos: 7.5,-5.5
+      pos: 1.5,-12.5
       parent: 1
-  - uid: 379
+  - uid: 1237
     components:
     - type: Transform
-      pos: 6.5,-7.5
+      pos: 2.5,-12.5
       parent: 1
-  - uid: 380
+  - uid: 1764
     components:
     - type: Transform
-      pos: -5.5,-6.5
+      pos: 7.5,-23.5
       parent: 1
-  - uid: 381
+  - uid: 1766
     components:
     - type: Transform
-      pos: -6.5,-6.5
+      pos: -4.5,-2.5
       parent: 1
-  - uid: 382
+  - uid: 1810
     components:
     - type: Transform
-      pos: -7.5,-6.5
+      pos: -0.5,-7.5
       parent: 1
-  - uid: 383
+  - uid: 1812
     components:
     - type: Transform
-      pos: -8.5,-6.5
+      pos: -1.5,-7.5
       parent: 1
-  - uid: 384
+  - uid: 1814
     components:
     - type: Transform
-      pos: -8.5,-5.5
+      pos: 0.5,-12.5
       parent: 1
-  - uid: 385
+- proto: CableApcStack
+  entities:
+  - uid: 395
     components:
     - type: Transform
-      pos: 11.5,-25.5
+      pos: -6.6621842,-3.3624609
       parent: 1
-  - uid: 386
+  - uid: 396
     components:
     - type: Transform
-      pos: 12.5,-25.5
+      pos: -6.3809342,-3.5499609
       parent: 1
-  - uid: 387
+- proto: CableHV
+  entities:
+  - uid: 39
     components:
     - type: Transform
-      pos: 12.5,-26.5
+      pos: -8.5,-23.5
       parent: 1
-  - uid: 388
+  - uid: 52
     components:
     - type: Transform
-      pos: -11.5,-25.5
+      pos: -8.5,-24.5
       parent: 1
-  - uid: 389
+  - uid: 116
     components:
     - type: Transform
-      pos: -12.5,-25.5
+      pos: -7.5,-25.5
       parent: 1
-  - uid: 390
+  - uid: 121
     components:
     - type: Transform
-      pos: -13.5,-25.5
+      pos: -8.5,-26.5
       parent: 1
-  - uid: 391
+  - uid: 122
     components:
     - type: Transform
-      pos: -13.5,-26.5
+      pos: -8.5,-27.5
       parent: 1
-  - uid: 392
+  - uid: 125
     components:
     - type: Transform
-      pos: -16.5,-18.5
+      pos: -8.5,-25.5
       parent: 1
-  - uid: 393
+  - uid: 128
     components:
     - type: Transform
-      pos: -17.5,-18.5
+      pos: -6.5,-28.5
       parent: 1
-  - uid: 394
+  - uid: 131
     components:
     - type: Transform
-      pos: -18.5,-18.5
+      pos: -6.5,-27.5
       parent: 1
-- proto: CableApcStack
-  entities:
-  - uid: 395
+  - uid: 995
     components:
     - type: Transform
-      pos: -6.6621842,-3.3624609
+      pos: -7.5,-27.5
       parent: 1
-  - uid: 396
+  - uid: 1901
     components:
     - type: Transform
-      pos: -6.3809342,-3.5499609
+      pos: -7.5,-26.5
       parent: 1
-- proto: CableHV
+- proto: CableMV
   entities:
-  - uid: 397
+  - uid: 101
     components:
     - type: Transform
-      pos: 5.5,-7.5
+      pos: -1.5,-6.5
       parent: 1
-  - uid: 398
+  - uid: 103
     components:
     - type: Transform
-      pos: 6.5,-7.5
+      pos: -1.5,-2.5
       parent: 1
-  - uid: 399
+  - uid: 105
     components:
     - type: Transform
-      pos: 6.5,-6.5
+      pos: -1.5,-7.5
       parent: 1
-  - uid: 400
+  - uid: 106
     components:
     - type: Transform
-      pos: 6.5,-5.5
+      pos: -1.5,-3.5
       parent: 1
-  - uid: 401
+  - uid: 107
     components:
     - type: Transform
-      pos: 6.5,-4.5
+      pos: -1.5,-5.5
       parent: 1
-  - uid: 402
+  - uid: 110
     components:
     - type: Transform
-      pos: 6.5,-3.5
+      pos: -1.5,-1.5
       parent: 1
-  - uid: 403
+  - uid: 111
     components:
     - type: Transform
-      pos: 6.5,-2.5
+      pos: -1.5,-4.5
       parent: 1
-  - uid: 404
+  - uid: 112
     components:
     - type: Transform
-      pos: 6.5,-1.5
+      pos: -6.5,-20.5
       parent: 1
-  - uid: 405
+  - uid: 129
     components:
     - type: Transform
-      pos: 6.5,-0.5
+      pos: -6.5,-27.5
       parent: 1
-  - uid: 406
+  - uid: 133
     components:
     - type: Transform
-      pos: 6.5,0.5
+      pos: -7.5,-25.5
       parent: 1
-  - uid: 407
+  - uid: 134
     components:
     - type: Transform
-      pos: 6.5,1.5
+      pos: -7.5,-24.5
       parent: 1
-  - uid: 408
+  - uid: 135
     components:
     - type: Transform
-      pos: 6.5,2.5
+      pos: -7.5,-23.5
       parent: 1
-  - uid: 409
+  - uid: 136
     components:
     - type: Transform
-      pos: 6.5,3.5
+      pos: -7.5,-22.5
       parent: 1
-  - uid: 410
+  - uid: 137
     components:
     - type: Transform
-      pos: 6.5,4.5
+      pos: -7.5,-21.5
       parent: 1
-  - uid: 411
+  - uid: 138
     components:
     - type: Transform
-      pos: 5.5,4.5
+      pos: -7.5,-20.5
       parent: 1
-  - uid: 412
+  - uid: 139
     components:
     - type: Transform
-      pos: 4.5,4.5
+      pos: -8.5,-20.5
       parent: 1
-  - uid: 413
+  - uid: 140
     components:
     - type: Transform
-      pos: 4.5,5.5
+      pos: -9.5,-20.5
       parent: 1
-  - uid: 414
+  - uid: 141
     components:
     - type: Transform
-      pos: 3.5,5.5
+      pos: -10.5,-20.5
       parent: 1
-  - uid: 415
+  - uid: 142
     components:
     - type: Transform
-      pos: 3.5,6.5
+      pos: -11.5,-20.5
       parent: 1
-  - uid: 416
+  - uid: 143
     components:
     - type: Transform
-      pos: 3.5,7.5
+      pos: -12.5,-20.5
       parent: 1
-  - uid: 417
+  - uid: 144
     components:
     - type: Transform
-      pos: 2.5,7.5
+      pos: -13.5,-20.5
       parent: 1
-  - uid: 418
+  - uid: 145
     components:
     - type: Transform
-      pos: 2.5,8.5
+      pos: -14.5,-20.5
       parent: 1
-  - uid: 419
+  - uid: 146
     components:
     - type: Transform
-      pos: 1.5,8.5
+      pos: -14.5,-19.5
       parent: 1
-  - uid: 420
+  - uid: 147
     components:
     - type: Transform
-      pos: 0.5,8.5
+      pos: -14.5,-18.5
       parent: 1
-  - uid: 421
+  - uid: 148
     components:
     - type: Transform
-      pos: -0.5,8.5
+      pos: -14.5,-17.5
       parent: 1
-  - uid: 422
+  - uid: 149
     components:
     - type: Transform
-      pos: -1.5,8.5
+      pos: -14.5,-16.5
       parent: 1
-  - uid: 423
+  - uid: 150
     components:
     - type: Transform
-      pos: -2.5,8.5
+      pos: -14.5,-15.5
       parent: 1
-  - uid: 424
+  - uid: 151
     components:
     - type: Transform
-      pos: -3.5,8.5
+      pos: -14.5,-14.5
       parent: 1
-  - uid: 425
+  - uid: 152
     components:
     - type: Transform
-      pos: -3.5,7.5
+      pos: -15.5,-14.5
       parent: 1
-  - uid: 426
+  - uid: 153
     components:
     - type: Transform
-      pos: -4.5,7.5
+      pos: -16.5,-14.5
       parent: 1
-  - uid: 427
+  - uid: 154
     components:
     - type: Transform
-      pos: -4.5,6.5
+      pos: -16.5,-13.5
       parent: 1
-  - uid: 428
+  - uid: 155
     components:
     - type: Transform
-      pos: -4.5,5.5
+      pos: -6.5,-25.5
       parent: 1
-  - uid: 429
+  - uid: 156
     components:
     - type: Transform
-      pos: -5.5,5.5
+      pos: -5.5,-25.5
       parent: 1
-  - uid: 430
+  - uid: 163
     components:
     - type: Transform
-      pos: -5.5,4.5
+      pos: -6.5,-26.5
       parent: 1
-  - uid: 431
+  - uid: 201
     components:
     - type: Transform
-      pos: -6.5,4.5
+      pos: -5.5,-20.5
       parent: 1
-  - uid: 432
+  - uid: 202
     components:
     - type: Transform
-      pos: -7.5,4.5
+      pos: -4.5,-20.5
       parent: 1
-  - uid: 433
+  - uid: 203
     components:
     - type: Transform
-      pos: -7.5,3.5
+      pos: -2.5,-20.5
       parent: 1
-  - uid: 434
+  - uid: 204
     components:
     - type: Transform
-      pos: -7.5,2.5
+      pos: -3.5,-20.5
       parent: 1
-  - uid: 435
+  - uid: 205
     components:
     - type: Transform
-      pos: -7.5,1.5
+      pos: -1.5,-20.5
       parent: 1
-  - uid: 436
+  - uid: 206
     components:
     - type: Transform
-      pos: -7.5,0.5
+      pos: -0.5,-20.5
       parent: 1
-  - uid: 437
+  - uid: 207
     components:
     - type: Transform
-      pos: -7.5,-0.5
+      pos: -0.5,-21.5
       parent: 1
-  - uid: 438
+  - uid: 208
     components:
     - type: Transform
-      pos: -7.5,-1.5
+      pos: -0.5,-22.5
       parent: 1
-  - uid: 439
+  - uid: 209
     components:
     - type: Transform
-      pos: -7.5,-2.5
+      pos: -0.5,-23.5
       parent: 1
-  - uid: 440
+  - uid: 210
     components:
     - type: Transform
-      pos: -7.5,-3.5
+      pos: -0.5,-24.5
       parent: 1
-  - uid: 441
+  - uid: 211
     components:
     - type: Transform
-      pos: -7.5,-4.5
+      pos: -0.5,-25.5
       parent: 1
-  - uid: 442
+  - uid: 212
     components:
     - type: Transform
-      pos: -7.5,-5.5
+      pos: 0.5,-25.5
       parent: 1
-  - uid: 443
+  - uid: 213
     components:
     - type: Transform
-      pos: -7.5,-6.5
+      pos: 1.5,-25.5
       parent: 1
-  - uid: 444
+  - uid: 244
     components:
     - type: Transform
-      pos: -7.5,-7.5
+      pos: 0.5,-20.5
       parent: 1
-  - uid: 445
+  - uid: 245
     components:
     - type: Transform
-      pos: -6.5,-7.5
+      pos: 1.5,-20.5
       parent: 1
-  - uid: 446
+  - uid: 246
     components:
     - type: Transform
-      pos: -7.5,-22.5
+      pos: 2.5,-20.5
       parent: 1
-  - uid: 447
+  - uid: 247
     components:
     - type: Transform
-      pos: 3.5,4.5
+      pos: 3.5,-20.5
       parent: 1
-  - uid: 448
+  - uid: 248
     components:
     - type: Transform
-      pos: -7.5,-23.5
+      pos: 4.5,-20.5
       parent: 1
-  - uid: 449
+  - uid: 249
     components:
     - type: Transform
-      pos: -7.5,-24.5
+      pos: 5.5,-20.5
       parent: 1
-  - uid: 450
+  - uid: 250
     components:
     - type: Transform
-      pos: -7.5,-25.5
+      pos: 6.5,-20.5
       parent: 1
-  - uid: 451
+  - uid: 251
     components:
     - type: Transform
-      pos: -7.5,-26.5
+      pos: 7.5,-20.5
       parent: 1
-  - uid: 452
+  - uid: 253
     components:
     - type: Transform
-      pos: -8.5,-26.5
+      pos: 8.5,-20.5
       parent: 1
-  - uid: 453
+  - uid: 254
     components:
     - type: Transform
-      pos: -7.5,-20.5
+      pos: 9.5,-20.5
       parent: 1
-  - uid: 454
+  - uid: 257
     components:
     - type: Transform
-      pos: -7.5,-21.5
+      pos: -6.5,-28.5
       parent: 1
-  - uid: 455
+  - uid: 264
     components:
     - type: Transform
-      pos: -6.5,-20.5
+      pos: 9.5,-21.5
       parent: 1
-  - uid: 456
+  - uid: 266
     components:
     - type: Transform
-      pos: -5.5,-20.5
+      pos: 10.5,-20.5
       parent: 1
-  - uid: 457
+  - uid: 267
     components:
     - type: Transform
-      pos: -4.5,-20.5
+      pos: 11.5,-20.5
       parent: 1
-  - uid: 458
+  - uid: 268
     components:
     - type: Transform
-      pos: -2.5,-20.5
+      pos: 12.5,-20.5
       parent: 1
-  - uid: 459
+  - uid: 269
     components:
     - type: Transform
-      pos: -3.5,-20.5
+      pos: 12.5,-19.5
       parent: 1
-  - uid: 460
+  - uid: 270
     components:
     - type: Transform
-      pos: -1.5,-20.5
+      pos: 12.5,-18.5
       parent: 1
-  - uid: 461
+  - uid: 271
     components:
     - type: Transform
-      pos: -0.5,-20.5
+      pos: 12.5,-17.5
       parent: 1
-  - uid: 462
+  - uid: 272
     components:
     - type: Transform
-      pos: -0.5,-19.5
+      pos: 12.5,-16.5
       parent: 1
-  - uid: 463
+  - uid: 273
     components:
     - type: Transform
-      pos: -0.5,-18.5
+      pos: 12.5,-15.5
       parent: 1
-  - uid: 464
+  - uid: 276
     components:
     - type: Transform
-      pos: -0.5,-17.5
+      pos: 12.5,-14.5
       parent: 1
-  - uid: 465
+  - uid: 277
     components:
     - type: Transform
-      pos: -0.5,-16.5
+      pos: 11.5,-14.5
       parent: 1
-  - uid: 466
+  - uid: 306
     components:
     - type: Transform
-      pos: -0.5,-15.5
+      pos: -3.5,-19.5
       parent: 1
-  - uid: 467
+  - uid: 307
     components:
     - type: Transform
-      pos: -0.5,-14.5
+      pos: -3.5,-18.5
       parent: 1
-  - uid: 468
+  - uid: 308
     components:
     - type: Transform
-      pos: -0.5,-13.5
+      pos: -3.5,-17.5
       parent: 1
-  - uid: 469
+  - uid: 309
     components:
     - type: Transform
-      pos: -0.5,-12.5
+      pos: -3.5,-16.5
       parent: 1
-  - uid: 470
+  - uid: 310
     components:
     - type: Transform
-      pos: -0.5,-11.5
+      pos: -3.5,-15.5
       parent: 1
-  - uid: 471
+  - uid: 311
     components:
     - type: Transform
-      pos: -0.5,-10.5
+      pos: -2.5,-15.5
       parent: 1
-  - uid: 472
+  - uid: 312
     components:
     - type: Transform
-      pos: -0.5,-9.5
+      pos: -1.5,-15.5
       parent: 1
-  - uid: 473
+  - uid: 313
     components:
     - type: Transform
-      pos: -0.5,-8.5
+      pos: -0.5,-15.5
       parent: 1
-  - uid: 474
+  - uid: 314
     components:
     - type: Transform
-      pos: -0.5,-7.5
+      pos: -0.5,-14.5
       parent: 1
-  - uid: 475
+  - uid: 315
     components:
     - type: Transform
-      pos: -0.5,-6.5
+      pos: -0.5,-13.5
       parent: 1
-  - uid: 476
+  - uid: 316
     components:
     - type: Transform
-      pos: -0.5,-5.5
+      pos: -0.5,-12.5
       parent: 1
-  - uid: 477
+  - uid: 317
     components:
     - type: Transform
-      pos: -0.5,-4.5
+      pos: -0.5,-11.5
       parent: 1
-  - uid: 478
+  - uid: 318
     components:
     - type: Transform
-      pos: -0.5,-3.5
+      pos: -0.5,-10.5
       parent: 1
-  - uid: 479
+  - uid: 319
     components:
     - type: Transform
-      pos: -0.5,-2.5
+      pos: -0.5,-9.5
       parent: 1
-  - uid: 480
+  - uid: 320
     components:
     - type: Transform
-      pos: -0.5,-1.5
+      pos: -0.5,-8.5
       parent: 1
-  - uid: 481
+  - uid: 321
     components:
     - type: Transform
-      pos: -0.5,-0.5
+      pos: -1.5,-8.5
       parent: 1
-  - uid: 482
+  - uid: 322
     components:
     - type: Transform
-      pos: -0.5,0.5
+      pos: -2.5,-8.5
       parent: 1
-  - uid: 483
+  - uid: 323
     components:
     - type: Transform
-      pos: -0.5,1.5
+      pos: -3.5,-8.5
       parent: 1
-  - uid: 484
+  - uid: 324
     components:
     - type: Transform
-      pos: -0.5,2.5
+      pos: -4.5,-8.5
       parent: 1
-  - uid: 485
+  - uid: 325
     components:
     - type: Transform
-      pos: -0.5,-21.5
+      pos: -5.5,-8.5
       parent: 1
-  - uid: 486
+  - uid: 326
     components:
     - type: Transform
-      pos: -0.5,-22.5
+      pos: 0.5,-8.5
       parent: 1
-  - uid: 487
+  - uid: 327
     components:
     - type: Transform
-      pos: -0.5,-23.5
+      pos: 1.5,-8.5
       parent: 1
-  - uid: 488
+  - uid: 328
     components:
     - type: Transform
-      pos: -0.5,-24.5
+      pos: 2.5,-8.5
       parent: 1
-  - uid: 489
+  - uid: 329
     components:
     - type: Transform
-      pos: -0.5,-25.5
+      pos: 3.5,-8.5
       parent: 1
-  - uid: 490
+  - uid: 330
     components:
     - type: Transform
-      pos: -0.5,-26.5
+      pos: 4.5,-8.5
       parent: 1
-  - uid: 491
+  - uid: 331
     components:
     - type: Transform
-      pos: -0.5,-27.5
+      pos: 5.5,-8.5
       parent: 1
-  - uid: 492
+  - uid: 332
     components:
     - type: Transform
-      pos: -0.5,-28.5
+      pos: -6.5,-8.5
       parent: 1
-  - uid: 493
+  - uid: 372
     components:
     - type: Transform
-      pos: -8.5,-20.5
+      pos: -1.5,-0.5
       parent: 1
-  - uid: 494
+  - uid: 373
     components:
     - type: Transform
-      pos: -9.5,-20.5
+      pos: -1.5,0.5
       parent: 1
-  - uid: 495
+  - uid: 374
     components:
     - type: Transform
-      pos: -10.5,-20.5
+      pos: -2.5,0.5
       parent: 1
-  - uid: 496
+  - uid: 375
     components:
     - type: Transform
-      pos: -11.5,-20.5
+      pos: -0.5,0.5
       parent: 1
-  - uid: 497
+  - uid: 376
     components:
     - type: Transform
-      pos: -12.5,-20.5
+      pos: -0.5,1.5
       parent: 1
-  - uid: 498
+  - uid: 377
     components:
     - type: Transform
-      pos: -13.5,-20.5
+      pos: -0.5,2.5
       parent: 1
-  - uid: 499
+  - uid: 378
     components:
     - type: Transform
-      pos: -14.5,-20.5
+      pos: -0.5,3.5
       parent: 1
-  - uid: 500
+  - uid: 379
     components:
     - type: Transform
-      pos: 0.5,-20.5
+      pos: 0.5,3.5
       parent: 1
-  - uid: 501
+- proto: CableTerminal
+  entities:
+  - uid: 40
     components:
     - type: Transform
-      pos: 1.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-27.5
       parent: 1
-  - uid: 502
+  - uid: 51
     components:
     - type: Transform
-      pos: 2.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-26.5
       parent: 1
-  - uid: 503
+- proto: CargoPallet
+  entities:
+  - uid: 1759
     components:
     - type: Transform
-      pos: 3.5,-20.5
+      pos: 12.5,-8.5
       parent: 1
-  - uid: 504
+  - uid: 1773
     components:
     - type: Transform
-      pos: 4.5,-20.5
+      pos: 12.5,-9.5
       parent: 1
-  - uid: 505
+  - uid: 1803
     components:
     - type: Transform
-      pos: 5.5,-20.5
+      pos: 13.5,-9.5
       parent: 1
-  - uid: 506
+  - uid: 1804
     components:
     - type: Transform
-      pos: 6.5,-20.5
+      pos: 13.5,-8.5
       parent: 1
-  - uid: 507
+- proto: Carpet
+  entities:
+  - uid: 70
     components:
     - type: Transform
-      pos: 7.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-26.5
       parent: 1
-  - uid: 508
+  - uid: 447
     components:
     - type: Transform
-      pos: 8.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-26.5
       parent: 1
-  - uid: 509
+  - uid: 592
     components:
     - type: Transform
-      pos: 9.5,-20.5
+      pos: -4.5,-22.5
       parent: 1
-  - uid: 510
+  - uid: 593
     components:
     - type: Transform
-      pos: 10.5,-20.5
+      pos: -4.5,-23.5
       parent: 1
-  - uid: 511
+  - uid: 594
     components:
     - type: Transform
-      pos: 11.5,-20.5
+      pos: -3.5,-22.5
       parent: 1
-  - uid: 512
+  - uid: 595
     components:
     - type: Transform
-      pos: 12.5,-20.5
+      pos: -3.5,-23.5
       parent: 1
-  - uid: 513
+- proto: CarpetBlue
+  entities:
+  - uid: 604
     components:
     - type: Transform
-      pos: 13.5,-20.5
+      pos: -4.5,0.5
       parent: 1
-  - uid: 514
+  - uid: 605
     components:
     - type: Transform
-      pos: 14.5,-20.5
+      pos: -3.5,0.5
       parent: 1
-  - uid: 515
+  - uid: 1822
     components:
     - type: Transform
-      pos: -15.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,0.5
       parent: 1
-  - uid: 516
+- proto: Catwalk
+  entities:
+  - uid: 126
     components:
     - type: Transform
-      pos: -0.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-26.5
       parent: 1
-  - uid: 517
+  - uid: 132
     components:
     - type: Transform
-      pos: -0.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-27.5
       parent: 1
-  - uid: 518
+  - uid: 450
     components:
     - type: Transform
-      pos: 0.5,4.5
+      pos: 8.5,-22.5
       parent: 1
-  - uid: 519
+  - uid: 489
     components:
     - type: Transform
-      pos: 1.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-23.5
       parent: 1
-  - uid: 520
+  - uid: 490
     components:
     - type: Transform
-      pos: 2.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-23.5
       parent: 1
-  - uid: 521
+  - uid: 491
     components:
     - type: Transform
-      pos: -8.5,-27.5
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-23.5
       parent: 1
-  - uid: 522
+  - uid: 492
     components:
     - type: Transform
-      pos: -7.5,-27.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-22.5
       parent: 1
-  - uid: 523
+  - uid: 493
     components:
     - type: Transform
-      pos: -6.5,-27.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-22.5
       parent: 1
-  - uid: 524
+  - uid: 494
     components:
     - type: Transform
-      pos: -6.5,-26.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-23.5
       parent: 1
-  - uid: 525
+  - uid: 495
     components:
     - type: Transform
-      pos: -1.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-23.5
       parent: 1
-  - uid: 526
+  - uid: 496
     components:
     - type: Transform
-      pos: -2.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-24.5
       parent: 1
-  - uid: 527
+  - uid: 497
     components:
     - type: Transform
-      pos: -2.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-25.5
       parent: 1
-  - uid: 528
+  - uid: 498
     components:
     - type: Transform
-      pos: -3.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-26.5
       parent: 1
-  - uid: 529
+  - uid: 502
     components:
     - type: Transform
-      pos: -3.5,6.5
+      rot: 3.141592653589793 rad
+      pos: 9.5,-22.5
       parent: 1
-  - uid: 530
+- proto: Chair
+  entities:
+  - uid: 608
     components:
     - type: Transform
-      pos: -7.5,-28.5
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-15.5
       parent: 1
-  - uid: 531
+  - uid: 609
     components:
     - type: Transform
-      pos: -8.5,-28.5
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-14.5
       parent: 1
-  - uid: 532
+  - uid: 803
     components:
     - type: Transform
-      pos: -6.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-23.5
       parent: 1
-  - uid: 533
+- proto: ChairFolding
+  entities:
+  - uid: 583
     components:
     - type: Transform
-      pos: -8.5,-27.5
+      rot: 3.141592653589793 rad
+      pos: 4.5,-6.5
       parent: 1
-  - uid: 534
+  - uid: 590
     components:
     - type: Transform
-      pos: -8.5,-25.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-6.5
       parent: 1
-  - uid: 535
+  - uid: 598
     components:
     - type: Transform
-      pos: -9.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: 5.5,-6.5
       parent: 1
-  - uid: 536
+  - uid: 610
     components:
     - type: Transform
-      pos: -10.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,0.5
       parent: 1
-  - uid: 537
+  - uid: 611
     components:
     - type: Transform
-      pos: -11.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,0.5
       parent: 1
-- proto: CableMV
-  entities:
-  - uid: 538
+  - uid: 612
     components:
     - type: Transform
-      pos: 3.5,4.5
+      pos: 3.5,2.5
       parent: 1
-  - uid: 539
+  - uid: 613
     components:
     - type: Transform
-      pos: 2.5,4.5
+      pos: 2.5,2.5
       parent: 1
-  - uid: 540
+  - uid: 724
     components:
     - type: Transform
-      pos: 1.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 5.5,-5.5
       parent: 1
-  - uid: 541
+  - uid: 804
     components:
     - type: Transform
-      pos: 0.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 4.5,-5.5
       parent: 1
-  - uid: 542
+- proto: ChairOfficeDark
+  entities:
+  - uid: 866
     components:
     - type: Transform
-      pos: 0.5,3.5
+      pos: 3.5,-13.5
       parent: 1
-  - uid: 543
+- proto: ChairOfficeLight
+  entities:
+  - uid: 453
     components:
     - type: Transform
-      pos: 0.5,2.5
+      pos: 16.5,-18.5
       parent: 1
-  - uid: 544
+- proto: ChairPilotSeat
+  entities:
+  - uid: 615
     components:
     - type: Transform
-      pos: 0.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,6.5
       parent: 1
-  - uid: 545
+  - uid: 616
     components:
     - type: Transform
-      pos: 0.5,0.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,6.5
       parent: 1
-  - uid: 546
+  - uid: 617
     components:
     - type: Transform
-      pos: 0.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,5.5
       parent: 1
-  - uid: 547
+- proto: ChairWood
+  entities:
+  - uid: 37
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      rot: 3.141592653589793 rad
+      pos: -15.5,-16.5
       parent: 1
-  - uid: 548
+  - uid: 99
     components:
     - type: Transform
-      pos: 0.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-14.5
       parent: 1
-  - uid: 549
+  - uid: 174
     components:
     - type: Transform
-      pos: 0.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: -16.5,-16.5
       parent: 1
-  - uid: 550
+  - uid: 683
     components:
     - type: Transform
-      pos: 0.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-13.5
       parent: 1
-  - uid: 551
+  - uid: 685
     components:
     - type: Transform
-      pos: 0.5,-5.5
+      pos: 1.5,-12.5
       parent: 1
-  - uid: 552
+  - uid: 686
     components:
     - type: Transform
-      pos: 0.5,-6.5
+      pos: 1.5,-14.5
       parent: 1
-  - uid: 553
+- proto: ChurchOrganInstrument
+  entities:
+  - uid: 622
     components:
     - type: Transform
-      pos: 0.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: -18.5,-14.5
       parent: 1
-  - uid: 554
+- proto: CigarGold
+  entities:
+  - uid: 1808
     components:
     - type: Transform
-      pos: 0.5,-8.5
+      pos: 3.5,-14.5
       parent: 1
-  - uid: 555
+- proto: CigarGoldCase
+  entities:
+  - uid: 623
     components:
     - type: Transform
-      pos: 0.5,-9.5
+      pos: -6.5097156,0.9530835
       parent: 1
-  - uid: 556
+- proto: ClosetEmergencyFilledRandom
+  entities:
+  - uid: 780
     components:
     - type: Transform
-      pos: 1.5,-9.5
+      pos: -2.5,-30.5
       parent: 1
-  - uid: 557
+- proto: ClosetEmergencyN2FilledRandom
+  entities:
+  - uid: 779
     components:
     - type: Transform
-      pos: 0.5,-11.5
+      pos: 1.5,-30.5
       parent: 1
-  - uid: 558
+- proto: ClosetL3JanitorFilled
+  entities:
+  - uid: 343
     components:
     - type: Transform
-      pos: 0.5,-10.5
+      pos: -16.5,-20.5
       parent: 1
-  - uid: 559
+- proto: ClosetToolFilled
+  entities:
+  - uid: 431
     components:
     - type: Transform
-      pos: 0.5,-12.5
+      pos: -8.5,-24.5
       parent: 1
-  - uid: 560
+- proto: ClosetWall
+  entities:
+  - uid: 1802
     components:
     - type: Transform
-      pos: 0.5,-13.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,-25.5
       parent: 1
-  - uid: 561
+- proto: ClosetWallEmergencyFilledRandom
+  entities:
+  - uid: 501
     components:
     - type: Transform
-      pos: 0.5,-14.5
+      pos: -7.5,-18.5
       parent: 1
-  - uid: 562
+  - uid: 977
     components:
     - type: Transform
-      pos: 0.5,-15.5
+      pos: 10.5,-18.5
       parent: 1
-  - uid: 563
+- proto: ClosetWallFireFilledRandom
+  entities:
+  - uid: 624
     components:
     - type: Transform
-      pos: 0.5,-16.5
+      pos: -11.5,-18.5
       parent: 1
-  - uid: 564
+  - uid: 975
     components:
     - type: Transform
-      pos: 0.5,-17.5
+      pos: 6.5,-18.5
       parent: 1
-  - uid: 565
+- proto: ClothingBeltChaplainSashFilled
+  entities:
+  - uid: 1902
     components:
     - type: Transform
-      pos: 0.5,-18.5
+      pos: -18.5,-16.5
       parent: 1
-  - uid: 566
+- proto: ClothingBeltMercenaryWebbing
+  entities:
+  - uid: 98
     components:
     - type: Transform
-      pos: 0.5,-19.5
+      pos: -5.7035966,-3.4349852
       parent: 1
-  - uid: 567
+- proto: ClothingEyesGlassesMercenary
+  entities:
+  - uid: 1780
     components:
     - type: Transform
-      pos: 0.5,-20.5
+      pos: -5.0521164,-3.5206459
       parent: 1
-  - uid: 568
+- proto: ClothingHandsGlovesBoxingBlue
+  entities:
+  - uid: 591
     components:
     - type: Transform
-      pos: -0.5,-20.5
+      pos: 5.5,-1.5
       parent: 1
-  - uid: 569
+- proto: ClothingHandsGlovesBoxingGreen
+  entities:
+  - uid: 722
     components:
     - type: Transform
-      pos: -1.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-1.5
       parent: 1
-  - uid: 570
+- proto: ClothingHandsGlovesBoxingRed
+  entities:
+  - uid: 597
     components:
     - type: Transform
-      pos: -2.5,-20.5
+      pos: 2.5,-4.5
       parent: 1
-  - uid: 571
+- proto: ClothingHandsGlovesBoxingYellow
+  entities:
+  - uid: 1184
     components:
     - type: Transform
-      pos: -3.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-4.5
       parent: 1
-  - uid: 572
+- proto: ClothingHeadBandMercenary
+  entities:
+  - uid: 1778
     components:
     - type: Transform
-      pos: -4.5,-20.5
+      pos: -4.5833664,-3.5675209
       parent: 1
-  - uid: 573
+- proto: ClothingHeadBandSkull
+  entities:
+  - uid: 541
     components:
     - type: Transform
-      pos: -5.5,-20.5
+      pos: 2.5,-5.5
       parent: 1
-  - uid: 574
+- proto: ClothingHeadHatBeretMercenary
+  entities:
+  - uid: 1457
     components:
     - type: Transform
-      pos: -6.5,-20.5
+      pos: -5.0052414,-3.2706459
       parent: 1
-  - uid: 575
+- proto: ClothingHeadHatCasa
+  entities:
+  - uid: 717
     components:
     - type: Transform
-      pos: -6.5,-21.5
+      pos: -0.8169179,-17.190418
       parent: 1
-  - uid: 576
+- proto: ClothingHeadHelmetMercenary
+  entities:
+  - uid: 1779
     components:
     - type: Transform
-      pos: -6.5,-22.5
+      pos: -4.1771164,-3.3643959
       parent: 1
-  - uid: 577
+- proto: ClothingMaskBat
+  entities:
+  - uid: 644
     components:
     - type: Transform
-      pos: -6.5,-23.5
+      pos: -1.5246618,-17.593832
       parent: 1
-  - uid: 578
+- proto: ClothingMaskBear
+  entities:
+  - uid: 645
     components:
     - type: Transform
-      pos: -6.5,-24.5
+      pos: -1.0090368,-18.320395
       parent: 1
-  - uid: 579
+- proto: ClothingMaskBee
+  entities:
+  - uid: 646
     components:
     - type: Transform
-      pos: -6.5,-25.5
+      pos: -0.02466178,-18.437582
       parent: 1
-  - uid: 580
+- proto: ClothingMaskGasAtmos
+  entities:
+  - uid: 1789
     components:
     - type: Transform
-      pos: -7.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-26.5
       parent: 1
-  - uid: 581
+- proto: ClothingMaskRat
+  entities:
+  - uid: 647
     components:
     - type: Transform
-      pos: -8.5,-25.5
+      pos: 0.6550257,-18.109457
       parent: 1
-  - uid: 582
+- proto: ClothingMaskRaven
+  entities:
+  - uid: 648
     components:
     - type: Transform
-      pos: -9.5,-25.5
+      pos: 0.04565072,-17.453207
       parent: 1
-  - uid: 583
+- proto: ClothingNeckBling
+  entities:
+  - uid: 589
     components:
     - type: Transform
-      pos: -10.5,-25.5
+      pos: -6.6606865,1.6361201
       parent: 1
-  - uid: 584
+- proto: ClothingOuterWinterMiner
+  entities:
+  - uid: 1775
     components:
     - type: Transform
-      pos: -11.5,-25.5
+      pos: 2.5,-28.3
       parent: 1
-  - uid: 585
+- proto: ClothingShoesBootsWinterMiner
+  entities:
+  - uid: 1776
     components:
     - type: Transform
-      pos: -5.5,-25.5
+      pos: 2.5,-28.5
       parent: 1
-- proto: CableTerminal
+- proto: ClothingUniformJumpsuitKimono
   entities:
-  - uid: 586
+  - uid: 526
     components:
     - type: Transform
-      pos: -8.5,-26.5
+      pos: -0.3637929,-17.362293
       parent: 1
-  - uid: 587
+- proto: ComfyChair
+  entities:
+  - uid: 659
     components:
     - type: Transform
-      pos: -7.5,-26.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,1.5
       parent: 1
-- proto: CargoPallet
-  entities:
-  - uid: 588
+  - uid: 660
     components:
     - type: Transform
-      pos: -5.5,-2.5
+      pos: 4.5,-16.5
       parent: 1
-  - uid: 589
+  - uid: 661
     components:
     - type: Transform
-      pos: -5.5,-1.5
+      rot: 3.141592653589793 rad
+      pos: 4.5,-18.5
       parent: 1
-  - uid: 590
+  - uid: 662
     components:
     - type: Transform
-      pos: -6.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,-18.5
       parent: 1
-  - uid: 591
+  - uid: 663
     components:
     - type: Transform
-      pos: -6.5,-1.5
+      pos: -5.5,-16.5
       parent: 1
-- proto: Carpet
-  entities:
-  - uid: 592
+  - uid: 664
     components:
     - type: Transform
-      pos: -4.5,-22.5
+      rot: 3.141592653589793 rad
+      pos: -13.5,-9.5
       parent: 1
-  - uid: 593
+  - uid: 665
     components:
     - type: Transform
-      pos: -4.5,-23.5
+      rot: 3.141592653589793 rad
+      pos: -14.5,-9.5
       parent: 1
-  - uid: 594
+  - uid: 790
     components:
     - type: Transform
-      pos: -3.5,-22.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-9.5
       parent: 1
-  - uid: 595
+- proto: ComputerCrewMonitoring
+  entities:
+  - uid: 666
     components:
     - type: Transform
-      pos: -3.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,6.5
       parent: 1
-  - uid: 596
+- proto: ComputerPowerMonitoring
+  entities:
+  - uid: 667
     components:
     - type: Transform
-      pos: 2.5,-22.5
+      rot: 1.5707963267948966 rad
+      pos: -3.5,6.5
       parent: 1
-  - uid: 597
+- proto: ComputerTabletopAlert
+  entities:
+  - uid: 670
     components:
     - type: Transform
-      pos: 2.5,-23.5
+      pos: -1.5,7.5
       parent: 1
-  - uid: 598
+- proto: ComputerTabletopBodyScanner
+  entities:
+  - uid: 535
     components:
     - type: Transform
-      pos: 3.5,-22.5
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-20.5
       parent: 1
-  - uid: 599
+- proto: ComputerTabletopRadar
+  entities:
+  - uid: 632
     components:
     - type: Transform
-      pos: 3.5,-23.5
+      pos: -2.5,7.5
       parent: 1
-  - uid: 600
+- proto: ComputerTabletopSalvageExpedition
+  entities:
+  - uid: 668
     components:
     - type: Transform
-      pos: 2.5,-26.5
+      pos: -0.5,7.5
       parent: 1
-  - uid: 601
+- proto: ComputerTabletopShuttle
+  entities:
+  - uid: 669
     components:
     - type: Transform
-      pos: 2.5,-27.5
+      pos: 1.5,7.5
       parent: 1
-  - uid: 602
+- proto: ComputerTabletopStationRecords
+  entities:
+  - uid: 671
     components:
     - type: Transform
-      pos: 3.5,-26.5
+      pos: 0.5,7.5
       parent: 1
-  - uid: 603
+- proto: ComputerTelevision
+  entities:
+  - uid: 962
     components:
     - type: Transform
-      pos: 3.5,-27.5
+      pos: 4.5,-15.5
       parent: 1
-- proto: CarpetBlue
+- proto: ConveyorBelt
   entities:
-  - uid: 604
+  - uid: 466
     components:
     - type: Transform
-      pos: -4.5,0.5
+      pos: -18.5,-19.5
       parent: 1
-  - uid: 605
+  - uid: 640
     components:
     - type: Transform
-      pos: -3.5,0.5
+      pos: -18.5,-20.5
       parent: 1
-- proto: Catwalk
-  entities:
-  - uid: 606
+  - uid: 875
     components:
     - type: Transform
-      pos: -8.5,-26.5
+      pos: -18.5,-18.5
       parent: 1
-  - uid: 607
+  - uid: 879
     components:
     - type: Transform
-      pos: -7.5,-26.5
+      pos: -17.5,-21.5
       parent: 1
-- proto: Chair
-  entities:
-  - uid: 608
+  - uid: 880
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-15.5
+      pos: -17.5,-22.5
       parent: 1
-  - uid: 609
+  - uid: 881
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-14.5
+      pos: -17.5,-20.5
       parent: 1
-- proto: ChairFolding
+- proto: CurtainsBlackOpen
   entities:
-  - uid: 610
+  - uid: 711
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-10.5
       parent: 1
-  - uid: 611
+  - uid: 822
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-10.5
       parent: 1
-  - uid: 612
+- proto: CurtainsBlue
+  entities:
+  - uid: 679
     components:
     - type: Transform
-      pos: 3.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-21.5
       parent: 1
-  - uid: 613
+- proto: CurtainsWhiteOpen
+  entities:
+  - uid: 345
     components:
     - type: Transform
-      pos: 2.5,2.5
+      pos: -3.5,-28.5
       parent: 1
-- proto: ChairOfficeLight
-  entities:
-  - uid: 614
+  - uid: 402
     components:
     - type: Transform
-      pos: 16.5,-20.5
+      pos: -4.5,-28.5
       parent: 1
-- proto: ChairPilotSeat
+- proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 615
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,6.5
-      parent: 1
-  - uid: 616
+  - uid: 294
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-17.5
       parent: 1
-  - uid: 617
+  - uid: 812
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-6.5
       parent: 1
-- proto: ChairRitual
+- proto: DeskBell
   entities:
-  - uid: 618
+  - uid: 818
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-20.5
+      pos: 2.5,-12.5
       parent: 1
-- proto: ChairWood
+- proto: DiceBag
   entities:
-  - uid: 619
+  - uid: 680
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-20.5
+      pos: -0.988676,-17.83214
       parent: 1
-- proto: MachineFrame
-  entities:
-  - uid: 620
+  - uid: 681
     components:
     - type: Transform
-      pos: 17.5,-19.5
+      pos: -0.566801,-17.819157
       parent: 1
-- proto: ChemistryHotplate
-  entities:
-  - uid: 621
+  - uid: 682
     components:
     - type: Transform
-      pos: 17.5,-18.5
+      pos: -0.19180101,-17.850407
       parent: 1
-    - type: ItemPlacer
-      placedEntities:
-      - 678
-    - type: PlaceableSurface
-      isPlaceable: False
-- proto: ChurchOrganInstrument
+- proto: DisposalBend
   entities:
-  - uid: 622
+  - uid: 200
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -18.5,-14.5
+      pos: -1.5,-26.5
       parent: 1
-- proto: CigarGoldCase
-  entities:
-  - uid: 623
+  - uid: 449
     components:
     - type: Transform
-      pos: -6.5097156,0.9530835
+      rot: 1.5707963267948966 rad
+      pos: 0.5,2.5
       parent: 1
-- proto: ClosetChefFilled
-  entities:
-  - uid: 630
+  - uid: 814
     components:
     - type: Transform
-      pos: 3.5,-3.5
+      pos: -14.5,-12.5
       parent: 1
-- proto: ClosetWallFireFilledRandom
-  entities:
-  - uid: 624
+  - uid: 890
     components:
     - type: Transform
-      pos: -11.5,-18.5
+      rot: 3.141592653589793 rad
+      pos: -16.5,-19.5
       parent: 1
-  - uid: 625
+  - uid: 891
     components:
     - type: Transform
-      pos: 10.5,-18.5
+      pos: -16.5,-18.5
       parent: 1
-- proto: ClothingHandsGlovesMercFingerless
-  entities:
-  - uid: 634
+  - uid: 906
     components:
     - type: Transform
-      pos: -4.510536,-3.39052
+      pos: -1.5,-19.5
       parent: 1
-- proto: ClothingHeadBandMercenary
-  entities:
-  - uid: 635
+  - uid: 907
     components:
     - type: Transform
-      pos: -5.0522027,-3.2863533
+      rot: -1.5707963267948966 rad
+      pos: 4.5,2.5
       parent: 1
-- proto: ClothingHeadHelmetMercenary
-  entities:
-  - uid: 637
+  - uid: 912
     components:
     - type: Transform
-      pos: -4.031369,-3.26552
+      pos: 4.5,4.5
       parent: 1
-- proto: ClothingHeadHelmetWizardHelm
-  entities:
-  - uid: 642
+  - uid: 927
     components:
     - type: Transform
-      pos: -0.8449743,-17.265707
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-16.5
       parent: 1
-- proto: ClothingHeadNurseHat
-  entities:
-  - uid: 643
+  - uid: 928
     components:
     - type: Transform
-      pos: 17.674637,-18.253355
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-16.5
       parent: 1
-- proto: ClothingMaskBat
-  entities:
-  - uid: 644
+  - uid: 948
     components:
     - type: Transform
-      pos: -1.5246618,-17.593832
+      rot: 1.5707963267948966 rad
+      pos: -0.5,1.5
       parent: 1
-- proto: ClothingMaskBear
-  entities:
-  - uid: 645
+  - uid: 965
     components:
     - type: Transform
-      pos: -1.0090368,-18.320395
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-20.5
       parent: 1
-- proto: ClothingMaskBee
-  entities:
-  - uid: 646
+  - uid: 966
     components:
     - type: Transform
-      pos: -0.02466178,-18.437582
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-19.5
       parent: 1
-- proto: ClothingMaskRat
+- proto: DisposalJunction
   entities:
-  - uid: 647
+  - uid: 769
     components:
     - type: Transform
-      pos: 0.6550257,-18.109457
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-19.5
       parent: 1
-- proto: ClothingMaskRaven
-  entities:
-  - uid: 648
+  - uid: 904
     components:
     - type: Transform
-      pos: 0.04565072,-17.453207
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-19.5
       parent: 1
-- proto: ClothingNeckBling
-  entities:
-  - uid: 649
+  - uid: 940
     components:
     - type: Transform
-      pos: -6.5570135,1.3828969
+      pos: -0.5,-5.5
       parent: 1
-- proto: ClothingOuterWinterChef
-  entities:
-  - uid: 651
+  - uid: 949
     components:
     - type: Transform
-      pos: 3.8123903,-5.313849
+      rot: -1.5707963267948966 rad
+      pos: 0.5,1.5
       parent: 1
-- proto: ClothingOuterWizard
-  entities:
-  - uid: 652
+  - uid: 969
     components:
     - type: Transform
-      pos: -0.21216178,-17.289145
+      rot: 3.141592653589793 rad
+      pos: -1.5,-20.5
       parent: 1
-- proto: ClothingUnderSocksCoder
-  entities:
-  - uid: 653
+  - uid: 973
     components:
     - type: Transform
-      pos: 4.226733,4.8322687
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-20.5
       parent: 1
-- proto: ClothingUniformJumpskirtNurse
+- proto: DisposalJunctionFlipped
   entities:
-  - uid: 654
+  - uid: 937
     components:
     - type: Transform
-      pos: 17.747555,-18.409605
+      pos: -0.5,-8.5
       parent: 1
-- proto: ClothingUniformJumpskirtOfLife
+- proto: DisposalPipe
   entities:
-  - uid: 655
+  - uid: 635
     components:
     - type: Transform
-      pos: 17.786142,-18.370012
+      rot: 3.141592653589793 rad
+      pos: -1.5,-25.5
       parent: 1
-- proto: ComfyChair
-  entities:
-  - uid: 659
+  - uid: 688
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,1.5
+      pos: -15.5,-19.5
       parent: 1
-  - uid: 660
+  - uid: 704
     components:
     - type: Transform
-      pos: 4.5,-16.5
+      pos: -14.5,-13.5
       parent: 1
-  - uid: 661
+  - uid: 758
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-18.5
+      pos: -14.5,-16.5
       parent: 1
-  - uid: 662
+  - uid: 760
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-18.5
+      pos: -14.5,-17.5
       parent: 1
-  - uid: 663
+  - uid: 772
     components:
     - type: Transform
-      pos: -5.5,-16.5
+      pos: -14.5,-18.5
       parent: 1
-  - uid: 664
+  - uid: 887
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-9.5
+      pos: -14.5,-15.5
       parent: 1
-  - uid: 665
+  - uid: 888
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-9.5
+      pos: -14.5,-14.5
       parent: 1
-- proto: ComputerCrewMonitoring
-  entities:
-  - uid: 666
+  - uid: 892
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,6.5
+      pos: -17.5,-18.5
       parent: 1
-- proto: ComputerPowerMonitoring
-  entities:
-  - uid: 667
+  - uid: 893
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-19.5
       parent: 1
-- proto: ComputerRadar
-  entities:
-  - uid: 668
+  - uid: 894
     components:
     - type: Transform
-      pos: -2.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-19.5
       parent: 1
-- proto: ComputerSalvageExpedition
-  entities:
-  - uid: 669
+  - uid: 895
     components:
     - type: Transform
-      pos: -0.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-19.5
       parent: 1
-- proto: ComputerShuttle
-  entities:
-  - uid: 670
+  - uid: 896
     components:
     - type: Transform
-      pos: 1.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-19.5
       parent: 1
-- proto: ComputerSolarControl
-  entities:
-  - uid: 671
+  - uid: 897
     components:
     - type: Transform
-      pos: -1.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-19.5
       parent: 1
-- proto: ComputerStationRecords
-  entities:
-  - uid: 672
+  - uid: 898
     components:
     - type: Transform
-      pos: 0.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-19.5
       parent: 1
-- proto: CrateHydroponicsSeeds
-  entities:
-  - uid: 674
+  - uid: 899
     components:
     - type: Transform
-      pos: 2.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-19.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-- proto: CrateHydroponicsTools
-  entities:
-  - uid: 675
+  - uid: 900
     components:
     - type: Transform
-      pos: 5.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-19.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-- proto: CryoPod
-  entities:
-  - uid: 676
+  - uid: 901
     components:
     - type: Transform
-      pos: 16.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: CryoxadoneBeakerSmall
-  entities:
-  - uid: 677
+  - uid: 902
     components:
     - type: Transform
-      pos: 17.275366,-18.143486
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-19.5
       parent: 1
-    - type: CollisionWake
-      enabled: False
-    - type: Physics
-      sleepingAllowed: False
-  - uid: 678
+  - uid: 903
     components:
     - type: Transform
-      pos: 17.598927,-18.155516
+      rot: 3.141592653589793 rad
+      pos: -1.5,-24.5
       parent: 1
-    - type: CollisionWake
-      enabled: False
-    - type: Physics
-      sleepingAllowed: False
-- proto: DefibrillatorCabinetFilled
-  entities:
-  - uid: 679
+  - uid: 905
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,-17.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-19.5
       parent: 1
-- proto: DiceBag
-  entities:
-  - uid: 680
+  - uid: 908
     components:
     - type: Transform
-      pos: -0.988676,-17.83214
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-26.5
       parent: 1
-  - uid: 681
+  - uid: 909
     components:
     - type: Transform
-      pos: -0.566801,-17.819157
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-26.5
       parent: 1
-  - uid: 682
+  - uid: 913
     components:
     - type: Transform
-      pos: -0.19180101,-17.850407
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-19.5
       parent: 1
-- proto: DisposalBend
-  entities:
-  - uid: 683
+  - uid: 914
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-19.5
       parent: 1
-  - uid: 684
+  - uid: 915
     components:
     - type: Transform
-      pos: 15.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-19.5
       parent: 1
-- proto: DisposalPipe
-  entities:
-  - uid: 685
+  - uid: 916
     components:
     - type: Transform
-      pos: 4.5,-15.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-19.5
       parent: 1
-  - uid: 686
+  - uid: 917
     components:
     - type: Transform
-      pos: 4.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-19.5
       parent: 1
-  - uid: 687
+  - uid: 918
     components:
     - type: Transform
-      pos: 4.5,-16.5
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-19.5
       parent: 1
-  - uid: 688
+  - uid: 919
     components:
     - type: Transform
-      pos: 4.5,-17.5
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-19.5
       parent: 1
-  - uid: 689
+  - uid: 920
     components:
     - type: Transform
-      pos: 4.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-19.5
       parent: 1
-  - uid: 690
+  - uid: 921
     components:
     - type: Transform
-      pos: 4.5,-19.5
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-19.5
       parent: 1
-  - uid: 691
+  - uid: 922
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-19.5
       parent: 1
-  - uid: 692
+  - uid: 923
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-19.5
       parent: 1
-  - uid: 693
+  - uid: 925
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-18.5
       parent: 1
-  - uid: 694
+  - uid: 926
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-17.5
       parent: 1
-  - uid: 695
+  - uid: 929
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-16.5
       parent: 1
-  - uid: 696
+  - uid: 930
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-15.5
       parent: 1
-  - uid: 697
+  - uid: 931
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-14.5
       parent: 1
-  - uid: 698
+  - uid: 932
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-13.5
       parent: 1
-  - uid: 699
+  - uid: 933
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-12.5
       parent: 1
-  - uid: 700
+  - uid: 934
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-11.5
       parent: 1
-  - uid: 701
+  - uid: 935
     components:
     - type: Transform
-      pos: 15.5,-21.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-10.5
       parent: 1
-  - uid: 702
+  - uid: 936
     components:
     - type: Transform
-      pos: 15.5,-22.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-9.5
       parent: 1
-  - uid: 703
+  - uid: 938
     components:
     - type: Transform
-      pos: 15.5,-23.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-7.5
       parent: 1
-- proto: DisposalTrunk
-  entities:
-  - uid: 704
+  - uid: 939
     components:
     - type: Transform
-      pos: 4.5,-13.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-6.5
       parent: 1
-- proto: DisposalUnit
-  entities:
-  - uid: 705
+  - uid: 941
     components:
     - type: Transform
-      pos: 4.5,-13.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-4.5
       parent: 1
-- proto: DogBed
-  entities:
-  - uid: 706
+  - uid: 942
     components:
     - type: Transform
-      pos: -4.5,3.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-3.5
       parent: 1
-- proto: DrinkMugOne
-  entities:
-  - uid: 707
+  - uid: 943
     components:
     - type: Transform
-      pos: -0.21170354,6.7031326
+      rot: 3.141592653589793 rad
+      pos: -0.5,-2.5
       parent: 1
-- proto: DrinkWineBottleFull
-  entities:
-  - uid: 708
+  - uid: 944
     components:
     - type: Transform
-      pos: -6.6023116,2.597079
+      rot: 3.141592653589793 rad
+      pos: -0.5,-1.5
       parent: 1
-- proto: DrinkWineGlass
-  entities:
-  - uid: 709
+  - uid: 945
     components:
     - type: Transform
-      pos: -6.2273116,2.081454
+      rot: 3.141592653589793 rad
+      pos: -0.5,-0.5
       parent: 1
-  - uid: 710
+  - uid: 946
     components:
     - type: Transform
-      pos: -6.6491866,1.847079
+      rot: 3.141592653589793 rad
+      pos: -0.5,0.5
       parent: 1
-- proto: ExtinguisherCabinet
-  entities:
-  - uid: 713
+  - uid: 950
     components:
     - type: Transform
-      pos: 5.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-8.5
       parent: 1
-  - uid: 714
+  - uid: 951
     components:
     - type: Transform
-      pos: -6.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-8.5
       parent: 1
-- proto: ExtinguisherCabinetFilled
-  entities:
-  - uid: 715
+  - uid: 952
     components:
     - type: Transform
-      pos: 11.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-8.5
       parent: 1
-  - uid: 716
+  - uid: 953
     components:
     - type: Transform
-      pos: -12.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-8.5
       parent: 1
-  - uid: 717
+  - uid: 954
     components:
     - type: Transform
-      pos: -0.5,-0.5
-      parent: 1
-- proto: FaxMachineShip
-  entities:
-  - uid: 718
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 1
-- proto: filingCabinetDrawerRandom
-  entities:
-  - uid: 719
-    components:
-    - type: Transform
-      pos: 5.5,1.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-5.5
       parent: 1
-- proto: Firelock
-  entities:
-  - uid: 720
+  - uid: 955
     components:
     - type: Transform
-      pos: -7.5,-21.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-5.5
       parent: 1
-  - uid: 721
+  - uid: 956
     components:
     - type: Transform
-      pos: -1.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-5.5
       parent: 1
-  - uid: 722
+  - uid: 957
     components:
     - type: Transform
-      pos: 0.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-5.5
       parent: 1
-  - uid: 723
+  - uid: 967
     components:
     - type: Transform
-      pos: -2.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-19.5
       parent: 1
-  - uid: 724
+  - uid: 970
     components:
     - type: Transform
-      pos: -0.5,3.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,-21.5
       parent: 1
-  - uid: 725
+  - uid: 971
     components:
     - type: Transform
-      pos: -6.5,-21.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,-22.5
       parent: 1
-  - uid: 726
+  - uid: 972
     components:
     - type: Transform
-      pos: 5.5,-21.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,-23.5
       parent: 1
-  - uid: 727
+  - uid: 974
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -2.5,-2.5
+      pos: 2.5,-19.5
       parent: 1
-  - uid: 728
+  - uid: 980
     components:
     - type: Transform
-      pos: 6.5,-21.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,2.5
       parent: 1
-- proto: FirelockEdge
-  entities:
-  - uid: 729
+  - uid: 981
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,2.5
       parent: 1
-  - uid: 730
+  - uid: 982
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,2.5
       parent: 1
-  - uid: 731
+  - uid: 983
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-5.5
+      pos: 4.5,3.5
       parent: 1
-  - uid: 732
+- proto: DisposalTrunk
+  entities:
+  - uid: 10
     components:
     - type: Transform
-      pos: -2.5,-14.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,4.5
       parent: 1
-  - uid: 733
+  - uid: 810
     components:
     - type: Transform
-      pos: -1.5,-14.5
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-12.5
       parent: 1
-  - uid: 734
+  - uid: 910
     components:
     - type: Transform
-      pos: -0.5,-14.5
+      pos: -0.5,-19.5
       parent: 1
-  - uid: 735
+  - uid: 911
     components:
     - type: Transform
-      pos: 0.5,-14.5
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-26.5
       parent: 1
-  - uid: 736
+  - uid: 924
     components:
     - type: Transform
-      pos: 1.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-19.5
       parent: 1
-  - uid: 737
+  - uid: 947
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-19.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,1.5
       parent: 1
-  - uid: 738
+  - uid: 958
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -6.5,-20.5
+      pos: -5.5,-5.5
       parent: 1
-  - uid: 739
+  - uid: 959
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 5.5,-19.5
+      pos: 4.5,-8.5
       parent: 1
-  - uid: 740
+- proto: DisposalUnit
+  entities:
+  - uid: 96
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-20.5
+      pos: -15.5,-12.5
       parent: 1
-  - uid: 741
+  - uid: 602
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-22.5
+      pos: 4.5,-8.5
       parent: 1
-  - uid: 742
+  - uid: 695
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-22.5
+      pos: 1.5,1.5
       parent: 1
-  - uid: 743
+  - uid: 696
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-22.5
+      pos: 14.5,-19.5
       parent: 1
-- proto: FirelockGlass
-  entities:
-  - uid: 744
+  - uid: 785
     components:
     - type: Transform
-      pos: -3.5,-13.5
+      pos: -5.5,-5.5
       parent: 1
-  - uid: 745
+  - uid: 817
     components:
     - type: Transform
-      pos: 2.5,-14.5
+      pos: -0.5,-19.5
       parent: 1
-  - uid: 746
+- proto: DogBed
+  entities:
+  - uid: 706
     components:
     - type: Transform
-      pos: -3.5,-14.5
+      pos: -4.5,3.5
       parent: 1
-  - uid: 747
+- proto: DresserFilled
+  entities:
+  - uid: 470
     components:
     - type: Transform
-      pos: 2.5,-12.5
+      pos: -4.5,-24.5
       parent: 1
-  - uid: 748
+- proto: DrinkGlass
+  entities:
+  - uid: 568
     components:
     - type: Transform
-      pos: 4.5,-14.5
+      pos: -4.7032313,-5.4821234
       parent: 1
-  - uid: 749
+  - uid: 1770
     components:
     - type: Transform
-      pos: 2.5,-13.5
+      pos: -4.3751063,-5.48545
       parent: 1
-  - uid: 750
+  - uid: 1771
     components:
     - type: Transform
-      pos: 2.5,-11.5
+      pos: -4.1094813,-5.3292
       parent: 1
-  - uid: 751
+- proto: DrinkMugOne
+  entities:
+  - uid: 701
     components:
     - type: Transform
-      pos: -5.5,-14.5
+      pos: -0.25845867,6.7074924
       parent: 1
-  - uid: 752
+- proto: DrinkShotGlass
+  entities:
+  - uid: 569
     components:
     - type: Transform
-      pos: -4.5,-14.5
+      pos: -6.297799,2.5893223
       parent: 1
-  - uid: 753
+  - uid: 1769
     components:
     - type: Transform
-      pos: 3.5,-14.5
+      pos: -6.308756,2.0965161
       parent: 1
-  - uid: 754
+- proto: DrinkWineBottleFull
+  entities:
+  - uid: 708
     components:
     - type: Transform
-      pos: 11.5,-19.5
+      pos: -6.6023116,2.597079
       parent: 1
-  - uid: 755
+- proto: ExtinguisherCabinet
+  entities:
+  - uid: 547
     components:
     - type: Transform
-      pos: 11.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-5.5
       parent: 1
-  - uid: 756
+  - uid: 714
     components:
     - type: Transform
-      pos: -12.5,-19.5
+      pos: -6.5,-7.5
       parent: 1
-  - uid: 757
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 689
     components:
     - type: Transform
-      pos: -12.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-16.5
       parent: 1
-  - uid: 758
+  - uid: 889
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -2.5,-8.5
+      pos: -12.5,-16.5
       parent: 1
-  - uid: 759
+- proto: FaxMachineShip
+  entities:
+  - uid: 718
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-8.5
+      pos: 3.5,1.5
       parent: 1
-  - uid: 760
+- proto: filingCabinetDrawerRandom
+  entities:
+  - uid: 719
     components:
     - type: Transform
-      pos: -3.5,-11.5
+      pos: 5.5,1.5
       parent: 1
-  - uid: 761
+- proto: filingCabinetRandom
+  entities:
+  - uid: 634
     components:
     - type: Transform
-      pos: -3.5,-12.5
+      pos: 4.5,-12.5
       parent: 1
-  - uid: 762
+- proto: FirelockGlass
+  entities:
+  - uid: 573
     components:
     - type: Transform
-      pos: 15.5,-13.5
+      pos: 6.5,-21.5
       parent: 1
-  - uid: 763
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 16
+  - uid: 574
     components:
     - type: Transform
-      pos: 14.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,2.5
       parent: 1
-  - uid: 764
+    - type: DeviceNetwork
+      deviceLists:
+      - 1326
+  - uid: 575
     components:
     - type: Transform
-      pos: 13.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,3.5
       parent: 1
-  - uid: 765
+    - type: DeviceNetwork
+      deviceLists:
+      - 1326
+  - uid: 576
     components:
     - type: Transform
-      pos: 12.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-0.5
       parent: 1
-  - uid: 766
+    - type: DeviceNetwork
+      deviceLists:
+      - 1326
+      - 730
+  - uid: 577
     components:
     - type: Transform
-      pos: -14.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-0.5
       parent: 1
-  - uid: 767
+    - type: DeviceNetwork
+      deviceLists:
+      - 1326
+      - 730
+  - uid: 578
     components:
     - type: Transform
-      pos: -13.5,-13.5
+      pos: 5.5,-21.5
       parent: 1
-- proto: Fireplace
-  entities:
-  - uid: 768
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 16
+  - uid: 579
     components:
     - type: Transform
-      pos: -5.5,3.5
+      pos: -7.5,-21.5
       parent: 1
-- proto: FloorDrain
-  entities:
-  - uid: 769
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 1758
+  - uid: 581
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-2.5
+      pos: -6.5,-21.5
       parent: 1
-    - type: Fixtures
-      fixtures: {}
-  - uid: 770
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 1758
+  - uid: 628
     components:
     - type: Transform
-      pos: -3.5,-28.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-2.5
       parent: 1
-    - type: Fixtures
-      fixtures: {}
-  - uid: 771
+    - type: DeviceNetwork
+      deviceLists:
+      - 730
+  - uid: 754
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-6.5
+      pos: 11.5,-19.5
       parent: 1
-    - type: Fixtures
-      fixtures: {}
-  - uid: 772
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 571
+  - uid: 755
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-6.5
+      pos: 11.5,-20.5
       parent: 1
-    - type: Fixtures
-      fixtures: {}
-- proto: FloorWaterEntity
-  entities:
-  - uid: 773
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 571
+  - uid: 756
     components:
     - type: Transform
-      pos: -14.5,-22.5
+      pos: -12.5,-19.5
       parent: 1
-  - uid: 774
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 698
+  - uid: 757
     components:
     - type: Transform
-      pos: -14.5,-23.5
+      pos: -12.5,-20.5
       parent: 1
-  - uid: 775
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 698
+  - uid: 762
     components:
     - type: Transform
-      pos: -13.5,-22.5
+      pos: 15.5,-13.5
       parent: 1
-  - uid: 776
+    - type: DeviceNetwork
+      deviceLists:
+      - 571
+  - uid: 763
     components:
     - type: Transform
-      pos: -13.5,-23.5
+      pos: 14.5,-13.5
       parent: 1
-  - uid: 777
+    - type: DeviceNetwork
+      deviceLists:
+      - 571
+  - uid: 764
     components:
     - type: Transform
-      pos: -13.5,-24.5
+      pos: 13.5,-13.5
       parent: 1
-- proto: GasAnalyzer
-  entities:
-  - uid: 780
+    - type: DeviceNetwork
+      deviceLists:
+      - 571
+  - uid: 765
     components:
     - type: Transform
-      pos: 8.679014,-24.362837
+      pos: 12.5,-13.5
       parent: 1
-- proto: GasFilter
-  entities:
-  - uid: 781
+    - type: DeviceNetwork
+      deviceLists:
+      - 571
+  - uid: 766
     components:
     - type: Transform
-      pos: 6.5,-25.5
+      pos: -14.5,-13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 782
+    - type: DeviceNetwork
+      deviceLists:
+      - 698
+  - uid: 767
     components:
     - type: Transform
-      pos: 6.5,-24.5
+      pos: -13.5,-13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 783
+    - type: DeviceNetwork
+      deviceLists:
+      - 698
+  - uid: 968
     components:
     - type: Transform
-      pos: 6.5,-26.5
+      pos: 0.5,-9.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 784
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 730
+  - uid: 987
     components:
     - type: Transform
-      pos: 15.5,-16.5
+      pos: -0.5,-9.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasMixer
-  entities:
-  - uid: 785
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 730
+  - uid: 988
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-23.5
+      pos: -1.5,-9.5
       parent: 1
-    - type: GasMixer
-      inletTwoConcentration: 0.56
-      inletOneConcentration: 0.44
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 786
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 730
+  - uid: 991
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-23.5
+      pos: -1.5,-22.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasPassiveVent
-  entities:
-  - uid: 787
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 1747
+  - uid: 992
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,-28.5
+      pos: -0.5,-22.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasPipeBend
-  entities:
-  - uid: 788
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 1747
+  - uid: 993
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-18.5
+      pos: 0.5,-22.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 789
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+      - 1747
+  - uid: 1229
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-19.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-8.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 790
+    - type: DeviceNetwork
+      deviceLists:
+      - 730
+      - 871
+  - uid: 1231
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -2.5,-19.5
+      pos: 1.5,-8.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 791
+    - type: DeviceNetwork
+      deviceLists:
+      - 730
+  - uid: 1234
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-11.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 792
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+  - uid: 1236
     components:
     - type: Transform
-      pos: 3.5,-19.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-7.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 793
+  - uid: 1647
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-20.5
+      pos: -15.5,-19.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 794
+  - uid: 1756
     components:
     - type: Transform
-      pos: 4.5,-18.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-21.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 795
+    - type: DeviceNetwork
+      deviceLists:
+      - 571
+- proto: Fireplace
+  entities:
+  - uid: 768
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-19.5
+      pos: -5.5,3.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 796
+- proto: FlippoLighter
+  entities:
+  - uid: 691
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,-19.5
+      pos: -6.250924,1.3861973
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 797
+- proto: FloorDrain
+  entities:
+  - uid: 567
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-19.5
+      pos: -17.5,-18.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 798
+    - type: Fixtures
+      fixtures: {}
+  - uid: 720
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-20.5
+      pos: -4.5,-28.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 799
+    - type: Fixtures
+      fixtures: {}
+- proto: FloorTileItemBoxing
+  entities:
+  - uid: 342
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-23.5
+      pos: 4.5,-2.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 800
+  - uid: 784
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-27.5
+      pos: 3.5,-3.5
       parent: 1
-  - uid: 801
+  - uid: 792
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-26.5
+      pos: 3.5,-1.5
       parent: 1
-  - uid: 802
+  - uid: 848
     components:
     - type: Transform
-      pos: 10.5,-26.5
+      pos: 4.5,-3.5
       parent: 1
-  - uid: 803
+- proto: FloorWaterEntity
+  entities:
+  - uid: 123
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-23.5
+      pos: -13.5,-22.5
       parent: 1
-  - uid: 804
+  - uid: 777
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,-17.5
+      pos: -13.5,-24.5
       parent: 1
-  - uid: 805
+  - uid: 1402
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,-15.5
+      pos: -14.5,-22.5
       parent: 1
-  - uid: 806
+  - uid: 1437
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 15.5,-15.5
+      pos: -13.5,-23.5
       parent: 1
-  - uid: 807
+  - uid: 1439
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 15.5,-17.5
+      pos: -14.5,-23.5
       parent: 1
-  - uid: 808
+- proto: GasAnalyzer
+  entities:
+  - uid: 748
     components:
     - type: Transform
-      pos: 13.5,-20.5
+      pos: 10.5,-24.5
       parent: 1
-- proto: GasPipeFourway
+- proto: GasFilterNitrogenOn
   entities:
-  - uid: 809
+  - uid: 606
     components:
     - type: Transform
-      pos: 16.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-24.5
       parent: 1
-  - uid: 810
+- proto: GasFilterOxygenOn
+  entities:
+  - uid: 1394
     components:
     - type: Transform
-      pos: -1.5,-19.5
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-24.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 811
+- proto: GasMixerOnFlipped
+  entities:
+  - uid: 463
     components:
     - type: Transform
-      pos: 0.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-22.5
       parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.20999998
+      inletOneConcentration: 0.79
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 812
+- proto: GasOutletInjector
+  entities:
+  - uid: 427
     components:
     - type: Transform
-      pos: -1.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: 7.5,-26.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 813
+  - uid: 436
     components:
     - type: Transform
-      pos: 0.5,-18.5
+      rot: 3.141592653589793 rad
+      pos: 5.5,-26.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 814
+- proto: GasPassiveVent
+  entities:
+  - uid: 421
     components:
     - type: Transform
-      pos: 0.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-27.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 815
+  - uid: 430
     components:
     - type: Transform
-      pos: -1.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-27.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 816
+  - uid: 469
     components:
     - type: Transform
-      pos: -1.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-26.5
       parent: 1
-  - uid: 817
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 633
     components:
     - type: Transform
-      pos: -1.5,-27.5
+      rot: 3.141592653589793 rad
+      pos: -14.5,-22.5
       parent: 1
-- proto: GasPipeStraight
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+- proto: GasPipeBend
   entities:
-  - uid: 818
+  - uid: 66
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-2.5
+      pos: -13.5,-21.5
       parent: 1
-  - uid: 819
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+  - uid: 424
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 13.5,-16.5
+      pos: 4.5,-24.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 820
+      color: '#990000FF'
+  - uid: 448
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -0.5,-18.5
+      pos: 6.5,-27.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 821
+  - uid: 454
     components:
     - type: Transform
-      pos: -1.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-27.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 822
+  - uid: 459
     components:
     - type: Transform
-      pos: -1.5,-17.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-23.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 823
+  - uid: 476
     components:
     - type: Transform
-      pos: -1.5,-16.5
+      rot: 3.141592653589793 rad
+      pos: 9.5,-26.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 824
+  - uid: 678
     components:
     - type: Transform
-      pos: -1.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-22.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 825
+  - uid: 716
     components:
     - type: Transform
-      pos: -1.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-22.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 826
+  - uid: 1076
     components:
     - type: Transform
-      pos: -1.5,-13.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-11.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 827
+      color: '#0055CCFF'
+  - uid: 1077
     components:
     - type: Transform
-      pos: -1.5,-12.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-9.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 828
+  - uid: 1111
     components:
     - type: Transform
-      pos: -1.5,-11.5
+      rot: 3.141592653589793 rad
+      pos: -3.5,-8.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 829
+  - uid: 1176
     components:
     - type: Transform
-      pos: -1.5,-10.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-6.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 830
+  - uid: 1295
     components:
     - type: Transform
-      pos: -1.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,0.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 831
+      color: '#0055CCFF'
+  - uid: 1311
     components:
     - type: Transform
-      pos: -1.5,-8.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-8.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 832
+      color: '#0055CCFF'
+  - uid: 1323
     components:
     - type: Transform
-      pos: -1.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,5.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 833
+      color: '#0055CCFF'
+  - uid: 1429
     components:
     - type: Transform
-      pos: -1.5,-6.5
+      rot: 3.141592653589793 rad
+      pos: -13.5,-20.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 834
+      color: '#0055CCFF'
+  - uid: 1436
     components:
     - type: Transform
-      pos: -1.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-21.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 835
+      color: '#03FCD3FF'
+  - uid: 1544
     components:
     - type: Transform
-      pos: -1.5,-4.5
+      pos: -13.5,-11.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 836
+      color: '#0055CCFF'
+  - uid: 1633
     components:
     - type: Transform
-      pos: -1.5,-2.5
+      pos: -14.5,-9.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 837
+- proto: GasPipeFourway
+  entities:
+  - uid: 1008
     components:
     - type: Transform
-      pos: 0.5,-3.5
+      pos: 12.5,-20.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 838
+  - uid: 1098
     components:
     - type: Transform
-      pos: 0.5,-4.5
+      pos: -1.5,-19.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 839
+      color: '#990000FF'
+  - uid: 1127
     components:
     - type: Transform
-      pos: 0.5,-5.5
+      pos: 0.5,-20.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 840
+  - uid: 1727
     components:
     - type: Transform
-      pos: 0.5,-6.5
+      pos: 0.5,-27.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 841
+- proto: GasPipeStraight
+  entities:
+  - uid: 41
     components:
     - type: Transform
-      pos: 0.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-19.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 842
+      color: '#990000FF'
+  - uid: 258
     components:
     - type: Transform
-      pos: 0.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-24.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 843
+  - uid: 261
     components:
     - type: Transform
-      pos: 0.5,-9.5
+      pos: 6.5,-25.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 844
+  - uid: 262
     components:
     - type: Transform
-      pos: 0.5,-10.5
+      pos: 8.5,-25.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 845
+  - uid: 423
     components:
     - type: Transform
-      pos: 0.5,-11.5
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-23.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 846
+  - uid: 437
     components:
     - type: Transform
-      pos: 0.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-24.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 847
+      color: '#990000FF'
+  - uid: 438
     components:
     - type: Transform
-      pos: 0.5,-13.5
+      rot: 3.141592653589793 rad
+      pos: 5.5,-25.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 848
+  - uid: 439
     components:
     - type: Transform
-      pos: 0.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-22.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 849
+  - uid: 442
     components:
     - type: Transform
-      pos: 0.5,-15.5
+      rot: 3.141592653589793 rad
+      pos: 8.5,-26.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 850
+  - uid: 444
     components:
     - type: Transform
-      pos: 0.5,-16.5
+      rot: 3.141592653589793 rad
+      pos: 6.5,-26.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 851
+  - uid: 455
     components:
     - type: Transform
-      pos: 0.5,-17.5
+      pos: 8.5,-23.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 852
+  - uid: 456
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -2.5,-18.5
+      pos: 9.5,-23.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 853
+  - uid: 467
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-18.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-26.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 854
+      color: '#990000FF'
+  - uid: 468
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-26.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 855
+  - uid: 472
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: 7.5,-25.5
+      parent: 1
+  - uid: 989
+    components:
+    - type: Transform
+      pos: 5.5,-20.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 856
+  - uid: 998
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-20.5
+      pos: 5.5,-21.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 857
+  - uid: 999
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,-20.5
+      pos: 6.5,-21.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 858
+      color: '#0055CCFF'
+  - uid: 1000
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -8.5,-20.5
+      pos: 5.5,-20.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 859
+      color: '#0055CCFF'
+  - uid: 1001
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -9.5,-20.5
+      pos: 7.5,-20.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 860
+      color: '#0055CCFF'
+  - uid: 1002
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -10.5,-20.5
+      pos: 4.5,-20.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 861
+      color: '#0055CCFF'
+  - uid: 1003
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -11.5,-20.5
+      pos: 6.5,-19.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 862
+  - uid: 1004
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -4.5,-19.5
+      pos: 8.5,-20.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 863
+  - uid: 1005
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -5.5,-19.5
+      pos: 9.5,-20.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 864
+  - uid: 1006
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -6.5,-19.5
+      pos: 10.5,-20.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 865
+  - uid: 1007
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -8.5,-19.5
+      pos: 11.5,-20.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 866
+  - uid: 1009
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: 12.5,-21.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 867
+  - uid: 1010
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-19.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-19.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 868
+      color: '#990000FF'
+  - uid: 1011
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-19.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-19.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 869
+      color: '#990000FF'
+  - uid: 1012
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-18.5
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-19.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 870
+      color: '#990000FF'
+  - uid: 1013
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-18.5
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-19.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 871
+      color: '#990000FF'
+  - uid: 1014
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-18.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-19.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 872
+      color: '#990000FF'
+  - uid: 1015
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-19.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-19.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 873
+  - uid: 1017
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 0.5,-19.5
+      pos: 13.5,-20.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 874
+      color: '#0055CCFF'
+  - uid: 1018
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 1.5,-19.5
+      pos: 14.5,-20.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 875
+      color: '#0055CCFF'
+  - uid: 1019
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-19.5
+      pos: 15.5,-20.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 876
+      color: '#0055CCFF'
+  - uid: 1020
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-20.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 877
+  - uid: 1021
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 5.5,-21.5
+      pos: 13.5,-20.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 878
+      color: '#990000FF'
+  - uid: 1022
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: 13.5,-21.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 879
+  - uid: 1027
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 5.5,-20.5
+      pos: 14.5,-18.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 880
+  - uid: 1028
     components:
     - type: Transform
-      pos: 6.5,-21.5
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-18.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 881
+  - uid: 1029
     components:
     - type: Transform
-      pos: 6.5,-22.5
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-18.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 882
+  - uid: 1031
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: 12.5,-19.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 883
+  - uid: 1032
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: 12.5,-18.5
       parent: 1
-  - uid: 884
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1035
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: 12.5,-17.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 885
+  - uid: 1047
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: 12.5,-16.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 886
+  - uid: 1048
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: 12.5,-15.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 887
+  - uid: 1056
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: 12.5,-14.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 888
+  - uid: 1058
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: 12.5,-13.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 889
+  - uid: 1062
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 12.5,-19.5
+      pos: 12.5,-12.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 890
+      color: '#0055CCFF'
+  - uid: 1066
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-11.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 891
+      color: '#0055CCFF'
+  - uid: 1070
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-11.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 892
+      color: '#0055CCFF'
+  - uid: 1071
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-11.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 893
+      color: '#0055CCFF'
+  - uid: 1074
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-11.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 894
+      color: '#0055CCFF'
+  - uid: 1075
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-11.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 895
+      color: '#0055CCFF'
+  - uid: 1078
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-19.5
+      pos: 13.5,-17.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 896
+      color: '#990000FF'
+  - uid: 1079
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-20.5
+      pos: 13.5,-16.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 897
+  - uid: 1080
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-20.5
+      pos: 13.5,-15.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 898
+  - uid: 1081
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.5,-18.5
+      pos: 13.5,-14.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 899
+  - uid: 1082
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.5,-17.5
+      pos: 13.5,-13.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 900
+  - uid: 1083
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 13.5,-18.5
+      pos: 13.5,-12.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 901
+      color: '#990000FF'
+  - uid: 1085
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 13.5,-17.5
+      pos: 13.5,-11.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 902
+      color: '#990000FF'
+  - uid: 1086
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 13.5,-15.5
+      pos: 13.5,-10.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 903
+      color: '#990000FF'
+  - uid: 1087
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 13.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-9.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 904
+      color: '#990000FF'
+  - uid: 1088
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-9.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 905
+      color: '#990000FF'
+  - uid: 1089
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-17.5
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-9.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 906
+      color: '#990000FF'
+  - uid: 1091
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-16.5
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-9.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 907
+      color: '#990000FF'
+  - uid: 1099
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-14.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-19.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 908
+      color: '#990000FF'
+  - uid: 1100
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-19.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 909
+      color: '#990000FF'
+  - uid: 1101
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-18.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-19.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 910
+  - uid: 1102
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-19.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-19.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 911
+  - uid: 1103
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-17.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-19.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 912
+  - uid: 1104
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 1.5,-2.5
+      pos: -2.5,-19.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 913
+      color: '#990000FF'
+  - uid: 1105
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 2.5,-2.5
+      pos: -3.5,-19.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 914
+      color: '#990000FF'
+  - uid: 1107
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-19.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 915
+      color: '#990000FF'
+  - uid: 1108
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-3.5
+      pos: -5.5,-18.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 916
+  - uid: 1112
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-23.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,-18.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 917
+      color: '#990000FF'
+  - uid: 1115
     components:
     - type: Transform
-      pos: 6.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-8.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 918
+  - uid: 1116
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-2.5
+      pos: -1.5,-18.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 919
+      color: '#990000FF'
+  - uid: 1117
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-21.5
+      pos: -1.5,-17.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 920
+  - uid: 1118
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-19.5
+      pos: -1.5,-16.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 921
+      color: '#990000FF'
+  - uid: 1119
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-22.5
+      pos: -1.5,-15.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 922
+  - uid: 1123
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-20.5
+      pos: -1.5,-14.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 923
+  - uid: 1124
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 9.5,-26.5
-      parent: 1
-  - uid: 924
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,-27.5
-      parent: 1
-  - uid: 925
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-21.5
+      pos: 3.5,-20.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 926
+  - uid: 1125
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-22.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-20.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 927
+  - uid: 1126
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -1.5,-2.5
+      pos: 2.5,-20.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 928
+  - uid: 1131
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-2.5
+      pos: 0.5,-19.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 929
+  - uid: 1133
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-2.5
+      pos: 0.5,-17.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 930
+  - uid: 1134
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-3.5
+      pos: 0.5,-16.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 931
+      color: '#0055CCFF'
+  - uid: 1135
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-3.5
+      pos: 0.5,-15.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 932
+      color: '#0055CCFF'
+  - uid: 1138
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-14.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 933
+      color: '#0055CCFF'
+  - uid: 1139
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-13.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 934
+      color: '#0055CCFF'
+  - uid: 1148
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-12.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 935
+      color: '#0055CCFF'
+  - uid: 1149
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-12.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 936
+  - uid: 1150
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-12.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 937
+  - uid: 1151
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -1.5,-1.5
+      pos: 3.5,-17.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 938
+  - uid: 1154
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -1.5,-0.5
+      pos: 3.5,-16.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 939
+  - uid: 1159
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -1.5,0.5
+      pos: 3.5,-15.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 940
+  - uid: 1165
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,1.5
+      pos: 3.5,-13.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 941
+  - uid: 1168
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,1.5
+      pos: 3.5,-12.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 942
+  - uid: 1170
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,0.5
+      pos: 3.5,-11.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 943
+      color: '#990000FF'
+  - uid: 1179
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,0.5
+      pos: 3.5,-7.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 944
+      color: '#990000FF'
+  - uid: 1181
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,0.5
+      pos: 3.5,-8.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 945
+      color: '#990000FF'
+  - uid: 1182
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,0.5
+      pos: 3.5,-9.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 946
+      color: '#990000FF'
+  - uid: 1183
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,0.5
+      pos: 0.5,-11.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 947
+  - uid: 1185
     components:
     - type: Transform
-      pos: -1.5,2.5
+      pos: -1.5,-13.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 948
+  - uid: 1186
     components:
     - type: Transform
-      pos: -1.5,3.5
+      pos: -1.5,-12.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 949
+  - uid: 1187
     components:
     - type: Transform
-      pos: -1.5,4.5
+      pos: -1.5,-11.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 950
+  - uid: 1188
     components:
     - type: Transform
-      pos: 0.5,1.5
+      pos: 0.5,-10.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 951
+  - uid: 1189
     components:
     - type: Transform
-      pos: 0.5,2.5
+      pos: -1.5,-10.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 952
+      color: '#990000FF'
+  - uid: 1193
     components:
     - type: Transform
-      pos: 0.5,3.5
+      pos: -1.5,-9.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 953
+      color: '#990000FF'
+  - uid: 1198
     components:
     - type: Transform
-      pos: 0.5,4.5
+      pos: 0.5,-9.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 954
+  - uid: 1205
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-8.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 955
+      color: '#0055CCFF'
+  - uid: 1207
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,1.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,-9.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 956
+      color: '#0055CCFF'
+  - uid: 1213
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,1.5
+      pos: 2.5,-7.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 957
+      color: '#0055CCFF'
+  - uid: 1246
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,0.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 958
+  - uid: 1253
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,0.5
+      pos: -1.5,-6.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 959
+      color: '#990000FF'
+  - uid: 1256
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,0.5
+      pos: -1.5,-5.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 960
+      color: '#990000FF'
+  - uid: 1260
     components:
     - type: Transform
-      pos: -6.5,-21.5
+      pos: -1.5,-4.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 961
+  - uid: 1262
     components:
     - type: Transform
-      pos: -7.5,-20.5
+      pos: -1.5,-3.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 962
+      color: '#990000FF'
+  - uid: 1263
     components:
     - type: Transform
-      pos: -7.5,-21.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-4.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 963
+  - uid: 1264
     components:
     - type: Transform
-      pos: -6.5,-22.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-5.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 964
+      color: '#0055CCFF'
+  - uid: 1268
     components:
     - type: Transform
-      pos: -7.5,-22.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,-1.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 965
+      color: '#990000FF'
+  - uid: 1269
     components:
     - type: Transform
-      pos: -7.5,-23.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-7.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 966
+  - uid: 1270
     components:
     - type: Transform
-      pos: -6.5,-23.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-1.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 967
+      color: '#0055CCFF'
+  - uid: 1271
     components:
     - type: Transform
-      pos: -6.5,-24.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-1.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 968
+      color: '#0055CCFF'
+  - uid: 1272
     components:
     - type: Transform
-      pos: -7.5,-24.5
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 969
+  - uid: 1273
     components:
     - type: Transform
-      pos: -6.5,-25.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 970
+  - uid: 1274
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-2.5
       parent: 1
-  - uid: 971
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1277
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-24.5
+      pos: -1.5,-0.5
       parent: 1
-  - uid: 972
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1278
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-25.5
+      pos: 0.5,-0.5
       parent: 1
-  - uid: 973
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1280
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -1.5,-26.5
+      pos: -0.5,1.5
       parent: 1
-  - uid: 974
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1285
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,-27.5
+      pos: -2.5,0.5
       parent: 1
-  - uid: 975
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1287
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 0.5,-27.5
+      pos: -0.5,1.5
       parent: 1
-  - uid: 976
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1289
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-27.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,1.5
       parent: 1
-  - uid: 977
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1290
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,1.5
       parent: 1
-  - uid: 978
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1308
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,0.5
       parent: 1
-  - uid: 979
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1309
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,0.5
       parent: 1
-  - uid: 980
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1312
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,2.5
       parent: 1
-  - uid: 981
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1313
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-27.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,2.5
       parent: 1
-  - uid: 982
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1314
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 13.5,-16.5
+      pos: -3.5,2.5
       parent: 1
-  - uid: 983
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1315
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 14.5,-16.5
-      parent: 1
-  - uid: 984
-    components:
-    - type: Transform
-      pos: 13.5,-21.5
-      parent: 1
-  - uid: 985
-    components:
-    - type: Transform
-      pos: 13.5,-22.5
+      pos: -4.5,2.5
       parent: 1
-- proto: GasPipeTJunction
-  entities:
-  - uid: 986
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1316
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,2.5
       parent: 1
-  - uid: 987
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1318
     components:
     - type: Transform
-      pos: -6.5,-20.5
+      pos: -1.5,2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 988
+  - uid: 1319
     components:
     - type: Transform
-      pos: -7.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 989
+  - uid: 1320
     components:
     - type: Transform
-      pos: 5.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,3.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 990
+      color: '#990000FF'
+  - uid: 1321
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-22.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,4.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 991
+  - uid: 1322
     components:
     - type: Transform
-      pos: 6.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,4.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 992
+  - uid: 1327
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,-27.5
+      pos: 0.5,-21.5
       parent: 1
-  - uid: 993
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1328
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-16.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-20.5
       parent: 1
-  - uid: 994
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1329
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,-17.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-20.5
       parent: 1
-- proto: GasPort
-  entities:
-  - uid: 995
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1330
     components:
     - type: Transform
-      pos: 9.5,-22.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 996
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1331
     components:
     - type: Transform
-      pos: 8.5,-22.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 997
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1332
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-24.5
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 998
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1333
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 999
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1338
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-26.5
+      pos: -6.5,-21.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1000
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1339
     components:
     - type: Transform
-      pos: 10.5,-22.5
+      pos: -6.5,-22.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1001
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1342
     components:
     - type: Transform
-      pos: 17.5,-16.5
+      pos: -6.5,-23.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasPressurePump
-  entities:
-  - uid: 1002
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1343
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-23.5
+      pos: -6.5,-24.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1003
+  - uid: 1346
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 16.5,-16.5
+      pos: -7.5,-24.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasThermoMachineFreezer
-  entities:
-  - uid: 1004
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1348
     components:
     - type: Transform
-      pos: 17.5,-14.5
+      rot: 3.141592653589793 rad
+      pos: -7.5,-23.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasThermoMachineHeater
-  entities:
-  - uid: 1005
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1374
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -13.5,-24.5
+      pos: -7.5,-22.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1006
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1375
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 8.5,-25.5
+      pos: -7.5,-21.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasValve
-  entities:
-  - uid: 1007
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1377
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-26.5
+      rot: 3.141592653589793 rad
+      pos: -7.5,-20.5
       parent: 1
-    - type: GasValve
-      open: False
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasVentPump
-  entities:
-  - uid: 1008
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1379
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 5.5,-2.5
+      pos: -6.5,-19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1009
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1380
     components:
     - type: Transform
-      pos: -13.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1010
+      color: '#990000FF'
+  - uid: 1381
     components:
     - type: Transform
-      pos: 13.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1011
+      color: '#990000FF'
+  - uid: 1382
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1012
+      color: '#990000FF'
+  - uid: 1383
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1013
+      color: '#990000FF'
+  - uid: 1384
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,0.5
+      pos: -7.5,-20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1014
+  - uid: 1385
     components:
     - type: Transform
-      pos: 0.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1015
+  - uid: 1386
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1016
+  - uid: 1389
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1017
+  - uid: 1390
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 6.5,-22.5
+      pos: -11.5,-20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-- proto: GasVentScrubber
-  entities:
-  - uid: 1018
+  - uid: 1391
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-23.5
+      pos: -12.5,-20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1019
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1408
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 3.5,-3.5
+      pos: -12.5,-19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1020
+  - uid: 1421
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,1.5
+      pos: -13.5,-19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1021
+  - uid: 1422
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -13.5,-19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1022
-    components:
+      color: '#0055CCFF'
+  - uid: 1449
+    components:
     - type: Transform
-      pos: -1.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-18.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1023
+      color: '#0055CCFF'
+  - uid: 1450
     components:
     - type: Transform
-      pos: -14.5,-16.5
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-18.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1024
+      color: '#0055CCFF'
+  - uid: 1472
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-3.5
+      pos: -14.5,-18.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1025
+  - uid: 1473
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-26.5
+      pos: -14.5,-17.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1026
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-27.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1027
+  - uid: 1475
     components:
     - type: Transform
-      pos: 12.5,-15.5
+      pos: -13.5,-17.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1028
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1515
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1029
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1525
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-27.5
+      rot: 3.141592653589793 rad
+      pos: -14.5,-16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1030
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1526
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-27.5
+      rot: 3.141592653589793 rad
+      pos: -14.5,-15.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1031
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1529
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -1.5,-28.5
+      pos: -13.5,-15.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1032
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1541
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 13.5,-23.5
+      pos: -13.5,-14.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GravityGeneratorMini
-  entities:
-  - uid: 1033
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1549
     components:
     - type: Transform
-      pos: -11.5,-26.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-11.5
       parent: 1
-- proto: Grille
-  entities:
-  - uid: 1034
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1554
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-11.5
       parent: 1
-  - uid: 1035
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1556
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-11.5
       parent: 1
-  - uid: 1036
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1573
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-11.5
       parent: 1
-  - uid: 1037
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1582
     components:
     - type: Transform
-      pos: -2.5,8.5
+      rot: -1.5707963267948966 rad
+      pos: -18.5,-11.5
       parent: 1
-  - uid: 1038
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1584
     components:
     - type: Transform
-      pos: -1.5,8.5
+      rot: 3.141592653589793 rad
+      pos: -13.5,-12.5
       parent: 1
-  - uid: 1039
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1589
     components:
     - type: Transform
-      pos: -0.5,8.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-2.5
       parent: 1
-  - uid: 1040
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1590
     components:
     - type: Transform
-      pos: 0.5,8.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,0.5
       parent: 1
-  - uid: 1041
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1606
     components:
     - type: Transform
-      pos: 1.5,8.5
+      rot: 3.141592653589793 rad
+      pos: -13.5,-13.5
       parent: 1
-  - uid: 1042
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1622
     components:
     - type: Transform
-      pos: -7.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: -18.5,-9.5
       parent: 1
-  - uid: 1043
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1623
     components:
     - type: Transform
-      pos: -7.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: -17.5,-9.5
       parent: 1
-  - uid: 1044
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1627
     components:
     - type: Transform
-      pos: -19.5,-14.5
+      rot: 1.5707963267948966 rad
+      pos: -16.5,-9.5
       parent: 1
-  - uid: 1045
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1632
     components:
     - type: Transform
-      pos: -19.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-9.5
       parent: 1
-  - uid: 1046
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1635
     components:
     - type: Transform
-      pos: -19.5,-16.5
+      pos: -14.5,-10.5
       parent: 1
-  - uid: 1047
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1636
     components:
     - type: Transform
-      pos: -19.5,-17.5
+      pos: -14.5,-11.5
       parent: 1
-  - uid: 1048
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1637
     components:
     - type: Transform
-      pos: -19.5,-18.5
+      pos: -14.5,-12.5
       parent: 1
-  - uid: 1049
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1638
     components:
     - type: Transform
-      pos: -10.5,-18.5
+      pos: -14.5,-13.5
       parent: 1
-  - uid: 1050
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1651
     components:
     - type: Transform
-      pos: 7.5,-18.5
+      pos: -1.5,-20.5
       parent: 1
-  - uid: 1051
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1661
     components:
     - type: Transform
-      pos: 8.5,-18.5
+      pos: -1.5,-21.5
       parent: 1
-  - uid: 1052
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1662
     components:
     - type: Transform
-      pos: 9.5,-18.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-24.5
       parent: 1
-  - uid: 1053
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1664
     components:
     - type: Transform
-      pos: -9.5,-18.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-24.5
       parent: 1
-  - uid: 1054
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1674
     components:
     - type: Transform
-      pos: -8.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-23.5
       parent: 1
-  - uid: 1055
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1676
     components:
     - type: Transform
-      pos: -6.5,-16.5
+      pos: 0.5,-24.5
       parent: 1
-  - uid: 1056
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1683
     components:
     - type: Transform
-      pos: 5.5,-16.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-0.5
       parent: 1
-  - uid: 1057
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1692
     components:
     - type: Transform
-      pos: -6.5,-15.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-22.5
       parent: 1
-  - uid: 1058
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1711
     components:
     - type: Transform
-      pos: 5.5,-15.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-22.5
       parent: 1
-  - uid: 1059
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1714
     components:
     - type: Transform
-      pos: -12.5,-11.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-23.5
       parent: 1
-  - uid: 1060
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1716
     components:
     - type: Transform
-      pos: -12.5,-10.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-24.5
       parent: 1
-  - uid: 1061
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1717
     components:
     - type: Transform
-      pos: -12.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-23.5
       parent: 1
-  - uid: 1062
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1723
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1724
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 1.5,-1.5
+      pos: 0.5,-25.5
       parent: 1
-  - uid: 1063
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1725
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -14.5,-7.5
+      pos: 0.5,-26.5
       parent: 1
-  - uid: 1064
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1728
     components:
     - type: Transform
-      pos: 19.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-27.5
       parent: 1
-  - uid: 1065
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1731
     components:
     - type: Transform
-      pos: 13.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-27.5
       parent: 1
-  - uid: 1066
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1732
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-27.5
       parent: 1
-  - uid: 1067
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1733
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -6.5,-13.5
+      pos: -2.5,-27.5
       parent: 1
-  - uid: 1068
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1740
     components:
     - type: Transform
-      pos: 12.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-28.5
       parent: 1
-  - uid: 1069
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1741
     components:
     - type: Transform
-      pos: -20.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-28.5
       parent: 1
-  - uid: 1070
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1742
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-28.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1743
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 1.5,-2.5
+      pos: 0.5,-28.5
       parent: 1
-  - uid: 1071
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1745
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-12.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,-23.5
       parent: 1
-- proto: GunSafeShuttleCaptain
-  entities:
-  - uid: 639
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1746
     components:
     - type: Transform
-      pos: -3.5,-1.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,-25.5
       parent: 1
-- proto: Gyroscope
-  entities:
-  - uid: 1072
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1750
     components:
     - type: Transform
-      pos: -10.5,-26.5
+      pos: -1.5,-27.5
       parent: 1
-  - uid: 1073
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1751
     components:
     - type: Transform
-      pos: -9.5,-26.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-26.5
       parent: 1
-- proto: HospitalCurtains
-  entities:
-  - uid: 1074
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1752
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -17.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,-29.5
       parent: 1
-  - uid: 1075
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1753
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -4.5,-28.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-29.5
       parent: 1
-  - uid: 1076
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1761
     components:
     - type: Transform
-      pos: -3.5,-28.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-7.5
       parent: 1
-    - type: Occluder
-      enabled: False
-    - type: Door
-      state: Open
-    - type: Physics
-      canCollide: False
-- proto: HospitalCurtainsOpen
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeTJunction
   entities:
-  - uid: 640
+  - uid: 69
     components:
     - type: Transform
-      pos: -14.5,-21.5
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-18.5
       parent: 1
-- proto: hydroponicsTrayAnchored
-  entities:
-  - uid: 1078
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 457
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 5.5,-1.5
+      pos: 7.5,-23.5
       parent: 1
-  - uid: 1079
+  - uid: 458
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-1.5
+      pos: 8.5,-22.5
       parent: 1
-  - uid: 1080
+  - uid: 479
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.5,-1.5
+      pos: 9.5,-25.5
       parent: 1
-  - uid: 1081
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 510
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-1.5
+      pos: 9.5,-24.5
       parent: 1
-- proto: IntercomCommon
-  entities:
-  - uid: 1083
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 641
     components:
     - type: Transform
-      pos: -7.5,-18.5
+      rot: 3.141592653589793 rad
+      pos: 6.5,-22.5
       parent: 1
-  - uid: 1084
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 677
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -12.5,-25.5
+      pos: 4.5,-23.5
       parent: 1
-  - uid: 1085
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 996
     components:
     - type: Transform
-      pos: -18.5,-15.5
+      pos: 5.5,-19.5
       parent: 1
-- proto: IntercomMedical
-  entities:
-  - uid: 1087
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 997
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-15.5
+      pos: 6.5,-20.5
       parent: 1
-- proto: LampGold
-  entities:
-  - uid: 1090
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1016
     components:
     - type: Transform
-      pos: -14.404601,-8.26588
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-19.5
       parent: 1
-- proto: Lighter
-  entities:
-  - uid: 1091
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1026
     components:
     - type: Transform
-      pos: -6.293895,1.3893847
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-18.5
       parent: 1
-- proto: LockerBoozeFilled
-  entities:
-  - uid: 1092
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1095
     components:
     - type: Transform
-      pos: -6.5,-5.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,-19.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-- proto: LockerCaptainFilledHardsuit
-  entities:
-  - uid: 626
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1096
     components:
     - type: Transform
-      pos: -5.5,0.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,-19.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14908
-        moles:
-        - 1.606311
-        - 6.042789
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-- proto: LockerChiefEngineerFilledHardsuit
-  entities:
-  - uid: 1093
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1109
     components:
     - type: Transform
-      pos: -8.5,-26.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1132
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1141
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1171
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1199
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1206
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1241
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1242
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1250
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1251
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1279
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1282
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1288
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1310
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1334
+    components:
+    - type: Transform
+      pos: -6.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1378
+    components:
+    - type: Transform
+      pos: -7.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1400
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1423
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-23.5
+      parent: 1
+  - uid: 1480
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1503
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1698
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1713
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-22.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1715
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-22.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1722
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1744
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1748
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-26.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1749
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-28.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPort
+  entities:
+  - uid: 461
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-23.5
+      parent: 1
+  - uid: 462
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-22.5
+      parent: 1
+  - uid: 465
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-25.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 727
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1428
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-23.5
+      parent: 1
+- proto: GasPressurePump
+  entities:
+  - uid: 1084
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-22.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#03FCD3FF'
+- proto: GasPressurePumpOn
+  entities:
+  - uid: 420
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-24.5
+      parent: 1
+  - uid: 429
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-24.5
+      parent: 1
+- proto: GasPressurePumpOnMax
+  entities:
+  - uid: 460
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-26.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasThermoMachineHeater
+  entities:
+  - uid: 642
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-24.5
+      parent: 1
+- proto: GasVentPump
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-22.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 16
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1024
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-22.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 571
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1025
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-20.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 571
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1093
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 571
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1144
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-12.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1146
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-18.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1208
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1212
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1276
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-1.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 730
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1294
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1317
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,2.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1326
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1325
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1326
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1344
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-25.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1758
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1463
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,-18.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 698
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1500
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-16.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 698
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1614
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 698
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1720
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-22.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1747
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1721
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-23.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1747
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1734
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-27.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1747
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1735
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-27.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1747
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1736
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-30.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1760
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-6.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 730
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 636
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,-19.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 698
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1023
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,-22.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 571
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1030
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-18.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 571
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1094
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-9.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 571
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1110
+    components:
+    - type: Transform
+      pos: -5.5,-17.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1113
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1160
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-14.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 871
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1172
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1173
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1267
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1275
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-2.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 730
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1284
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,0.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1326
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1291
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1324
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1326
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1345
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,-25.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1758
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1499
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-14.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 698
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1615
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-9.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 698
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1712
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-22.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1747
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1718
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-24.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1747
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1737
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-30.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1738
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-26.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1747
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1739
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-28.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1747
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1763
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-7.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 730
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GlowstickBase
+  entities:
+  - uid: 1777
+    components:
+    - type: Transform
+      pos: 2.6357017,-27.660505
+      parent: 1
+- proto: GlowstickBlue
+  entities:
+  - uid: 513
+    components:
+    - type: Transform
+      pos: 2.5,-27.5
+      parent: 1
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 1033
+    components:
+    - type: Transform
+      pos: -11.5,-26.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 259
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 432
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-25.5
+      parent: 1
+  - uid: 525
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,-10.5
+      parent: 1
+  - uid: 527
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,-10.5
+      parent: 1
+  - uid: 533
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-10.5
+      parent: 1
+  - uid: 534
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,-12.5
+      parent: 1
+  - uid: 539
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-12.5
+      parent: 1
+  - uid: 549
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-11.5
+      parent: 1
+  - uid: 558
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-9.5
+      parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 4.5,-7.5
+      parent: 1
+  - uid: 643
+    components:
+    - type: Transform
+      pos: 2.5,-30.5
+      parent: 1
+  - uid: 651
+    components:
+    - type: Transform
+      pos: 11.5,-26.5
+      parent: 1
+  - uid: 652
+    components:
+    - type: Transform
+      pos: 11.5,-27.5
+      parent: 1
+  - uid: 653
+    components:
+    - type: Transform
+      pos: 10.5,-27.5
+      parent: 1
+  - uid: 654
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 1
+  - uid: 656
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 657
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 1
+  - uid: 658
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 673
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 674
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 675
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 702
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 1
+  - uid: 731
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 734
+    components:
+    - type: Transform
+      pos: -3.5,-30.5
+      parent: 1
+  - uid: 736
+    components:
+    - type: Transform
+      pos: 9.5,-27.5
+      parent: 1
+  - uid: 741
+    components:
+    - type: Transform
+      pos: 5.5,-13.5
+      parent: 1
+  - uid: 742
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 744
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 746
+    components:
+    - type: Transform
+      pos: 2.5,-7.5
+      parent: 1
+  - uid: 825
+    components:
+    - type: Transform
+      pos: -7.5,-2.5
+      parent: 1
+  - uid: 832
+    components:
+    - type: Transform
+      pos: -7.5,-1.5
+      parent: 1
+  - uid: 838
+    components:
+    - type: Transform
+      pos: -0.5,-29.5
+      parent: 1
+  - uid: 853
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 978
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 1034
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 1036
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-7.5
+      parent: 1
+  - uid: 1037
+    components:
+    - type: Transform
+      pos: -2.5,8.5
+      parent: 1
+  - uid: 1038
+    components:
+    - type: Transform
+      pos: -1.5,8.5
+      parent: 1
+  - uid: 1039
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 1
+  - uid: 1040
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 1
+  - uid: 1041
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 1042
+    components:
+    - type: Transform
+      pos: -7.5,2.5
+      parent: 1
+  - uid: 1043
+    components:
+    - type: Transform
+      pos: -7.5,1.5
+      parent: 1
+  - uid: 1044
+    components:
+    - type: Transform
+      pos: -19.5,-14.5
+      parent: 1
+  - uid: 1045
+    components:
+    - type: Transform
+      pos: -19.5,-15.5
+      parent: 1
+  - uid: 1046
+    components:
+    - type: Transform
+      pos: -19.5,-16.5
+      parent: 1
+  - uid: 1049
+    components:
+    - type: Transform
+      pos: -10.5,-18.5
+      parent: 1
+  - uid: 1050
+    components:
+    - type: Transform
+      pos: 7.5,-18.5
+      parent: 1
+  - uid: 1051
+    components:
+    - type: Transform
+      pos: 8.5,-18.5
+      parent: 1
+  - uid: 1052
+    components:
+    - type: Transform
+      pos: 9.5,-18.5
+      parent: 1
+  - uid: 1053
+    components:
+    - type: Transform
+      pos: -9.5,-18.5
+      parent: 1
+  - uid: 1054
+    components:
+    - type: Transform
+      pos: -8.5,-18.5
+      parent: 1
+  - uid: 1055
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 1
+  - uid: 1057
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 1059
+    components:
+    - type: Transform
+      pos: -12.5,-11.5
+      parent: 1
+  - uid: 1060
+    components:
+    - type: Transform
+      pos: -12.5,-10.5
+      parent: 1
+  - uid: 1061
+    components:
+    - type: Transform
+      pos: -12.5,-9.5
+      parent: 1
+  - uid: 1063
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,-7.5
+      parent: 1
+  - uid: 1064
+    components:
+    - type: Transform
+      pos: 19.5,-8.5
+      parent: 1
+  - uid: 1065
+    components:
+    - type: Transform
+      pos: 13.5,-7.5
+      parent: 1
+  - uid: 1067
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-13.5
+      parent: 1
+  - uid: 1068
+    components:
+    - type: Transform
+      pos: 12.5,-7.5
+      parent: 1
+  - uid: 1069
+    components:
+    - type: Transform
+      pos: -20.5,-8.5
+      parent: 1
+- proto: GunSafeShuttleCaptain
+  entities:
+  - uid: 672
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+- proto: Gyroscope
+  entities:
+  - uid: 1072
+    components:
+    - type: Transform
+      pos: -10.5,-26.5
+      parent: 1
+  - uid: 1073
+    components:
+    - type: Transform
+      pos: -9.5,-26.5
+      parent: 1
+- proto: IntercomEngineering
+  entities:
+  - uid: 1903
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-22.5
+      parent: 1
+- proto: IntercomMedical
+  entities:
+  - uid: 676
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-15.5
+      parent: 1
+- proto: IntercomService
+  entities:
+  - uid: 1792
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+- proto: LampGold
+  entities:
+  - uid: 692
+    components:
+    - type: Transform
+      pos: 2.5,-10.2
+      parent: 1
+  - uid: 1090
+    components:
+    - type: Transform
+      pos: -14.45,-8.25
+      parent: 1
+- proto: LockerBoozeFilled
+  entities:
+  - uid: 1092
+    components:
+    - type: Transform
+      pos: -6.5,-5.5
+      parent: 1
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.1496
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+- proto: LockerCaptainFilledHardsuit
+  entities:
+  - uid: 626
+    components:
+    - type: Transform
+      pos: -5.5,0.5
+      parent: 1
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14908
+        moles:
+        - 1.606311
+        - 6.042789
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+- proto: LockerEngineerFilled
+  entities:
+  - uid: 422
+    components:
+    - type: Transform
+      pos: -6.5,-27.5
+      parent: 1
+- proto: LockerJanitorFilled
+  entities:
+  - uid: 885
+    components:
+    - type: Transform
+      pos: -16.5,-18.5
+      parent: 1
+- proto: LockerMedicineFilled
+  entities:
+  - uid: 517
+    components:
+    - type: Transform
+      pos: 15.5,-21.5
+      parent: 1
+- proto: LockerWallEVAColorChaplainFilled
+  entities:
+  - uid: 1790
+    components:
+    - type: Transform
+      pos: -17.5,-13.5
+      parent: 1
+- proto: LockerWallMaterialsFuelAmeJarFilled
+  entities:
+  - uid: 1762
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-26.5
+      parent: 1
+- proto: MachineCryoSleepPod
+  entities:
+  - uid: 797
+    components:
+    - type: Transform
+      pos: 12.5,-24.5
+      parent: 1
+- proto: MaterialReclaimer
+  entities:
+  - uid: 1446
+    components:
+    - type: Transform
+      pos: -18.5,-20.5
+      parent: 1
+- proto: Mirror
+  entities:
+  - uid: 824
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-27.5
+      parent: 1
+- proto: MopBucketFull
+  entities:
+  - uid: 811
+    components:
+    - type: Transform
+      pos: -17.5,-18.5
+      parent: 1
+- proto: Morgue
+  entities:
+  - uid: 563
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-23.5
+      parent: 1
+  - uid: 564
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-22.5
+      parent: 1
+- proto: NFPosterLegitMagnusWatching
+  entities:
+  - uid: 699
+    components:
+    - type: Transform
+      pos: -3.5,-25.5
+      parent: 1
+- proto: NitrogenCanister
+  entities:
+  - uid: 487
+    components:
+    - type: Transform
+      pos: 7.5,-27.5
+      parent: 1
+  - uid: 488
+    components:
+    - type: Transform
+      anchored: True
+      pos: 10.5,-22.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+- proto: NoticeBoardNF
+  entities:
+  - uid: 452
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-10.5
+      parent: 1
+- proto: OperatingTable
+  entities:
+  - uid: 557
+    components:
+    - type: Transform
+      pos: 16.5,-21.5
+      parent: 1
+- proto: OxygenCanister
+  entities:
+  - uid: 485
+    components:
+    - type: Transform
+      pos: 5.5,-27.5
+      parent: 1
+  - uid: 486
+    components:
+    - type: Transform
+      anchored: True
+      pos: 10.5,-23.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+- proto: PaintingAmogusTriptych
+  entities:
+  - uid: 870
+    components:
+    - type: Transform
+      pos: -17.5,-17.5
+      parent: 1
+- proto: PaperBin10
+  entities:
+  - uid: 694
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 1114
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-18.5
+      parent: 1
+- proto: PaperBin5
+  entities:
+  - uid: 684
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-14.5
+      parent: 1
+- proto: PlasticFlapsAirtightClear
+  entities:
+  - uid: 883
+    components:
+    - type: Transform
+      pos: -17.5,-21.5
+      parent: 1
+- proto: PlushieMoffRandom
+  entities:
+  - uid: 808
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+- proto: PortableScrubber
+  entities:
+  - uid: 255
+    components:
+    - type: Transform
+      pos: 10.5,-25.5
+      parent: 1
+- proto: PosterContrabandBeachStarYamamoto
+  entities:
+  - uid: 1120
+    components:
+    - type: Transform
+      pos: 3.5,6.5
+      parent: 1
+- proto: PosterContrabandBountyHunters
+  entities:
+  - uid: 1121
+    components:
+    - type: Transform
+      pos: -4.5,6.5
+      parent: 1
+- proto: PosterLegitSafetyMothHardhat
+  entities:
+  - uid: 815
+    components:
+    - type: Transform
+      pos: 18.5,-16.5
+      parent: 1
+- proto: PosterLegitSMEpi
+  entities:
+  - uid: 690
+    components:
+    - type: Transform
+      pos: 18.5,-19.5
+      parent: 1
+- proto: PosterLegitSMPills
+  entities:
+  - uid: 816
+    components:
+    - type: Transform
+      pos: 18.5,-18.5
+      parent: 1
+- proto: PosterLegitSMPoisoning
+  entities:
+  - uid: 791
+    components:
+    - type: Transform
+      pos: 18.5,-14.5
+      parent: 1
+- proto: PottedPlantRandom
+  entities:
+  - uid: 409
+    components:
+    - type: Transform
+      pos: 14.5,-20.5
+      parent: 1
+  - uid: 1097
+    components:
+    - type: Transform
+      pos: -15.5,-14.5
+      parent: 1
+  - uid: 1122
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 1128
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 1129
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+- proto: PowerCellRecharger
+  entities:
+  - uid: 508
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-19.5
+      parent: 1
+  - uid: 976
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-17.5
+      parent: 1
+  - uid: 1203
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-22.5
+      parent: 1
+- proto: Poweredlight
+  entities:
+  - uid: 23
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-10.5
+      parent: 1
+  - uid: 538
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-10.5
+      parent: 1
+  - uid: 705
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 710
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 751
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-15.5
+      parent: 1
+  - uid: 761
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-31.5
+      parent: 1
+  - uid: 840
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-4.5
+      parent: 1
+  - uid: 845
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 863
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-12.5
+      parent: 1
+  - uid: 984
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-6.5
+      parent: 1
+  - uid: 1136
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,1.5
+      parent: 1
+  - uid: 1137
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,4.5
+      parent: 1
+  - uid: 1140
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,-20.5
+      parent: 1
+  - uid: 1142
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-20.5
+      parent: 1
+  - uid: 1145
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-25.5
+      parent: 1
+  - uid: 1147
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-15.5
+      parent: 1
+  - uid: 1152
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-18.5
+      parent: 1
+  - uid: 1155
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-8.5
+      parent: 1
+  - uid: 1156
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-20.5
+      parent: 1
+  - uid: 1157
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-20.5
+      parent: 1
+  - uid: 1158
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-20.5
+      parent: 1
+  - uid: 1765
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-20.5
+      parent: 1
+  - uid: 1899
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-10.5
+      parent: 1
+- proto: PoweredlightExterior
+  entities:
+  - uid: 1143
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-23.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-- proto: LockerMedicineFilled
+  - uid: 1153
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 1161
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,4.5
+      parent: 1
+  - uid: 1813
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-23.5
+      parent: 1
+  - uid: 1818
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,9.5
+      parent: 1
+  - uid: 1819
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,4.5
+      parent: 1
+- proto: PoweredlightOrange
   entities:
-  - uid: 1094
+  - uid: 100
     components:
     - type: Transform
-      pos: 15.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-24.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-- proto: LockerParamedicFilled
+  - uid: 440
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-24.5
+      parent: 1
+  - uid: 1817
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-26.5
+      parent: 1
+- proto: PoweredLightPostSmall
   entities:
-  - uid: 1095
+  - uid: 619
     components:
     - type: Transform
-      pos: 15.5,-19.5
+      pos: 12.5,-5.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-- proto: LockerWallMedical
+  - uid: 775
+    components:
+    - type: Transform
+      pos: -13.5,-5.5
+      parent: 1
+- proto: PoweredSmallLight
   entities:
-  - uid: 1096
+  - uid: 464
+    components:
+    - type: Transform
+      pos: -18.5,-18.5
+      parent: 1
+  - uid: 709
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,0.5
+      parent: 1
+  - uid: 726
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-24.5
+      parent: 1
+  - uid: 1163
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,-16.5
+      pos: 12.5,-22.5
       parent: 1
-- proto: Bed
+  - uid: 1164
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-22.5
+      parent: 1
+  - uid: 1166
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-22.5
+      parent: 1
+  - uid: 1169
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 1247
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-8.5
+      parent: 1
+  - uid: 1729
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-27.5
+      parent: 1
+  - uid: 1730
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 1785
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 1786
+    components:
+    - type: Transform
+      pos: -18.5,-14.5
+      parent: 1
+  - uid: 1815
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-26.5
+      parent: 1
+  - uid: 1816
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-26.5
+      parent: 1
+- proto: Rack
   entities:
-  - uid: 1097
+  - uid: 596
     components:
     - type: Transform
-      pos: 17.5,-15.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,-5.5
       parent: 1
-  - uid: 1098
+- proto: RagItem
+  entities:
+  - uid: 979
     components:
     - type: Transform
-      pos: 17.5,-17.5
+      pos: -4.5,-14.2
       parent: 1
-- proto: Mirror
+- proto: Railing
   entities:
-  - uid: 1106
+  - uid: 181
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -5.5,-27.5
+      pos: 15.5,-19.5
       parent: 1
-- proto: Morgue
+  - uid: 182
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-20.5
+      parent: 1
+  - uid: 629
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 806
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-5.5
+      parent: 1
+  - uid: 841
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-5.5
+      parent: 1
+  - uid: 1174
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-14.5
+      parent: 1
+  - uid: 1175
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-15.5
+      parent: 1
+  - uid: 1892
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -17.5,-20.5
+      parent: 1
+- proto: RailingCorner
   entities:
-  - uid: 1107
+  - uid: 1177
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-22.5
+      rot: 3.141592653589793 rad
+      pos: 14.5,-14.5
       parent: 1
-  - uid: 1108
+  - uid: 1178
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-16.5
       parent: 1
-- proto: Multitool
+- proto: RailingCornerSmall
   entities:
-  - uid: 1109
+  - uid: 284
     components:
     - type: Transform
-      pos: 4.76107,4.8082094
+      pos: 15.5,-21.5
       parent: 1
-- proto: NitrogenCanister
-  entities:
-  - uid: 1110
+  - uid: 511
     components:
     - type: Transform
-      anchored: True
-      pos: 8.5,-22.5
+      pos: 16.5,-14.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1111
+  - uid: 546
     components:
     - type: Transform
-      anchored: True
-      pos: 9.5,-22.5
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-16.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: OxygenCanister
-  entities:
-  - uid: 1112
+  - uid: 1405
     components:
     - type: Transform
-      anchored: True
-      pos: 10.5,-22.5
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-17.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: PaperBin10
-  entities:
-  - uid: 1113
+  - uid: 1895
     components:
     - type: Transform
-      pos: 2.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-18.5
       parent: 1
-  - uid: 1114
+  - uid: 1896
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-18.5
+      rot: 3.141592653589793 rad
+      pos: 14.5,-18.5
       parent: 1
-  - uid: 1115
+  - uid: 1897
+    components:
+    - type: Transform
+      pos: 15.5,-17.5
+      parent: 1
+  - uid: 1898
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -0.5,-17.5
+      pos: 14.5,-19.5
       parent: 1
-- proto: PlushieAtmosian
+- proto: RandomDrinkGlass
   entities:
-  - uid: 1116
+  - uid: 961
     components:
     - type: Transform
-      pos: 10.573052,-23.745752
+      pos: -3.5,-11.5
       parent: 1
-- proto: PlushieSharkBlue
-  entities:
-  - uid: 1117
+  - uid: 1796
     components:
     - type: Transform
-      pos: 4.507983,4.3010187
+      pos: -3.5,-13.5
       parent: 1
-- proto: PortableScrubber
+- proto: RandomInstruments
   entities:
-  - uid: 1118
+  - uid: 522
     components:
     - type: Transform
-      pos: 9.5,-24.5
+      pos: -3.5,-24.5
       parent: 1
-  - uid: 1119
+- proto: RandomPainting
+  entities:
+  - uid: 990
     components:
     - type: Transform
-      pos: 10.5,-24.5
+      pos: 16.5,-13.5
       parent: 1
-- proto: PosterContrabandBeachStarYamamoto
-  entities:
-  - uid: 1120
+  - uid: 994
     components:
     - type: Transform
-      pos: 3.5,6.5
+      pos: 3.5,-25.5
       parent: 1
-- proto: PosterContrabandBountyHunters
-  entities:
-  - uid: 1121
+  - uid: 1190
     components:
     - type: Transform
-      pos: -4.5,6.5
+      pos: -4.5,4.5
       parent: 1
-- proto: PottedPlantRandom
-  entities:
-  - uid: 1122
+  - uid: 1238
     components:
     - type: Transform
-      pos: -0.5,-1.5
+      pos: -18.5,-13.5
       parent: 1
-  - uid: 1123
+  - uid: 1782
     components:
     - type: Transform
-      pos: -4.5,-17.5
+      pos: 2.5,3.5
       parent: 1
-  - uid: 1124
+- proto: RandomPosterContraband
+  entities:
+  - uid: 120
     components:
     - type: Transform
-      pos: 3.5,-17.5
+      pos: -12.5,-26.5
       parent: 1
-  - uid: 1126
+  - uid: 124
     components:
     - type: Transform
-      pos: 14.5,-19.5
+      pos: -7.5,-3.5
       parent: 1
-  - uid: 1127
+  - uid: 1799
     components:
     - type: Transform
-      pos: 14.5,-20.5
+      pos: -19.5,-18.5
       parent: 1
-  - uid: 1128
+- proto: RandomPosterLegit
+  entities:
+  - uid: 119
     components:
     - type: Transform
-      pos: -2.5,-16.5
+      pos: -2.5,-7.5
       parent: 1
-  - uid: 1129
+  - uid: 130
     components:
     - type: Transform
-      pos: 1.5,-16.5
+      pos: -5.5,-24.5
       parent: 1
-- proto: PowerCellRecharger
-  entities:
-  - uid: 1130
+  - uid: 509
     components:
     - type: Transform
-      pos: -7.5,-26.5
+      pos: -12.5,-18.5
       parent: 1
-- proto: Poweredlight
-  entities:
-  - uid: 1131
+  - uid: 582
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-16.5
+      pos: 2.5,-0.5
       parent: 1
-  - uid: 1132
+  - uid: 809
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-16.5
+      pos: -6.5,-18.5
       parent: 1
-  - uid: 1133
+  - uid: 884
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-9.5
+      pos: -2.5,-5.5
       parent: 1
-  - uid: 1134
+  - uid: 1192
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-2.5
+      pos: 2.5,-21.5
       parent: 1
-  - uid: 1135
+  - uid: 1196
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,0.5
+      pos: -3.5,-21.5
       parent: 1
-  - uid: 1136
+  - uid: 1200
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,1.5
+      pos: 1.5,-6.5
       parent: 1
-  - uid: 1137
+  - uid: 1202
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,4.5
+      pos: 3.5,-0.5
       parent: 1
-  - uid: 1138
+  - uid: 1204
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,-10.5
+      pos: -5.5,-4.5
       parent: 1
-  - uid: 1139
+  - uid: 1672
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-10.5
+      pos: 4.5,-11.5
       parent: 1
-  - uid: 1140
+  - uid: 1807
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,-20.5
+      pos: 11.5,-13.5
       parent: 1
-  - uid: 1141
+  - uid: 1809
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.5,-18.5
+      pos: 5.5,-17.5
       parent: 1
-  - uid: 1142
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 445
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 8.5,-20.5
+      pos: 5.5,-25.5
       parent: 1
-  - uid: 1143
+  - uid: 478
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -6.5,-24.5
+      pos: 7.5,-25.5
       parent: 1
-  - uid: 1144
+- proto: ReinforcedWindow
+  entities:
+  - uid: 528
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: 16.5,-10.5
       parent: 1
-  - uid: 1145
+  - uid: 537
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: -17.5,-10.5
       parent: 1
-  - uid: 1146
+  - uid: 703
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -0.5,-30.5
+      pos: -0.5,-0.5
       parent: 1
-  - uid: 1147
+  - uid: 752
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-15.5
+      pos: -0.5,-29.5
       parent: 1
-  - uid: 1148
+- proto: ShuttersNormalOpen
+  entities:
+  - uid: 84
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,-10.5
+      pos: -0.5,8.5
       parent: 1
-  - uid: 1149
+  - uid: 85
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-10.5
+      pos: 0.5,8.5
       parent: 1
-  - uid: 1150
+  - uid: 86
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-11.5
+      pos: -1.5,8.5
       parent: 1
-  - uid: 1151
+  - uid: 87
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-11.5
+      pos: -2.5,8.5
       parent: 1
-  - uid: 1152
+  - uid: 964
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,-18.5
+      pos: 1.5,8.5
       parent: 1
-  - uid: 1153
+- proto: ShuttleWindow
+  entities:
+  - uid: 239
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-8.5
+      pos: 2.5,-7.5
       parent: 1
-  - uid: 1154
+  - uid: 287
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -0.5,-1.5
+      pos: 4.5,-7.5
       parent: 1
-  - uid: 1155
+  - uid: 514
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-8.5
+      pos: 12.5,-7.5
       parent: 1
-  - uid: 1156
+  - uid: 524
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -12.5,-14.5
+      rot: 3.141592653589793 rad
+      pos: 11.5,-10.5
       parent: 1
-  - uid: 1157
+  - uid: 529
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -3.5,-20.5
+      pos: -12.5,-11.5
       parent: 1
-  - uid: 1158
+  - uid: 530
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 2.5,-20.5
+      pos: -12.5,-12.5
       parent: 1
-  - uid: 1159
+  - uid: 548
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-6.5
+      rot: 3.141592653589793 rad
+      pos: 11.5,-11.5
       parent: 1
-  - uid: 1160
+  - uid: 550
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: 8.5,-22.5
+      rot: 3.141592653589793 rad
+      pos: 11.5,-12.5
       parent: 1
-- proto: PoweredlightLED
-  entities:
-  - uid: 1161
+  - uid: 551
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 2.5,9.5
+      pos: 11.5,-9.5
       parent: 1
-  - uid: 1162
+  - uid: 586
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,9.5
+      pos: 1.5,-4.5
       parent: 1
-- proto: PoweredSmallLight
-  entities:
-  - uid: 1163
+  - uid: 588
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-22.5
+      pos: 6.5,-3.5
       parent: 1
-  - uid: 1164
+  - uid: 649
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-22.5
+      pos: -3.5,-30.5
       parent: 1
-  - uid: 1165
+  - uid: 650
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-22.5
+      pos: 11.5,-26.5
       parent: 1
-  - uid: 1166
+  - uid: 700
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-22.5
+      pos: 5.5,-15.5
       parent: 1
-  - uid: 1167
+  - uid: 707
     components:
     - type: Transform
-      pos: -5.5,-5.5
+      pos: 5.5,-16.5
       parent: 1
-  - uid: 1168
+  - uid: 733
     components:
     - type: Transform
-      pos: 3.5,-5.5
+      pos: 2.5,-30.5
       parent: 1
-  - uid: 1169
+  - uid: 735
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-3.5
+      pos: 11.5,-27.5
       parent: 1
-  - uid: 1170
+  - uid: 738
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-3.5
+      pos: 10.5,-27.5
       parent: 1
-  - uid: 1171
+  - uid: 740
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,1.5
+      pos: -0.5,8.5
       parent: 1
-  - uid: 1729
+  - uid: 743
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-27.5
+      pos: 5.5,-9.5
       parent: 1
-  - uid: 1730
+  - uid: 745
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-26.5
+      pos: 5.5,-10.5
       parent: 1
-- proto: Rack
-  entities:
-  - uid: 1172
+  - uid: 747
     components:
     - type: Transform
-      pos: -6.5,-27.5
+      pos: 1.5,-1.5
       parent: 1
-- proto: RagItem
-  entities:
-  - uid: 1173
+  - uid: 773
     components:
     - type: Transform
-      pos: -3.5151198,-12.430893
+      pos: -7.5,-1.5
       parent: 1
-- proto: Railing
-  entities:
-  - uid: 1174
+  - uid: 774
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 15.5,-14.5
+      pos: -7.5,-2.5
       parent: 1
-  - uid: 1175
+  - uid: 828
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,-15.5
+      pos: 5.5,-12.5
       parent: 1
-  - uid: 1176
+  - uid: 829
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-20.5
+      pos: 5.5,-13.5
       parent: 1
-- proto: RailingCorner
-  entities:
-  - uid: 1177
+  - uid: 830
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 14.5,-14.5
+      pos: 1.5,-3.5
       parent: 1
-  - uid: 1178
+  - uid: 839
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,-16.5
+      pos: 1.5,-2.5
       parent: 1
-  - uid: 1179
+  - uid: 849
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-19.5
+      pos: 6.5,-2.5
       parent: 1
-- proto: RandomArcade
-  entities:
-  - uid: 1180
+  - uid: 869
     components:
     - type: Transform
-      pos: 4.5,-15.5
+      pos: 9.5,-27.5
       parent: 1
-- proto: RandomDrinkBottle
-  entities:
-  - uid: 1181
+  - uid: 1194
     components:
     - type: Transform
-      pos: -3.5,-11.5
+      pos: 4.5,-0.5
       parent: 1
-- proto: RandomDrinkGlass
-  entities:
-  - uid: 1182
+  - uid: 1209
     components:
     - type: Transform
-      pos: -4.5,-14.5
+      rot: 3.141592653589793 rad
+      pos: -13.5,-7.5
       parent: 1
-  - uid: 1183
+  - uid: 1210
     components:
     - type: Transform
-      pos: -3.5,-13.5
+      rot: 3.141592653589793 rad
+      pos: -14.5,-7.5
       parent: 1
-- proto: RandomInstruments
-  entities:
-  - uid: 1186
+  - uid: 1211
     components:
     - type: Transform
-      pos: -5.5,-17.5
+      pos: -19.5,-15.5
       parent: 1
-    - type: RandomSpawner
-      chance: 1
-- proto: RandomItem
-  entities:
-  - uid: 1187
+  - uid: 1214
     components:
     - type: Transform
-      pos: 2.5,-24.5
+      pos: -2.5,8.5
       parent: 1
-    - type: RandomSpawner
-      chance: 1
-  - uid: 1188
+  - uid: 1215
     components:
     - type: Transform
-      pos: -3.5,-24.5
+      pos: -1.5,8.5
       parent: 1
-    - type: RandomSpawner
-      chance: 1
-  - uid: 1189
+  - uid: 1217
     components:
     - type: Transform
-      pos: 2.5,-28.5
+      pos: 0.5,8.5
       parent: 1
-    - type: RandomSpawner
-      chance: 1
-- proto: RandomPainting
-  entities:
-  - uid: 1190
+  - uid: 1218
     components:
     - type: Transform
-      pos: -4.5,4.5
+      pos: 1.5,8.5
       parent: 1
-  - uid: 1191
+  - uid: 1219
     components:
     - type: Transform
-      pos: -17.5,-13.5
+      pos: -7.5,1.5
       parent: 1
-- proto: RandomPosterLegit
-  entities:
-  - uid: 1192
+  - uid: 1220
     components:
     - type: Transform
-      pos: 2.5,-21.5
+      pos: -7.5,2.5
       parent: 1
-  - uid: 1193
+  - uid: 1221
     components:
     - type: Transform
-      pos: -6.5,-18.5
+      pos: 7.5,-18.5
       parent: 1
-  - uid: 1194
+  - uid: 1222
     components:
     - type: Transform
-      pos: 2.5,3.5
+      pos: 8.5,-18.5
       parent: 1
-  - uid: 1195
+  - uid: 1223
     components:
     - type: Transform
-      pos: -2.5,-9.5
+      pos: -8.5,-18.5
       parent: 1
-  - uid: 1196
+  - uid: 1224
     components:
     - type: Transform
-      pos: -3.5,-21.5
+      pos: 9.5,-18.5
       parent: 1
-  - uid: 1197
+  - uid: 1225
     components:
     - type: Transform
-      pos: 5.5,-18.5
+      pos: -10.5,-18.5
       parent: 1
-  - uid: 1198
+  - uid: 1226
     components:
     - type: Transform
-      pos: -2.5,-6.5
+      pos: -9.5,-18.5
       parent: 1
-  - uid: 1199
+  - uid: 1227
     components:
     - type: Transform
-      pos: 1.5,-4.5
+      pos: -19.5,-14.5
       parent: 1
-  - uid: 1200
+  - uid: 1228
     components:
     - type: Transform
-      pos: 1.5,-6.5
+      pos: -19.5,-16.5
       parent: 1
-  - uid: 1201
+  - uid: 1230
     components:
     - type: Transform
-      pos: 1.5,-7.5
+      pos: -12.5,-10.5
       parent: 1
-  - uid: 1202
+  - uid: 1232
     components:
     - type: Transform
-      pos: 3.5,-0.5
+      pos: -12.5,-9.5
       parent: 1
-  - uid: 1203
+  - uid: 1233
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 1235
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 1
+  - uid: 1239
     components:
     - type: Transform
-      pos: -3.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-13.5
       parent: 1
-  - uid: 1204
+  - uid: 1240
     components:
     - type: Transform
-      pos: -5.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-12.5
       parent: 1
-- proto: Screwdriver
-  entities:
-  - uid: 1207
+  - uid: 1243
     components:
     - type: Transform
-      pos: 4.5673113,4.772986
+      pos: 19.5,-8.5
       parent: 1
-- proto: ShuttleWindow
-  entities:
-  - uid: 1208
+  - uid: 1244
     components:
     - type: Transform
-      pos: 12.5,-7.5
+      pos: 13.5,-7.5
       parent: 1
-  - uid: 1209
+  - uid: 1245
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-7.5
+      pos: -20.5,-8.5
       parent: 1
-  - uid: 1210
+  - uid: 1781
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-7.5
+      pos: 6.5,-1.5
       parent: 1
-  - uid: 1211
+- proto: SignalButton
+  entities:
+  - uid: 88
     components:
     - type: Transform
-      pos: -19.5,-15.5
+      pos: -0.5,6.5
       parent: 1
-  - uid: 1212
+    - type: DeviceLinkSource
+      linkedPorts:
+        87:
+        - Pressed: Toggle
+        86:
+        - Pressed: Toggle
+        84:
+        - Pressed: Toggle
+        85:
+        - Pressed: Toggle
+        964:
+        - Pressed: Toggle
+  - uid: 97
     components:
     - type: Transform
-      pos: -19.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-20.5
       parent: 1
-  - uid: 1213
+    - type: DeviceLinkSource
+      linkedPorts:
+        872:
+        - Pressed: Toggle
+- proto: SignArcade
+  entities:
+  - uid: 1600
     components:
     - type: Transform
-      pos: -19.5,-17.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-7.5
       parent: 1
-  - uid: 1214
+- proto: SignAtmos
+  entities:
+  - uid: 1195
     components:
     - type: Transform
-      pos: -2.5,8.5
+      pos: 4.5,-21.5
       parent: 1
-  - uid: 1215
+- proto: SignAtmosMinsky
+  entities:
+  - uid: 555
     components:
     - type: Transform
-      pos: -1.5,8.5
+      pos: 7.5,-21.5
       parent: 1
-  - uid: 1216
+- proto: SignBar
+  entities:
+  - uid: 1248
     components:
     - type: Transform
-      pos: -0.5,8.5
+      pos: -3.5,-10.5
       parent: 1
-  - uid: 1217
+- proto: SignBarbershop
+  entities:
+  - uid: 65
     components:
     - type: Transform
-      pos: 0.5,8.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-22.5
       parent: 1
-  - uid: 1218
+- proto: SignBridge
+  entities:
+  - uid: 1249
     components:
     - type: Transform
-      pos: 1.5,8.5
+      pos: -1.5,3.5
       parent: 1
-  - uid: 1219
+- proto: SignChapel
+  entities:
+  - uid: 771
     components:
     - type: Transform
-      pos: -7.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -15.5,-17.5
       parent: 1
-  - uid: 1220
+- proto: SignDirectionalBridge
+  entities:
+  - uid: 1130
     components:
     - type: Transform
-      pos: -7.5,2.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-9.5
       parent: 1
-  - uid: 1221
+  - uid: 1893
     components:
     - type: Transform
-      pos: 7.5,-18.5
+      rot: 3.141592653589793 rad
+      pos: 5.5,-18.3
       parent: 1
-  - uid: 1222
+- proto: SignDirectionalDorms
+  entities:
+  - uid: 1252
     components:
     - type: Transform
-      pos: 8.5,-18.5
+      pos: -2.5,-22.5
       parent: 1
-  - uid: 1223
+- proto: SignDirectionalEng
+  entities:
+  - uid: 1894
     components:
     - type: Transform
-      pos: -8.5,-18.5
+      pos: -2.5,-9.7
       parent: 1
-  - uid: 1224
+- proto: SignDirectionalMed
+  entities:
+  - uid: 1497
     components:
     - type: Transform
-      pos: 9.5,-18.5
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-18.5
       parent: 1
-  - uid: 1225
+- proto: SignElectricalMed
+  entities:
+  - uid: 38
     components:
     - type: Transform
-      pos: -10.5,-18.5
+      pos: -9.5,-21.5
       parent: 1
-  - uid: 1226
+- proto: SignEngine
+  entities:
+  - uid: 1254
     components:
     - type: Transform
-      pos: -9.5,-18.5
+      pos: -8.5,-21.5
       parent: 1
-  - uid: 1227
+- proto: SignEngineering
+  entities:
+  - uid: 697
     components:
     - type: Transform
-      pos: -19.5,-14.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,-21.5
       parent: 1
-  - uid: 1228
+- proto: SignFire
+  entities:
+  - uid: 1162
     components:
     - type: Transform
-      pos: -19.5,-16.5
+      pos: -7.5,-28.5
       parent: 1
-  - uid: 1229
+- proto: SignFlammableMed
+  entities:
+  - uid: 1805
     components:
     - type: Transform
-      pos: -12.5,-11.5
+      rot: 3.141592653589793 rad
+      pos: -11.5,-21.5
       parent: 1
-  - uid: 1230
+- proto: SignHead
+  entities:
+  - uid: 1255
     components:
     - type: Transform
-      pos: -12.5,-10.5
+      pos: -2.5,1.5
       parent: 1
-  - uid: 1231
+- proto: SignJanitor
+  entities:
+  - uid: 802
     components:
     - type: Transform
-      pos: 5.5,-16.5
+      pos: -15.5,-18.5
       parent: 1
-  - uid: 1232
+- proto: SignLastIdiot
+  entities:
+  - uid: 1257
     components:
     - type: Transform
-      pos: -12.5,-9.5
+      pos: 17.5,-8.5
       parent: 1
-  - uid: 1233
+  - uid: 1258
     components:
     - type: Transform
-      pos: -6.5,-15.5
+      pos: -19.5,-8.5
       parent: 1
-  - uid: 1234
+- proto: SignLibrary
+  entities:
+  - uid: 1259
     components:
     - type: Transform
-      pos: 5.5,-15.5
+      pos: -15.5,-13.5
       parent: 1
-  - uid: 1235
+- proto: SignMedical
+  entities:
+  - uid: 417
     components:
     - type: Transform
-      pos: -6.5,-16.5
+      rot: 3.141592653589793 rad
+      pos: 11.5,-18.5
       parent: 1
-  - uid: 1236
+  - uid: 1806
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-13.5
+      rot: 3.141592653589793 rad
+      pos: 16.5,-12.5
       parent: 1
-  - uid: 1237
+- proto: SignMorgue
+  entities:
+  - uid: 536
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-1.5
+      pos: 13.5,-21.5
       parent: 1
-  - uid: 1238
+- proto: SignReception
+  entities:
+  - uid: 556
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-12.5
+      pos: 2.5,-11.5
       parent: 1
-  - uid: 1239
+- proto: SignShield
+  entities:
+  - uid: 1261
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-13.5
+      pos: -2.5,-3.5
       parent: 1
-  - uid: 1240
+- proto: SignShipDock
+  entities:
+  - uid: 74
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: 20.5,-10.5
       parent: 1
-  - uid: 1241
+  - uid: 554
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-10.5
       parent: 1
-  - uid: 1242
+  - uid: 770
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 1.5,-2.5
+      pos: -0.5,-32.5
       parent: 1
-  - uid: 1243
+- proto: SignSurgery
+  entities:
+  - uid: 3
     components:
     - type: Transform
-      pos: 19.5,-8.5
+      pos: 17.5,-21.5
       parent: 1
-  - uid: 1244
+- proto: SignTelecomms
+  entities:
+  - uid: 1831
     components:
     - type: Transform
-      pos: 13.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-0.5
       parent: 1
-  - uid: 1245
+- proto: Sink
+  entities:
+  - uid: 344
     components:
     - type: Transform
-      pos: -20.5,-8.5
+      pos: -17.5,-18.5
       parent: 1
-- proto: SignalButton
+- proto: SinkWide
   entities:
-  - uid: 1246
+  - uid: 1265
     components:
     - type: Transform
-      pos: -0.23381275,6.3443847
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-27.5
       parent: 1
-    - type: SignalSwitch
-      state: True
-    - type: DeviceLinkSource
-      linkedPorts:
-        88:
-        - Pressed: Toggle
-        87:
-        - Pressed: Toggle
-        86:
-        - Pressed: Toggle
-        85:
-        - Pressed: Toggle
-        84:
-        - Pressed: Toggle
-- proto: SignAtmosMinsky
+- proto: SMESBasic
   entities:
-  - uid: 1247
+  - uid: 198
     components:
     - type: Transform
-      pos: 4.5,-21.5
+      pos: -8.5,-27.5
       parent: 1
-- proto: SignBar
-  entities:
-  - uid: 1248
+  - uid: 1900
     components:
     - type: Transform
-      pos: -3.5,-10.5
+      pos: -8.5,-26.5
       parent: 1
-- proto: SignBridge
+- proto: SoapDeluxe
   entities:
-  - uid: 1249
+  - uid: 1783
     components:
     - type: Transform
-      pos: -1.5,3.5
+      pos: -4.5,-28.5
       parent: 1
-- proto: SignChapel
+- proto: SoapNT
   entities:
-  - uid: 1250
+  - uid: 1788
     components:
     - type: Transform
-      pos: -17.5,-19.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,4.5
       parent: 1
-- proto: SignCryogenicsMed
+- proto: SpaceVillainArcadeFilled
   entities:
-  - uid: 1251
+  - uid: 1774
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 17.5,-13.5
+      pos: 4.5,-9.5
       parent: 1
-- proto: SignDirectionalDorms
+- proto: SpawnPointLatejoin
   entities:
-  - uid: 1252
+  - uid: 580
     components:
     - type: Transform
-      pos: -2.5,-22.5
+      pos: -0.5,-16.5
       parent: 1
-- proto: SignDirectionalFood
+- proto: SprayBottleWater
   entities:
-  - uid: 1253
+  - uid: 507
     components:
     - type: Transform
-      pos: 2.5,-10.5
+      pos: 2.5,-22.5
       parent: 1
-- proto: SignEngine
+- proto: StairWhite
   entities:
-  - uid: 1254
+  - uid: 505
     components:
     - type: Transform
-      pos: -8.5,-21.5
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-18.5
       parent: 1
-- proto: SignHead
-  entities:
-  - uid: 1255
+  - uid: 516
     components:
     - type: Transform
-      pos: -2.5,1.5
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-17.5
       parent: 1
-- proto: SignHydro1
+- proto: StationMap
   entities:
-  - uid: 1256
+  - uid: 1784
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-4.5
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-15.5
       parent: 1
-- proto: SignLastIdiot
-  entities:
-  - uid: 1257
+  - uid: 1800
     components:
     - type: Transform
-      pos: 17.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-15.5
       parent: 1
-  - uid: 1258
+  - uid: 1801
     components:
     - type: Transform
-      pos: -19.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-4.5
       parent: 1
-- proto: SignLibrary
+- proto: SteelBench
   entities:
-  - uid: 1259
+  - uid: 882
     components:
     - type: Transform
-      pos: -15.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-22.5
       parent: 1
-- proto: SignMorgue
-  entities:
-  - uid: 1260
+  - uid: 1609
     components:
     - type: Transform
-      pos: 12.5,-21.5
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-23.5
       parent: 1
-- proto: SignShield
+- proto: StoolBar
   entities:
-  - uid: 1261
+  - uid: 778
     components:
     - type: Transform
-      pos: -2.5,-3.5
+      pos: -2.5,-13.5
       parent: 1
-- proto: SignShipDock
-  entities:
-  - uid: 1262
+  - uid: 1281
     components:
     - type: Transform
-      pos: -17.5,-10.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-12.5
       parent: 1
-  - uid: 1263
+  - uid: 1283
     components:
     - type: Transform
-      pos: -0.5,-29.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-11.5
       parent: 1
-  - uid: 1264
+  - uid: 1286
     components:
     - type: Transform
-      pos: 16.5,-10.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-14.5
       parent: 1
-- proto: SinkWide
+- proto: SubstationBasic
   entities:
-  - uid: 1265
+  - uid: 1106
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-27.5
+      pos: -6.5,-28.5
       parent: 1
-- proto: SMESBasic
+- proto: SuitStorageEVA
   entities:
-  - uid: 1266
+  - uid: 118
     components:
     - type: Transform
-      pos: -8.5,-27.5
+      pos: 17.5,-12.5
       parent: 1
-  - uid: 1267
+  - uid: 1296
     components:
     - type: Transform
-      pos: -7.5,-27.5
+      pos: -18.5,-12.5
       parent: 1
-- proto: SoapDeluxe
+- proto: Table
   entities:
-  - uid: 1268
+  - uid: 403
     components:
     - type: Transform
-      pos: -4.1038713,-28.441486
+      pos: 2.5,-22.5
       parent: 1
-- proto: soda_dispenser
-  entities:
-  - uid: 1269
+  - uid: 446
     components:
     - type: Transform
-      pos: -5.5,-5.5
+      pos: 3.5,-22.5
       parent: 1
-- proto: SpawnPointLatejoin
-  entities:
-  - uid: 1273
+  - uid: 786
     components:
     - type: Transform
-      pos: -4.5,-23.5
+      pos: -3.5,-7.5
       parent: 1
-  - uid: 1274
+  - uid: 788
     components:
     - type: Transform
-      pos: 3.5,-23.5
+      pos: -4.5,-5.5
       parent: 1
-  - uid: 1275
+  - uid: 789
     components:
     - type: Transform
-      pos: 3.5,-27.5
+      pos: -3.5,-5.5
       parent: 1
-- proto: SteelBench
-  entities:
-  - uid: 632
+  - uid: 795
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 1
+  - uid: 876
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -13.5,-22.5
+      pos: -8.5,-22.5
       parent: 1
-- proto: StoolBar
-  entities:
-  - uid: 1279
+  - uid: 1297
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-11.5
+      pos: -6.5,-3.5
       parent: 1
-  - uid: 1280
+  - uid: 1298
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-12.5
+      pos: -5.5,-3.5
       parent: 1
-  - uid: 1281
+  - uid: 1299
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-12.5
+      pos: -4.5,-3.5
       parent: 1
-  - uid: 1282
+  - uid: 1300
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-14.5
+      pos: -3.5,-3.5
       parent: 1
-  - uid: 1283
+- proto: TableCarpet
+  entities:
+  - uid: 1302
+    components:
+    - type: Transform
+      pos: -1.5,-17.5
+      parent: 1
+  - uid: 1303
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -2.5,-11.5
+      pos: -0.5,-17.5
       parent: 1
-  - uid: 1284
+  - uid: 1304
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-13.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-18.5
       parent: 1
-  - uid: 1285
+  - uid: 1305
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-13.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-18.5
       parent: 1
-  - uid: 1286
+  - uid: 1306
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -2.5,-14.5
+      pos: -1.5,-18.5
+      parent: 1
+  - uid: 1307
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
       parent: 1
-- proto: StorageCanister
+- proto: TableReinforced
   entities:
-  - uid: 1287
+  - uid: 874
     components:
     - type: Transform
-      anchored: True
-      pos: 5.5,-24.5
+      pos: -0.5,7.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1288
+  - uid: 963
     components:
     - type: Transform
-      anchored: True
-      pos: 5.5,-25.5
+      pos: -2.5,7.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 1289
+  - uid: 1335
     components:
     - type: Transform
-      anchored: True
-      pos: 5.5,-26.5
+      pos: 1.5,7.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: SubstationBasic
+  - uid: 1726
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+  - uid: 1793
+    components:
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 1
+  - uid: 1821
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,6.5
+      parent: 1
+- proto: TableReinforcedGlass
   entities:
-  - uid: 1291
+  - uid: 286
     components:
     - type: Transform
-      pos: 3.5,4.5
+      pos: 17.5,-19.5
       parent: 1
-  - uid: 1292
+  - uid: 540
     components:
     - type: Transform
-      pos: -11.5,-25.5
+      pos: 17.5,-20.5
       parent: 1
-- proto: SuitStorageEVA
+  - uid: 542
+    components:
+    - type: Transform
+      pos: 17.5,-18.5
+      parent: 1
+- proto: TableWood
   entities:
-  - uid: 1293
+  - uid: 76
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-27.5
+      parent: 1
+  - uid: 544
     components:
     - type: Transform
-      pos: 17.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-17.5
       parent: 1
-  - uid: 1294
+  - uid: 545
     components:
     - type: Transform
-      pos: 1.5,-30.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-17.5
       parent: 1
-  - uid: 1295
+  - uid: 566
     components:
     - type: Transform
-      pos: -2.5,-30.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-10.5
       parent: 1
-  - uid: 1296
+  - uid: 759
     components:
     - type: Transform
-      pos: -18.5,-12.5
+      rot: 1.5707963267948966 rad
+      pos: -18.5,-16.5
       parent: 1
-- proto: Table
-  entities:
-  - uid: 1297
+  - uid: 781
     components:
     - type: Transform
-      pos: -6.5,-3.5
+      pos: 2.5,1.5
       parent: 1
-  - uid: 1298
+  - uid: 782
     components:
     - type: Transform
-      pos: -5.5,-3.5
+      pos: 3.5,1.5
       parent: 1
-  - uid: 1299
+  - uid: 798
     components:
     - type: Transform
-      pos: -4.5,-3.5
+      pos: -6.5,1.5
       parent: 1
-  - uid: 1300
+  - uid: 799
     components:
     - type: Transform
-      pos: -3.5,-3.5
+      pos: -6.5,0.5
       parent: 1
-  - uid: 1301
+  - uid: 800
     components:
     - type: Transform
-      pos: -7.5,-26.5
+      pos: -6.5,2.5
       parent: 1
-- proto: TableCarpet
-  entities:
-  - uid: 1302
+  - uid: 1336
     components:
     - type: Transform
-      pos: -1.5,-17.5
+      pos: -13.5,-8.5
       parent: 1
-  - uid: 1303
+  - uid: 1337
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-17.5
+      pos: -14.5,-8.5
       parent: 1
-  - uid: 1304
+  - uid: 1340
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-18.5
+      pos: -3.5,-24.5
       parent: 1
-  - uid: 1305
+  - uid: 1341
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-18.5
+      pos: 2.5,-28.5
       parent: 1
-  - uid: 1306
+- proto: TableWoodReinforced
+  entities:
+  - uid: 565
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-18.5
+      pos: 4.5,-14.5
       parent: 1
-  - uid: 1307
+  - uid: 601
     components:
     - type: Transform
-      pos: 0.5,-17.5
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-13.5
       parent: 1
-- proto: TableCounterWood
-  entities:
-  - uid: 1308
+  - uid: 603
     components:
     - type: Transform
-      pos: -17.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-12.5
       parent: 1
-- proto: TableGlass
-  entities:
-  - uid: 1309
+  - uid: 618
     components:
     - type: Transform
-      pos: 3.5,1.5
+      pos: 2.5,-14.5
       parent: 1
-  - uid: 1310
+  - uid: 627
     components:
     - type: Transform
-      pos: 2.5,1.5
+      pos: 2.5,-12.5
       parent: 1
-  - uid: 1311
+  - uid: 631
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-14.5
       parent: 1
-  - uid: 1312
+  - uid: 721
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-21.5
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-11.5
       parent: 1
-  - uid: 1313
+  - uid: 723
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,-21.5
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-14.5
       parent: 1
-  - uid: 1314
+  - uid: 783
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,-18.5
+      pos: 2.5,-13.5
       parent: 1
-  - uid: 1315
+  - uid: 787
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-17.5
+      pos: 3.5,-14.5
       parent: 1
-  - uid: 1316
+  - uid: 1347
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-17.5
+      pos: -4.5,-14.5
       parent: 1
-- proto: TableReinforced
+- proto: TelecomServerFilledShuttle
   entities:
-  - uid: 1317
+  - uid: 1794
     components:
     - type: Transform
-      pos: 3.5,-14.5
+      pos: -6.5,-1.5
       parent: 1
-  - uid: 1318
+- proto: Thruster
+  entities:
+  - uid: 1180
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.5,-5.5
+      pos: -16.5,-23.5
       parent: 1
-  - uid: 1319
+  - uid: 1349
     components:
     - type: Transform
-      pos: 2.5,-14.5
+      pos: -8.5,4.5
       parent: 1
-  - uid: 1320
+  - uid: 1350
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-7.5
+      pos: 7.5,4.5
       parent: 1
-  - uid: 1321
+    - type: Thruster
+      enabled: False
+    - type: ApcPowerReceiver
+      powerLoad: 1
+  - uid: 1351
     components:
     - type: Transform
-      pos: 4.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,1.5
       parent: 1
-  - uid: 1322
+  - uid: 1352
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-5.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,2.5
       parent: 1
-  - uid: 1323
+  - uid: 1353
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -3.5,-5.5
+      pos: -8.5,2.5
       parent: 1
-  - uid: 1324
+  - uid: 1354
     components:
     - type: Transform
-      pos: 2.5,-13.5
+      rot: 1.5707963267948966 rad
+      pos: -8.5,1.5
       parent: 1
-  - uid: 1325
+  - uid: 1355
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-7.5
+      rot: 3.141592653589793 rad
+      pos: 6.5,-8.5
       parent: 1
-  - uid: 1326
+  - uid: 1356
     components:
     - type: Transform
-      pos: 2.5,-11.5
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-7.5
       parent: 1
-  - uid: 1327
+  - uid: 1357
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-5.5
+      rot: 3.141592653589793 rad
+      pos: -7.5,-8.5
       parent: 1
-  - uid: 1328
+  - uid: 1358
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-7.5
       parent: 1
-  - uid: 1329
+  - uid: 1359
     components:
     - type: Transform
-      pos: 2.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-26.5
       parent: 1
-  - uid: 1330
+  - uid: 1360
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -3.5,-6.5
+      pos: -13.5,-26.5
       parent: 1
-  - uid: 1331
+  - uid: 1361
     components:
     - type: Transform
-      pos: -5.5,-5.5
+      pos: 10.5,-16.5
       parent: 1
-- proto: TableReinforcedGlass
-  entities:
-  - uid: 1332
+  - uid: 1362
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -6.5,1.5
+      pos: -5.5,-30.5
       parent: 1
-  - uid: 1333
+  - uid: 1363
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -6.5,0.5
+      pos: -4.5,-30.5
       parent: 1
-  - uid: 1334
+  - uid: 1364
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -6.5,2.5
+      pos: 3.5,-30.5
       parent: 1
-- proto: TableStone
-  entities:
-  - uid: 1335
+  - uid: 1365
     components:
     - type: Transform
-      pos: -0.5,6.5
+      rot: 3.141592653589793 rad
+      pos: 4.5,-30.5
       parent: 1
-- proto: TableWood
-  entities:
-  - uid: 1336
+  - uid: 1367
     components:
     - type: Transform
-      pos: -13.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-23.5
       parent: 1
-  - uid: 1337
+  - uid: 1368
     components:
     - type: Transform
-      pos: -14.5,-8.5
+      pos: -8.5,-4.5
       parent: 1
-  - uid: 1338
+  - uid: 1369
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-15.5
+      pos: 7.5,-4.5
       parent: 1
-  - uid: 1339
+  - uid: 1370
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -16.5,-15.5
+      pos: -6.5,-30.5
       parent: 1
-  - uid: 1340
+  - uid: 1371
     components:
     - type: Transform
-      pos: -3.5,-24.5
+      rot: 3.141592653589793 rad
+      pos: 5.5,-30.5
       parent: 1
-  - uid: 1341
+  - uid: 1372
     components:
     - type: Transform
-      pos: 2.5,-28.5
+      pos: -11.5,-16.5
       parent: 1
-  - uid: 1342
+- proto: ToiletEmpty
+  entities:
+  - uid: 9
     components:
     - type: Transform
-      pos: 2.5,-24.5
-      parent: 1
-- proto: TableWoodReinforced
-  entities:
-  - uid: 1343
+      rot: 1.5707963267948966 rad
+      pos: 3.5,4.5
+      parent: 1
+  - uid: 1373
     components:
     - type: Transform
-      pos: -3.5,-13.5
+      pos: -4.5,-26.5
       parent: 1
-  - uid: 1344
+- proto: ToyFigurineBartender
+  entities:
+  - uid: 1772
     components:
     - type: Transform
-      pos: -3.5,-14.5
+      pos: -3.3282313,-5.3727484
       parent: 1
-  - uid: 1345
+- proto: ToyFigurineBoxer
+  entities:
+  - uid: 587
     components:
     - type: Transform
-      pos: -5.5,-14.5
+      pos: 2.752349,-5.3944893
       parent: 1
-  - uid: 1346
+- proto: TwoWayLever
+  entities:
+  - uid: 862
     components:
     - type: Transform
-      pos: -3.5,-12.5
+      pos: -17.5,-19.5
       parent: 1
-  - uid: 1347
+    - type: DeviceLinkSource
+      linkedPorts:
+        875:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        466:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        640:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        881:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        879:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+        880:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
+- proto: UniformShortsRedWithTop
+  entities:
+  - uid: 805
     components:
     - type: Transform
-      pos: -4.5,-14.5
+      pos: 2.5,-5.5
       parent: 1
-  - uid: 1348
+- proto: VendingMachineBooze
+  entities:
+  - uid: 1167
     components:
     - type: Transform
-      pos: -3.5,-11.5
+      pos: -3.5,-9.5
       parent: 1
-- proto: Thruster
+- proto: VendingMachineTankDispenserEVA
   entities:
-  - uid: 1349
+  - uid: 1387
     components:
     - type: Transform
-      pos: -8.5,4.5
+      pos: -19.5,-12.5
       parent: 1
-  - uid: 1350
+  - uid: 1388
     components:
     - type: Transform
-      pos: 7.5,4.5
+      pos: 18.5,-12.5
       parent: 1
-  - uid: 1351
+- proto: WallShuttle
+  entities:
+  - uid: 176
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -18.5,-17.5
       parent: 1
-  - uid: 1352
+  - uid: 425
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,2.5
+      rot: 3.141592653589793 rad
+      pos: 6.5,-26.5
       parent: 1
-  - uid: 1353
+  - uid: 426
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,2.5
+      rot: 3.141592653589793 rad
+      pos: 6.5,-27.5
       parent: 1
-  - uid: 1354
+  - uid: 433
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,1.5
+      rot: 3.141592653589793 rad
+      pos: 6.5,-25.5
       parent: 1
-  - uid: 1355
+  - uid: 434
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 6.5,-8.5
+      pos: 8.5,-26.5
       parent: 1
-  - uid: 1356
+  - uid: 441
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-7.5
+      rot: 3.141592653589793 rad
+      pos: 8.5,-27.5
       parent: 1
-  - uid: 1357
+  - uid: 451
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -7.5,-8.5
+      pos: 8.5,-25.5
       parent: 1
-  - uid: 1358
+  - uid: 512
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-7.5
+      rot: 3.141592653589793 rad
+      pos: -19.5,-18.5
       parent: 1
-  - uid: 1359
+  - uid: 532
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,-26.5
+      rot: 3.141592653589793 rad
+      pos: -15.5,-18.5
       parent: 1
-  - uid: 1360
+  - uid: 553
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-26.5
+      pos: 13.5,-21.5
       parent: 1
-  - uid: 1361
+  - uid: 614
     components:
     - type: Transform
-      pos: 10.5,-16.5
+      pos: 1.5,-10.5
       parent: 1
-  - uid: 1362
+  - uid: 620
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-30.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-11.5
       parent: 1
-  - uid: 1363
+  - uid: 621
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-30.5
+      pos: 2.5,-11.5
       parent: 1
-  - uid: 1364
+  - uid: 655
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-30.5
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-17.5
       parent: 1
-  - uid: 1365
+  - uid: 732
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-30.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-9.5
       parent: 1
-  - uid: 1366
+  - uid: 739
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-23.5
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-17.5
       parent: 1
-  - uid: 1367
+  - uid: 821
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 15.5,-23.5
+      pos: -16.5,-17.5
       parent: 1
-  - uid: 1368
+  - uid: 823
     components:
     - type: Transform
-      pos: -8.5,-4.5
+      pos: -2.5,-29.5
       parent: 1
-  - uid: 1369
+  - uid: 826
     components:
     - type: Transform
-      pos: 7.5,-4.5
+      pos: -4.5,-25.5
       parent: 1
-  - uid: 1370
+  - uid: 827
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-30.5
+      pos: 1.5,-28.5
       parent: 1
-  - uid: 1371
+  - uid: 833
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-30.5
+      pos: 1.5,-27.5
       parent: 1
-  - uid: 1372
+  - uid: 835
     components:
     - type: Transform
-      pos: -11.5,-16.5
+      pos: -5.5,-25.5
       parent: 1
-- proto: ToiletEmpty
-  entities:
-  - uid: 1373
+  - uid: 836
     components:
     - type: Transform
-      pos: -4.5,-26.5
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-21.5
       parent: 1
-- proto: VendingBarDrobe
-  entities:
-  - uid: 1374
+  - uid: 837
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: -6.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-22.5
       parent: 1
-- proto: VendingMachineAtmosDrobe
-  entities:
-  - uid: 1375
+  - uid: 842
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: 10.5,-26.5
+      pos: -4.5,-21.5
       parent: 1
-- proto: VendingMachineBooze
-  entities:
-  - uid: 1376
+  - uid: 844
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: -3.5,-9.5
+      pos: -3.5,-25.5
       parent: 1
-- proto: VendingMachineChapel
-  entities:
-  - uid: 629
+  - uid: 846
     components:
     - type: Transform
-      pos: 3.5,-24.5
+      pos: -5.5,-22.5
       parent: 1
-- proto: VendingMachineChefDrobe
-  entities:
-  - uid: 1378
+  - uid: 847
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: 5.5,-6.5
+      pos: -2.5,-28.5
       parent: 1
-- proto: VendingMachineChefvend
-  entities:
-  - uid: 1379
+  - uid: 850
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: 5.5,-5.5
+      pos: -2.5,-27.5
       parent: 1
-- proto: VendingMachineCigs
-  entities:
-  - uid: 1380
+  - uid: 851
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: -5.5,-15.5
+      pos: -5.5,-24.5
       parent: 1
-- proto: VendingMachineClothing
-  entities:
-  - uid: 1381
+  - uid: 852
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: -0.5,-28.5
+      pos: 1.5,-29.5
       parent: 1
-- proto: VendingMachineCondiments
-  entities:
-  - uid: 1382
+  - uid: 854
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: 2.5,-7.5
+      pos: 2.5,-29.5
       parent: 1
-- proto: VendingMachineDinnerware
-  entities:
-  - uid: 1383
+  - uid: 855
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: 2.5,-9.5
+      pos: -2.5,-25.5
       parent: 1
-- proto: VendingMachineEngiDrobe
-  entities:
-  - uid: 628
+  - uid: 856
     components:
     - type: Transform
-      pos: -4.5,-24.5
+      pos: -5.5,-23.5
       parent: 1
-- proto: VendingMachineEngivend
-  entities:
-  - uid: 1384
+  - uid: 857
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: -7.5,-24.5
+      pos: 3.5,-29.5
       parent: 1
-- proto: VendingMachineHydrobe
-  entities:
-  - uid: 627
+  - uid: 858
     components:
     - type: Transform
-      pos: 2.5,-3.5
+      pos: -5.5,-21.5
       parent: 1
-- proto: VendingMachineMediDrobe
-  entities:
-  - uid: 1385
+  - uid: 859
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: 3.5,-28.5
+      pos: -2.5,-24.5
       parent: 1
-- proto: VendingMachineSalvage
-  entities:
-  - uid: 1386
+  - uid: 860
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: 9.5,-26.5
+      pos: 4.5,-28.5
       parent: 1
-- proto: VendingMachineTankDispenserEVA
-  entities:
-  - uid: 1387
+  - uid: 861
+    components:
+    - type: Transform
+      pos: 4.5,-29.5
+      parent: 1
+  - uid: 873
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: -19.5,-12.5
+      rot: 3.141592653589793 rad
+      pos: -19.5,-19.5
       parent: 1
-  - uid: 1388
+  - uid: 886
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      pos: 18.5,-12.5
+      pos: -17.5,-17.5
       parent: 1
-- proto: LockerWallMedical
-  entities:
-  - uid: 1390
+  - uid: 1292
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,-15.5
+      pos: -3.5,-0.5
       parent: 1
-- proto: WallShuttle
-  entities:
-  - uid: 636
+  - uid: 1293
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -13.5,-21.5
+      pos: -2.5,0.5
       parent: 1
-  - uid: 1391
+  - uid: 1301
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-27.5
+      pos: -4.5,-0.5
       parent: 1
   - uid: 1392
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -6.5,-28.5
+      rot: 3.141592653589793 rad
+      pos: -13.5,-21.5
       parent: 1
   - uid: 1393
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-28.5
       parent: 1
-  - uid: 1394
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -16.5,-21.5
-      parent: 1
   - uid: 1395
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -21.5,-10.5
       parent: 1
   - uid: 1396
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -21.5,-12.5
       parent: 1
   - uid: 1397
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -21.5,-8.5
       parent: 1
   - uid: 1398
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-10.5
       parent: 1
   - uid: 1399
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-8.5
       parent: 1
-  - uid: 1400
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -7.5,-2.5
-      parent: 1
   - uid: 1401
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-0.5
       parent: 1
-  - uid: 1402
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -12.5,-12.5
-      parent: 1
   - uid: 1403
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-6.5
       parent: 1
   - uid: 1404
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-24.5
       parent: 1
-  - uid: 1405
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -2.5,-25.5
-      parent: 1
   - uid: 1406
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,3.5
       parent: 1
   - uid: 1407
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-22.5
       parent: 1
-  - uid: 1408
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -2.5,-28.5
-      parent: 1
   - uid: 1409
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-29.5
       parent: 1
   - uid: 1410
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-11.5
       parent: 1
   - uid: 1411
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-7.5
       parent: 1
   - uid: 1412
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-8.5
       parent: 1
   - uid: 1413
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-14.5
       parent: 1
   - uid: 1414
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-16.5
       parent: 1
   - uid: 1415
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-18.5
       parent: 1
   - uid: 1416
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-7.5
       parent: 1
   - uid: 1417
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-7.5
       parent: 1
   - uid: 1418
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -2.5,-1.5
+      pos: -2.5,1.5
       parent: 1
   - uid: 1419
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -2.5,-0.5
+      pos: -2.5,-1.5
       parent: 1
   - uid: 1420
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-21.5
       parent: 1
-  - uid: 1421
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 5.5,-9.5
-      parent: 1
-  - uid: 1422
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 11.5,-10.5
-      parent: 1
-  - uid: 1423
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 11.5,-12.5
-      parent: 1
   - uid: 1424
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-4.5
       parent: 1
   - uid: 1425
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-7.5
       parent: 1
   - uid: 1426
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-7.5
       parent: 1
   - uid: 1427
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,-7.5
       parent: 1
-  - uid: 1428
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 11.5,-11.5
-      parent: 1
-  - uid: 1429
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 11.5,-9.5
-      parent: 1
   - uid: 1430
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-8.5
       parent: 1
   - uid: 1431
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-7.5
       parent: 1
   - uid: 1432
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-29.5
       parent: 1
   - uid: 1433
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-29.5
       parent: 1
   - uid: 1434
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,-28.5
       parent: 1
   - uid: 1435
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,-3.5
       parent: 1
-  - uid: 1436
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 10.5,-27.5
-      parent: 1
-  - uid: 1437
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 5.5,-10.5
-      parent: 1
   - uid: 1438
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-28.5
       parent: 1
-  - uid: 1439
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 1.5,-4.5
-      parent: 1
   - uid: 1440
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-28.5
       parent: 1
   - uid: 1441
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-8.5
       parent: 1
   - uid: 1442
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -4.5,-0.5
+      pos: 1.5,-0.5
       parent: 1
   - uid: 1443
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-8.5
       parent: 1
   - uid: 1444
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-28.5
       parent: 1
   - uid: 1445
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-11.5
       parent: 1
-  - uid: 1446
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -15.5,-19.5
-      parent: 1
   - uid: 1447
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,-4.5
       parent: 1
   - uid: 1448
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,-27.5
       parent: 1
-  - uid: 1449
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 8.5,-27.5
-      parent: 1
-  - uid: 1450
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 9.5,-27.5
-      parent: 1
   - uid: 1451
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,-4.5
       parent: 1
   - uid: 1452
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: 1.5,-0.5
+      pos: -2.5,-0.5
       parent: 1
   - uid: 1453
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,3.5
       parent: 1
   - uid: 1454
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-0.5
       parent: 1
   - uid: 1455
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-0.5
       parent: 1
   - uid: 1456
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-8.5
       parent: 1
-  - uid: 1457
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 4.5,-0.5
-      parent: 1
   - uid: 1458
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-8.5
       parent: 1
   - uid: 1459
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,4.5
       parent: 1
   - uid: 1460
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-0.5
       parent: 1
   - uid: 1461
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-25.5
       parent: 1
   - uid: 1462
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,-25.5
       parent: 1
-  - uid: 1463
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -7.5,-1.5
-      parent: 1
   - uid: 1464
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,5.5
       parent: 1
   - uid: 1465
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-5.5
       parent: 1
   - uid: 1466
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,-6.5
       parent: 1
   - uid: 1467
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,1.5
       parent: 1
   - uid: 1468
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,2.5
       parent: 1
   - uid: 1469
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-12.5
       parent: 1
   - uid: 1470
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,3.5
       parent: 1
   - uid: 1471
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-13.5
       parent: 1
-  - uid: 1472
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -17.5,-21.5
-      parent: 1
-  - uid: 1473
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -2.5,-29.5
-      parent: 1
   - uid: 1474
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,-4.5
       parent: 1
-  - uid: 1475
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 2.5,-10.5
-      parent: 1
   - uid: 1476
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-14.5
       parent: 1
   - uid: 1477
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-32.5
       parent: 1
   - uid: 1478
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-22.5
       parent: 1
   - uid: 1479
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-21.5
       parent: 1
-  - uid: 1480
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 1
   - uid: 1481
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-18.5
       parent: 1
   - uid: 1482
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-26.5
       parent: 1
   - uid: 1483
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-17.5
       parent: 1
   - uid: 1484
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-16.5
       parent: 1
   - uid: 1485
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-14.5
       parent: 1
   - uid: 1486
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-23.5
       parent: 1
   - uid: 1487
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-24.5
       parent: 1
   - uid: 1488
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-23.5
       parent: 1
   - uid: 1489
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-22.5
       parent: 1
   - uid: 1490
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -2.5,1.5
+      pos: -5.5,-0.5
       parent: 1
   - uid: 1491
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-18.5
       parent: 1
   - uid: 1492
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-22.5
       parent: 1
   - uid: 1493
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -3.5,-0.5
+      pos: -6.5,-0.5
       parent: 1
   - uid: 1494
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,-32.5
       parent: 1
   - uid: 1495
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-18.5
       parent: 1
   - uid: 1496
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-23.5
       parent: 1
-  - uid: 1497
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -2.5,0.5
-      parent: 1
   - uid: 1498
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-22.5
       parent: 1
-  - uid: 1499
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -17.5,-22.5
-      parent: 1
-  - uid: 1500
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -16.5,-22.5
-      parent: 1
   - uid: 1501
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-23.5
       parent: 1
   - uid: 1502
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-18.5
       parent: 1
-  - uid: 1503
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -0.5,-29.5
-      parent: 1
   - uid: 1504
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-5.5
       parent: 1
   - uid: 1505
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-21.5
       parent: 1
   - uid: 1506
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-22.5
       parent: 1
   - uid: 1507
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-25.5
       parent: 1
   - uid: 1508
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-22.5
       parent: 1
   - uid: 1509
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,-10.5
       parent: 1
   - uid: 1510
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-13.5
       parent: 1
   - uid: 1511
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,-21.5
       parent: 1
   - uid: 1512
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,-25.5
       parent: 1
   - uid: 1513
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-17.5
       parent: 1
   - uid: 1514
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-10.5
       parent: 1
-  - uid: 1515
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 6.5,-3.5
-      parent: 1
   - uid: 1516
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-16.5
       parent: 1
   - uid: 1517
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-22.5
       parent: 1
   - uid: 1518
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-14.5
       parent: 1
   - uid: 1519
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-27.5
       parent: 1
   - uid: 1520
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-25.5
       parent: 1
   - uid: 1521
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-9.5
       parent: 1
   - uid: 1522
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-21.5
       parent: 1
   - uid: 1523
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-21.5
       parent: 1
   - uid: 1524
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,6.5
       parent: 1
-  - uid: 1525
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 6.5,-1.5
-      parent: 1
-  - uid: 1526
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 11.5,-26.5
-      parent: 1
   - uid: 1527
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-17.5
       parent: 1
   - uid: 1528
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,5.5
       parent: 1
-  - uid: 1529
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 1.5,-9.5
-      parent: 1
   - uid: 1530
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-15.5
       parent: 1
   - uid: 1531
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-27.5
       parent: 1
   - uid: 1532
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-18.5
       parent: 1
   - uid: 1533
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-21.5
       parent: 1
   - uid: 1534
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-13.5
       parent: 1
   - uid: 1535
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,4.5
       parent: 1
   - uid: 1536
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-15.5
       parent: 1
   - uid: 1537
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,3.5
       parent: 1
   - uid: 1538
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-8.5
       parent: 1
   - uid: 1539
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-25.5
       parent: 1
   - uid: 1540
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,-22.5
       parent: 1
-  - uid: 1541
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -2.5,-24.5
-      parent: 1
   - uid: 1542
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-25.5
       parent: 1
   - uid: 1543
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-12.5
       parent: 1
-  - uid: 1544
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 11.5,-27.5
-      parent: 1
   - uid: 1545
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-24.5
       parent: 1
   - uid: 1546
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-15.5
       parent: 1
   - uid: 1547
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,-29.5
       parent: 1
   - uid: 1548
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-24.5
       parent: 1
-  - uid: 1549
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 3.5,-4.5
-      parent: 1
   - uid: 1550
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-23.5
       parent: 1
   - uid: 1551
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-31.5
       parent: 1
   - uid: 1552
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-7.5
       parent: 1
   - uid: 1553
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,-31.5
       parent: 1
-  - uid: 1554
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -3.5,-25.5
-      parent: 1
   - uid: 1555
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-21.5
       parent: 1
-  - uid: 1556
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -0.5,-0.5
-      parent: 1
   - uid: 1557
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-18.5
       parent: 1
   - uid: 1558
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-18.5
       parent: 1
   - uid: 1559
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-21.5
       parent: 1
   - uid: 1560
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-21.5
       parent: 1
   - uid: 1561
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-12.5
       parent: 1
   - uid: 1562
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-4.5
       parent: 1
   - uid: 1563
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,3.5
       parent: 1
   - uid: 1564
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-28.5
       parent: 1
   - uid: 1565
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-24.5
       parent: 1
   - uid: 1566
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,-29.5
       parent: 1
   - uid: 1567
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,4.5
       parent: 1
   - uid: 1568
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -15.5,-24.5
       parent: 1
   - uid: 1569
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,4.5
       parent: 1
   - uid: 1570
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,-9.5
       parent: 1
   - uid: 1571
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-18.5
       parent: 1
   - uid: 1572
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,-7.5
       parent: 1
-  - uid: 1573
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -5.5,-23.5
-      parent: 1
   - uid: 1574
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-20.5
       parent: 1
   - uid: 1575
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-8.5
       parent: 1
   - uid: 1576
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-8.5
       parent: 1
   - uid: 1577
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-13.5
       parent: 1
   - uid: 1578
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-19.5
       parent: 1
   - uid: 1579
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,-21.5
       parent: 1
   - uid: 1580
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,6.5
       parent: 1
   - uid: 1581
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-21.5
       parent: 1
-  - uid: 1582
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 1.5,-28.5
-      parent: 1
   - uid: 1583
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -14.5,-24.5
       parent: 1
-  - uid: 1584
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 5.5,-4.5
-      parent: 1
   - uid: 1585
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-6.5
       parent: 1
   - uid: 1586
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,8.5
       parent: 1
   - uid: 1587
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-21.5
       parent: 1
   - uid: 1588
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,7.5
       parent: 1
-  - uid: 1589
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 2.5,8.5
-      parent: 1
-  - uid: 1590
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 3.5,7.5
-      parent: 1
   - uid: 1591
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,5.5
       parent: 1
   - uid: 1592
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,-21.5
       parent: 1
   - uid: 1593
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,5.5
       parent: 1
   - uid: 1594
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,4.5
       parent: 1
   - uid: 1595
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,4.5
       parent: 1
   - uid: 1596
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,4.5
       parent: 1
   - uid: 1597
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,4.5
       parent: 1
   - uid: 1598
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-8.5
       parent: 1
   - uid: 1599
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,-21.5
       parent: 1
-  - uid: 1600
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -6.5,-0.5
-      parent: 1
   - uid: 1601
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,0.5
       parent: 1
   - uid: 1602
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-4.5
       parent: 1
   - uid: 1603
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-7.5
       parent: 1
   - uid: 1604
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-7.5
       parent: 1
   - uid: 1605
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-3.5
       parent: 1
-  - uid: 1606
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 2.5,-4.5
-      parent: 1
   - uid: 1607
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-5.5
       parent: 1
   - uid: 1608
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-7.5
       parent: 1
-  - uid: 1609
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -5.5,-0.5
-      parent: 1
   - uid: 1610
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,3.5
       parent: 1
   - uid: 1611
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-0.5
       parent: 1
   - uid: 1612
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-7.5
       parent: 1
   - uid: 1613
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,0.5
       parent: 1
-  - uid: 1614
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 1.5,-29.5
-      parent: 1
-  - uid: 1615
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -5.5,-21.5
-      parent: 1
   - uid: 1616
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-12.5
       parent: 1
   - uid: 1617
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-32.5
       parent: 1
   - uid: 1618
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -20.5,-13.5
       parent: 1
   - uid: 1619
     components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 18.5,-17.5
-      parent: 1
-  - uid: 1620
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -7.5,3.5
-      parent: 1
-  - uid: 1621
-    components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: 6.5,3.5
+      pos: 18.5,-17.5
       parent: 1
-  - uid: 1622
+  - uid: 1620
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -2.5,-27.5
+      pos: -7.5,3.5
       parent: 1
-  - uid: 1623
+  - uid: 1621
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
-      pos: -17.5,-19.5
+      pos: 6.5,3.5
       parent: 1
   - uid: 1624
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-6.5
       parent: 1
   - uid: 1625
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-29.5
       parent: 1
   - uid: 1626
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-27.5
       parent: 1
-  - uid: 1627
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 6.5,-2.5
-      parent: 1
   - uid: 1628
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-25.5
       parent: 1
   - uid: 1629
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-21.5
       parent: 1
   - uid: 1630
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-25.5
       parent: 1
   - uid: 1631
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-28.5
       parent: 1
-  - uid: 1632
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 2.5,-29.5
-      parent: 1
-  - uid: 1633
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
   - uid: 1634
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-22.5
       parent: 1
-  - uid: 1635
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -5.5,-22.5
-      parent: 1
-  - uid: 1636
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 3.5,-29.5
-      parent: 1
-  - uid: 1637
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -5.5,-24.5
-      parent: 1
-  - uid: 1638
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -5.5,-25.5
-      parent: 1
   - uid: 1639
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-26.5
       parent: 1
   - uid: 1640
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-27.5
       parent: 1
   - uid: 1641
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-28.5
       parent: 1
   - uid: 1642
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-29.5
       parent: 1
   - uid: 1643
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-24.5
       parent: 1
   - uid: 1644
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-25.5
       parent: 1
   - uid: 1645
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-26.5
       parent: 1
   - uid: 1646
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-27.5
       parent: 1
-  - uid: 1647
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 4.5,-28.5
-      parent: 1
-  - uid: 1648
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 4.5,-29.5
-      parent: 1
   - uid: 1649
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,3.5
       parent: 1
   - uid: 1650
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-21.5
       parent: 1
-  - uid: 1651
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 12.5,-21.5
-      parent: 1
   - uid: 1652
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-22.5
       parent: 1
   - uid: 1653
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-21.5
       parent: 1
   - uid: 1654
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-21.5
       parent: 1
   - uid: 1655
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-21.5
       parent: 1
   - uid: 1656
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-17.5
       parent: 1
   - uid: 1657
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-14.5
       parent: 1
   - uid: 1658
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-4.5
       parent: 1
   - uid: 1659
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,-5.5
       parent: 1
   - uid: 1660
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-7.5
       parent: 1
-  - uid: 1661
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 16.5,-10.5
-      parent: 1
-  - uid: 1662
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -17.5,-10.5
-      parent: 1
   - uid: 1663
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-13.5
       parent: 1
-  - uid: 1664
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -19.5,-19.5
-      parent: 1
   - uid: 1665
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-20.5
       parent: 1
   - uid: 1666
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-13.5
       parent: 1
   - uid: 1667
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-13.5
       parent: 1
   - uid: 1668
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-13.5
       parent: 1
   - uid: 1669
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-20.5
       parent: 1
   - uid: 1670
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,-13.5
       parent: 1
   - uid: 1671
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-13.5
       parent: 1
-  - uid: 1672
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -3.5,-30.5
-      parent: 1
   - uid: 1673
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,-31.5
       parent: 1
-  - uid: 1674
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 2.5,-30.5
-      parent: 1
   - uid: 1675
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-31.5
       parent: 1
-  - uid: 1676
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: 12.5,-24.5
-      parent: 1
   - uid: 1677
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-12.5
       parent: 1
   - uid: 1678
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 19.5,-13.5
       parent: 1
+  - uid: 1795
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,8.5
+      parent: 1
+  - uid: 1798
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,7.5
+      parent: 1
 - proto: WallShuttleDiagonal
   entities:
+  - uid: 625
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-11.5
+      parent: 1
   - uid: 1679
     components:
     - type: Transform
@@ -11421,12 +12707,6 @@ entities:
     - type: Transform
       pos: 2.5,5.5
       parent: 1
-  - uid: 1683
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,7.5
-      parent: 1
   - uid: 1684
     components:
     - type: Transform
@@ -11474,12 +12754,6 @@ entities:
     - type: Transform
       pos: 5.5,0.5
       parent: 1
-  - uid: 1692
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-10.5
-      parent: 1
   - uid: 1693
     components:
     - type: Transform
@@ -11506,12 +12780,6 @@ entities:
     - type: Transform
       pos: -4.5,8.5
       parent: 1
-  - uid: 1698
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,8.5
-      parent: 1
   - uid: 1699
     components:
     - type: Transform
@@ -11582,60 +12850,59 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-30.5
       parent: 1
-- proto: WarningCO2
-  entities:
-  - uid: 1711
+  - uid: 1791
     components:
     - type: Transform
-      pos: 4.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,8.5
       parent: 1
-- proto: WarningN2
-  entities:
-  - uid: 1712
+  - uid: 1797
     components:
     - type: Transform
-      pos: 8.5,-21.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,7.5
       parent: 1
-- proto: WarningO2
+- proto: WarningN2
   entities:
-  - uid: 1713
+  - uid: 428
     components:
     - type: Transform
-      pos: 10.5,-21.5
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-25.5
       parent: 1
-  - uid: 1714
+- proto: WarningO2
+  entities:
+  - uid: 265
     components:
     - type: Transform
-      pos: 18.5,-16.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-25.5
       parent: 1
 - proto: WarningWaste
   entities:
-  - uid: 1715
+  - uid: 471
     components:
     - type: Transform
-      pos: 10.5,-27.5
+      pos: 11.5,-25.5
       parent: 1
 - proto: WarpPointShip
   entities:
-  - uid: 1716
+  - uid: 1767
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-14.5
+      pos: -0.5,-13.5
       parent: 1
 - proto: WaterCooler
   entities:
-  - uid: 1717
+  - uid: 796
     components:
     - type: Transform
-      pos: 2.5,-15.5
+      pos: -6.5,-6.5
       parent: 1
-- proto: WaterTankFull
-  entities:
-  - uid: 1718
+  - uid: 813
     components:
     - type: Transform
-      pos: 5.5,-2.5
+      pos: -5.5,-15.5
       parent: 1
 - proto: WeaponCapacitorRecharger
   entities:
@@ -11644,25 +12911,54 @@ entities:
     - type: Transform
       pos: -3.5,-3.5
       parent: 1
-- proto: WindoorSecure
+- proto: WeaponRackBase
   entities:
-  - uid: 1721
+  - uid: 1811
+    components:
+    - type: Transform
+      pos: -5.5,-1.5
+      parent: 1
+- proto: WeaponRackPistolBase
+  entities:
+  - uid: 1376
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 1
+- proto: Windoor
+  entities:
+  - uid: 630
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 868
     components:
     - type: Transform
       pos: -3.5,-27.5
       parent: 1
-- proto: WindowFrostedDirectional
+- proto: WindoorSecure
   entities:
-  - uid: 1722
+  - uid: 820
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,-19.5
+      parent: 1
+- proto: WindowDirectional
+  entities:
+  - uid: 867
     components:
     - type: Transform
       pos: -4.5,-27.5
       parent: 1
-- proto: Wrench
+- proto: WindowReinforcedDirectional
   entities:
-  - uid: 1723
+  - uid: 1820
     components:
     - type: Transform
-      pos: 10.451632,-23.93664
+      rot: 1.5707963267948966 rad
+      pos: -18.5,-18.5
       parent: 1
 ...
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
index 8465828c963f..b6709992c255 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
@@ -1,28 +1,38 @@
-# - type: vessel
-  # id: Anchor
-  # name: KC Anchor
-  # description: A large luxury cruiser capable of long ranged travel acrossed the sector, expedition capable.
-  # price: 135020
-  # category: Large
-  # group: Expedition
-  # shuttlePath: /Maps/_NF/Shuttles/Expedition/anchor.yml
-  
-# - type: gameMap
-  # id: Anchor
-  # mapName: 'KC Anchor'
-  # mapPath: /Maps/_NF/Shuttles/Expedition/anchor.yml
-  # minPlayers: 0
-  # stations: 
-    # Anchor:
-      # stationProto: StandardFrontierExpeditionVessel
-      # components:
-        # - type: StationNameSetup
-          # mapNameTemplate: 'Anchor {1}'
-          # nameGenerator:
-            # !type:NanotrasenNameGenerator
-            # prefixCreator: '14'
-        # - type: StationJobs
-          # availableJobs:
-            # Contractor: [ 0, 0 ]
-            # Pilot: [ 0, 0 ]
-            # Mercenary: [ 0, 0 ]
\ No newline at end of file
+# Author Info
+# GitHub: Kesiath (https://github.com/Kesiath)
+# Discord: ???
+
+# Maintainer Info
+# GitHub: ???
+# Discord: ???
+
+# Shuttle Notes:
+#
+- type: vessel
+  id: Anchor
+  name: KC Anchor
+  description: A large luxury cruiser capable of long ranged travel acrossed the sector, expedition capable.
+  price: 105300 # $81000 +30%
+  category: Large
+  group: Expedition
+  shuttlePath: /Maps/_NF/Shuttles/Expedition/anchor.yml
+
+- type: gameMap
+  id: Anchor
+  mapName: 'KC Anchor'
+  mapPath: /Maps/_NF/Shuttles/Expedition/anchor.yml
+  minPlayers: 0
+  stations:
+    Anchor:
+      stationProto: StandardFrontierExpeditionVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Anchor {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]

From 449c8e5ee6ffa5a327dac62a18656e9e8291fb8c Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Tue, 13 Aug 2024 17:00:07 +0000
Subject: [PATCH 22/39] Automatic Changelog (#1685)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 99b8e66dd20b..5f3ceff8cc46 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6273,3 +6273,9 @@ Entries:
       message: Added new wall lockers for EVA suits, fuel and materials.
   id: 5198
   time: '2024-08-12T22:40:54.0000000+00:00'
+- author: ThatOneGoblin25
+  changes:
+    - type: Add
+      message: KC Anchor returns to the expedition shipyard with a rework.
+  id: 5199
+  time: '2024-08-13T16:59:42.0000000+00:00'

From 892221081ee01d9ac5cfd62f41c409f11c692faf Mon Sep 17 00:00:00 2001
From: "Alice \"Arimah\" Heurlin" <30327355+arimah@users.noreply.github.com>
Date: Tue, 13 Aug 2024 19:58:43 +0200
Subject: [PATCH 23/39] Remove superfluous keys from shuttle telecom server
 (#1857)

---
 .../_NF/Entities/Structures/Machines/telecomms.yml           | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/telecomms.yml
index c160bbe9bfef..7cc6b448f3a9 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/telecomms.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/telecomms.yml
@@ -7,12 +7,7 @@
     containers:
       key_slots:
       - EncryptionKeyCommon
-      - EncryptionKeyCargo
-      - EncryptionKeyEngineering
       - EncryptionKeyMedical
-      - EncryptionKeyScience
-      - EncryptionKeyService
-      - EncryptionKeyTraffic
 
 - type: entity
   parent: TelecomServer

From 41c0882c8b660bbbd8bb43a3ded54f3eb6625028 Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Tue, 13 Aug 2024 21:07:01 +0300
Subject: [PATCH 24/39] LVHI Broom Shuttle (New) (#1806)

* Broom-broom

* comments

* comment

* defib, extinguisher, price tag

* frontier staff shipyard

* update mail shuttles

* fix 2

* mail mover

* broom lockers

* fixes

* SR console reskin

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
---
 Resources/Maps/_NF/Outpost/frontier.yml       | 2482 +++++++++--------
 Resources/Maps/_NF/Shuttles/Sr/broom.yml      |  917 ++++++
 .../Maps/_NF/Shuttles/{ => Sr}/mailpod.yml    |    0
 .../Maps/_NF/Shuttles/{ => Sr}/parcel.yml     |    0
 .../Machines/Computers/computers_shipyard.yml |    4 +-
 .../Structures/Shuttles/thrusters.yml         |   22 +
 .../Prototypes/_NF/Shipyard/Sr/broom.yml      |   36 +
 .../_NF/Shipyard/{ => Sr}/mailpod.yml         |    7 +-
 .../_NF/Shipyard/{ => Sr}/parcel.yml          |    7 +-
 .../Machines/computers.rsi/shipyard_sr.png    |  Bin 3069 -> 1302 bytes
 10 files changed, 2231 insertions(+), 1244 deletions(-)
 create mode 100644 Resources/Maps/_NF/Shuttles/Sr/broom.yml
 rename Resources/Maps/_NF/Shuttles/{ => Sr}/mailpod.yml (100%)
 rename Resources/Maps/_NF/Shuttles/{ => Sr}/parcel.yml (100%)
 create mode 100644 Resources/Prototypes/_NF/Shipyard/Sr/broom.yml
 rename Resources/Prototypes/_NF/Shipyard/{ => Sr}/mailpod.yml (84%)
 rename Resources/Prototypes/_NF/Shipyard/{ => Sr}/parcel.yml (84%)

diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
index a25ffeb1b805..f317a19dfb56 100644
--- a/Resources/Maps/_NF/Outpost/frontier.yml
+++ b/Resources/Maps/_NF/Outpost/frontier.yml
@@ -177,26 +177,32 @@ entities:
             color: '#334E6DC8'
             id: ArrowsGreyscale
           decals:
-            1837: 0,9
-            1838: 0,9
-            1839: 0,9
-            1840: 0,9
+            1833: 0,9
+            1834: 0,9
+            1835: 0,9
+            1836: 0,9
+            1868: -2,9
+            1869: -2,9
+            1870: -2,9
+            1871: -2,9
             1872: -2,9
-            1873: -2,9
-            1874: -2,9
-            1875: -2,9
-            1876: -2,9
         - node:
             angle: 3.141592653589793 rad
             color: '#334E6DC8'
             id: ArrowsGreyscale
           decals:
-            1831: -2,12
-            1832: -2,12
-            1833: -2,12
-            1834: 0,12
-            1835: 0,12
-            1836: 0,12
+            1827: -2,12
+            1828: -2,12
+            1829: -2,12
+            1830: 0,12
+            1831: 0,12
+            1832: 0,12
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#4B709CFF'
+            id: ArrowsGreyscale
+          decals:
+            2454: -2,27
         - node:
             color: '#52B4E9FF'
             id: ArrowsGreyscale
@@ -210,39 +216,39 @@ entities:
             color: '#52B4F3AD'
             id: ArrowsGreyscale
           decals:
+            1425: 23,21
+            1426: 23,21
+            1427: 23,21
+            1428: 23,21
             1429: 23,21
             1430: 23,21
             1431: 23,21
             1432: 23,21
             1433: 23,21
             1434: 23,21
-            1435: 23,21
-            1436: 23,21
-            1437: 23,21
-            1438: 23,21
-            1441: 21,21
-            1442: 21,21
-            1443: 21,21
-            1444: 21,21
+            1437: 21,21
+            1438: 21,21
+            1439: 21,21
+            1440: 21,21
         - node:
             color: '#2E9935FF'
             id: BotLeftGreyscale
           decals:
-            2368: 8,25
-            2369: 7,25
-            2370: 6,25
-            2371: 5,25
-            2372: 4,25
+            2357: 8,25
+            2358: 7,25
+            2359: 6,25
+            2360: 5,25
+            2361: 4,25
         - node:
             color: '#52B4E996'
             id: BotLeftGreyscale
           decals:
-            2062: 26,20
+            2058: 26,20
         - node:
             color: '#52B4E9AE'
             id: BotLeftGreyscale
           decals:
-            1428: 24,20
+            1424: 24,20
         - node:
             color: '#52B4E9FF'
             id: BotLeftGreyscale
@@ -270,10 +276,10 @@ entities:
             270: 3,14
             271: 3,12
             272: 3,10
-            2034: -5,10
-            2035: -5,12
-            2036: -5,14
-            2037: -5,17
+            2030: -5,10
+            2031: -5,12
+            2032: -5,14
+            2033: -5,17
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -288,15 +294,15 @@ entities:
             id: BrickTileDarkCornerNe
           decals:
             273: -4,28
-            1820: 1,9
-            2071: 22,12
+            1816: 1,9
+            2067: 22,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
           decals:
             276: -6,28
-            1869: -3,9
-            2074: 19,12
+            1865: -3,9
+            2070: 19,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSe
@@ -315,37 +321,37 @@ entities:
             color: '#FFFFFF81'
             id: BrickTileDarkInnerNe
           decals:
-            1796: -3,12
-            1797: -3,12
-            1806: -1,12
-            1807: -1,12
+            1792: -3,12
+            1793: -3,12
+            1802: -1,12
+            1803: -1,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
           decals:
             139: 4,14
-            1822: 0,9
+            1818: 0,9
         - node:
             color: '#FFFFFF81'
             id: BrickTileDarkInnerNw
           decals:
-            1800: -1,12
-            1801: -1,12
-            1808: 1,12
-            1809: 1,12
+            1796: -1,12
+            1797: -1,12
+            1804: 1,12
+            1805: 1,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
           decals:
-            1871: -2,9
+            1867: -2,9
         - node:
             color: '#FFFFFF81'
             id: BrickTileDarkInnerSe
           decals:
-            1857: -1,9
-            1858: -1,9
-            1859: -3,9
-            1860: -3,9
+            1853: -1,9
+            1854: -1,9
+            1855: -3,9
+            1856: -3,9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
@@ -356,10 +362,10 @@ entities:
             color: '#FFFFFF81'
             id: BrickTileDarkInnerSw
           decals:
-            1827: 1,9
-            1828: 1,9
-            1863: -1,9
-            1864: -1,9
+            1823: 1,9
+            1824: 1,9
+            1859: -1,9
+            1860: -1,9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
@@ -369,19 +375,19 @@ entities:
             color: '#52B4E996'
             id: BrickTileDarkLineE
           decals:
-            2042: -48,2
+            2038: -48,2
         - node:
             color: '#FFFFFF81'
             id: BrickTileDarkLineE
           decals:
-            1794: -3,13
-            1795: -3,13
-            1804: -1,13
-            1805: -1,13
-            1851: -3,8
-            1852: -3,8
-            1853: -1,8
-            1854: -1,8
+            1790: -3,13
+            1791: -3,13
+            1800: -1,13
+            1801: -1,13
+            1847: -3,8
+            1848: -3,8
+            1849: -1,8
+            1850: -1,8
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
@@ -390,27 +396,27 @@ entities:
             137: 4,16
             279: -4,27
             1238: 1,13
-            1821: 1,8
-            1844: -3,11
-            1845: -3,10
-            2040: -48,2
-            2041: -48,1
-            2069: 22,10
-            2070: 22,11
+            1817: 1,8
+            1840: -3,11
+            1841: -3,10
+            2036: -48,2
+            2037: -48,1
+            2065: 22,10
+            2066: 22,11
         - node:
             color: '#FFFFFF81'
             id: BrickTileDarkLineN
           decals:
-            1798: -2,12
-            1799: -2,12
-            1812: 0,12
-            1813: 0,12
-            1823: 0,9
-            1824: 0,9
-            1865: -1,9
-            1866: -1,9
-            1867: -2,9
-            1868: -2,9
+            1794: -2,12
+            1795: -2,12
+            1808: 0,12
+            1809: 0,12
+            1819: 0,9
+            1820: 0,9
+            1861: -1,9
+            1862: -1,9
+            1863: -2,9
+            1864: -2,9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -421,22 +427,22 @@ entities:
             224: 17,16
             251: 7,16
             277: -5,28
-            2072: 21,12
-            2073: 20,12
+            2068: 21,12
+            2069: 20,12
         - node:
             color: '#FFFFFF81'
             id: BrickTileDarkLineS
           decals:
-            1814: -2,12
-            1815: -2,12
-            1816: 0,12
-            1817: 0,12
-            1818: -1,12
-            1819: -1,12
-            1829: 0,9
-            1830: 0,9
-            1861: -2,9
-            1862: -2,9
+            1810: -2,12
+            1811: -2,12
+            1812: 0,12
+            1813: 0,12
+            1814: -1,12
+            1815: -1,12
+            1825: 0,9
+            1826: 0,9
+            1857: -2,9
+            1858: -2,9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
@@ -457,14 +463,14 @@ entities:
             color: '#FFFFFF81'
             id: BrickTileDarkLineW
           decals:
-            1802: -1,13
-            1803: -1,13
-            1810: 1,13
-            1811: 1,13
-            1825: 1,8
-            1826: 1,8
-            1855: -1,8
-            1856: -1,8
+            1798: -1,13
+            1799: -1,13
+            1806: 1,13
+            1807: 1,13
+            1821: 1,8
+            1822: 1,8
+            1851: -1,8
+            1852: -1,8
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
@@ -477,11 +483,11 @@ entities:
             233: 12,10
             280: -6,27
             1239: -3,13
-            1842: 1,11
-            1843: 1,10
-            1870: -3,8
-            2075: 19,11
-            2076: 19,10
+            1838: 1,11
+            1839: 1,10
+            1866: -3,8
+            2071: 19,11
+            2072: 19,10
         - node:
             color: '#52B4E9FF'
             id: BrickTileSteelCornerNe
@@ -491,23 +497,23 @@ entities:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNe
           decals:
-            2212: 32,18
+            2208: 32,18
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNw
           decals:
-            2189: 27,18
+            2185: 27,18
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerSe
           decals:
-            2225: 32,15
+            2221: 32,15
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerSw
           decals:
-            2190: 27,16
-            2226: 31,15
+            2186: 27,16
+            2222: 31,15
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelEndN
@@ -517,19 +523,24 @@ entities:
             315: 19,21
             316: 25,21
             317: 27,21
-            1439: 23,21
-            1440: 21,21
+            1435: 23,21
+            1436: 21,21
+        - node:
+            color: '#B3B3B3FF'
+            id: BrickTileSteelInnerNw
+          decals:
+            2452: -1,27
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSw
           decals:
-            2227: 31,16
+            2223: 31,16
         - node:
             color: '#52B4E996'
             id: BrickTileSteelLineE
           decals:
-            2043: -48,2
-            2044: -48,1
+            2039: -48,2
+            2040: -48,1
         - node:
             color: '#52B4E9FF'
             id: BrickTileSteelLineE
@@ -543,10 +554,10 @@ entities:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineE
           decals:
-            1849: 0,11
-            1850: 0,10
-            2213: 32,17
-            2224: 32,16
+            1845: 0,11
+            1846: 0,10
+            2209: 32,17
+            2220: 32,16
         - node:
             color: '#52B4E9FF'
             id: BrickTileSteelLineN
@@ -562,33 +573,38 @@ entities:
             471: -55,8
             490: -49,15
             491: -50,15
+        - node:
+            color: '#B3B3B3FF'
+            id: BrickTileSteelLineN
+          decals:
+            2453: -2,27
         - node:
             color: '#FF5C5CFF'
             id: BrickTileSteelLineN
           decals:
-            2247: 37,20
-            2248: 36,20
+            2243: 37,20
+            2244: 36,20
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineN
           decals:
-            2192: 28,18
-            2193: 29,18
-            2194: 30,18
-            2214: 31,18
+            2188: 28,18
+            2189: 29,18
+            2190: 30,18
+            2210: 31,18
         - node:
             color: '#FF5C5CFF'
             id: BrickTileSteelLineS
           decals:
-            2249: 37,20
-            2250: 36,20
+            2245: 37,20
+            2246: 36,20
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineS
           decals:
-            2195: 28,16
-            2196: 29,16
-            2197: 30,16
+            2191: 28,16
+            2192: 29,16
+            2193: 30,16
         - node:
             color: '#52B4E9FF'
             id: BrickTileSteelLineW
@@ -606,85 +622,106 @@ entities:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineW
           decals:
-            1841: -2,10
-            1848: -2,11
-            2191: 27,17
+            1837: -2,10
+            1844: -2,11
+            2187: 27,17
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteCornerNe
           decals:
-            2405: 11,16
+            2394: 11,16
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerNe
           decals:
             165: -48,18
             596: -44,11
-            2385: 5,23
+            2374: 5,23
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteCornerNw
           decals:
-            2414: 16,16
+            2403: 16,16
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerNw
           decals:
             163: -50,18
             594: -46,11
-            2386: 3,23
+            2375: 3,23
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerSe
           decals:
             162: -48,17
             589: -44,8
-            2393: 5,20
+            2382: 5,20
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerSw
           decals:
             164: -50,17
             591: -46,8
-            2394: 3,20
+            2383: 3,20
+        - node:
+            color: '#8C347F96'
+            id: BrickTileWhiteInnerNe
+          decals:
+            2460: -6,18
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteInnerNe
           decals:
             143: 4,14
-            2407: 11,14
+            2396: 11,14
+        - node:
+            color: '#8C347F96'
+            id: BrickTileWhiteInnerNw
+          decals:
+            2456: -2,25
+            2459: -4,18
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteInnerNw
           decals:
-            2412: 16,14
+            2401: 16,14
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteInnerSe
           decals:
             142: 4,17
+        - node:
+            color: '#8C347F96'
+            id: BrickTileWhiteInnerSw
+          decals:
+            2457: -2,27
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineE
           decals:
             140: 4,15
             141: 4,16
-            2406: 11,15
+            2395: 11,15
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineE
           decals:
             597: -44,10
             598: -44,9
-            2388: 5,22
-            2389: 5,21
+            2377: 5,22
+            2378: 5,21
         - node:
             color: '#3EB38896'
             id: BrickTileWhiteLineN
           decals:
-            2426: -33,12
-            2427: -32,12
-            2428: -31,12
+            2415: -33,12
+            2416: -32,12
+            2417: -31,12
+        - node:
+            color: '#8C347F96'
+            id: BrickTileWhiteLineN
+          decals:
+            2458: -5,18
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineN
@@ -694,10 +731,10 @@ entities:
             245: 6,16
             246: 17,16
             252: 7,16
-            2408: 12,14
-            2409: 13,14
-            2410: 14,14
-            2411: 15,14
+            2397: 12,14
+            2398: 13,14
+            2399: 14,14
+            2400: 15,14
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineN
@@ -711,23 +748,23 @@ entities:
             638: -29,12
             639: -28,12
             640: -27,12
-            2418: -37,12
-            2419: -36,12
-            2420: -35,12
-            2421: -34,12
+            2407: -37,12
+            2408: -36,12
+            2409: -35,12
+            2410: -34,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineN
           decals:
             167: -49,18
             595: -45,11
-            2387: 4,23
+            2376: 4,23
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineS
           decals:
-            2415: 13,12
-            2416: 12,12
+            2404: 13,12
+            2405: 12,12
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineS
@@ -753,37 +790,42 @@ entities:
             629: -29,11
             630: -28,11
             631: -27,11
-            2417: 11,12
-            2429: -31,11
-            2430: -32,11
-            2431: -33,11
-            2432: -34,11
-            2433: -35,11
-            2434: -36,11
-            2435: -37,11
-            2436: -38,11
-            2437: -39,11
-            2438: -40,11
-            2439: -41,11
-            2440: -42,11
+            2406: 11,12
+            2418: -31,11
+            2419: -32,11
+            2420: -33,11
+            2421: -34,11
+            2422: -35,11
+            2423: -36,11
+            2424: -37,11
+            2425: -38,11
+            2426: -39,11
+            2427: -40,11
+            2428: -41,11
+            2429: -42,11
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineS
           decals:
             166: -49,17
             590: -45,8
-            2392: 4,20
+            2381: 4,20
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineW
           decals:
             241: 12,11
             242: 12,10
+        - node:
+            color: '#8C347F96'
+            id: BrickTileWhiteLineW
+          decals:
+            2455: -2,26
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineW
           decals:
-            2413: 16,15
+            2402: 16,15
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineW
@@ -802,8 +844,8 @@ entities:
           decals:
             592: -46,9
             593: -46,10
-            2390: 3,21
-            2391: 3,22
+            2379: 3,21
+            2380: 3,22
         - node:
             color: '#9FED580F'
             id: CheckerNESW
@@ -963,39 +1005,39 @@ entities:
             448: -50,18
             449: -48,18
             450: -48,18
-            1990: 5,3
-            1991: 6,3
-            1992: 9,3
-            1993: 8,2
-            1994: 10,3
-            1995: 9,2
-            1996: 8,3
-            1997: 7,3
-            1998: 6,3
-            1999: 7,4
-            2000: 8,4
-            2001: 11,3
-            2002: 5,3
-            2003: -13,3
-            2004: -13,3
-            2005: -12,3
-            2006: -11,3
-            2007: -11,3
-            2008: -11,4
-            2009: -10,2
-            2010: -9,2
-            2011: -9,3
-            2012: -10,3
-            2013: -8,3
-            2014: -7,3
-            2015: -8,3
+            1986: 5,3
+            1987: 6,3
+            1988: 9,3
+            1989: 8,2
+            1990: 10,3
+            1991: 9,2
+            1992: 8,3
+            1993: 7,3
+            1994: 6,3
+            1995: 7,4
+            1996: 8,4
+            1997: 11,3
+            1998: 5,3
+            1999: -13,3
+            2000: -13,3
+            2001: -12,3
+            2002: -11,3
+            2003: -11,3
+            2004: -11,4
+            2005: -10,2
+            2006: -9,2
+            2007: -9,3
+            2008: -10,3
+            2009: -8,3
+            2010: -7,3
+            2011: -8,3
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            2120: 35,7
-            2265: 43,18
+            2116: 35,7
+            2261: 43,18
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -1201,229 +1243,240 @@ entities:
             1279: -2,18
             1286: -3,18
             1287: -3,18
-            1307: -4,15
-            1308: -4,14
-            1315: -4,12
-            1316: -6,11
-            1317: -6,11
-            1318: -6,11
-            1339: -5,8
-            1340: -5,8
-            1341: -5,8
-            1342: 2,10
-            1343: 2,9
-            1344: 3,8
-            1386: 3,28
-            1387: 4,26
-            1388: 8,28
-            1389: 6,28
-            1390: 9,26
-            1391: 10,26
-            1392: 10,24
-            1393: 10,23
-            1394: 11,24
-            1395: 11,25
-            1396: 11,28
-            1427: 11,26
-            1445: 12,26
-            1446: 13,26
-            1447: 13,24
-            1448: 13,22
-            1449: 16,23
-            1450: 14,21
-            1451: 13,20
-            1452: 14,20
-            1453: 15,23
-            1454: 18,25
-            1455: 15,26
-            1456: 14,26
-            1457: 16,25
-            1458: 17,22
-            1459: 18,25
-            1460: 19,25
-            1461: 17,25
-            1462: 18,22
-            1463: 19,23
-            1464: 22,22
-            1465: 18,23
-            1466: 19,25
-            1467: 17,24
-            1468: 19,23
-            1469: 23,25
-            1470: 21,26
-            1471: 20,25
-            1472: 23,21
-            1473: 21,22
-            1474: 25,22
-            1475: 25,24
-            1476: 25,23
-            1477: 25,25
-            1478: 24,25
-            1479: 28,24
-            1480: 30,23
-            1481: 26,24
-            1482: 27,25
-            1483: 27,24
-            1484: 27,23
-            1485: 29,22
-            1486: 30,22
-            1487: 30,21
-            1488: 29,20
-            1489: 29,20
-            1490: 30,19
-            1491: 33,25
-            1492: 33,25
-            1493: 31,26
-            1617: 16,21
-            1618: 24,21
-            1619: 24,21
-            1620: 30,19
-            1632: 36,26
-            1633: 37,24
-            1634: 37,24
-            1662: 48,24
-            1663: 47,24
-            1664: 47,23
-            1665: 48,23
-            1666: 49,23
-            1667: 52,24
-            1668: 51,25
-            1669: 50,26
-            1670: 49,25
-            1671: 51,25
-            1672: 52,26
-            1673: 52,26
-            1674: 50,26
-            1675: 53,26
-            1676: 53,26
-            1677: 54,26
-            1730: 53,24
-            1757: 14,15
-            1758: 10,15
-            1759: 12,15
-            1760: 14,15
-            1761: 16,15
-            1762: 17,14
-            1763: 16,11
-            1764: 15,10
-            1765: 15,10
-            1766: 15,11
-            1767: 16,10
-            1768: 17,11
-            1769: 17,11
-            1847: -3,10
-            1972: 7,2
-            1973: 6,4
-            1974: 4,3
-            1975: 5,4
-            1976: 11,3
-            1977: 10,2
-            2016: -8,4
-            2017: -7,4
-            2046: -50,3
-            2047: -50,3
-            2048: -53,6
-            2049: -52,6
-            2102: 36,23
-            2103: 37,21
-            2104: 36,20
-            2111: 40,17
-            2112: 41,16
-            2113: 40,16
-            2114: 43,16
-            2115: 44,16
-            2116: 45,17
-            2117: 44,17
-            2118: 44,16
-            2121: 36,9
-            2127: 45,7
-            2128: 44,9
-            2129: 45,8
-            2130: 46,9
-            2131: 47,8
-            2132: 42,9
-            2133: 43,8
-            2134: 47,10
-            2135: 48,8
-            2136: 26,9
-            2144: 34,21
-            2145: 34,22
-            2146: 32,23
-            2147: 34,23
-            2148: 40,23
-            2149: 39,23
-            2150: 40,22
-            2151: 45,22
-            2152: 47,22
-            2153: 41,22
-            2154: 42,22
-            2155: 49,22
-            2156: 52,22
-            2157: 53,23
-            2158: 52,23
-            2159: 43,6
-            2160: 46,6
-            2161: 46,6
-            2162: 48,6
-            2163: 47,6
-            2164: 42,6
-            2165: 50,3
-            2166: 51,3
-            2167: 53,3
-            2168: 54,3
-            2169: 56,3
-            2170: 57,3
-            2171: 46,4
-            2172: 47,3
-            2173: 45,6
-            2174: 20,22
-            2198: 27,18
-            2199: 28,18
-            2200: 29,18
-            2201: 29,17
-            2202: 28,16
-            2203: 30,16
-            2204: 30,18
-            2230: 32,16
-            2231: 31,16
-            2232: 28,18
-            2233: 28,18
-            2266: 43,17
-            2267: 38,17
-            2286: 38,5
-            2287: 40,5
-            2323: 45,15
-            2324: 42,15
-            2325: 41,15
-            2326: 44,15
-            2327: 43,15
-            2328: 45,15
-            2329: 45,16
-            2330: 37,17
-            2331: 36,18
-            2332: 37,18
+            1303: -4,15
+            1304: -4,14
+            1311: -4,12
+            1312: -6,11
+            1313: -6,11
+            1314: -6,11
+            1335: -5,8
+            1336: -5,8
+            1337: -5,8
+            1338: 2,10
+            1339: 2,9
+            1340: 3,8
+            1382: 3,28
+            1383: 4,26
+            1384: 8,28
+            1385: 6,28
+            1386: 9,26
+            1387: 10,26
+            1388: 10,24
+            1389: 10,23
+            1390: 11,24
+            1391: 11,25
+            1392: 11,28
+            1423: 11,26
+            1441: 12,26
+            1442: 13,26
+            1443: 13,24
+            1444: 13,22
+            1445: 16,23
+            1446: 14,21
+            1447: 13,20
+            1448: 14,20
+            1449: 15,23
+            1450: 18,25
+            1451: 15,26
+            1452: 14,26
+            1453: 16,25
+            1454: 17,22
+            1455: 18,25
+            1456: 19,25
+            1457: 17,25
+            1458: 18,22
+            1459: 19,23
+            1460: 22,22
+            1461: 18,23
+            1462: 19,25
+            1463: 17,24
+            1464: 19,23
+            1465: 23,25
+            1466: 21,26
+            1467: 20,25
+            1468: 23,21
+            1469: 21,22
+            1470: 25,22
+            1471: 25,24
+            1472: 25,23
+            1473: 25,25
+            1474: 24,25
+            1475: 28,24
+            1476: 30,23
+            1477: 26,24
+            1478: 27,25
+            1479: 27,24
+            1480: 27,23
+            1481: 29,22
+            1482: 30,22
+            1483: 30,21
+            1484: 29,20
+            1485: 29,20
+            1486: 30,19
+            1487: 33,25
+            1488: 33,25
+            1489: 31,26
+            1613: 16,21
+            1614: 24,21
+            1615: 24,21
+            1616: 30,19
+            1628: 36,26
+            1629: 37,24
+            1630: 37,24
+            1658: 48,24
+            1659: 47,24
+            1660: 47,23
+            1661: 48,23
+            1662: 49,23
+            1663: 52,24
+            1664: 51,25
+            1665: 50,26
+            1666: 49,25
+            1667: 51,25
+            1668: 52,26
+            1669: 52,26
+            1670: 50,26
+            1671: 53,26
+            1672: 53,26
+            1673: 54,26
+            1726: 53,24
+            1753: 14,15
+            1754: 10,15
+            1755: 12,15
+            1756: 14,15
+            1757: 16,15
+            1758: 17,14
+            1759: 16,11
+            1760: 15,10
+            1761: 15,10
+            1762: 15,11
+            1763: 16,10
+            1764: 17,11
+            1765: 17,11
+            1843: -3,10
+            1968: 7,2
+            1969: 6,4
+            1970: 4,3
+            1971: 5,4
+            1972: 11,3
+            1973: 10,2
+            2012: -8,4
+            2013: -7,4
+            2042: -50,3
+            2043: -50,3
+            2044: -53,6
+            2045: -52,6
+            2098: 36,23
+            2099: 37,21
+            2100: 36,20
+            2107: 40,17
+            2108: 41,16
+            2109: 40,16
+            2110: 43,16
+            2111: 44,16
+            2112: 45,17
+            2113: 44,17
+            2114: 44,16
+            2117: 36,9
+            2123: 45,7
+            2124: 44,9
+            2125: 45,8
+            2126: 46,9
+            2127: 47,8
+            2128: 42,9
+            2129: 43,8
+            2130: 47,10
+            2131: 48,8
+            2132: 26,9
+            2140: 34,21
+            2141: 34,22
+            2142: 32,23
+            2143: 34,23
+            2144: 40,23
+            2145: 39,23
+            2146: 40,22
+            2147: 45,22
+            2148: 47,22
+            2149: 41,22
+            2150: 42,22
+            2151: 49,22
+            2152: 52,22
+            2153: 53,23
+            2154: 52,23
+            2155: 43,6
+            2156: 46,6
+            2157: 46,6
+            2158: 48,6
+            2159: 47,6
+            2160: 42,6
+            2161: 50,3
+            2162: 51,3
+            2163: 53,3
+            2164: 54,3
+            2165: 56,3
+            2166: 57,3
+            2167: 46,4
+            2168: 47,3
+            2169: 45,6
+            2170: 20,22
+            2194: 27,18
+            2195: 28,18
+            2196: 29,18
+            2197: 29,17
+            2198: 28,16
+            2199: 30,16
+            2200: 30,18
+            2226: 32,16
+            2227: 31,16
+            2228: 28,18
+            2229: 28,18
+            2262: 43,17
+            2263: 38,17
+            2282: 38,5
+            2283: 40,5
+            2319: 45,15
+            2320: 42,15
+            2321: 41,15
+            2322: 44,15
+            2323: 43,15
+            2324: 45,15
+            2325: 45,16
+            2326: 37,17
+            2327: 36,18
+            2328: 37,18
+            2461: -4,18
+            2462: -5,18
+            2463: -6,18
+            2464: -1,23
+            2465: -2,23
+            2466: -2,24
+            2467: -2,22
+            2468: -2,25
+            2469: -2,26
+            2470: -2,27
+            2471: -2,28
         - node:
             cleanable: True
             zIndex: 180
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            1899: -33,7
-            1900: -34,10
-            1901: -35,11
-            1902: -39,11
-            1903: -40,12
-            1923: -53,18
-            1924: -53,16
-            1925: -52,15
-            1926: -52,14
-            1927: -51,15
-            1944: -49,5
-            1945: -49,5
-            1946: -56,2
-            1947: -46,4
-            1948: -42,3
-            1949: -42,3
+            1895: -33,7
+            1896: -34,10
+            1897: -35,11
+            1898: -39,11
+            1899: -40,12
+            1919: -53,18
+            1920: -53,16
+            1921: -52,15
+            1922: -52,14
+            1923: -51,15
+            1940: -49,5
+            1941: -49,5
+            1942: -56,2
+            1943: -46,4
+            1944: -42,3
+            1945: -42,3
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -1546,246 +1599,244 @@ entities:
             1290: -3,16
             1291: -4,17
             1292: -4,17
-            1293: -4,18
-            1294: -4,18
-            1300: -5,17
-            1301: -4,16
-            1309: -6,14
-            1310: -6,13
-            1311: -6,15
-            1312: -5,16
-            1313: -4,11
-            1314: -4,11
-            1326: -4,9
-            1327: -6,10
-            1328: -6,10
-            1329: -3,11
-            1330: -6,13
-            1331: -6,13
-            1345: 4,9
-            1346: 3,12
-            1347: 3,13
-            1348: 3,13
-            1349: 2,12
-            1350: 2,12
-            1351: 3,11
-            1352: 3,10
-            1353: 3,14
-            1354: 3,17
-            1355: 3,17
-            1397: 3,28
-            1398: 3,27
-            1399: 3,26
-            1400: 3,25
-            1401: 7,26
-            1402: 7,27
-            1403: 6,27
-            1494: 14,25
-            1495: 13,25
-            1496: 14,23
-            1497: 14,23
-            1498: 13,23
-            1499: 15,24
-            1500: 15,24
-            1501: 16,24
-            1502: 17,23
-            1503: 16,22
-            1504: 15,22
-            1505: 18,24
-            1506: 19,25
-            1507: 19,24
-            1508: 20,24
-            1509: 20,24
-            1510: 20,23
-            1511: 20,23
-            1512: 19,26
-            1513: 19,26
-            1514: 18,26
-            1515: 17,26
-            1516: 16,26
-            1517: 21,24
-            1518: 21,24
-            1519: 21,22
-            1520: 23,22
-            1521: 21,23
-            1522: 21,23
-            1523: 22,23
+            1296: -5,17
+            1297: -4,16
+            1305: -6,14
+            1306: -6,13
+            1307: -6,15
+            1308: -5,16
+            1309: -4,11
+            1310: -4,11
+            1322: -4,9
+            1323: -6,10
+            1324: -6,10
+            1325: -3,11
+            1326: -6,13
+            1327: -6,13
+            1341: 4,9
+            1342: 3,12
+            1343: 3,13
+            1344: 3,13
+            1345: 2,12
+            1346: 2,12
+            1347: 3,11
+            1348: 3,10
+            1349: 3,14
+            1350: 3,17
+            1351: 3,17
+            1393: 3,28
+            1394: 3,27
+            1395: 3,26
+            1396: 3,25
+            1397: 7,26
+            1398: 7,27
+            1399: 6,27
+            1490: 14,25
+            1491: 13,25
+            1492: 14,23
+            1493: 14,23
+            1494: 13,23
+            1495: 15,24
+            1496: 15,24
+            1497: 16,24
+            1498: 17,23
+            1499: 16,22
+            1500: 15,22
+            1501: 18,24
+            1502: 19,25
+            1503: 19,24
+            1504: 20,24
+            1505: 20,24
+            1506: 20,23
+            1507: 20,23
+            1508: 19,26
+            1509: 19,26
+            1510: 18,26
+            1511: 17,26
+            1512: 16,26
+            1513: 21,24
+            1514: 21,24
+            1515: 21,22
+            1516: 23,22
+            1517: 21,23
+            1518: 21,23
+            1519: 22,23
+            1520: 23,24
+            1521: 22,25
+            1522: 21,24
+            1523: 22,24
             1524: 23,24
-            1525: 22,25
-            1526: 21,24
-            1527: 22,24
-            1528: 23,24
-            1529: 24,24
-            1530: 26,25
-            1531: 26,25
-            1532: 24,24
-            1533: 24,23
-            1534: 27,22
-            1535: 27,22
-            1536: 26,22
-            1537: 26,23
-            1538: 28,23
-            1539: 28,23
-            1540: 28,24
-            1541: 29,24
-            1542: 29,24
-            1543: 31,24
-            1544: 31,25
-            1545: 29,25
-            1546: 30,24
-            1547: 29,22
-            1548: 31,23
-            1549: 31,23
-            1550: 31,22
-            1551: 30,23
-            1552: 29,23
-            1553: 29,21
-            1554: 28,22
-            1555: 30,20
-            1556: 31,21
-            1557: 31,21
-            1558: 33,24
-            1559: 33,24
-            1560: 32,24
-            1561: 32,25
-            1562: 32,26
-            1621: 34,25
-            1622: 34,26
-            1635: 41,25
-            1636: 40,26
-            1637: 40,26
-            1638: 39,25
-            1639: 40,24
-            1640: 41,23
-            1641: 44,24
-            1642: 44,25
-            1643: 43,25
-            1644: 42,25
-            1645: 43,25
-            1646: 44,26
-            1647: 44,26
-            1648: 46,25
-            1649: 47,26
-            1650: 49,26
-            1651: 48,26
-            1652: 49,25
-            1653: 49,26
-            1654: 50,25
-            1655: 50,24
-            1656: 50,23
-            1657: 49,24
-            1658: 48,24
-            1659: 46,23
-            1660: 46,23
-            1661: 46,24
-            1724: 50,26
-            1725: 51,23
-            1726: 51,24
-            1727: 45,23
-            1728: 44,23
-            1729: 42,23
-            1732: 14,11
-            1733: 14,11
-            1734: 14,11
-            1735: 14,10
-            1736: 13,10
-            1737: 13,11
-            1738: 11,11
-            1739: 10,11
-            1740: 9,11
-            1741: 9,11
-            1742: 9,10
-            1743: 9,13
-            1744: 9,13
-            1745: 9,13
-            1746: 9,13
-            1747: 11,15
-            1748: 10,15
-            1749: 11,15
-            1750: 13,14
-            1751: 15,15
-            1752: 17,16
-            1753: 17,15
-            1754: 17,13
-            1755: 17,13
-            1756: 17,12
-            1770: 10,12
-            1771: 9,12
-            1772: 8,12
-            1773: 8,12
-            1774: 10,14
-            1846: -3,11
-            1879: -3,13
-            1880: -2,10
-            1881: -3,9
-            1882: -1,8
-            1883: -1,9
-            1884: 0,10
-            1888: -1,12
-            1889: -1,13
-            1890: -3,12
-            1891: 0,11
-            1892: 1,13
-            1893: 3,16
-            1894: 3,16
-            1895: 3,18
-            1896: 3,18
-            1897: 3,18
-            1898: 2,18
-            1978: 8,2
-            1979: 7,4
-            1980: 11,4
-            1981: 6,5
-            2018: -14,2
-            2019: -14,4
-            2020: -13,2
-            2216: 31,17
-            2217: 32,18
-            2228: 32,15
-            2229: 31,15
-            2268: 39,17
-            2269: 38,18
-            2270: 36,17
-            2283: 33,5
-            2284: 35,5
-            2285: 37,5
-            2333: 38,18
-            2334: 36,17
-            2335: 37,17
-            2336: 37,22
-            2337: 36,22
-            2395: 4,25
-            2396: 5,25
-            2397: 6,25
-            2398: 7,25
-            2399: 8,25
-            2400: 7,25
-            2401: 0,21
-            2402: 0,21
-            2451: -37,12
-            2452: -38,12
+            1525: 24,24
+            1526: 26,25
+            1527: 26,25
+            1528: 24,24
+            1529: 24,23
+            1530: 27,22
+            1531: 27,22
+            1532: 26,22
+            1533: 26,23
+            1534: 28,23
+            1535: 28,23
+            1536: 28,24
+            1537: 29,24
+            1538: 29,24
+            1539: 31,24
+            1540: 31,25
+            1541: 29,25
+            1542: 30,24
+            1543: 29,22
+            1544: 31,23
+            1545: 31,23
+            1546: 31,22
+            1547: 30,23
+            1548: 29,23
+            1549: 29,21
+            1550: 28,22
+            1551: 30,20
+            1552: 31,21
+            1553: 31,21
+            1554: 33,24
+            1555: 33,24
+            1556: 32,24
+            1557: 32,25
+            1558: 32,26
+            1617: 34,25
+            1618: 34,26
+            1631: 41,25
+            1632: 40,26
+            1633: 40,26
+            1634: 39,25
+            1635: 40,24
+            1636: 41,23
+            1637: 44,24
+            1638: 44,25
+            1639: 43,25
+            1640: 42,25
+            1641: 43,25
+            1642: 44,26
+            1643: 44,26
+            1644: 46,25
+            1645: 47,26
+            1646: 49,26
+            1647: 48,26
+            1648: 49,25
+            1649: 49,26
+            1650: 50,25
+            1651: 50,24
+            1652: 50,23
+            1653: 49,24
+            1654: 48,24
+            1655: 46,23
+            1656: 46,23
+            1657: 46,24
+            1720: 50,26
+            1721: 51,23
+            1722: 51,24
+            1723: 45,23
+            1724: 44,23
+            1725: 42,23
+            1728: 14,11
+            1729: 14,11
+            1730: 14,11
+            1731: 14,10
+            1732: 13,10
+            1733: 13,11
+            1734: 11,11
+            1735: 10,11
+            1736: 9,11
+            1737: 9,11
+            1738: 9,10
+            1739: 9,13
+            1740: 9,13
+            1741: 9,13
+            1742: 9,13
+            1743: 11,15
+            1744: 10,15
+            1745: 11,15
+            1746: 13,14
+            1747: 15,15
+            1748: 17,16
+            1749: 17,15
+            1750: 17,13
+            1751: 17,13
+            1752: 17,12
+            1766: 10,12
+            1767: 9,12
+            1768: 8,12
+            1769: 8,12
+            1770: 10,14
+            1842: -3,11
+            1875: -3,13
+            1876: -2,10
+            1877: -3,9
+            1878: -1,8
+            1879: -1,9
+            1880: 0,10
+            1884: -1,12
+            1885: -1,13
+            1886: -3,12
+            1887: 0,11
+            1888: 1,13
+            1889: 3,16
+            1890: 3,16
+            1891: 3,18
+            1892: 3,18
+            1893: 3,18
+            1894: 2,18
+            1974: 8,2
+            1975: 7,4
+            1976: 11,4
+            1977: 6,5
+            2014: -14,2
+            2015: -14,4
+            2016: -13,2
+            2212: 31,17
+            2213: 32,18
+            2224: 32,15
+            2225: 31,15
+            2264: 39,17
+            2265: 38,18
+            2266: 36,17
+            2279: 33,5
+            2280: 35,5
+            2281: 37,5
+            2329: 38,18
+            2330: 36,17
+            2331: 37,17
+            2332: 37,22
+            2333: 36,22
+            2384: 4,25
+            2385: 5,25
+            2386: 6,25
+            2387: 7,25
+            2388: 8,25
+            2389: 7,25
+            2390: 0,21
+            2391: 0,21
+            2440: -37,12
+            2441: -38,12
         - node:
             cleanable: True
             zIndex: 180
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            1904: -40,11
-            1905: -41,12
-            1906: -38,12
-            1907: -37,11
-            1908: -36,11
-            1909: -36,11
-            1910: -29,12
-            1911: -28,12
-            1912: -27,12
-            1928: -53,15
-            1929: -51,14
-            1930: -51,14
-            1931: -53,12
-            1932: -53,12
-            1933: -53,13
-            1934: -52,12
+            1900: -40,11
+            1901: -41,12
+            1902: -38,12
+            1903: -37,11
+            1904: -36,11
+            1905: -36,11
+            1906: -29,12
+            1907: -28,12
+            1908: -27,12
+            1924: -53,15
+            1925: -51,14
+            1926: -51,14
+            1927: -53,12
+            1928: -53,12
+            1929: -53,13
+            1930: -52,12
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -2035,250 +2086,250 @@ entities:
             1283: -1,16
             1284: -3,17
             1285: -3,17
-            1319: -6,9
-            1320: -4,8
-            1321: -4,8
-            1322: -4,8
-            1323: -4,8
-            1332: -6,17
-            1333: -4,16
-            1334: -6,8
-            1335: -6,8
-            1336: -6,8
-            1337: -6,8
-            1338: -6,9
-            1356: 2,17
-            1357: 2,18
-            1358: 4,18
-            1359: 4,18
-            1360: 4,17
-            1361: 4,17
-            1362: 4,16
+            1315: -6,9
+            1316: -4,8
+            1317: -4,8
+            1318: -4,8
+            1319: -4,8
+            1328: -6,17
+            1329: -4,16
+            1330: -6,8
+            1331: -6,8
+            1332: -6,8
+            1333: -6,8
+            1334: -6,9
+            1352: 2,17
+            1353: 2,18
+            1354: 4,18
+            1355: 4,18
+            1356: 4,17
+            1357: 4,17
+            1358: 4,16
+            1359: 4,14
+            1360: 4,13
+            1361: 4,13
+            1362: 4,14
             1363: 4,14
-            1364: 4,13
-            1365: 4,13
-            1366: 4,14
-            1367: 4,14
-            1368: 2,16
-            1369: 2,16
-            1370: 2,16
-            1371: 2,16
-            1372: 2,11
-            1373: 2,10
-            1374: 2,9
-            1375: 3,8
-            1376: 2,8
-            1404: 4,27
-            1405: 4,27
-            1406: 5,28
-            1407: 5,28
-            1408: 5,27
-            1409: 10,27
-            1410: 10,27
-            1411: 9,27
-            1412: 11,27
-            1413: 11,26
-            1425: 9,25
-            1426: 6,26
-            1563: 33,26
-            1564: 34,26
-            1565: 34,25
-            1566: 34,24
-            1567: 31,24
-            1568: 32,24
-            1569: 33,24
-            1570: 33,24
-            1571: 30,21
-            1572: 30,22
-            1573: 29,21
+            1364: 2,16
+            1365: 2,16
+            1366: 2,16
+            1367: 2,16
+            1368: 2,11
+            1369: 2,10
+            1370: 2,9
+            1371: 3,8
+            1372: 2,8
+            1400: 4,27
+            1401: 4,27
+            1402: 5,28
+            1403: 5,28
+            1404: 5,27
+            1405: 10,27
+            1406: 10,27
+            1407: 9,27
+            1408: 11,27
+            1409: 11,26
+            1421: 9,25
+            1422: 6,26
+            1559: 33,26
+            1560: 34,26
+            1561: 34,25
+            1562: 34,24
+            1563: 31,24
+            1564: 32,24
+            1565: 33,24
+            1566: 33,24
+            1567: 30,21
+            1568: 30,22
+            1569: 29,21
+            1570: 28,21
+            1571: 28,23
+            1572: 27,22
+            1573: 26,22
             1574: 28,21
-            1575: 28,23
-            1576: 27,22
-            1577: 26,22
-            1578: 28,21
-            1579: 28,22
-            1580: 25,23
-            1581: 26,23
-            1582: 26,23
-            1583: 25,21
-            1584: 24,23
-            1585: 23,24
-            1586: 24,23
-            1587: 23,23
-            1588: 23,23
-            1589: 24,22
-            1590: 24,24
-            1591: 23,25
-            1592: 22,24
-            1593: 22,25
-            1594: 22,26
-            1595: 25,26
-            1596: 25,26
-            1597: 20,26
-            1598: 19,26
-            1599: 20,26
-            1600: 17,26
-            1601: 18,26
-            1602: 15,26
-            1603: 15,26
-            1604: 15,25
-            1605: 15,25
-            1606: 17,24
-            1607: 16,24
-            1608: 13,24
-            1609: 14,23
-            1610: 14,22
-            1611: 15,22
-            1612: 17,23
-            1613: 19,22
-            1614: 20,21
-            1615: 20,21
-            1616: 18,21
-            1623: 37,26
-            1624: 37,26
-            1625: 36,25
-            1626: 36,25
-            1627: 34,26
-            1628: 33,26
-            1629: 32,26
-            1630: 31,25
-            1631: 29,25
-            1695: 39,25
-            1696: 39,24
-            1697: 39,24
-            1698: 41,23
-            1699: 44,24
-            1700: 44,24
-            1701: 43,24
-            1702: 43,24
-            1703: 42,23
-            1704: 43,23
-            1705: 44,23
-            1706: 45,24
-            1707: 45,25
-            1708: 45,25
-            1709: 47,26
-            1710: 47,26
-            1711: 50,25
-            1712: 50,25
-            1713: 49,24
-            1714: 51,25
-            1715: 52,25
-            1716: 51,25
-            1717: 51,25
-            1718: 53,26
-            1719: 54,26
-            1720: 53,25
-            1721: 53,25
-            1722: 54,25
-            1723: 51,26
-            1731: 29,8
-            1775: 10,14
-            1776: 10,14
-            1777: 10,13
-            1778: 10,13
-            1779: 17,15
-            1780: 17,14
-            1781: 17,15
-            1782: 17,16
-            1783: 17,13
-            1784: 15,11
-            1785: 15,10
-            1786: 14,10
-            1787: 7,15
-            1788: 8,16
-            1789: 8,16
-            1790: 7,16
-            1791: 13,21
-            1792: 13,21
-            1793: 13,21
-            1877: -1,11
-            1878: -1,13
-            1885: -2,11
-            1886: 1,11
-            1887: -5,12
-            1982: 5,4
-            1983: 5,3
-            1984: 6,2
-            1985: 4,2
-            1986: 10,2
-            2021: -13,2
-            2022: -13,4
-            2023: -11,2
-            2024: -12,2
-            2105: 36,21
-            2106: 37,20
-            2107: 36,19
-            2108: 37,19
-            2109: 37,18
-            2110: 37,17
-            2119: 40,17
-            2125: 39,10
-            2126: 39,9
-            2137: 24,9
-            2138: 7,20
-            2139: 31,20
-            2140: 32,21
-            2141: 32,22
-            2142: 33,23
-            2143: 33,22
-            2205: 28,17
-            2206: 28,17
-            2207: 27,16
-            2215: 32,17
-            2271: 36,18
-            2273: 45,16
-            2274: 37,25
-            2275: 46,25
-            2276: 43,22
-            2277: 41,5
-            2278: 39,5
-            2279: 36,5
-            2280: 34,5
-            2281: 32,5
-            2282: 28,5
-            2338: 39,22
-            2339: 40,22
-            2340: 42,22
-            2341: 43,22
-            2342: 37,22
-            2343: 36,22
-            2344: 38,23
-            2345: 38,25
-            2346: 38,26
-            2347: 40,8
-            2348: 38,8
-            2349: 39,8
-            2350: 40,8
-            2351: 40,11
-            2352: 40,10
-            2353: 37,11
-            2450: -35,12
+            1575: 28,22
+            1576: 25,23
+            1577: 26,23
+            1578: 26,23
+            1579: 25,21
+            1580: 24,23
+            1581: 23,24
+            1582: 24,23
+            1583: 23,23
+            1584: 23,23
+            1585: 24,22
+            1586: 24,24
+            1587: 23,25
+            1588: 22,24
+            1589: 22,25
+            1590: 22,26
+            1591: 25,26
+            1592: 25,26
+            1593: 20,26
+            1594: 19,26
+            1595: 20,26
+            1596: 17,26
+            1597: 18,26
+            1598: 15,26
+            1599: 15,26
+            1600: 15,25
+            1601: 15,25
+            1602: 17,24
+            1603: 16,24
+            1604: 13,24
+            1605: 14,23
+            1606: 14,22
+            1607: 15,22
+            1608: 17,23
+            1609: 19,22
+            1610: 20,21
+            1611: 20,21
+            1612: 18,21
+            1619: 37,26
+            1620: 37,26
+            1621: 36,25
+            1622: 36,25
+            1623: 34,26
+            1624: 33,26
+            1625: 32,26
+            1626: 31,25
+            1627: 29,25
+            1691: 39,25
+            1692: 39,24
+            1693: 39,24
+            1694: 41,23
+            1695: 44,24
+            1696: 44,24
+            1697: 43,24
+            1698: 43,24
+            1699: 42,23
+            1700: 43,23
+            1701: 44,23
+            1702: 45,24
+            1703: 45,25
+            1704: 45,25
+            1705: 47,26
+            1706: 47,26
+            1707: 50,25
+            1708: 50,25
+            1709: 49,24
+            1710: 51,25
+            1711: 52,25
+            1712: 51,25
+            1713: 51,25
+            1714: 53,26
+            1715: 54,26
+            1716: 53,25
+            1717: 53,25
+            1718: 54,25
+            1719: 51,26
+            1727: 29,8
+            1771: 10,14
+            1772: 10,14
+            1773: 10,13
+            1774: 10,13
+            1775: 17,15
+            1776: 17,14
+            1777: 17,15
+            1778: 17,16
+            1779: 17,13
+            1780: 15,11
+            1781: 15,10
+            1782: 14,10
+            1783: 7,15
+            1784: 8,16
+            1785: 8,16
+            1786: 7,16
+            1787: 13,21
+            1788: 13,21
+            1789: 13,21
+            1873: -1,11
+            1874: -1,13
+            1881: -2,11
+            1882: 1,11
+            1883: -5,12
+            1978: 5,4
+            1979: 5,3
+            1980: 6,2
+            1981: 4,2
+            1982: 10,2
+            2017: -13,2
+            2018: -13,4
+            2019: -11,2
+            2020: -12,2
+            2101: 36,21
+            2102: 37,20
+            2103: 36,19
+            2104: 37,19
+            2105: 37,18
+            2106: 37,17
+            2115: 40,17
+            2121: 39,10
+            2122: 39,9
+            2133: 24,9
+            2134: 7,20
+            2135: 31,20
+            2136: 32,21
+            2137: 32,22
+            2138: 33,23
+            2139: 33,22
+            2201: 28,17
+            2202: 28,17
+            2203: 27,16
+            2211: 32,17
+            2267: 36,18
+            2269: 45,16
+            2270: 37,25
+            2271: 46,25
+            2272: 43,22
+            2273: 41,5
+            2274: 39,5
+            2275: 36,5
+            2276: 34,5
+            2277: 32,5
+            2278: 28,5
+            2334: 39,22
+            2335: 40,22
+            2336: 42,22
+            2337: 43,22
+            2338: 37,22
+            2339: 36,22
+            2340: 38,23
+            2341: 38,25
+            2342: 38,26
+            2343: 40,8
+            2344: 38,8
+            2345: 39,8
+            2346: 40,8
+            2347: 40,11
+            2348: 40,10
+            2349: 37,11
+            2439: -35,12
         - node:
             cleanable: True
             zIndex: 180
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            1913: -38,11
-            1914: -38,11
-            1915: -39,12
-            1916: -39,12
-            1917: -41,10
-            1918: -38,12
-            1919: -33,11
-            1920: -29,11
-            1921: -30,12
-            1922: -30,12
-            1935: -52,11
-            1936: -53,10
-            1937: -49,14
-            1938: -48,14
-            1939: -48,14
-            1940: -50,5
-            1941: -51,5
-            1942: -51,6
-            1943: -51,5
+            1909: -38,11
+            1910: -38,11
+            1911: -39,12
+            1912: -39,12
+            1913: -41,10
+            1914: -38,12
+            1915: -33,11
+            1916: -29,11
+            1917: -30,12
+            1918: -30,12
+            1931: -52,11
+            1932: -53,10
+            1933: -49,14
+            1934: -48,14
+            1935: -48,14
+            1936: -50,5
+            1937: -51,5
+            1938: -51,6
+            1939: -51,5
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -2438,82 +2489,80 @@ entities:
             1228: -9,17
             1229: -8,15
             1230: -9,15
-            1295: -5,18
-            1296: -5,18
-            1297: -5,17
-            1298: -6,17
-            1299: -6,16
-            1302: -6,16
-            1303: -5,15
-            1304: -5,13
-            1305: -5,13
-            1306: -4,13
-            1324: -5,9
-            1325: -4,10
-            1377: 2,8
-            1378: 4,9
-            1379: 4,10
-            1380: 3,9
-            1381: 4,12
-            1382: 4,13
-            1383: 2,15
-            1384: 2,14
-            1385: 4,15
-            1414: 3,28
-            1415: 4,28
-            1416: 5,28
-            1417: 7,28
-            1418: 7,28
-            1419: 6,27
-            1420: 5,26
-            1421: 5,26
-            1422: 8,27
-            1423: 10,23
-            1424: 11,23
-            1678: 48,26
-            1679: 49,26
-            1680: 48,25
-            1681: 47,25
-            1682: 46,26
-            1683: 45,26
-            1684: 45,26
-            1685: 40,26
-            1686: 43,26
-            1687: 43,26
-            1688: 42,24
-            1689: 41,24
-            1690: 42,25
-            1691: 42,26
-            1692: 41,26
-            1693: 40,25
-            1694: 39,26
-            1987: 4,3
-            1988: 6,4
-            1989: 11,2
-            2025: -9,4
-            2026: -10,4
-            2027: -8,2
-            2028: -12,4
-            2029: -11,2
-            2030: -12,2
-            2031: -12,1
-            2032: -13,4
-            2033: -13,5
-            2122: 37,10
-            2123: 38,9
-            2124: 38,10
-            2218: 31,18
-            2219: 32,17
-            2272: 42,16
-            2453: -33,12
-            2454: -34,12
-            2455: -32,12
-            2456: -31,12
+            1293: -5,17
+            1294: -6,17
+            1295: -6,16
+            1298: -6,16
+            1299: -5,15
+            1300: -5,13
+            1301: -5,13
+            1302: -4,13
+            1320: -5,9
+            1321: -4,10
+            1373: 2,8
+            1374: 4,9
+            1375: 4,10
+            1376: 3,9
+            1377: 4,12
+            1378: 4,13
+            1379: 2,15
+            1380: 2,14
+            1381: 4,15
+            1410: 3,28
+            1411: 4,28
+            1412: 5,28
+            1413: 7,28
+            1414: 7,28
+            1415: 6,27
+            1416: 5,26
+            1417: 5,26
+            1418: 8,27
+            1419: 10,23
+            1420: 11,23
+            1674: 48,26
+            1675: 49,26
+            1676: 48,25
+            1677: 47,25
+            1678: 46,26
+            1679: 45,26
+            1680: 45,26
+            1681: 40,26
+            1682: 43,26
+            1683: 43,26
+            1684: 42,24
+            1685: 41,24
+            1686: 42,25
+            1687: 42,26
+            1688: 41,26
+            1689: 40,25
+            1690: 39,26
+            1983: 4,3
+            1984: 6,4
+            1985: 11,2
+            2021: -9,4
+            2022: -10,4
+            2023: -8,2
+            2024: -12,4
+            2025: -11,2
+            2026: -12,2
+            2027: -12,1
+            2028: -13,4
+            2029: -13,5
+            2118: 37,10
+            2119: 38,9
+            2120: 38,10
+            2214: 31,18
+            2215: 32,17
+            2268: 42,16
+            2442: -33,12
+            2443: -34,12
+            2444: -32,12
+            2445: -31,12
         - node:
             color: '#334E6DC8'
             id: FullTileOverlayGreyscale
           decals:
-            2045: -50,3
+            2041: -50,3
         - node:
             color: '#35526FFF'
             id: FullTileOverlayGreyscale
@@ -2584,42 +2633,42 @@ entities:
             color: '#1F6626FF'
             id: MiniTileCheckerAOverlay
           decals:
-            2373: 3,23
-            2374: 4,23
-            2375: 5,23
-            2376: 5,22
-            2377: 4,22
-            2378: 3,22
-            2379: 3,21
-            2380: 4,21
-            2381: 5,21
-            2382: 5,20
-            2383: 4,20
-            2384: 3,20
+            2362: 3,23
+            2363: 4,23
+            2364: 5,23
+            2365: 5,22
+            2366: 4,22
+            2367: 3,22
+            2368: 3,21
+            2369: 4,21
+            2370: 5,21
+            2371: 5,20
+            2372: 4,20
+            2373: 3,20
         - node:
             color: '#9FED5896'
             id: MiniTileCheckerAOverlay
           decals:
-            2177: 27,18
-            2178: 27,17
-            2179: 27,16
-            2180: 28,16
-            2181: 28,17
-            2182: 28,18
-            2183: 29,18
-            2184: 29,17
-            2185: 29,16
-            2186: 30,16
-            2187: 30,17
-            2188: 30,18
-            2208: 31,17
-            2209: 31,18
-            2210: 32,18
-            2211: 32,17
-            2220: 31,16
-            2221: 32,16
-            2222: 32,15
-            2223: 31,15
+            2173: 27,18
+            2174: 27,17
+            2175: 27,16
+            2176: 28,16
+            2177: 28,17
+            2178: 28,18
+            2179: 29,18
+            2180: 29,17
+            2181: 29,16
+            2182: 30,16
+            2183: 30,17
+            2184: 30,18
+            2204: 31,17
+            2205: 31,18
+            2206: 32,18
+            2207: 32,17
+            2216: 31,16
+            2217: 32,16
+            2218: 32,15
+            2219: 31,15
         - node:
             color: '#FFFFFFFF'
             id: MiniTileCheckerAOverlay
@@ -2661,8 +2710,8 @@ entities:
             color: '#DE3A3A96'
             id: MiniTileLineOverlayW
           decals:
-            2316: 46,16
-            2317: 46,15
+            2312: 46,16
+            2313: 46,15
         - node:
             color: '#FFFFFFFF'
             id: MiniTileOverlay
@@ -2683,66 +2732,59 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileSteelCornerNe
           decals:
-            2297: 40,11
+            2293: 40,11
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelCornerNw
           decals:
-            2304: 37,11
+            2300: 37,11
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelCornerSe
           decals:
-            2296: 40,8
+            2292: 40,8
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelCornerSw
           decals:
-            2293: 37,8
+            2289: 37,8
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineE
           decals:
-            2302: 40,9
-            2303: 40,10
+            2298: 40,9
+            2299: 40,10
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineN
           decals:
-            2298: 39,11
-            2299: 38,11
+            2294: 39,11
+            2295: 38,11
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineS
           decals:
-            2300: 39,8
-            2301: 38,8
+            2296: 39,8
+            2297: 38,8
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineW
           decals:
-            2294: 37,9
-            2295: 37,10
-        - node:
-            color: '#4C2A5EFF'
-            id: QuarterTileOverlayGreyscale
-          decals:
-            2361: -6,18
-            2362: -5,18
-            2363: -4,18
+            2290: 37,9
+            2291: 37,10
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale
           decals:
             188: -31,-28
             197: -29,-26
-            2083: 42,6
-            2084: 44,6
-            2085: 43,6
-            2086: 45,6
-            2087: 46,6
-            2088: 47,6
-            2089: 48,6
+            2079: 42,6
+            2080: 44,6
+            2081: 43,6
+            2082: 45,6
+            2083: 46,6
+            2084: 47,6
+            2085: 48,6
         - node:
             color: '#D381C996'
             id: QuarterTileOverlayGreyscale
@@ -2784,14 +2826,6 @@ entities:
             id: QuarterTileOverlayGreyscale270
           decals:
             485: -58,1
-        - node:
-            color: '#774194FF'
-            id: QuarterTileOverlayGreyscale270
-          decals:
-            2364: -2,26
-            2365: -2,26
-            2366: -2,27
-            2367: -2,28
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale270
@@ -2808,31 +2842,31 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale270
           decals:
-            2251: 40,22
-            2252: 41,22
-            2253: 42,22
-            2254: 43,22
-            2255: 44,22
-            2256: 45,22
-            2257: 46,22
-            2258: 47,22
-            2259: 36,18
-            2260: 36,17
-            2261: 36,16
-            2262: 36,15
-            2263: 37,15
-            2264: 38,15
-            2305: 40,15
-            2306: 39,15
-            2307: 45,15
-            2308: 44,15
-            2309: 43,15
-            2310: 42,15
-            2311: 41,15
-            2312: 36,22
-            2313: 37,22
-            2314: 38,22
-            2315: 39,22
+            2247: 40,22
+            2248: 41,22
+            2249: 42,22
+            2250: 43,22
+            2251: 44,22
+            2252: 45,22
+            2253: 46,22
+            2254: 47,22
+            2255: 36,18
+            2256: 36,17
+            2257: 36,16
+            2258: 36,15
+            2259: 37,15
+            2260: 38,15
+            2301: 40,15
+            2302: 39,15
+            2303: 45,15
+            2304: 44,15
+            2305: 43,15
+            2306: 42,15
+            2307: 41,15
+            2308: 36,22
+            2309: 37,22
+            2310: 38,22
+            2311: 39,22
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale90
@@ -2855,11 +2889,11 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale90
           decals:
-            2318: 41,18
-            2319: 40,18
-            2320: 39,18
-            2321: 38,18
-            2322: 41,17
+            2314: 41,18
+            2315: 40,18
+            2316: 39,18
+            2317: 38,18
+            2318: 41,17
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale90
@@ -2873,82 +2907,82 @@ entities:
             619: -38,5
             620: -37,5
             621: -36,5
-            2422: -35,5
-            2423: -34,5
-            2424: -33,5
-            2425: -32,5
+            2411: -35,5
+            2412: -34,5
+            2413: -33,5
+            2414: -32,5
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign1
           decals:
-            1953: -11,4
-            1968: 7,4
+            1949: -11,4
+            1964: 7,4
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign10
           decals:
-            1958: -10,2
-            1969: 8,2
+            1954: -10,2
+            1965: 8,2
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign11
           decals:
-            1959: -9,2
-            1970: 9,2
+            1955: -9,2
+            1966: 9,2
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign2
           decals:
-            1960: -10,4
-            1971: 8,4
+            1956: -10,4
+            1967: 8,4
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign3
           decals:
-            1950: -13,3
-            1967: 5,3
+            1946: -13,3
+            1963: 5,3
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign4
           decals:
-            1951: -12,3
-            1966: 6,3
+            1947: -12,3
+            1962: 6,3
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign5
           decals:
-            1952: -11,3
-            1965: 7,3
+            1948: -11,3
+            1961: 7,3
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign6
           decals:
-            1954: -10,3
-            1964: 8,3
+            1950: -10,3
+            1960: 8,3
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign7
           decals:
-            1955: -9,3
-            1963: 9,3
+            1951: -9,3
+            1959: 9,3
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign8
           decals:
-            1956: -8,3
-            1962: 10,3
+            1952: -8,3
+            1958: 10,3
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign9
           decals:
-            1957: -7,3
-            1961: 11,3
+            1953: -7,3
+            1957: 11,3
         - node:
             color: '#FF5C5CFF'
             id: StandClearGreyscale
           decals:
-            2245: 37,20
-            2246: 36,20
+            2241: 37,20
+            2242: 36,20
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale
@@ -2975,45 +3009,45 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerNE
           decals:
-            2442: -39,16
+            2431: -39,16
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNW
           decals:
-            2444: -41,16
+            2433: -41,16
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSE
           decals:
-            2446: -39,14
+            2435: -39,14
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSW
           decals:
-            2448: -41,14
+            2437: -41,14
         - node:
             color: '#EFB34196'
             id: WarnFull
           decals:
-            2441: -32,6
+            2430: -32,6
         - node:
             color: '#52B4E996'
             id: WarnFullGreyscale
           decals:
-            2459: -36,6
-            2460: -35,6
+            2448: -36,6
+            2449: -35,6
         - node:
             color: '#D4D4D496'
             id: WarnFullGreyscale
           decals:
-            2461: -34,6
-            2462: -33,6
+            2450: -34,6
+            2451: -33,6
         - node:
             color: '#DE3A3A96'
             id: WarnFullGreyscale
           decals:
-            2457: -38,6
-            2458: -37,6
+            2446: -38,6
+            2447: -37,6
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
@@ -3069,14 +3103,14 @@ entities:
             1251: -3,16
             1252: -3,17
             1253: -3,18
-            2038: -28,1
-            2077: 35,26
-            2078: 35,25
-            2079: 35,24
-            2359: 35,22
-            2360: 35,23
-            2403: -57,2
-            2447: -39,15
+            2034: -28,1
+            2073: 35,26
+            2074: 35,25
+            2075: 35,24
+            2355: 35,22
+            2356: 35,23
+            2392: -57,2
+            2436: -39,15
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -3116,26 +3150,26 @@ entities:
             302: 48,21
             626: -41,8
             627: -40,8
-            2053: -31,0
-            2054: -30,0
-            2055: -29,0
-            2056: -31,-11
-            2057: -29,-11
-            2061: 29,-11
-            2234: 43,17
-            2235: 44,17
-            2236: 45,17
-            2237: 36,19
-            2238: 37,19
-            2239: 36,21
-            2240: 37,21
-            2449: -40,14
+            2049: -31,0
+            2050: -30,0
+            2051: -29,0
+            2052: -31,-11
+            2053: -29,-11
+            2057: 29,-11
+            2230: 43,17
+            2231: 44,17
+            2232: 45,17
+            2233: 36,19
+            2234: 37,19
+            2235: 36,21
+            2236: 37,21
+            2438: -40,14
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: WarnLineN
           decals:
-            2176: 29,19
+            2172: 29,19
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
@@ -3191,14 +3225,14 @@ entities:
             1255: 1,16
             1256: 1,17
             1257: 1,18
-            2039: -28,1
-            2080: 35,26
-            2081: 35,25
-            2082: 35,24
-            2357: 35,22
-            2358: 35,23
-            2404: -57,2
-            2445: -41,15
+            2035: -28,1
+            2076: 35,26
+            2077: 35,25
+            2078: 35,24
+            2353: 35,22
+            2354: 35,23
+            2393: -57,2
+            2434: -41,15
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -3243,105 +3277,105 @@ entities:
             623: -41,6
             624: -41,9
             625: -40,9
-            2050: -31,0
-            2051: -30,0
-            2052: -29,0
-            2058: -31,-11
-            2059: -29,-11
-            2060: 29,-11
-            2241: 36,19
-            2242: 37,19
-            2243: 37,21
-            2244: 36,21
-            2443: -40,16
+            2046: -31,0
+            2047: -30,0
+            2048: -29,0
+            2054: -31,-11
+            2055: -29,-11
+            2056: 29,-11
+            2237: 36,19
+            2238: 37,19
+            2239: 37,21
+            2240: 36,21
+            2432: -40,16
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            2175: 29,19
+            2171: 29,19
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinCornerNe
           decals:
-            2066: 26,12
-            2092: 46,10
+            2062: 26,12
+            2088: 46,10
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNe
           decals:
-            2289: 36,11
+            2285: 36,11
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinCornerNw
           decals:
-            2063: 24,12
-            2091: 42,10
+            2059: 24,12
+            2087: 42,10
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNw
           decals:
-            2288: 35,11
+            2284: 35,11
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinCornerSe
           decals:
-            2064: 26,11
-            2093: 46,8
+            2060: 26,11
+            2089: 46,8
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSe
           decals:
-            2355: 36,8
+            2351: 36,8
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinCornerSw
           decals:
-            2065: 24,11
-            2090: 42,8
+            2061: 24,11
+            2086: 42,8
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSw
           decals:
-            2354: 35,8
+            2350: 35,8
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinLineE
           decals:
-            2101: 46,9
+            2097: 46,9
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineE
           decals:
-            2290: 36,9
-            2291: 36,10
+            2286: 36,9
+            2287: 36,10
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinLineN
           decals:
-            2067: 25,12
-            2098: 43,10
-            2099: 44,10
-            2100: 45,10
+            2063: 25,12
+            2094: 43,10
+            2095: 44,10
+            2096: 45,10
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinLineS
           decals:
-            2068: 25,11
-            2095: 43,8
-            2096: 44,8
-            2097: 45,8
+            2064: 25,11
+            2091: 43,8
+            2092: 44,8
+            2093: 45,8
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinLineW
           decals:
-            2094: 42,9
+            2090: 42,9
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineW
           decals:
-            2292: 35,10
-            2356: 35,9
+            2288: 35,10
+            2352: 35,9
         - node:
             color: '#9BC516FF'
             id: shop
@@ -3512,7 +3546,7 @@ entities:
             0: 47903
           -9,3:
             0: 34831
-            2: 8704
+            3: 8704
           -8,4:
             0: 2187
             1: 768
@@ -3652,13 +3686,13 @@ entities:
             0: 63931
           -10,3:
             0: 13087
-            3: 34816
+            2: 34816
           -10,4:
             0: 3
-            3: 8
+            2: 8
             1: 3840
           -9,4:
-            2: 2
+            3: 2
             0: 8
             1: 3840
           -16,0:
@@ -3884,8 +3918,8 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
           - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -3899,7 +3933,6 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
           - 6666.982
           - 0
           - 0
@@ -3911,6 +3944,7 @@ entities:
           - 0
           - 0
           - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -5593,13 +5627,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 51.5,6.5
       parent: 2173
-- proto: BarricadeBlock
-  entities:
-  - uid: 2008
-    components:
-    - type: Transform
-      pos: -1.5,28.5
-      parent: 2173
 - proto: Bed
   entities:
   - uid: 346
@@ -14443,7 +14470,7 @@ entities:
   - uid: 514
     components:
     - type: Transform
-      pos: 6.5,23.5
+      pos: -1.5,28.5
       parent: 2173
     - type: ContainerContainer
       containers:
@@ -17471,10 +17498,10 @@ entities:
       parent: 2173
 - proto: filingCabinetRandom
   entities:
-  - uid: 2041
+  - uid: 2008
     components:
     - type: Transform
-      pos: 6.5,18.5
+      pos: 6.5,23.5
       parent: 2173
 - proto: FireAlarm
   entities:
@@ -27696,6 +27723,14 @@ entities:
     - type: Transform
       pos: 8.50093,23.502323
       parent: 2173
+- proto: LockerWallMaterialsBasicFilled
+  entities:
+  - uid: 2057
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,18.5
+      parent: 2173
 - proto: MachineCryoSleepPod
   entities:
   - uid: 1394
@@ -27735,24 +27770,6 @@ entities:
     - type: Transform
       pos: 29.342014,16.547031
       parent: 2173
-- proto: MailCarrierMothershipComputer
-  entities:
-  - uid: 4296
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,16.5
-      parent: 2173
-    - type: ContainerContainer
-      containers:
-        ShipyardConsole-targetId: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
 - proto: MailingUnit
   entities:
   - uid: 207
@@ -28412,6 +28429,11 @@ entities:
       parent: 2173
 - proto: PowerCellRecharger
   entities:
+  - uid: 2060
+    components:
+    - type: Transform
+      pos: 6.5,18.5
+      parent: 2173
   - uid: 2661
     components:
     - type: Transform
@@ -29132,12 +29154,6 @@ entities:
     - type: Transform
       pos: -45.5,7.5
       parent: 2173
-  - uid: 4050
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 32.5,18.5
-      parent: 2173
   - uid: 4158
     components:
     - type: Transform
@@ -31283,31 +31299,10 @@ entities:
       parent: 2173
 - proto: ServiceTechFab
   entities:
-  - uid: 4936
-    components:
-    - type: Transform
-      pos: 32.5,17.5
-      parent: 2173
-- proto: SheetGlass
-  entities:
-  - uid: 4819
+  - uid: 2056
     components:
     - type: Transform
-      pos: 32.45495,18.826864
-      parent: 2173
-- proto: SheetPlastic
-  entities:
-  - uid: 4930
-    components:
-    - type: Transform
-      pos: 32.61017,18.753946
-      parent: 2173
-- proto: SheetSteel
-  entities:
-  - uid: 4931
-    components:
-    - type: Transform
-      pos: 32.39142,18.68103
+      pos: 32.5,18.5
       parent: 2173
 - proto: SignAtmos
   entities:
@@ -32907,11 +32902,26 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,24.5
       parent: 2173
+  - uid: 2041
+    components:
+    - type: Transform
+      pos: 8.5,18.5
+      parent: 2173
   - uid: 2043
     components:
     - type: Transform
       pos: 10.5,21.5
       parent: 2173
+  - uid: 2055
+    components:
+    - type: Transform
+      pos: 27.5,16.5
+      parent: 2173
+  - uid: 2058
+    components:
+    - type: Transform
+      pos: 6.5,18.5
+      parent: 2173
   - uid: 2410
     components:
     - type: Transform
@@ -36816,11 +36826,6 @@ entities:
     - type: Transform
       pos: -28.5,13.5
       parent: 2173
-  - uid: 3054
-    components:
-    - type: Transform
-      pos: 9.5,22.5
-      parent: 2173
 - proto: WardrobeGreyFilled
   entities:
   - uid: 2435
@@ -36864,6 +36869,11 @@ entities:
       parent: 2173
 - proto: WeaponCapacitorRecharger
   entities:
+  - uid: 2059
+    components:
+    - type: Transform
+      pos: 8.5,18.5
+      parent: 2173
   - uid: 2763
     components:
     - type: Transform
diff --git a/Resources/Maps/_NF/Shuttles/Sr/broom.yml b/Resources/Maps/_NF/Shuttles/Sr/broom.yml
new file mode 100644
index 000000000000..5be33edad6ac
--- /dev/null
+++ b/Resources/Maps/_NF/Shuttles/Sr/broom.yml
@@ -0,0 +1,917 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  37: FloorDarkMini
+  38: FloorDarkMono
+  69: FloorMetalDiamond
+  112: FloorTechMaint
+  129: Lattice
+  130: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: Broom
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: JQAAAAAAcAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAAAcAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAARQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAJgAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAAAJQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAAAJgAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAJgAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: BotGreyscale
+          decals:
+            5: 1,-3
+        - node:
+            color: '#FFFFFFFF'
+            id: BoxGreyscale
+          decals:
+            21: 0,2
+        - node:
+            color: '#96DAFFFF'
+            id: DeliveryGreyscale
+          decals:
+            4: 1,0
+        - node:
+            color: '#FF5C5CFF'
+            id: DeliveryGreyscale
+          decals:
+            3: 1,1
+        - node:
+            color: '#FFFFFFFF'
+            id: DeliveryGreyscale
+          decals:
+            0: -1,0
+            1: -1,1
+            2: -1,-1
+            6: -1,-2
+            7: 1,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkCornerSw
+          decals:
+            15: 0,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkEndE
+          decals:
+            14: 1,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkEndN
+          decals:
+            13: 0,1
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkInnerNe
+          decals:
+            16: 0,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkLineE
+          decals:
+            17: 0,-1
+            18: 0,0
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkLineW
+          decals:
+            19: 0,-1
+            20: 0,0
+        - node:
+            color: '#8C347F96'
+            id: MiniTileOverlay
+          decals:
+            8: 1,-2
+            9: 0,-2
+            10: 0,-1
+            11: 0,0
+            12: 0,1
+        - node:
+            color: '#B3B3B3FF'
+            id: WarnLineGreyscaleS
+          decals:
+            22: 1,-2
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 4403
+            1: 17408
+          0,-1:
+            0: 13090
+          -1,0:
+            0: 34952
+          0,1:
+            1: 4
+          -1,-1:
+            1: 76
+            0: 34816
+          -1,1:
+            1: 4
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+    - type: BecomesStation
+      id: Broom
+- proto: AirAlarm
+  entities:
+  - uid: 56
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-1.5
+      parent: 1
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 1
+- proto: APCBasic
+  entities:
+  - uid: 104
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-2.5
+      parent: 1
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 26
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 1
+- proto: AtmosFixBlockerMarker
+  entities:
+  - uid: 86
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 87
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 88
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 89
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+  - uid: 90
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+- proto: CableApcExtension
+  entities:
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 57
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+- proto: CableMV
+  entities:
+  - uid: 59
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 95
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,2.5
+      parent: 1
+- proto: CleanerDispenser
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-2.5
+      parent: 1
+- proto: ComputerTabletopShuttle
+  entities:
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+- proto: ComputerTabletopStationRecords
+  entities:
+  - uid: 84
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
+      parent: 1
+- proto: ComputerWallmountBankATM
+  entities:
+  - uid: 29
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-2.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+    - type: Physics
+      canCollide: False
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 71
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-3.5
+      parent: 1
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 70
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-3.5
+      parent: 1
+- proto: FaxMachineShip
+  entities:
+  - uid: 85
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 1
+- proto: FloorDrain
+  entities:
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: FolderSpawner
+  entities:
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -0.27797323,3.1280715
+      parent: 1
+- proto: GasMixerOn
+  entities:
+  - uid: 37
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,0.5
+      parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.78
+      inletOneConcentration: 0.22
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPassiveVent
+  entities:
+  - uid: 33
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeBend
+  entities:
+  - uid: 34
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 40
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 42
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 39
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPort
+  entities:
+  - uid: 31
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 32
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPressurePumpOnMax
+  entities:
+  - uid: 44
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasVentPump
+  entities:
+  - uid: 41
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+    - type: DeviceNetwork
+      configurators:
+      - invalid
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+    - type: DeviceNetwork
+      configurators:
+      - invalid
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 52
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 9
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 1
+- proto: GrilleDiagonal
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+- proto: LockerWallEVAColorJanitorFilled
+  entities:
+  - uid: 30
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,2.5
+      parent: 1
+- proto: LockerWallMaterialsBasic10Filled
+  entities:
+  - uid: 47
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-0.5
+      parent: 1
+- proto: MaterialReclaimer
+  entities:
+  - uid: 35
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+- proto: NitrogenCanister
+  entities:
+  - uid: 94
+    components:
+    - type: Transform
+      anchored: True
+      pos: 1.5,1.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 93
+    components:
+    - type: Transform
+      anchored: True
+      pos: 1.5,0.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+- proto: PortableGeneratorPacmanShuttle
+  entities:
+  - uid: 54
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+    - type: FuelGenerator
+      on: False
+    - type: Physics
+      bodyType: Static
+- proto: PoweredlightLED
+  entities:
+  - uid: 53
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+- proto: ReinforcedWindow
+  entities:
+  - uid: 72
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,3.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,2.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,3.5
+      parent: 1
+- proto: ReinforcedWindowDiagonal
+  entities:
+  - uid: 78
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+- proto: ServiceTechFab
+  entities:
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+- proto: SheetPlasma
+  entities:
+  - uid: 36
+    components:
+    - type: Transform
+      pos: -0.515625,-0.453125
+      parent: 1
+- proto: SignJanitor
+  entities:
+  - uid: 98
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-1.5
+      parent: 1
+- proto: Sink
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
+      parent: 1
+- proto: SmallGyroscope
+  entities:
+  - uid: 43
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,0.5
+      parent: 1
+- proto: SmallThruster
+  entities:
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 51
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-3.5
+      parent: 1
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 101
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-0.5
+      parent: 1
+- proto: SubstationWallBasic
+  entities:
+  - uid: 55
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-0.5
+      parent: 1
+- proto: TableReinforced
+  entities:
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+- proto: Thruster
+  entities:
+  - uid: 50
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-3.5
+      parent: 1
+- proto: WallReinforced
+  entities:
+  - uid: 10
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 11
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 13
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 18
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 21
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 23
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 25
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 1
+- proto: WallReinforcedDiagonal
+  entities:
+  - uid: 14
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,2.5
+      parent: 1
+- proto: WarningN2
+  entities:
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+- proto: WarningO2
+  entities:
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+- proto: WarpPointShip
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+- proto: WindoorSecureJanitorLocked
+  entities:
+  - uid: 28
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-2.5
+      parent: 1
+- proto: Wrench
+  entities:
+  - uid: 97
+    components:
+    - type: Transform
+      pos: -0.69672847,-0.37076378
+      parent: 1
+...
diff --git a/Resources/Maps/_NF/Shuttles/mailpod.yml b/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/mailpod.yml
rename to Resources/Maps/_NF/Shuttles/Sr/mailpod.yml
diff --git a/Resources/Maps/_NF/Shuttles/parcel.yml b/Resources/Maps/_NF/Shuttles/Sr/parcel.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/parcel.yml
rename to Resources/Maps/_NF/Shuttles/Sr/parcel.yml
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml
index 1ba86111546c..4ef7a545b58b 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml
@@ -209,8 +209,8 @@
 - type: entity
   id: ComputerShipyardSr
   parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, ComputerShipyard]
-  name: sr shipyard console
-  description: Used to buy vessels exclusive to the station representative
+  name: outpost staff shipyard console
+  description: Used to buy vessels exclusive to the Frontier Outpost personnel.
   components:
   - type: ActivatableUI
     key: enum.ShipyardConsoleUiKey.Sr
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml
index 721dd786a35b..8f964277591f 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml
@@ -26,6 +26,17 @@
       shader: unshaded
       visible: false
       offset: 0, 1
+  - type: Fixtures # Small thruster, small fixture
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 190
+        mask:
+        - SmallMobMask #this is so they can go under plastic flaps
+        layer:
+        - MachineLayer
   - type: StaticPrice
     price: 100
   - type: Machine
@@ -58,6 +69,17 @@
       map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"]
       shader: unshaded
       visible: false
+  - type: Fixtures # Small gyro, small fixture
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 190
+        mask:
+        - SmallMobMask #this is so they can go under plastic flaps
+        layer:
+        - MachineLayer
   - type: StaticPrice
     price: 100
   - type: Machine
diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml b/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml
new file mode 100644
index 000000000000..52fc66014075
--- /dev/null
+++ b/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml
@@ -0,0 +1,36 @@
+# Author Info
+# GitHub: erhardsteinhauer
+# Discord: erhardsteinhauer
+
+# Maintainer Info
+# GitHub: erhardsteinhauer
+# Discord: erhardsteinhauer
+
+# Shuttle Notes:
+# 
+- type: vessel
+  id: Broom
+  name: LVHI Broom
+  description: A cramped yet reliable shuttle for providing janitorial services.
+  price: 11000 # ~9650$ on mapinit + ~1450$ from 15% markup
+  category: Small
+  group: Sr
+  access: Janitor
+  shuttlePath: /Maps/_NF/Shuttles/Sr/broom.yml
+
+- type: gameMap
+  id: Broom
+  mapName: 'Broom'
+  mapPath: /Maps/_NF/Shuttles/Sr/broom.yml
+  minPlayers: 0
+  stations:
+    Broom:
+      stationProto: StandardFrontierVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Broom {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          availableJobs: {}
diff --git a/Resources/Prototypes/_NF/Shipyard/mailpod.yml b/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml
similarity index 84%
rename from Resources/Prototypes/_NF/Shipyard/mailpod.yml
rename to Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml
index 5d56f9ec9708..8512ff3fa091 100644
--- a/Resources/Prototypes/_NF/Shipyard/mailpod.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml
@@ -14,13 +14,14 @@
   description: A cramped yet reliable shuttle for delivering packages.
   price: 15000
   category: Small
-  group: None
-  shuttlePath: /Maps/_NF/Shuttles/mailpod.yml
+  group: Sr
+  access: Mail
+  shuttlePath: /Maps/_NF/Shuttles/Sr/mailpod.yml
 
 - type: gameMap
   id: MailPod
   mapName: 'NC Mail Pod'
-  mapPath: /Maps/_NF/Shuttles/mailpod.yml
+  mapPath: /Maps/_NF/Shuttles/Sr/mailpod.yml
   minPlayers: 0
   stations:
     MailPod:
diff --git a/Resources/Prototypes/_NF/Shipyard/parcel.yml b/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml
similarity index 84%
rename from Resources/Prototypes/_NF/Shipyard/parcel.yml
rename to Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml
index 911a981b6b93..25bfe6d8b09b 100644
--- a/Resources/Prototypes/_NF/Shipyard/parcel.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml
@@ -14,13 +14,14 @@
   description: A reliable shuttle for delivering mail and packages.
   price: 18000
   category: Small
-  group: None
-  shuttlePath: /Maps/_NF/Shuttles/parcel.yml
+  group: Sr
+  access: Mail
+  shuttlePath: /Maps/_NF/Shuttles/Sr/parcel.yml
 
 - type: gameMap
   id: Parcel
   mapName: 'NC Parcel'
-  mapPath: /Maps/_NF/Shuttles/parcel.yml
+  mapPath: /Maps/_NF/Shuttles/Sr/parcel.yml
   minPlayers: 0
   stations:
     Parcel:
diff --git a/Resources/Textures/_NF/Structures/Machines/computers.rsi/shipyard_sr.png b/Resources/Textures/_NF/Structures/Machines/computers.rsi/shipyard_sr.png
index 5f9deca521ae631c332a511737e46b56b94e1306..54c2a857d41930f5871a7ea2b20f8ad1edc6657e 100644
GIT binary patch
delta 1283
zcmV+e1^oK`7nTZ;BYy<lNkl<Zc%1FsL2KJ)9LMp0#)j!(juUVWg%pBD7#R$_rR31Q
z0td=qhvceDUcxSIeQ4LqUP3Oq#*{)S#N-7ehq7#eLPH5Nh6Q>^=;EY@Vs`Kj?xQ_c
zWLtWq_>t`I2SO89(NB-`_>p4!`AY-<00000OpBSY2QPP5x_?Vg&WHYDt5%j#%LJF7
zT|W-ZBi~+r=myQNmAi%IuZFI$bMmjKWnSI=C?X;ce*b#t^8dU(kF*2g=0`z(c>b4z
ze&PMI9T5?6JlB7$>3ZULu6+9IlmFPOyB}rQS?ql;r?PReAO~Cfee3$+mmec<sP5J`
zw?ZG+^9L<6Xn*-Q-ffnoa@gs6>}a(h-|n>ipVfZSIiB0M53=0;fgRxX!%cbrY{x(7
zaopR!A8YxnsvLIYXti+dF`e2s!Tpq%eelJo1su<nrt8I8>A}{%9Bl2&<2#S8jRtvi
z(ma)u=IOxySNli(tGEC0okwHYMpFYv0Nt=ouyL^<^?%PhXX9c)MEZOG)9qiAZliVT
z6gP<4KWYTX%d=l3!U&+~L!GWZcP7iuqAWX$QlC2$5$Wswc^(0dRtr)&?DTyFPYGf4
z(J$-m=dXY%&*yaj@&Nz<000000000000000000000Qq7(H&7R4o?6;-<H%1Z-)MGl
za5iw1nSZKj&yEeQn|!nUp#>uT{OymvpYLto_v-<O^lAd>Q^E(;6}tU!b5t8b#jSr6
zrKV0CVeJ>`F9)NqJ4#KVIL6Wbp&cNs(#7?PApfsiRmw1_E0jfH?bpk}1lt&;rcl-l
ztq>Ac>nE%tNRUZgp)3lka-t6Uuns<|rcjnd9)AJi*7})*PVn^aUYk|h_4cUm!%lCb
zY6<}W00000000000000$hFtEhbjhFIe3@S>cjwp2);5Ct^ztL$H!$e!%Qs?kCzPs1
ztND}Ce&Y_1=0=cjFW<NWsE>@lefh@fIjK}FTFIZ3_8WHqeNsrAiHtYFM!r5rAkXcO
zbbs^cL5@}nQpwSclGE07J#lj0exnhfRV({<3Li8*>?XBp<*{dm<=dM5lxF*lMgTSB
zRHP{Nxzx5Lc7CZ^9Dlf<|Fe{;MJtnF(`>)-H9)Caly>9F9|^`y<=ZkT`Nkcf>3S2h
z6Q(&o(dz)J6WBZ_+sv=eo#np$#utI=+<(_}y|Mop6l^g0=J`e)V0Qg@rro%*Rs}@m
z+oJMqUH_!ne&g2xJ{KJ7I%202sC-+02~0|Uq8EbHMkLw-@^hQ-v;F=w`IbK)00000
z000000001(ShnAjCf{QIB+Zwfw){jN3s>Q`J{L!R^87>{K!w}7J6PU#eirhLJAc6C
z?uyleukvkC`8FoU>iJ0-cYviQ=l;QWJa_D~V}g?*$T!PR^s#V}-obA-u4Ji^bWP@L
z=5Jgq<huQdt^w4+w>cDNA^*ek7gqDFT?DFdTjxOze)9GkcYs!{ETwAk+TF6pMdjPl
zs+Hx#^B30UN2b;OL>GbTnQvo~WPBD1Gex<R_)X@gA@K`AmBUUN+mUPf?d9_(Q3ueU
z`B^F4G*0?~&ujY=j{qXQi;>y&<C!$pm8bl@y*&{T`R=FhbKCyJ9iZK~Qqz>JAm37c
tp5Fl@KLu0${x|sm00000004me_zyEchLqNsyd?kt002ovPDHLkV1n`wlvMx#

literal 3069
zcmcImX*kpk_x}BUhM6&8#!^`_Lp4ZciHOFGEki^|Bq1pkQPNn#$d+9xOIhnFN*S`2
z!N}TMS);+jOeEWwsYk|GhPVI6|F`$U`+hk0xz2Un=Q>~R>%LEt!wD-1aRqSz03@u*
z7LI>9_5TVX_6OTcygvc}s?FNM)H(FrqQ`arQ$zAw;x<>|w2p)UXGY?)+Eh_YX=Z?G
za*~naRo6PSEBU+BoBawhdn`!EH_kHVXSZ*+VkY#9zCU~HK?(l(wO4qQKQ&eK)x-HL
z8}pRci%&@@18dDr&0hyUM$&kNJZ>SSiDmcbYx4x9nYSL<vQ!YvZJeQ?Na^I=4(Per
zy`gBxA|GZ3sF2z*cS8k^U>tz4!cBfVE{cZErjY&_k2n8y$-UZaY3{j(cJRly`QO@>
zjw_qw$$SfEt#SKY15zTRe^Tta(@@X1$qk<^(tj&*z!NN}-s)L$2yxQ+6y<ZfvzNU(
zp4c;O0nqrt-X%;*7jZZEj;{~NW;1>-Q`!VcQ$zL(T70u1{<EODFMDy2-uNJV+Ua8n
zdri9GOQbk=%}dw6g-3C4cSi|@LWeVF#FxH~m-MXIP!%tZ1E<$2)W-xiUDMS$gZw$A
zjiRW+P2&RI(598<^Y?UfYv1fq<2syJJ$Ifw7RXxbsdN`<Y6}ghh^_m)KE#`E`eHxb
z>HA7h0Q)*sWEiN*X5BQbdgP!3uB9*g))du3Wo$8UQfsK3FQX_$qI*~Al3|PqPY)*v
zbI)b7OI=4AR>;WWlQv3G>4+(PkePl+dz*tAt{_We)dys|5XvBxw<fv7wbZwEr;l~8
znioCAWeUmywCGZ&THKyYn19+=Bmf@+aT;|mrg+<lnC&{P!POyD4y-}p?D@sVmoFM?
zQul2QCOgXEvhfU-3okY~S={g1HJ8}~thetGz&6QfZJ=H`%{=oQs2+4Xq<rT&BpK$n
zTI1Al@=&$XHKLK3Ukz)b@=`<n)V**^U9SO^Fe72q^k`!0loeKc(^jre;;F6N;DJpY
zO(0v(A8kznjpUi3R}I>eQO>JsR?F>q*<SVEFV2G(v=qJR(!iKev)^xeryKZNnYqT)
zM6>D~z2#VEilX$>uw%nn)>Xa=P(jt;rO%qAD+mUujE<?kY}=+xmGg3;Lq^8NxUlPp
zdE)+f7V(WpPa)xPAw1UwP-6AfWjUXK9NFPj&)Lf=ZJMB;B<Y!~CoNCJLA1f>NBI%P
znuoS9UhZGJ@}+WJsQ0nYew=!-ntiCk-@I5RrD}4;S1yRtiVAwOD88SF308C*ioj<v
zQqw#F0$)8$-VCeadCRezC9Nv9J=1v@(m-4YGPn;9+qI`OB&@DbeG6p(nNfpgG8UWA
zR0;0}MKly=9PQ7G2mBFj<5V>6?^T}&Etr@2POexS@T~_s7NG(tz7I0M!4Q;9<^&34
zq7xcH6;i`e7ylfBk)Zvz1Oj|tK&)Fa0}jW1yGBBwxf@kYJD^IHZ4{CJ!l~2H_csQ1
zQpP!vccQMsl7twTp+Ip_(uB_t6>OxKmKp0>hm|ad`p!#5@p^_9?+P(Zc$(nSUdGaj
zei>ntKp@P|%spKwse0}{k{j-%e=~n|=XQNN`Y|oIzNlZcN%G!YZU$u#F|Z<hid{Pw
zb`&c$Aj1e=4yMnG6mOtxn%MpCxZ2K5f=Ivd-#VnNO1_l%Mdymbtn{Mau$ymlw+`gx
z56k{@rRaBbzE0x@p5c(=jUlUU8^E!pPeOGk8Ip~4T?-pgZ&J{E3A^tIzXzN;WNUe!
ztP<<`8l~^>Wc-WnO~S6Dz0M^fGJS8J%fGC1E^q%zcYeJ2So?ai{skx5Up9b;ip7qo
z?!R`#-I3l?8cRE2iRqQrX*|7n$3nH_L31VKZ?dYyDHwhxYx<LP3f%-1x3<gBOoucx
zVh-k<KLeJ*XTgO}x3W_DW6qzZ?ot~d?20(*5<9HMQtXG>co(0hR_VplrK$TA&cDuL
zrJNsiRdw@m0ZQ3u{-#D&;_-lmyc7pYsN*}BqbOq{13o97_wvFK{TtmoU}6!4%1YTJ
z58cmFc@2D7u#%%$OWQ$=5xjFhcA3wPc&J(WY|3gq@#?Yf9JGjsQ+FKD(|$=2vevf2
ziY=eGA1qpYUz5g)f_*n))DyehcFRHtP&J*@-j*YdgWWZRFjAiT{^)WNVR7{K3&4ze
zcQ^Xi&u9M$DQzFXRqS3q!q}3!-O(H^P{aU5uac5JFDo0gSmXG@HdZdsv6O-v`2znS
z<Ec>Fsv=4l4Jn>pkVP85W@@dET$l|P9@i`YriyB2jf0x!ps{95=y%4`oP}@pa7uN-
zPaCnC3|RZrWPg+<zftm5nGhlbs=a1*34Td>A4H}isgnNrji5q0QA%wdZ<-klsp7^}
zBX3{7&gNG^HLq6HL&^oVmEKrQfS^wgb9-@pqZ1~$uxKclV5u=^+)>Crz;lP6R-Yyn
z+r;<_3Tf&`oHEXSxy#%aRVt=TB<Rac%{ZI-Kzj~<re5zD^y(Sg^374nf_aHPS#(nZ
z=%bxW_o#+2+pX!(eRY?K4+!DWY#2jO1+nq+J=$Itz}bY)Bhkv~8`{YDc*~%V!>uHc
zv|bw#?#yi<Fya8eXl_hOrt1>^(?tC?BT5t|bmJ~jnTe!x=(jqrS^#GfR8aQA56y3X
zoFjp_bwf#2;P5^GO8S!_lBAJX%9$i=B6tn1jVH}z_*@a=e7(_r-2Sg40DdAn@=Z!G
z=xz>lW)x%&f~m;9S}lF#XtVP@+-!<jk8kmTbv>}w+mk0$TK@qPOwmqFPSH$!eC6YS
z%&3?&-<_kxAbafoBaY{N<!!%$L8?0ix|w+IMR(T8^_h=RYgwc&(xbS6&FG%}%#VHM
zGxvon+}Ze!EhQH+@}D<`-!hi499WDLSR?D0RXj9S%$X^NL`n65KGI}9tz4<=1QiK>
zF!4aK(S3dhT&a+b4}jXcDNrk)M2ND5)Ij|8^(0~n&~DMQCr*UQ#5SvUv=-R`dIwp(
z>nlRKbt0S1LxHyW*}dQ4e;jwCJ62yS4j3-(m1_H6OwAbTQb7&Y;cjGgg!F9{V5LI#
zAlTl#>S5{+;RH3-d%BH%lJwT_n5yWWU=u<#iT4^7HMZsv!%|3(>a#0pFdg_|63N{>
zIw(#yn7+YHJ&Xs^-_~Q59eUyIYJS-SX^y1ZJA*>LSP(bOz#15(ZJO_(Z~fdGI{WDX
z14$N4b)qG~G-Podd25;mRLP?QUHyG2nVyY4wg}Qt#^J=ETQfnNK^ZeUOCu)iZlL=M
ze(4nE`%cdO=);^rzMlK9b?+ie;BWb*koDr)UGHi%VjIneYv9}46TH;jfW!D!Cb+@)
z!+=S)ZgtVmxmH$d{}iY4F|Z1o1PxGqvo6PJp9(6rK%{>lryS#D3pjr8%O8@cnuKzN
zW5^h3D&9NyHq9PxVBN5E=t7GRujGOAr}0-3kMNtbSzcGO7*g1lZSj_tL1QgpM*4VQ
z_Bbg#E}}0uvm$ou<cGkB)tfJ&2k_B9aUI8Wa}#?alISAA5SCtZ*4=ALYeNDY;n_S{
zCus8L(g+tOD_83(50N$d&xn%XF74TEg{?%Z8}fJM0I!7bIC`2dE^UhpIIVXE1Du%N
zgJVFFh3fk&C21NZ-Qn4`kFA$W%8U0r>>4TTQKhC$=WOl*4#eJ3T3`Cmj1^QP(7!u&
z%&ef#7e)X2oD2LTY#dqPJ>Sa;ke^R9sn!8E#4SdvQmAOg!Oh{<DDYJ&qe8?CXcV~D
zAB0sFLXDCLkTV%L{tnFu7v~t^V3jE?Aq!@}f=1=S|6gJOJFy;!3aRe&KVLmyZF$0?
J!p!Rq@Nc^~p)CLa


From 646f39b2dd3e0d3714e9dbac9fd02278ca82c7c6 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Tue, 13 Aug 2024 18:07:29 +0000
Subject: [PATCH 25/39] Automatic Changelog (#1806)

---
 Resources/Changelog/Changelog.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 5f3ceff8cc46..a69a03f53c7d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6279,3 +6279,21 @@ Entries:
       message: KC Anchor returns to the expedition shipyard with a rework.
   id: 5199
   time: '2024-08-13T16:59:42.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: >-
+        Added new micro shuttle LVHI Broom, available only to personnel with
+        janitorial access from Outpost Staff Shipyard Console at Frontier
+        Outpost.
+    - type: Tweak
+      message: >-
+        Placed Outpost Staff Shipyard Console in the nook by the Dock 6c (to the
+        North from SR's office), , removed SR and Mail Carrier Shipyard Consoles
+        from Frontier Outpost.
+    - type: Tweak
+      message: >-
+        Moved mail carrier shuttles and SR shuttle to Outpost Staff Shipyard
+        Console.
+  id: 5200
+  time: '2024-08-13T18:07:02.0000000+00:00'

From c7e56aac81c977295c8bb6efa5ccee13d7a0f9bd Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Thu, 15 Aug 2024 11:14:43 -0400
Subject: [PATCH 26/39] Remove preferences for sleeper agent (whoops) (#1863)

---
 Resources/Prototypes/Roles/Antags/traitor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml
index e4b8b137f18d..5278972064f9 100644
--- a/Resources/Prototypes/Roles/Antags/traitor.yml
+++ b/Resources/Prototypes/Roles/Antags/traitor.yml
@@ -2,7 +2,7 @@
   id: Traitor
   name: roles-antag-syndicate-agent-name
   antagonist: true
-  setPreference: false
+  setPreference: false # Frontier: true<false
   objective: roles-antag-syndicate-agent-objective
   # guides: [ Traitors ] # Frontier: removed, irrelevant
 
@@ -10,7 +10,7 @@
   id: TraitorSleeper
   name: roles-antag-syndicate-agent-sleeper-name
   antagonist: true
-  setPreference: true
+  setPreference: false # Frontier: true<false
   objective: roles-antag-syndicate-agent-sleeper-objective
 
 # Syndicate Operative Outfit - Monkey

From be0e257edb8dd99cb3a407019ee3c94a3a994b70 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Thu, 15 Aug 2024 15:15:16 +0000
Subject: [PATCH 27/39] Automatic Changelog (#1863)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a69a03f53c7d..2cdc7b957490 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6297,3 +6297,11 @@ Entries:
         Console.
   id: 5200
   time: '2024-08-13T18:07:02.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: >-
+        The option to set character antag preferences for the sleeper agent has
+        been removed, sleeper agents cannot spawn.
+  id: 5201
+  time: '2024-08-15T15:14:43.0000000+00:00'

From 2952598a3677c4f54e5928ae01bcbd3010b07651 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Thu, 15 Aug 2024 11:50:30 -0400
Subject: [PATCH 28/39] DungeonJob.PostGenWallMount: better error handling
 (#1858)

* DungeonJob.PostGenWallMount: spawngroup error chks

* PostGenAutoCabling: bounds check

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 .../Procedural/DungeonJob/DungeonJob.PostGenAutoCabling.cs | 3 +++
 .../Procedural/DungeonJob/DungeonJob.PostGenWallMount.cs   | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenAutoCabling.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenAutoCabling.cs
index aaea23ddd566..57d9d4a2b872 100644
--- a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenAutoCabling.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenAutoCabling.cs
@@ -53,6 +53,9 @@ private async Task PostGen(AutoCablingDunGen gen, DungeonData data, Dungeon dung
         if (!ValidateResume())
             return;
 
+        if (cableTiles.Count <= 0) // Frontier: empty check
+            return; // Frontier: empty check
+
         var startNodes = new List<Vector2i>(cableTiles);
         random.Shuffle(startNodes);
         var start = startNodes[0];
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWallMount.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWallMount.cs
index afc7608d64af..530c7344ab3c 100644
--- a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWallMount.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWallMount.cs
@@ -20,7 +20,9 @@ private async Task PostGen(WallMountDunGen gen, DungeonData data, Dungeon dungeo
         }
 
         var tileDef = _prototype.Index(tileProto);
-        data.SpawnGroups.TryGetValue(DungeonDataKey.WallMounts, out var spawnProto);
+        bool validProto = data.SpawnGroups.TryGetValue(DungeonDataKey.WallMounts, out var spawnProto); // Frontier: assign to validProto
+        if (!validProto) // Frontier: add error handling
+            _sawmill.Warning($"No wallmount spawn group for dungeon type."); // Frontier: add error handling
 
         var checkedTiles = new HashSet<Vector2i>();
         var allExterior = new HashSet<Vector2i>(dungeon.CorridorExteriorTiles);
@@ -38,6 +40,9 @@ private async Task PostGen(WallMountDunGen gen, DungeonData data, Dungeon dungeo
 
             _maps.SetTile(_gridUid, _grid, neighbor, _tile.GetVariantTile(tileDef, random));
             var gridPos = _maps.GridTileToLocal(_gridUid, _grid, neighbor);
+
+            if (!validProto) // Frontier: error handling
+                continue; // Frontier: error handling
             var protoNames = EntitySpawnCollection.GetSpawns(_prototype.Index(spawnProto).Entries, random);
 
             _entManager.SpawnEntities(gridPos, protoNames);

From 304de1e9cebfe332def47e7f9aea16a7f4269815 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Thu, 15 Aug 2024 15:50:56 +0000
Subject: [PATCH 29/39] Automatic Changelog (#1858)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2cdc7b957490..423c99282f96 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6305,3 +6305,11 @@ Entries:
         been removed, sleeper agents cannot spawn.
   id: 5201
   time: '2024-08-15T15:14:43.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: >-
+        An issue causing salvage expedition consoles to get stuck has been
+        resolved.
+  id: 5202
+  time: '2024-08-15T15:50:30.0000000+00:00'

From ec03b960f6a054f501a9bc84b2469752b6277e08 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Thu, 15 Aug 2024 11:51:18 -0400
Subject: [PATCH 30/39] Add RockWall to Mineshaft walls config (#1861)

---
 Resources/Prototypes/Procedural/dungeon_configs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml
index 1c96ee625578..61143da82420 100644
--- a/Resources/Prototypes/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/Procedural/dungeon_configs.yml
@@ -139,6 +139,7 @@
   id: Mineshaft
   data:
     entities:
+      Walls: WallRock # Frontier: enclose the mineshaft in rock
       Cabling: Catwalk
     spawnGroups:
       CornerClutter: MineshaftClutter

From de0045d7cd060d89b92489c412186965bfa95e4f Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Thu, 15 Aug 2024 21:16:23 +0300
Subject: [PATCH 31/39] Expedition Loots Balance Pass (Again) (#1821)

* ammo crates

* ammo boxes

* restocks, crates

* engi crates

* merc crates

* medical crates

* science crates

* service crates, overall lower spawn chances

* t1 weapons

* fix

* armory: remove refs to locked crates, rtg loot

* exped loot: cleanade crate

* Restore novalite "armory access to open" message

* Grammar fixes

* Replace fuel tanks with full versions

* Shift ammo crate welded sprite

* diamonds are rare, no stacks

* more ammo, more

* CrateFirearmsSecure

* secure ammo crate

* no more SecurityTechFabs

* fix

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
---
 .../Service/vending_machine_restock.yml       |   2 +-
 .../_NF/Catalog/Fills/Crates/armory.yml       | 275 ++++++++++++-
 .../Catalog/Fills/Crates/expeditions_loot.yml | 287 +++++++++++++-
 .../_NF/Catalog/Fills/Crates/materials.yml    |  22 ++
 .../_NF/Catalog/Fills/Crates/vending.yml      |   6 +-
 .../Fills/Items/weapon_cases_expedition.yml   | 269 ++++++++++++-
 .../Fills/StorageFillTemplates/ammo.yml       | 365 ++++++++++++++++++
 .../Random/dungeon_items_engineering.yml      |  47 ++-
 .../Spawners/Random/dungeon_items_general.yml |  13 +-
 .../Random/dungeon_items_hydroponics.yml      |  19 +-
 .../Spawners/Random/dungeon_items_kitchen.yml |  26 +-
 .../Spawners/Random/dungeon_items_medical.yml |  32 +-
 .../Random/dungeon_items_mercenary.yml        |  86 ++++-
 .../Random/dungeon_items_research.yml         |  84 +++-
 .../Spawners/Random/dungeon_items_supply.yml  |   2 +-
 .../Spawners/Random/dungeon_items_weapons.yml | 154 +++++++-
 .../{Tools => Storage}/weapon_cases.yml       |  36 +-
 .../Structures/Storage/Crates/crates.yml      |  57 +++
 .../hostile_humanoid_inventory_template.yml   |   1 -
 ...humanoid_simplified_inventory_template.yml |  10 +
 ...hostile_nonhumanoid_inventory_template.yml |  13 +
 .../Cases/ammocaseshort.rsi/icon-open.png     | Bin 0 -> 714 bytes
 .../Storage/Cases/ammocaseshort.rsi/icon.png  | Bin 0 -> 656 bytes
 .../Cases/ammocaseshort.rsi/inhand-left.png   | Bin 0 -> 657 bytes
 .../Cases/ammocaseshort.rsi/inhand-right.png  | Bin 0 -> 668 bytes
 .../Cases/ammocaseshort.rsi}/meta.json        |   0
 .../Cases/ammocaseshort.rsi}/unshaded.png     | Bin
 .../explosivescaseshort.rsi/icon-open.png     | Bin 0 -> 770 bytes
 .../Cases/explosivescaseshort.rsi/icon.png    | Bin 0 -> 717 bytes
 .../explosivescaseshort.rsi/inhand-left.png   | Bin 0 -> 665 bytes
 .../explosivescaseshort.rsi/inhand-right.png  | Bin 0 -> 675 bytes
 .../Cases/explosivescaseshort.rsi}/meta.json  |   0
 .../explosivescaseshort.rsi}/unshaded.png     | Bin
 .../Cases}/guncaseheavy.rsi/icon-open.png     | Bin
 .../Cases}/guncaseheavy.rsi/icon.png          | Bin
 .../Cases}/guncaseheavy.rsi/inhand-left.png   | Bin
 .../Cases}/guncaseheavy.rsi/inhand-right.png  | Bin
 .../Cases}/guncaseheavy.rsi/meta.json         |   0
 .../Cases}/guncaseheavy.rsi/unshaded.png      | Bin
 .../Cases}/guncaselong.rsi/icon-open.png      | Bin
 .../Cases}/guncaselong.rsi/icon.png           | Bin
 .../Cases}/guncaselong.rsi/inhand-left.png    | Bin
 .../Cases}/guncaselong.rsi/inhand-right.png   | Bin
 .../Storage/Cases/guncaselong.rsi/meta.json   |  31 ++
 .../Cases/guncaselong.rsi/unshaded.png        | Bin 0 -> 5576 bytes
 .../Cases}/guncaseshort.rsi/icon-open.png     | Bin
 .../Cases}/guncaseshort.rsi/icon.png          | Bin
 .../Cases}/guncaseshort.rsi/inhand-left.png   | Bin
 .../Cases}/guncaseshort.rsi/inhand-right.png  | Bin
 .../Storage/Cases/guncaseshort.rsi/meta.json  |  31 ++
 .../Cases/guncaseshort.rsi/unshaded.png       | Bin 0 -> 5576 bytes
 .../Storage/Crates/ammo.rsi/base.png          | Bin 0 -> 252 bytes
 .../Storage/Crates/ammo.rsi/closed.png        | Bin 0 -> 419 bytes
 .../Storage/Crates/ammo.rsi/icon.png          | Bin 0 -> 447 bytes
 .../Storage/Crates/ammo.rsi/meta.json         |  26 ++
 .../Storage/Crates/ammo.rsi/open.png          | Bin 0 -> 309 bytes
 .../Storage/Crates/ammo.rsi/welded.png        | Bin 0 -> 283 bytes
 .../Storage/Crates/secure_ammo.rsi/base.png   | Bin 0 -> 308 bytes
 .../Storage/Crates/secure_ammo.rsi/closed.png | Bin 0 -> 419 bytes
 .../Storage/Crates/secure_ammo.rsi/icon.png   | Bin 0 -> 494 bytes
 .../Storage/Crates/secure_ammo.rsi/locked.png | Bin 0 -> 100 bytes
 .../Storage/Crates/secure_ammo.rsi/meta.json  |  45 +++
 .../Storage/Crates/secure_ammo.rsi/open.png   | Bin 0 -> 305 bytes
 .../Storage/Crates/secure_ammo.rsi/sparks.png | Bin 0 -> 450 bytes
 .../Crates/secure_ammo.rsi/unlocked.png       | Bin 0 -> 102 bytes
 .../Storage/Crates/secure_ammo.rsi/welded.png | Bin 0 -> 294 bytes
 .../Crates/secure_firearms.rsi/base.png       | Bin 0 -> 354 bytes
 .../Crates/secure_firearms.rsi/closed.png     | Bin 0 -> 519 bytes
 .../Crates/secure_firearms.rsi/icon.png       | Bin 0 -> 604 bytes
 .../Crates/secure_firearms.rsi/locked.png     | Bin 0 -> 136 bytes
 .../Crates/secure_firearms.rsi/meta.json      |  39 ++
 .../Crates/secure_firearms.rsi/open.png       | Bin 0 -> 350 bytes
 .../Crates/secure_firearms.rsi/sparking.png   | Bin 0 -> 447 bytes
 .../Crates/secure_firearms.rsi/unlocked.png   | Bin 0 -> 155 bytes
 .../Crates/secure_firearms.rsi/welded.png     | Bin 0 -> 323 bytes
 .../Crates/secure_mercenary.rsi/base.png      | Bin 0 -> 351 bytes
 .../Crates/secure_mercenary.rsi/closed.png    | Bin 0 -> 484 bytes
 .../Crates/secure_mercenary.rsi/icon.png      | Bin 0 -> 551 bytes
 .../Crates/secure_mercenary.rsi/locked.png    | Bin 0 -> 136 bytes
 .../Crates/secure_mercenary.rsi/meta.json     |  39 ++
 .../Crates/secure_mercenary.rsi/open.png      | Bin 0 -> 340 bytes
 .../Crates/secure_mercenary.rsi/sparking.png  | Bin 0 -> 447 bytes
 .../Crates/secure_mercenary.rsi/unlocked.png  | Bin 0 -> 155 bytes
 .../Crates/secure_mercenary.rsi/welded.png    | Bin 0 -> 297 bytes
 .../Crates/secure_privatesec.rsi/base.png     | Bin 0 -> 360 bytes
 .../Crates/secure_privatesec.rsi/closed.png   | Bin 0 -> 524 bytes
 .../Crates/secure_privatesec.rsi/icon.png     | Bin 0 -> 604 bytes
 .../Crates/secure_privatesec.rsi/locked.png   | Bin 0 -> 136 bytes
 .../Crates/secure_privatesec.rsi/meta.json    |  39 ++
 .../Crates/secure_privatesec.rsi/open.png     | Bin 0 -> 351 bytes
 .../Crates/secure_privatesec.rsi/sparking.png | Bin 0 -> 447 bytes
 .../Crates/secure_privatesec.rsi/unlocked.png | Bin 0 -> 155 bytes
 .../Crates/secure_privatesec.rsi/welded.png   | Bin 0 -> 297 bytes
 93 files changed, 1976 insertions(+), 80 deletions(-)
 create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/ammo.yml
 rename Resources/Prototypes/_NF/Entities/Objects/{Tools => Storage}/weapon_cases.yml (66%)
 create mode 100644 Resources/Prototypes/_NF/InventoryTemplates/hostile_nonhumanoid_inventory_template.yml
 create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/icon-open.png
 create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/inhand-right.png
 rename Resources/Textures/_NF/Objects/{Tools/guncaselong.rsi => Storage/Cases/ammocaseshort.rsi}/meta.json (100%)
 rename Resources/Textures/_NF/Objects/{Tools/guncaselong.rsi => Storage/Cases/ammocaseshort.rsi}/unshaded.png (100%)
 create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/icon-open.png
 create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/inhand-right.png
 rename Resources/Textures/_NF/Objects/{Tools/guncaseshort.rsi => Storage/Cases/explosivescaseshort.rsi}/meta.json (100%)
 rename Resources/Textures/_NF/Objects/{Tools/guncaseshort.rsi => Storage/Cases/explosivescaseshort.rsi}/unshaded.png (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaseheavy.rsi/icon-open.png (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaseheavy.rsi/icon.png (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaseheavy.rsi/inhand-left.png (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaseheavy.rsi/inhand-right.png (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaseheavy.rsi/meta.json (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaseheavy.rsi/unshaded.png (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaselong.rsi/icon-open.png (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaselong.rsi/icon.png (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaselong.rsi/inhand-left.png (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaselong.rsi/inhand-right.png (100%)
 create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/unshaded.png
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaseshort.rsi/icon-open.png (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaseshort.rsi/icon.png (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaseshort.rsi/inhand-left.png (100%)
 rename Resources/Textures/_NF/Objects/{Tools => Storage/Cases}/guncaseshort.rsi/inhand-right.png (100%)
 create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/unshaded.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/base.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/closed.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/open.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/welded.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/base.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/closed.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/locked.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/open.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/sparks.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/unlocked.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/welded.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/base.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/closed.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/locked.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/open.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/sparking.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/unlocked.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/welded.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/base.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/closed.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/locked.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/open.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/sparking.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/unlocked.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/welded.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/base.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/closed.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/locked.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/open.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/sparking.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/unlocked.png
 create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/welded.png

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
index dacc479035e6..546de8ae47c3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -44,7 +44,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StaticPrice # Frontier
-    price: 200 # Frontier
+    price: 400 # Frontier
 
 - type: entity
   parent: BaseVendingMachineRestock
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/armory.yml
index 0f7e465567c1..fac0f214f3b7 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/armory.yml
@@ -1,7 +1,7 @@
 # Registered (legal) weapon crates
 - type: entity
   id: CrateArmoryRifleGestio
-  parent: CrateWeaponSecure
+  parent: CrateFirearmsSecure
   name: gestio rifle crate
   description: Contains two old prototype, burst-fire rifles with six low capacity mags. Requires Armory access to open.
   components:
@@ -15,7 +15,7 @@
 # Contraband (unregistered) weaponry crates for expeditions
 - type: entity
   id: CrateArmorySMGExpedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: SMG crate
   description: Contains two high-powered, SMGs with four mags. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -29,7 +29,7 @@
 
 - type: entity
   id: CrateArmoryShotgunExpedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: shotgun crate
   description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -43,7 +43,7 @@
 
 - type: entity
   id: CrateArmoryLaserExpedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: lasers crate
   description: Contains three standard-issue laser carbines. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -55,7 +55,7 @@
 
 - type: entity
   id: CrateArmoryEnergyGunExpedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: energy guns crate
   description: Contains three energy guns. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -67,7 +67,7 @@
 
 - type: entity
   id: CrateArmoryPistolsExpedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: pistols crate
   description: Contains two standard NT pistols with four mags. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -81,7 +81,7 @@
 
 - type: entity
   id: CrateArmoryRifleGestioExpedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: gestio rifle crate
   description: Contains two old prototype, burst-fire rifles with six low capacity mags. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -95,7 +95,7 @@
 
 - type: entity
   id: CrateArmoryRifleNovaliteC1Expedition
-  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ]
   name: novalite rifle crate
   description: Contains two civilian grade rifles with six low capacity clips. Requires Armory access to open. Unregistered.
   noSpawn: true
@@ -106,3 +106,262 @@
         amount: 2
       - id: MagazineNovaliteC1
         amount: 6
+
+# Ammo crates
+## .20 rifle
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxLethal20
+  id: CrateAmmoBoxLethal20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxBigLethal20
+  id: CrateAmmoBoxBigLethal20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxRubber20
+  id: CrateAmmoBoxRubber20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxBigRubber20
+  id: CrateAmmoBoxBigRubber20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxPractice20
+  id: CrateAmmoBoxPractice20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxIncendiary20
+  id: CrateAmmoBoxIncendiary20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxUranium20
+  id: CrateAmmoBoxUranium20
+  noSpawn: true
+
+## .30 rifle
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxLethal30
+  id: CrateAmmoBoxLethal30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxBigLethal30
+  id: CrateAmmoBoxBigLethal30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxRubber30
+  id: CrateAmmoBoxRubber30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxPractice30
+  id: CrateAmmoBoxPractice30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxIncendiary30
+  id: CrateAmmoBoxIncendiary30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxUranium30
+  id: CrateAmmoBoxUranium30
+  noSpawn: true
+
+## .35 pistol
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxLethal35
+  id: CrateAmmoBoxLethal35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxRubber35
+  id: CrateAmmoBoxRubber35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxPractice35
+  id: CrateAmmoBoxPractice35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxIncendiary35
+  id: CrateAmmoBoxIncendiary35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxUranium35
+  id: CrateAmmoBoxUranium35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxEmp35
+  id: CrateAmmoBoxEmp35
+  noSpawn: true
+
+## .25 caseless
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxLethal25
+  id: CrateAmmoBoxLethal25
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxBigLethal25
+  id: CrateAmmoBoxBigLethal25
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxRubber25
+  id: CrateAmmoBoxRubber25
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxBigRubber25
+  id: CrateAmmoBoxBigRubber25
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxPractice25
+  id: CrateAmmoBoxPractice25
+  noSpawn: true
+
+## Shotgun
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxLethalShotgun
+  id: CrateAmmoBoxLethalShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxRubberShotgun
+  id: CrateAmmoBoxRubberShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxPracticeShotgun
+  id: CrateAmmoBoxPracticeShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxIncendiaryShotgun
+  id: CrateAmmoBoxIncendiaryShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxUraniumShotgun
+  id: CrateAmmoBoxUraniumShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxSlugShotgun
+  id: CrateAmmoBoxSlugShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxFlareShotgun
+  id: CrateAmmoBoxFlareShotgun
+  noSpawn: true
+
+## .45 ammo
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxLethal45
+  id: CrateAmmoBoxLethal45
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxRubber45
+  id: CrateAmmoBoxRubber45
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxPractice45
+  id: CrateAmmoBoxPractice45
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxIncendiary45
+  id: CrateAmmoBoxIncendiary45
+  noSpawn: true
+
+- type: entity
+  parent:
+  - CrateAmmoSecureMercenary
+  - StorageFillAmmoBoxUranium45
+  id: CrateAmmoBoxUranium45
+  noSpawn: true
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml
index 2e870130b955..a0435763c449 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml
@@ -3,18 +3,29 @@
   parent: CrateEngineering
   id: CrateEngineeringKitRtg
   name: RTG toolkit
-  description: Contains a full kit to build RTG power plant.
+  description: Contains a full kit to build an RTG power plant.
   components:
   - type: StorageFill
     contents:
+      # Expected value: 2.8
+    - id: GeneratorRTGFlatpack
+      amount: 2
+      orGroup: rtg
+      prob: 0.4
+    - id: GeneratorRTGFlatpack
+      amount: 3
+      orGroup: rtg
+      prob: 0.4
     - id: GeneratorRTGFlatpack
       amount: 4
+      orGroup: rtg
+      prob: 0.2
 
 - type: entity
   parent: CrateEngineering
   id: CrateEngineeringKitFabrication
   name: fabrication kit
-  description: Contains a full kit to build engineering fabrication facility.
+  description: Contains a full kit to build an engineering fabrication facility.
   components:
   - type: StorageFill
     contents:
@@ -43,6 +54,94 @@
     - id: ShipyardRCDAmmo
       amount: 4
 
+- type: entity
+  parent: CrateEngineering
+  id: CrateEngineerHardsuit
+  name: station engineer's hardsuit crate
+  description: Contains a station engineer hardsuit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingShoesBootsMag
+    - id: ClothingOuterHardsuitEngineering
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+
+- type: entity
+  parent: CrateEngineering
+  id: CrateAtmosTechHardsuit
+  name: atmospheric technician's hardsuit crate
+  description: Contains a atmospheric technician hardsuit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingShoesBootsMag
+    - id: ClothingOuterHardsuitAtmos
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+
+- type: entity
+  parent: CrateEngineering
+  id: CrateEngineerChiefHardsuit
+  name: chief engineer's hardsuit crate
+  description: Contains a chief engineer hardsuit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingShoesBootsMag
+    - id: ClothingOuterHardsuitEngineeringWhite
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+
+- type: entity
+  parent: CrateEngineering
+  id: CrateTools
+  name: tools crate
+  description: Contains essential tools for engineering.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterVestHazard
+        prob: 0.4
+      - id: FlashlightLantern
+        prob: 0.7
+      - id: Screwdriver
+        prob: 0.7
+      - id: Wrench
+        prob: 0.7
+      - id: Welder
+        prob: 0.7
+      - id: Crowbar
+        prob: 0.7
+      - id: Wirecutter
+        prob: 0.7
+      - id: Multitool
+        prob: 0.2
+      - id: trayScanner
+        prob: 0.7
+      - id: GasAnalyzer
+        prob: 0.7
+      - id: ClothingBeltUtility
+        prob: 0.2
+      - id: ClothingHandsGlovesColorYellow
+        prob: 0.05
+      - id: ClothingHeadHatHardhatRed
+        prob: 0.4
+      - id: CableApcStack
+        prob: 0.3
+      - id: CableApcStack
+        prob: 0.3
+      - id: CableApcStack
+        prob: 0.3
+      - id: SprayPainter
+        prob: 0.7
+
 # Science
 
 # Service
@@ -64,6 +163,24 @@
     - id: VendingMachineRestockChefvend
     - id: VendingMachineRestockDinnerware
 
+- type: entity
+  parent: CratePlastic
+  id: CrateServiceKitCleanades
+  name: cleanade crate
+  description: Contains a full kit to clean up a warzone.
+  components:
+  - type: StorageFill
+    contents:
+    - id: CleanerGrenade
+      amount: 2
+      orGroup: cleanades
+    - id: CleanerGrenade
+      amount: 4
+      orGroup: cleanades
+    - id: CleanerGrenade
+      amount: 6
+      orGroup: cleanades
+
 - type: entity
   parent: CrateHydroponics
   id: CrateServiceKitHydroponics
@@ -126,3 +243,169 @@
     - id: KitchenReagentGrinderFlatpack
     - id: VendingMachineChemicalsFlatpack
     - id: VendingMachineRestockChemVend
+
+- type: entity
+  parent: CrateChemistrySecure
+  id: CrateChemistrySecureKitChemist
+  name: chemistry kit
+  description: Contains a chemist equipment kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxSyringe
+    - id: BoxBeaker
+      amount: 2
+    - id: BoxPillCanister
+    - id: BoxBottle
+    - id: BoxVial
+    - id: ChemBag
+    - id: ClothingHandsGlovesLatex
+    - id: ClothingMaskSterile
+    - id: ClothingEyesGlassesChemical  
+
+- type: entity
+  parent: CrateMedicalSecure
+  id: CrateMedicalSecureDoctor
+  name: doctor chest
+  description: Contains a doctor equipment kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: HandheldHealthAnalyzer
+    - id: ClothingHandsGlovesLatex
+    - id: ClothingEyesHudMedical
+    - id: ClothingMaskSterile
+    - id: ClothingBeltMedicalFilled
+
+- type: entity
+  parent: CrateSurgery
+  id: CrateMedicalSecureMedicine
+  name: medicine chest
+  description: Contains essential medical supplies.
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxSyringe
+    - id: EpinephrineChemistryBottle
+      amount: 1
+    - id: Brutepack
+      amount: 2
+    - id: Ointment
+      amount: 2
+    - id: Bloodpack
+      amount: 2
+    - id: Gauze
+  
+- type: entity
+  parent: CrateSurgery
+  id: CrateMedicalSecureMedicinePierce
+  name: medicine chest
+  description: Contains essential medical supplies.
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxSyringe
+    - id: EpinephrineChemistryBottle
+      amount: 1
+    - id: Bloodpack
+      amount: 3
+    - id: Gauze
+      amount: 3
+  
+- type: entity
+  parent: CrateMedical
+  id: CrateMedicalRollerBeds
+  name: roller bed chest
+  description: Contains four roller beds.
+  components:
+  - type: StorageFill
+    contents:
+    - id: RollerBedSpawnFolded
+      amount: 4
+  
+- type: entity
+  parent: CrateEvaKit
+  id: CrateEvaKitParamedic
+  name: paramedic voidsuit kit
+  description: Contains a full paramedic voidsuit kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterHardsuitVoidParamed
+    - id: ClothingMaskBreathMedical
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+
+- type: entity
+  parent: CrateEvaKit
+  id: CrateEvaKitCmo
+  name: chief medical officer hardsuit kit
+  description: Contains a full chief medical officer hardsuit kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterHardsuitMedical
+    - id: ClothingMaskBreathMedical
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+
+# Mercenary
+- type: entity
+  parent: CrateSecureMercenary
+  id: CrateSecureMercenaryHardsuitMagBoots
+  name: mercenary hardsuit crate
+  description: Contains a mercenary hardsuit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: DoubleEmergencyAirTankFilled
+    - id: ClothingShoesBootsMagMercenary
+    - id: ClothingOuterHardsuitMercenary
+    - id: ClothingMaskGasMercenary
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+
+- type: entity
+  parent: CrateSecureMercenaryPrivateSec
+  id: CrateSecureMercenaryPrivateSecHardsuitMagBoots
+  name: private security hardsuit crate
+  description: Contains a private security hardsuit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: DoubleEmergencyAirTankFilled
+    - id: ClothingShoesBootsMagCombat
+    - id: ClothingOuterHardsuitPrivateSecurity
+    - id: ClothingMaskGasSecurity
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+
+- type: entity
+  parent: CrateSecureMercenary
+  id: CrateSecureMercenaryHardsuit
+  name: mercenary hardsuit crate
+  description: Contains a mercenary hardsuit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: DoubleEmergencyAirTankFilled
+    - id: ClothingOuterHardsuitMercenary
+    - id: ClothingMaskGasMercenary
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+
+- type: entity
+  parent: CrateSecureMercenaryPrivateSec
+  id: CrateSecureMercenaryPrivateSecHardsuit
+  name: private security hardsuit crate
+  description: Contains a private security hardsuit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: DoubleEmergencyAirTankFilled
+    - id: ClothingOuterHardsuitPrivateSecurity
+    - id: ClothingMaskGasSecurity
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml
index b7d04083d793..9d16c9afbdec 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml
@@ -11,3 +11,25 @@
       - id: SheetSteel
       - id: SheetPlasma
       - id: SheetPlasteel
+
+- type: entity
+  id: CrateMaterialMetalRods
+  parent: CrateGenericSteel
+  name: metal rods crate
+  description: 90 metal rods, packed with reckless abandon.
+  components:
+  - type: StorageFill
+    contents:
+    - id: PartRodMetal
+      amount: 3
+
+- type: entity
+  id: CrateMaterialBiomass
+  parent: CrateFreezer
+  name: biomass crate
+  description: 300 units of biomass. Yum.
+  components:
+  - type: StorageFill
+    contents:
+    - id: MaterialBiomass
+      amount: 3
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml
index 6c5ff2f1a43e..2acf0058ea78 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml
@@ -11,7 +11,7 @@
 
 - type: entity
   id: CrateVendingMachineRestockAmmoFilled
-  parent: CratePlasticBiodegradable
+  parent: CrateAmmoGeneric
   name: Liberation restock crate
   description: Contains two restock boxes for the Liberation vending machine.
   components:
@@ -44,7 +44,7 @@
 
 - type: entity
   id: CrateVendingMachineRestockLessLethalVendFilled
-  parent: CratePlasticBiodegradable
+  parent: CrateAmmoGeneric
   name: LessLethalVend restock crate
   description: Contains two restock boxes for the LessLethalVend vending machine.
   components:
@@ -55,7 +55,7 @@
 
 - type: entity
   id: CrateVendingMachineRestockNonLethalVendFilled
-  parent: CratePlasticBiodegradable
+  parent: CrateAmmoGeneric
   name: NonLethalVend restock crate
   description: Contains two restock boxes for the NonLethalVend vending machine.
   components:
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
index d3c80ad32e03..d1c2b2c8d677 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
@@ -573,7 +573,7 @@
 
 # Explosives
 - type: entity
-  parent: WeaponCaseShort
+  parent: WeaponCaseShortExplosives
   id: WeaponCaseShortFireBomb
   suffix: Dungeon, Fire Bomb
   noSpawn: true
@@ -584,7 +584,7 @@
       amount: 4
 
 - type: entity
-  parent: WeaponCaseShort
+  parent: WeaponCaseShortExplosives
   id: WeaponCaseShortPipeBomb
   suffix: Dungeon, Pipe Bomb
   noSpawn: true
@@ -595,7 +595,7 @@
       amount: 4
 
 - type: entity
-  parent: WeaponCaseShort
+  parent: WeaponCaseShortExplosives
   id: WeaponCaseShortSeismicCharge
   suffix: Dungeon, Seismic Charge
   noSpawn: true
@@ -606,7 +606,7 @@
       amount: 4
 
 - type: entity
-  parent: WeaponCaseShort
+  parent: WeaponCaseShortExplosives
   id: WeaponCaseShortExGrenade
   suffix: Dungeon, Explosive Grenade
   noSpawn: true
@@ -617,7 +617,7 @@
       amount: 4
 
 - type: entity
-  parent: WeaponCaseShort
+  parent: WeaponCaseShortExplosives
   id: WeaponCaseShortC4
   suffix: Dungeon, C4
   noSpawn: true
@@ -640,3 +640,262 @@
       amount: 1
     - id: MagazineAsmgtUniversalPistol
       amount: 4
+
+# Ammo
+## .20 rifle
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxLethal20
+  id: WeaponCaseShortAmmoBoxLethal20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxBigLethal20
+  id: WeaponCaseShortAmmoBoxBigLethal20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxRubber20
+  id: WeaponCaseShortAmmoBoxRubber20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxBigRubber20
+  id: WeaponCaseShortAmmoBoxBigRubber20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxPractice20
+  id: WeaponCaseShortAmmoBoxPractice20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxIncendiary20
+  id: WeaponCaseShortAmmoBoxIncendiary20
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxUranium20
+  id: WeaponCaseShortAmmoBoxUranium20
+  noSpawn: true
+
+## .30 rifle
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxLethal30
+  id: WeaponCaseShortAmmoBoxLethal30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxBigLethal30
+  id: WeaponCaseShortAmmoBoxBigLethal30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxRubber30
+  id: WeaponCaseShortAmmoBoxRubber30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxPractice30
+  id: WeaponCaseShortAmmoBoxPractice30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxIncendiary30
+  id: WeaponCaseShortAmmoBoxIncendiary30
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxUranium30
+  id: WeaponCaseShortAmmoBoxUranium30
+  noSpawn: true
+
+## .35 pistol
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxLethal35
+  id: WeaponCaseShortAmmoBoxLethal35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxRubber35
+  id: WeaponCaseShortAmmoBoxRubber35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxPractice35
+  id: WeaponCaseShortAmmoBoxPractice35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxIncendiary35
+  id: WeaponCaseShortAmmoBoxIncendiary35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxUranium35
+  id: WeaponCaseShortAmmoBoxUranium35
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxEmp35
+  id: WeaponCaseShortAmmoBoxEmp35
+  noSpawn: true
+
+## .25 caseless
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxLethal25
+  id: WeaponCaseShortAmmoBoxLethal25
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxBigLethal25
+  id: WeaponCaseShortAmmoBoxBigLethal25
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxRubber25
+  id: WeaponCaseShortAmmoBoxRubber25
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxBigRubber25
+  id: WeaponCaseShortAmmoBoxBigRubber25
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxPractice25
+  id: WeaponCaseShortAmmoBoxPractice25
+  noSpawn: true
+
+## Shotgun
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxLethalShotgun
+  id: WeaponCaseShortAmmoBoxLethalShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxRubberShotgun
+  id: WeaponCaseShortAmmoBoxRubberShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxPracticeShotgun
+  id: WeaponCaseShortAmmoBoxPracticeShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxIncendiaryShotgun
+  id: WeaponCaseShortAmmoBoxIncendiaryShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxUraniumShotgun
+  id: WeaponCaseShortAmmoBoxUraniumShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxSlugShotgun
+  id: WeaponCaseShortAmmoBoxSlugShotgun
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxFlareShotgun
+  id: WeaponCaseShortAmmoBoxFlareShotgun
+  noSpawn: true
+
+## .45 ammo
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxLethal45
+  id: WeaponCaseShortAmmoBoxLethal45
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxRubber45
+  id: WeaponCaseShortAmmoBoxRubber45
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxPractice45
+  id: WeaponCaseShortAmmoBoxPractice45
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxIncendiary45
+  id: WeaponCaseShortAmmoBoxIncendiary45
+  noSpawn: true
+
+- type: entity
+  parent:
+  - WeaponCaseShortAmmo
+  - StorageFillAmmoBoxUranium45
+  id: WeaponCaseShortAmmoBoxUranium45
+  noSpawn: true
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/ammo.yml b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/ammo.yml
new file mode 100644
index 000000000000..1521d4a5db01
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/ammo.yml
@@ -0,0 +1,365 @@
+# .20 rifle ammo
+- type: entity # Lethal
+  abstract: true
+  id: StorageFillAmmoBoxLethal20
+  suffix: .20 rifle, Lethal, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxRifle
+      amount: 4
+
+- type: entity # Lethal
+  abstract: true
+  id: StorageFillAmmoBoxBigLethal20
+  suffix: .20 rifle, Lethal, x4 big boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxRifleBig
+      amount: 4
+
+- type: entity # Rubber
+  abstract: true
+  id: StorageFillAmmoBoxRubber20
+  suffix: .20 rifle, Rubber, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxRifleRubber
+      amount: 4
+
+- type: entity # Rubber
+  abstract: true
+  id: StorageFillAmmoBoxBigRubber20
+  suffix: .20 rifle, Rubber, x4 big boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxRifleBigRubber
+      amount: 4
+
+- type: entity # Practice
+  abstract: true
+  id: StorageFillAmmoBoxPractice20
+  suffix: .20 rifle, Practice, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxRiflePractice
+      amount: 4
+
+- type: entity # Incendiary
+  abstract: true
+  id: StorageFillAmmoBoxIncendiary20
+  suffix: .20 rifle, Incendiary, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxRifleIncendiary
+      amount: 4
+
+- type: entity # Uranium
+  abstract: true
+  id: StorageFillAmmoBoxUranium20
+  suffix: .20 rifle, Uranium, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxRifleUranium
+      amount: 4
+
+# .30 rifle ammo
+- type: entity # Lethal
+  abstract: true
+  id: StorageFillAmmoBoxLethal30
+  suffix: .30 rifle, Lethal, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxLightRifle
+      amount: 4
+
+- type: entity # Lethal
+  abstract: true
+  id: StorageFillAmmoBoxBigLethal30
+  suffix: .30 rifle, Lethal, x4 big boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxLightRifleBig
+      amount: 4
+
+- type: entity # Rubber
+  abstract: true
+  id: StorageFillAmmoBoxRubber30
+  suffix: .30 rifle, Rubber, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxLightRifleRubber
+      amount: 4
+
+- type: entity # Practice
+  abstract: true
+  id: StorageFillAmmoBoxPractice30
+  suffix: .30 rifle, Practice, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxLightRiflePractice
+      amount: 4
+
+- type: entity # Incendiary
+  abstract: true
+  id: StorageFillAmmoBoxIncendiary30
+  suffix: .30 rifle, Incendiary, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxLightRifleIncendiary
+      amount: 4
+
+- type: entity # Uranium
+  abstract: true
+  id: StorageFillAmmoBoxUranium30
+  suffix: .30 rifle, Uranium, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxLightRifleUranium
+      amount: 4
+
+# .35 pistol ammo
+- type: entity # Lethal
+  abstract: true
+  id: StorageFillAmmoBoxLethal35
+  suffix: .35 pistol, Lethal, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxPistol
+      amount: 4
+
+- type: entity # Rubber
+  abstract: true
+  id: StorageFillAmmoBoxRubber35
+  suffix: .35 pistol, Rubber, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxPistolRubber
+      amount: 4
+
+- type: entity # Practice
+  abstract: true
+  id: StorageFillAmmoBoxPractice35
+  suffix: .35 pistol, Practice, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxPistolPractice
+      amount: 4
+
+- type: entity # Incendiary
+  abstract: true
+  id: StorageFillAmmoBoxIncendiary35
+  suffix: .35 pistol, Incendiary, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxPistolIncendiary
+      amount: 4
+
+- type: entity # Uranium
+  abstract: true
+  id: StorageFillAmmoBoxUranium35
+  suffix: .35 pistol, Uranium, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxPistolUranium
+      amount: 4
+
+- type: entity # EMP
+  abstract: true
+  id: StorageFillAmmoBoxEmp35
+  suffix: .35 pistol, EMP, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxPistolEmp
+      amount: 4
+
+# .25 caseless ammo
+- type: entity # Lethal
+  abstract: true
+  id: StorageFillAmmoBoxLethal25
+  suffix: .25 caseless, Lethal, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxCaselessRifle
+      amount: 4
+
+- type: entity # Lethal
+  abstract: true
+  id: StorageFillAmmoBoxBigLethal25
+  suffix: .25 caseless, Lethal, x4 big boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxCaselessRifleBig
+      amount: 4
+
+- type: entity # Rubber
+  abstract: true
+  id: StorageFillAmmoBoxRubber25
+  suffix: .25 caseless, Rubber, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxPistolRubber
+      amount: 4
+
+- type: entity # Rubber
+  abstract: true
+  id: StorageFillAmmoBoxBigRubber25
+  suffix: .25 caseless, Rubber, x4 big boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxCaselessRifleBigRubber
+      amount: 4
+
+- type: entity # Practice
+  abstract: true
+  id: StorageFillAmmoBoxPractice25
+  suffix: .25 caseless, Practice, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxPistolPractice
+      amount: 4
+
+# Shotgun ammo
+- type: entity # Lethal
+  abstract: true
+  id: StorageFillAmmoBoxLethalShotgun
+  suffix: Shotgun, Lethal, x2 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxLethalshot
+      amount: 2
+
+- type: entity # Rubber
+  abstract: true
+  id: StorageFillAmmoBoxRubberShotgun
+  suffix: Shotgun, Rubber, x2 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxBeanbag
+      amount: 2
+
+- type: entity # Practice
+  abstract: true
+  id: StorageFillAmmoBoxPracticeShotgun
+  suffix: Shotgun, Practice, x2 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxShotgunPractice
+      amount: 2
+
+- type: entity # Incendiary
+  abstract: true
+  id: StorageFillAmmoBoxIncendiaryShotgun
+  suffix: Shotgun, Incendiary, x2 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxShotgunIncendiary
+      amount: 2
+
+- type: entity # Uranium
+  abstract: true
+  id: StorageFillAmmoBoxUraniumShotgun
+  suffix: Shotgun, Uranium, x2 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxShotgunUranium
+      amount: 2
+
+- type: entity # Slugs
+  abstract: true
+  id: StorageFillAmmoBoxSlugShotgun
+  suffix: Shotgun, Slugs, x2 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxShotgunSlug
+      amount: 2
+
+- type: entity # Flare
+  abstract: true
+  id: StorageFillAmmoBoxFlareShotgun
+  suffix: Shotgun, Flare, x2 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxShotgunFlare
+      amount: 2
+
+# .45 ammo
+- type: entity # Lethal
+  abstract: true
+  id: StorageFillAmmoBoxLethal45
+  suffix: .45, Lethal, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxMagnum
+      amount: 4
+
+- type: entity # Rubber
+  abstract: true
+  id: StorageFillAmmoBoxRubber45
+  suffix: .45, Rubber, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxMagnumRubber
+      amount: 4
+
+- type: entity # Practice
+  abstract: true
+  id: StorageFillAmmoBoxPractice45
+  suffix: .45, Practice, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxMagnumPractice
+      amount: 4
+
+- type: entity # Incendiary
+  abstract: true
+  id: StorageFillAmmoBoxIncendiary45
+  suffix: .45, Incendiary, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxMagnumIncendiary
+      amount: 4
+
+- type: entity # Uranium
+  abstract: true
+  id: StorageFillAmmoBoxUranium45
+  suffix: .45, Uranium, x4 boxes
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineBoxMagnumUranium
+      amount: 4
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
index 81c486b9732d..ba3797f4d101 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
@@ -257,11 +257,30 @@
   - type: RandomSpawner
     prototypes:
     # Empty crates
-    - SpawnDungeonLootCrateEmptyEngi
+    - CratePlasma
+    - CrateEngineering
+    - CrateElectrical
+    - CrateRadiation
+    - CrateUranium
     # Restocks
-    - SpawnDungeonLootCrateRestockEngi
+    - CrateVendingMachineRestockEngineeringFilled
+    - CrateVendingMachineRestockVendomatFilled
+    - CrateVendingMachineRestockRoboticsFilled
+    - CrateVendingMachineRestockAstroVendFilled
+    - CrateVendingMachineRestockTankDispenserFilled
+    # - CrateVendingMachineRestockFlatpackVendFilled
     # Mats
-    - SpawnDungeonLootCrateMaterials
+    - CrateMaterialGlass
+    - CrateMaterialSteel
+    - CrateMaterialPlastic
+    - CrateMaterialWood
+    - CrateMaterialPlasteel
+    - CrateMaterialPlasma
+    - CrateMaterialUranium
+    - CrateMaterialTextiles
+    - CrateMaterials
+    - CrateMaterialBrass
+    - WeldingFuelTankFull
     # Filled crates
     - CrateEngineeringGear
     - CrateEngineeringElectricalSupplies
@@ -270,14 +289,28 @@
     - CrateEngineeringCableHV
     - CrateEngineeringCableBulk
     - CrateEngineeringToolbox
-    - CrateEngineeringKitShipyardRcd
     - CrateEngineeringShuttle
-    chance: 0.95
+    - CrateEngineeringFoamGrenade
+    - CrateEngineeringMiniJetpack
+    - CrateAirlockKit
+    - CrateEngineeringSpaceHeater
+    - CrateEngineeringSolar
+    - CrateTools
+    - CrateEngineerHardsuit
+    - CrateAtmosTechHardsuit
+    - CrateEngineeringThruster
+    - CrateEngineeringGyroscope
+    chance: 0.9
     offset: 0.0
     rarePrototypes:
+    # Mats
+    - WeldingFuelTankHighCapacity
+    # Filled crates
+    - CrateEngineeringKitShipyardRcd
     - CrateEngineeringKitRtg
     - CrateEngineeringKitFabrication
-    rareChance: 0.1
+    - CrateEngineerChiefHardsuit
+    rareChance: 0.01
 
 - type: entity
   name: random crate (empty)
@@ -324,7 +357,7 @@
     - CrateVendingMachineRestockRoboticsFilled
     - CrateVendingMachineRestockAstroVendFilled
     - CrateVendingMachineRestockTankDispenserFilled
-    - CrateVendingMachineRestockFlatpackVendFilled
+    # - CrateVendingMachineRestockFlatpackVendFilled
     chance: 1.0
     offset: 0.0
 
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
index ace8c156c610..4f856692969f 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
@@ -316,6 +316,7 @@
     prototypes:
     # Empty Crates
     - CrateEmptySpawner
+    - GenericTank
     # Mats
     - CrateMaterialGlass
     - CrateMaterialSteel
@@ -327,8 +328,16 @@
     - CrateMaterialTextiles
     - CrateMaterials
     - CrateMaterialBrass
+    - CrateMaterialMetalRods
+    - CrateMaterialPaper
+    - WeldingFuelTankFull
+    - WaterTankFull
     chance: 1.0
     offset: 0.0
+    rarePrototypes:
+    - WeldingFuelTankHighCapacity
+    - WaterTankHighCapacity
+    rareChance: 0.01
 
 - type: entity
   name: random crate (restock)
@@ -772,7 +781,7 @@
     chance: 0.9
     offset: 0.0
     rarePrototypes:
-    - MaterialDiamond
+    - MaterialDiamond1
     rareChance: 0.01
 
 - type: entity
@@ -1072,7 +1081,7 @@
     - VendingMachineRestockChemVend
     - VendingMachineRestockAstroVend
     - VendingMachineRestockAmmo
-    - VendingMachineRestockFlatpackVend
+    # - VendingMachineRestockFlatpackVend
     - VendingMachineRestockLessLethalVend
     - VendingMachineRestockNonLethalVend
     - VendingMachineRestockAutoTuneVend
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_hydroponics.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_hydroponics.yml
index 7287a33c1144..8541aae42104 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_hydroponics.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_hydroponics.yml
@@ -80,19 +80,30 @@
   - type: RandomSpawner
     prototypes:
     # Empty crates
-    - SpawnDungeonLootCrateEmptyHydro
+    - CrateHydroponics
+    - CrateHydroSecure
+    - CratePlastic
+    - CratePlasticBiodegradable
     # Restocks
-    - SpawnDungeonLootCrateRestockHydro
+    - CrateVendingMachineRestockNutriMaxFilled
+    - CrateVendingMachineRestockSeedsFilled
+    # Mats
+    - CrateMaterialGlass
+    - CrateMaterialSteel
+    - CrateMaterialPlastic
+    - CrateMaterialWood
+    - CrateMaterialTextiles
+    - CrateMaterialBiomass
     # Filled crates
     - CrateHydroponicsTools
     - CrateHydroponicsSeeds
     - CrateHydroponicsSeedsExotic
     - CrateHydroponicsSeedsMedicinal
-    chance: 0.95
+    chance: 0.9
     offset: 0.0
     rarePrototypes:
     - CrateServiceKitHydroponics
-    rareChance: 0.05
+    rareChance: 0.005
 
 - type: entity
   name: random crate (restock)
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml
index ab7674367294..ae30ae6addb7 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml
@@ -189,9 +189,26 @@
   - type: RandomSpawner
     prototypes:
     # Empty crates
-    - SpawnDungeonLootCrateEmptyService
+    - CrateFreezer
+    - CrateTrashCartJani
+    - CrateHydroponics
+    - CrateHydroSecure
+    - CratePlastic
+    - CratePlasticBiodegradable
     # Restocks
-    - SpawnDungeonLootCrateRestockService
+    - CrateVendingMachineRestockBoozeFilled
+    - CrateVendingMachineRestockChefvendFilled
+    - CrateVendingMachineRestockCondimentStationFilled
+    - CrateVendingMachineRestockDinnerwareFilled
+    - CrateVendingMachineRestockSmokesFilled
+    - CrateVendingMachineRestockHappyHonkFilled
+    # Mats
+    - CrateMaterialGlass
+    - CrateMaterialSteel
+    - CrateMaterialPlastic
+    - CrateMaterialWood
+    - CrateMaterialTextiles
+    - CrateMaterialBiomass
     # Filled crates
     - CrateServiceReplacementLights
     - CrateServiceReplacementColoredLights
@@ -209,12 +226,13 @@
     - CrateFoodBarSupply
     - CrateServiceBoozeDispenser
     - CrateSpaceCleaner
-    chance: 0.95
+    - CrateServiceKitCleanades
+    chance: 0.9
     offset: 0.0
     rarePrototypes:
     - CrateServiceKitKitchen
     - CrateServiceKitHydroponics
-    rareChance: 0.05
+    rareChance: 0.005
 
 - type: entity
   name: random crate (restock)
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_medical.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_medical.yml
index 2cd01bc44be9..181b6c76fbda 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_medical.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_medical.yml
@@ -543,27 +543,45 @@
   - type: RandomSpawner
     prototypes:
     # Empty crates
-    - SpawnDungeonLootCrateEmptyMed
+    - CrateMedical
+    - CrateSurgery
+    - CrateChemistrySecure
     # Restocks
-    - SpawnDungeonLootCrateRestockMed
+    - CrateVendingMachineRestockMedicalFilled
+    - CrateVendingMachineRestockChemVendFilled
+    - CrateVendingMachineRestockCiviMedVendFilled
+    # Mats
+    - CrateMaterialGlass
+    - CrateMaterialSteel
+    - CrateMaterialPlastic
+    - CrateMaterialTextiles
+    - CrateMaterialBiomass
+    - CrateChemistryD
+    - CrateChemistryP
+    - CrateChemistryS
+    - WaterTankFull
     # Filled crates
     - CrateBodyBags
+    - CrateMedicalRollerBeds
     - CrateChemistrySupplies
     - CrateChemistryVials
-    - CrateChemistryD
-    - CrateChemistryP
-    - CrateChemistryS
     - CrateMedicalSupplies
     - CrateMedicalSurgery
     - CrateMedicalScrubs
     - CrateVirologyBiosuit
-    chance: 0.95
+    - CrateChemistrySecureKitChemist
+    - CrateMedicalSecureDoctor
+    - CrateMedicalSecureMedicine
+    - CrateMedicalSecureMedicinePierce
+    - CrateEvaKitParamedic
+    chance: 0.9
     offset: 0.0
     rarePrototypes:
     - CrateServiceKitMedbay
     - CrateServiceKitChemLab
     - CrateServiceKitMedbayCryo
-    rareChance: 0.05
+    - CrateEvaKitCmo
+    rareChance: 0.01
 
 - type: entity
   name: random crate (empty)
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
index 839b1c46a9e9..d6febd2a05d4 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
@@ -27,7 +27,7 @@
     - Zipties
     - Handcuffs
     - ComputerIFFCircuitboard
-    chance: 0.95
+    chance: 0.9
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootHardsuitsMercenary
@@ -71,7 +71,7 @@
     - RiotShield
     - RiotLaserShield
     - ComputerIFFCircuitboard
-    chance: 0.85
+    chance: 0.8
     offset: 0.0
     rarePrototypes:
     - ClothingOuterArmorReflective
@@ -98,8 +98,17 @@
     prototypes:
     - SpawnDungeonLootGunT1
     - SpawnDungeonLootGunT1
+    - SpawnDungeonLootGunT1
     - SpawnDungeonLootMeleeT1
-    chance: 0.8
+    - SpawnDungeonLootMeleeT1
+    - SpawnDungeonLootAmmoLethal
+    - SpawnDungeonLootAmmoLethal
+    - SpawnDungeonLootAmmoLethal
+    - SpawnDungeonLootAmmoLethal
+    - SpawnDungeonLootAmmoRubber
+    - SpawnDungeonLootAmmoRubber
+    - SpawnDungeonLootAmmoPractice
+    chance: 0.75
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT2
@@ -127,7 +136,8 @@
     - SpawnDungeonLootGunT2
     - SpawnDungeonLootGunT2
     - SpawnDungeonLootMeleeT2
-    chance: 0.85
+    - SpawnDungeonLootAmmoLethal
+    chance: 0.8
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT3
@@ -154,7 +164,7 @@
     prototypes:
     - SpawnDungeonLootMeleeT1
     - SpawnDungeonLootMeleeT2
-    chance: 0.85
+    chance: 0.8
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT3
@@ -180,7 +190,7 @@
     - SpawnDungeonLootGunT3
     - SpawnDungeonLootGunT3
     - SpawnDungeonLootMeleeT3
-    chance: 0.95
+    chance: 0.9
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT4
@@ -207,7 +217,7 @@
     prototypes:
     - SpawnDungeonLootExplosivesT1
     - SpawnDungeonLootExplosivesT2
-    chance: 0.85
+    chance: 0.8
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootExplosivesT3
@@ -410,11 +420,38 @@
         color: red
   - type: RandomSpawner
     prototypes:
+    # Empty crates
+    - CrateSecureMercenary
+    - CrateSecureMercenaryPrivateSec
+    - CrateAmmoGeneric
+    # Restocks
+    - CrateVendingMachineRestockAmmoFilled
+    - CrateVendingMachineRestockLessLethalVendFilled
+    - CrateVendingMachineRestockNonLethalVendFilled
+    # Filled crates
+    - CrateSecureMercenaryHardsuit
+    - CrateSecureMercenaryPrivateSecHardsuit
+    - CrateSecurityArmor
+    - CrateSecurityHelmet
     - CrateArmoryShotgunExpedition
     - CrateArmoryPistolsExpedition
     - CrateArmoryRifleGestioExpedition
     - CrateArmoryRifleNovaliteC1Expedition
     - CrateArmoryEnergyGunExpedition
+    # Ammo
+    - CrateAmmoBoxLethal20
+    - CrateAmmoBoxLethal25
+    - CrateAmmoBoxLethal30
+    - CrateAmmoBoxLethal35
+    - CrateAmmoBoxLethal45
+    - CrateAmmoBoxLethalShotgun
+    - CrateAmmoBoxSlugShotgun
+    - CrateAmmoBoxRubber20
+    - CrateAmmoBoxRubber25
+    - CrateAmmoBoxRubber30
+    - CrateAmmoBoxRubber35
+    - CrateAmmoBoxRubber45
+    - CrateAmmoBoxRubberShotgun
     chance: 0.85
     offset: 0.0
     rarePrototypes:
@@ -423,7 +460,33 @@
     - CrateArmorySMGExpedition
     - CrateArmoryLaserExpedition
     - CrateSecurityNonlethal
-    rareChance: 0.1
+    - CrateSecureMercenaryHardsuitMagBoots
+    - CrateSecureMercenaryPrivateSecHardsuitMagBoots
+    # Ammo
+    - CrateAmmoBoxBigLethal20
+    - CrateAmmoBoxBigLethal25
+    - CrateAmmoBoxBigLethal30
+    - CrateAmmoBoxBigRubber20
+    - CrateAmmoBoxBigRubber25
+    - CrateAmmoBoxIncendiary20
+    - CrateAmmoBoxIncendiary30
+    - CrateAmmoBoxIncendiary35
+    - CrateAmmoBoxIncendiary45
+    - CrateAmmoBoxIncendiaryShotgun
+    - CrateAmmoBoxUranium20
+    - CrateAmmoBoxUranium30
+    - CrateAmmoBoxUranium35
+    - CrateAmmoBoxUranium45
+    - CrateAmmoBoxUraniumShotgun
+    - CrateAmmoBoxFlareShotgun
+    - CrateAmmoBoxEmp35
+    - CrateAmmoBoxPractice20
+    - CrateAmmoBoxPractice25
+    - CrateAmmoBoxPractice30
+    - CrateAmmoBoxPractice35
+    - CrateAmmoBoxPractice45
+    - CrateAmmoBoxPracticeShotgun
+    rareChance: 0.05
 
 - type: entity
   name: random crate
@@ -496,8 +559,8 @@
     offset: 0.0
     rarePrototypes:
     - VendingMachineArcadia
-    - VendingMachineSec
-    - VendingMachineSecDrobe
+    #- VendingMachineSec
+    #- VendingMachineSecDrobe
     - SpawnDungeonMachineFrame
     rareChance: 0.01
 
@@ -522,6 +585,3 @@
     - AmmoTechFab
     chance: 1
     offset: 0.0
-    rarePrototypes:
-    - SecurityTechFab
-    rareChance: 0.01
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml
index 80615332aff3..a25211956ec1 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml
@@ -116,19 +116,87 @@
   - type: RandomSpawner
     prototypes:
     # Empty crates
-    - SpawnDungeonLootCrateEmptyEngi
+    - CrateScienceSecure
+    - CratePlasma
+    - CrateEngineering
+    - CrateElectrical
+    - CrateRadiation
+    - CrateUranium
+    - CrateMedical
+    - CrateSurgery
+    - CrateChemistrySecure
     # Restocks
-    - SpawnDungeonLootCrateRestockEngi
+    - CrateVendingMachineRestockEngineeringFilled
+    - CrateVendingMachineRestockVendomatFilled
+    - CrateVendingMachineRestockRoboticsFilled
+    - CrateVendingMachineRestockAstroVendFilled
+    - CrateVendingMachineRestockTankDispenserFilled
+    # - CrateVendingMachineRestockFlatpackVendFilled
+    - CrateVendingMachineRestockMedicalFilled
+    - CrateVendingMachineRestockChemVendFilled
+    - CrateVendingMachineRestockCiviMedVendFilled
     # Mats
-    - SpawnDungeonLootCrateMaterials
+    - CrateMaterialGlass
+    - CrateMaterialSteel
+    - CrateMaterialPlastic
+    - CrateMaterialWood
+    - CrateMaterialPlasteel
+    - CrateMaterialPlasma
+    - CrateMaterialUranium
+    - CrateMaterialTextiles
+    - CrateMaterials
+    - CrateMaterialBrass
+    - CrateMaterialMetalRods
+    - CrateMaterialPaper
+    - WeldingFuelTankFull
+    - WaterTankFull
     # Filled crates
-    - SpawnDungeonLootCrateEngi
-    - SpawnDungeonLootCrateMed
-    chance: 0.95
+    - CrateEngineeringGear
+    - CrateEngineeringElectricalSupplies
+    - CrateEngineeringCableLV
+    - CrateEngineeringCableMV
+    - CrateEngineeringCableHV
+    - CrateEngineeringCableBulk
+    - CrateEngineeringToolbox
+    - CrateEngineeringShuttle
+    - CrateEngineeringFoamGrenade
+    - CrateEngineeringMiniJetpack
+    - CrateAirlockKit
+    - CrateEngineeringSpaceHeater
+    - CrateEngineeringSolar
+    - CrateTools
+    - CrateEngineerHardsuit
+    - CrateAtmosTechHardsuit
+    - CrateEngineeringThruster
+    - CrateEngineeringGyroscope
+    - CrateBodyBags
+    - CrateMedicalRollerBeds
+    - CrateChemistrySupplies
+    - CrateChemistryVials
+    - CrateMedicalSupplies
+    - CrateMedicalSurgery
+    - CrateMedicalScrubs
+    - CrateVirologyBiosuit
+    - CrateChemistrySecureKitChemist
+    - CrateMedicalSecureDoctor
+    - CrateMedicalSecureMedicine
+    - CrateMedicalSecureMedicinePierce
+    - CrateEvaKitParamedic
+    chance: 0.9
     offset: 0.0
     rarePrototypes:
-    - CrateScienceLabBundle
-    rareChance: 0.03
+    # Mats
+    - WeldingFuelTankHighCapacity
+    # Filled crates
+    - CrateEngineeringKitShipyardRcd
+    - CrateEngineeringKitRtg
+    - CrateEngineeringKitFabrication
+    - CrateEngineerChiefHardsuit
+    - CrateServiceKitMedbay
+    - CrateServiceKitChemLab
+    - CrateServiceKitMedbayCryo
+    - CrateEvaKitCmo
+    rareChance: 0.01
 
 # Other
 - type: entity
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml
index cc0dbbd1cb70..0853edf31970 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml
@@ -291,7 +291,7 @@
     - OreProcessorIndustrialMachineCircuitboard
     - AmmoTechFabCircuitboard
     - ShuttleGunSvalinnMachineGunCircuitboard
-    - SecurityTechFabCircuitboard
+    #- SecurityTechFabCircuitboard
     - ComputerIFFCircuitboard
     rareChance: 0.03
 
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
index 33a79fdd1480..bf88f86085ba 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
@@ -154,7 +154,7 @@
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT3
-    rareChance: 0.1
+    rareChance: 0.15
 
 - type: entity
   name: random weapon
@@ -188,7 +188,7 @@
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootGunT3
-    rareChance: 0.1
+    rareChance: 0.15
 
 - type: entity
   name: random weapon
@@ -243,7 +243,7 @@
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT4
-    rareChance: 0.1
+    rareChance: 0.15
 
 - type: entity
   name: random weapon
@@ -270,12 +270,14 @@
     - WeaponCaseLongLecterExpedition
     - WeaponCaseLongLaserCarbineExpedition
     - WeaponCaseLongHristovExpedition
+    - WeaponCaseShortSvalinnExpedition
+    - WeaponCaseShortAdvancedLaserExpedition
     #- WeaponCaseLongMusketExpedition
     chance: 1.0
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootGunT4
-    rareChance: 0.1
+    rareChance: 0.15
 
 - type: entity
   name: random weapon
@@ -330,7 +332,7 @@
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootMeleeT5
-    rareChance: 0.01
+    rareChance: 0.05
 
 - type: entity
   name: random weapon
@@ -354,8 +356,6 @@
     - WeaponCaseLongM90Expedition
     - WeaponCaseLongC20r
     - WeaponCaseLongAkExpedition
-    - WeaponCaseShortSvalinnExpedition
-    - WeaponCaseShortAdvancedLaserExpedition
     - WeaponCaseHeavyAsmgtExpeditions
     - WeaponCaseLongEnforcerExpedition
     - WeaponCaseLongLaserCannonExpedition
@@ -363,7 +363,7 @@
     offset: 0.0
     rarePrototypes:
     - SpawnDungeonLootGunT5
-    rareChance: 0.01
+    rareChance: 0.1
 
 - type: entity
   name: random weapon
@@ -462,3 +462,141 @@
     - WeaponCaseShortC4
     chance: 0.3
     offset: 0.0
+
+# Ammo
+- type: entity
+  name: random ammo
+  id: SpawnDungeonLootAmmoLethal
+  parent: MarkerBasePlaceFree
+  suffix: "Dungeon, Ammo, Lethal"
+  noSpawn: true
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+      scale: 0.7, 0.7
+    - sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes:
+    - WeaponCaseShortAmmoBoxLethal20
+    - WeaponCaseShortAmmoBoxLethal30
+    - WeaponCaseShortAmmoBoxLethal35
+    - WeaponCaseShortAmmoBoxLethal25
+    - WeaponCaseShortAmmoBoxLethalShotgun
+    - WeaponCaseShortAmmoBoxSlugShotgun
+    - WeaponCaseShortAmmoBoxLethal45
+    chance: 0.8
+    offset: 0.0
+    rarePrototypes:
+    - WeaponCaseShortAmmoBoxBigLethal20
+    - WeaponCaseShortAmmoBoxBigLethal30
+    - WeaponCaseShortAmmoBoxBigLethal25
+    - WeaponCaseShortAmmoBoxEmp35
+    - WeaponCaseShortAmmoBoxFlareShotgun
+    - SpawnDungeonLootAmmoRubber
+    - SpawnDungeonLootAmmoPractice
+    - SpawnDungeonLootAmmoIncendiary
+    - SpawnDungeonLootAmmoUranium
+    rareChance: 0.01
+
+- type: entity
+  name: random ammo
+  id: SpawnDungeonLootAmmoRubber
+  parent: MarkerBasePlaceFree
+  suffix: "Dungeon, Ammo, Rubber"
+  noSpawn: true
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+      scale: 0.7, 0.7
+    - sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes:
+    - WeaponCaseShortAmmoBoxRubber20
+    - WeaponCaseShortAmmoBoxRubber30
+    - WeaponCaseShortAmmoBoxRubber35
+    - WeaponCaseShortAmmoBoxRubber25
+    - WeaponCaseShortAmmoBoxRubberShotgun
+    - WeaponCaseShortAmmoBoxRubber45
+    chance: 0.7
+    offset: 0.0
+    rarePrototypes:
+    - WeaponCaseShortAmmoBoxBigRubber20
+    - WeaponCaseShortAmmoBoxBigRubber25
+    rareChance: 0.01
+
+- type: entity
+  name: random ammo
+  id: SpawnDungeonLootAmmoPractice
+  parent: MarkerBasePlaceFree
+  suffix: "Dungeon, Ammo, Practice"
+  noSpawn: true
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+      scale: 0.7, 0.7
+    - sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes:
+    - WeaponCaseShortAmmoBoxPractice20
+    - WeaponCaseShortAmmoBoxPractice30
+    - WeaponCaseShortAmmoBoxPractice35
+    - WeaponCaseShortAmmoBoxPractice25
+    - WeaponCaseShortAmmoBoxPracticeShotgun
+    - WeaponCaseShortAmmoBoxPractice45
+    chance: 0.6
+    offset: 0.0
+
+- type: entity
+  name: random ammo
+  id: SpawnDungeonLootAmmoIncendiary
+  parent: MarkerBasePlaceFree
+  suffix: "Dungeon, Ammo, Incendiary"
+  noSpawn: true
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+      scale: 0.7, 0.7
+    - sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes:
+    - WeaponCaseShortAmmoBoxIncendiary20
+    - WeaponCaseShortAmmoBoxIncendiary30
+    - WeaponCaseShortAmmoBoxIncendiary35
+    - WeaponCaseShortAmmoBoxIncendiaryShotgun
+    - WeaponCaseShortAmmoBoxIncendiary45
+    chance: 0.5
+    offset: 0.0
+    rarePrototypes:
+    - SpawnDungeonLootAmmoUranium
+    rareChance: 0.01
+
+- type: entity
+  name: random ammo
+  id: SpawnDungeonLootAmmoUranium
+  parent: MarkerBasePlaceFree
+  suffix: "Dungeon, Ammo, Uranium"
+  noSpawn: true
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+      scale: 0.7, 0.7
+    - sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes:
+    - WeaponCaseShortAmmoBoxUranium20
+    - WeaponCaseShortAmmoBoxUranium30
+    - WeaponCaseShortAmmoBoxUranium35
+    - WeaponCaseShortAmmoBoxUraniumShotgun
+    - WeaponCaseShortAmmoBoxUranium45
+    chance: 0.4
+    offset: 0.0
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/weapon_cases.yml b/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml
similarity index 66%
rename from Resources/Prototypes/_NF/Entities/Objects/Tools/weapon_cases.yml
rename to Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml
index b4548ef96ad1..f85e21f16aba 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Tools/weapon_cases.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml
@@ -8,14 +8,14 @@
   - type: ExplosionResistance
     damageCoefficient: 0.3
   - type: Sprite
-    sprite: _NF/Objects/Tools/guncaselong.rsi
+    sprite: _NF/Objects/Storage/Cases/guncaselong.rsi
     layers:
     - map: [ base ]
       state: icon
     - state: unshaded
       shader: unshaded
   - type: Item
-    sprite: _NF/Objects/Tools/guncaselong.rsi
+    sprite: _NF/Objects/Storage/Cases/guncaselong.rsi
   - type: GenericVisualizer
     visuals:
       enum.StorageVisuals.Open:
@@ -47,10 +47,10 @@
   suffix: Short
   components:
   - type: Sprite
-    sprite: _NF/Objects/Tools/guncaseshort.rsi
+    sprite: _NF/Objects/Storage/Cases/guncaseshort.rsi
   - type: Item
     size: Large
-    sprite: _NF/Objects/Tools/guncaseshort.rsi
+    sprite: _NF/Objects/Storage/Cases/guncaseshort.rsi
   - type: Storage
     maxItemSize: Normal
     grid:
@@ -68,6 +68,30 @@
       tags:
       - Cartridge
 
+- type: entity
+  name: ammo case
+  parent: WeaponCaseShort
+  id: WeaponCaseShortAmmo
+  description: A reinforced casing for storing ammo.
+  suffix: Short
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi
+  - type: Item
+    sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi
+
+- type: entity
+  name: explosives case
+  parent: WeaponCaseShort
+  id: WeaponCaseShortExplosives
+  description: A reinforced casing for storing explosives.
+  suffix: Short
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Cases/explosivescaseshort.rsi
+  - type: Item
+    sprite: _NF/Objects/Storage/Cases/explosivescaseshort.rsi
+
 - type: entity
   name: weapon case
   parent: WeaponCaseLong
@@ -77,10 +101,10 @@
   components:
   - type: MultiHandedItem
   - type: Sprite
-    sprite: _NF/Objects/Tools/guncaseheavy.rsi
+    sprite: _NF/Objects/Storage/Cases/guncaseheavy.rsi
   - type: Item
     size: Ginormous
-    sprite: _NF/Objects/Tools/guncaseheavy.rsi
+    sprite: _NF/Objects/Storage/Cases/guncaseheavy.rsi
   - type: Storage
     maxItemSize: Ginormous
     grid:
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
index b084c9feaa78..1600d76bf9ca 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
@@ -197,6 +197,16 @@
   - type: AccessReader
     access: [["Security"]]
 
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateAmmoGeneric
+  name: ammo crate
+  components:
+  - type: Icon
+    sprite: _NF/Structures/Storage/Crates/ammo.rsi
+  - type: Sprite
+    sprite: _NF/Structures/Storage/Crates/ammo.rsi
+
 - type: entity
   parent: CratePirate
   id: CratePirateGrey
@@ -229,3 +239,50 @@
     sprite: _NF/Structures/Storage/Crates/mccargo.rsi
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/mccargo.rsi
+
+# Mercenary
+- type: entity
+  parent: CrateBaseSecure
+  id: CrateSecureMercenary
+  name: mercenary crate
+  components:
+  - type: Icon
+    sprite: _NF/Structures/Storage/Crates/secure_mercenary.rsi
+  - type: Sprite
+    sprite: _NF/Structures/Storage/Crates/secure_mercenary.rsi
+  - type: AccessReader
+    access: [["Mercenary"]]
+
+- type: entity
+  parent: CrateBaseSecure
+  id: CrateSecureMercenaryPrivateSec
+  name: private security crate
+  components:
+  - type: Icon
+    sprite: _NF/Structures/Storage/Crates/secure_privatesec.rsi
+  - type: Sprite
+    sprite: _NF/Structures/Storage/Crates/secure_privatesec.rsi
+  - type: AccessReader
+    access: [["Mercenary"]]
+
+- type: entity
+  parent: CrateBaseSecure
+  id: CrateAmmoSecureMercenary
+  name: secure ammo crate
+  components:
+  - type: Icon
+    sprite: _NF/Structures/Storage/Crates/secure_ammo.rsi
+  - type: Sprite
+    sprite: _NF/Structures/Storage/Crates/secure_ammo.rsi
+  - type: AccessReader
+    access: [["Mercenary"]]
+
+- type: entity
+  parent: CrateWeaponSecure
+  id: CrateFirearmsSecure
+  name: secure firearms crate
+  components:
+  - type: Icon
+    sprite: _NF/Structures/Storage/Crates/secure_firearms.rsi
+  - type: Sprite
+    sprite: _NF/Structures/Storage/Crates/secure_firearms.rsi
diff --git a/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_inventory_template.yml b/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_inventory_template.yml
index c2a373600826..10129e68d3e6 100644
--- a/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_inventory_template.yml
+++ b/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_inventory_template.yml
@@ -31,7 +31,6 @@
       stripTime: 999999 # "Not strippable"
       uiWindowPos: 2,1
       strippingWindowPos: 2,0
-      dependsOn: jumpsuit
       displayName: ID
 
     - name: back
diff --git a/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_simplified_inventory_template.yml b/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_simplified_inventory_template.yml
index b93d1e9fdd77..037ad90c3a7d 100644
--- a/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_simplified_inventory_template.yml
+++ b/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_simplified_inventory_template.yml
@@ -57,3 +57,13 @@
       uiWindowPos: 2,1
       strippingWindowPos: 22,22
       displayName: Gloves
+
+    - name: id
+      slotTexture: id
+      fullTextureName: template_small
+      slotFlags: IDCARD
+      slotGroup: SecondHotbar
+      stripTime: 999999 # "Not strippable"
+      uiWindowPos: 2,1
+      strippingWindowPos: 22,20
+      displayName: ID
diff --git a/Resources/Prototypes/_NF/InventoryTemplates/hostile_nonhumanoid_inventory_template.yml b/Resources/Prototypes/_NF/InventoryTemplates/hostile_nonhumanoid_inventory_template.yml
new file mode 100644
index 000000000000..f711a52b57e4
--- /dev/null
+++ b/Resources/Prototypes/_NF/InventoryTemplates/hostile_nonhumanoid_inventory_template.yml
@@ -0,0 +1,13 @@
+- type: inventoryTemplate
+  id: hostilenonhumanoid
+  slots:
+# "Not strippable", "hidden"
+    - name: id
+      slotTexture: id
+      fullTextureName: template_small
+      slotFlags: IDCARD
+      slotGroup: SecondHotbar
+      stripTime: 999999 # "Not strippable"
+      uiWindowPos: 2,1
+      strippingWindowPos: 22,20
+      displayName: ID
diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/icon-open.png b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/icon-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..76255a387c0ef6e4a97ce935877db65320eedcf2
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_a9QplX(p
zipRukZbb~fB7h+T(T#qInR+6<kb&p;x`&UicTt|@eeTcEqvTBn_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w@T5zI<Vb#+LZJY>pV2qvfWBLxYt`+oxsTHaAVXa(-2exN
zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb507*naR9J;$U>NCukr+iL7Lxx-HTcYl
z=R}#!LX723u3Dtp&%nUI@Shk*5Oe?xY+HYyXq&wP6^T~MM6^m80ir{Ifq{X6hlib@
znlE2|lH>rQLx32|Nl{0#184<C9YAy<lu?Alt%;c`!<kdJG30THQ^f)Mc3*?Dl~jZo
z9^8M4p$1tTn>;Q+u%v>Og!k^eCE8FW6=8;byRQ*d91|S{Pwo?+zm-&oRyy#BkZ1=G
zTf&iA5|UIDlWI6IV8Ek*=n#lWHYVE8ckkX&*8#}o01O~EQn1NW)d32M;&>gUpeW9;
w##xRbWbY%m7_o)XfVT-p!6+C7qhP=R011IizMraq(EtDd07*qoM6N<$f_ouE(f|Me

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ce7e3194216feef19a3d2ad5dd5d4df2bee7d51
GIT binary patch
literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_a9QplX(p
zipRukZbb~fB7h+T(T#qInR+6<kb&p;x`&UicTt|@eeTcEqvTBn_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w@T5zI<Vb#+LZJY>pV2qvfWBLxYt`+oxsTHaAVXa(-2exN
zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb4#z{m$R9J;$U>F6XU=)mkkq#J%QDkBv
z`JYsS&zyKpl-VrASZ-vZOsf413=9naiE#uIDJGT|E`(!bK8#HcAm~DJL*U$*yF^6;
zSs?&p<B}r<P!s~l7IyZ>qsS2(0t6EwK7ej1Ie;h!2ne!MY!O8c*th%Iz&b!dQJg_Z
zMVR5<owslr9iYoUxc`zU2N0DAv57mmYQfpKLWpXKP(e`~Lk!tc1x0a&HO_JjA$uRe
q#i$kn3=Fib3r4{x7zLwXzySbYtx_Vrdv<sL0000<MNUMnLSTXj<sWwd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..36e94e1817785206311eaee005d284953bd00890
GIT binary patch
literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_a9QplX(p
zipRukZbb~fB7h+T(T#qInR+6<kb&p;x`&UicTt|@eeTcEqvTBn_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w@T5zI<Vb#+LZJY>pV2qvfWBLxYt`+oxsTHaAVXa(-2exN
zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb4$4Nv%RCt{2+93|YFcik|2SK7hEOpxr
z5EVTLh8rWe12}>Jg)asH+nP}F+O^sL=elIyy4O~{iU0rr00000n3IKepmoN7j!(zy
z-`~*83R!9giiosbBW>3dmo+9y0ct`4rk=pmRw+U+=Ub6k00000000000IK>O-O|mz
zHCAl_tTTRWw}qaEsP+c;hn>&a%X{A)82oI^9FjCgbJ}dzU*pI98TG!}5wOl=U41QT
rJ0QjVonOSRcwf~=pvD~s04T`|Fl8=ct96_e00000NkvXXu0mjfAdD;x

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..0debbd10ad4c4d89f8a8d0983dfc63a410910f8b
GIT binary patch
literal 668
zcmV;N0%QG&P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_a9QplX(p
zipRukZbb~fB7h+T(T#qInR+6<kb&p;x`&UicTt|@eeTcEqvTBn_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w@T5zI<Vb#+LZJY>pV2qvfWBLxYt`+oxsTHaAVXa(-2exN
zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb4(n&-?RCt{2+C372Fc5~}=vZ25!O+1C
zC@44x4JWkmAQl$hKs(1mEBn}3#6RMWYr@a_%uoOs=3@!ft}y@r000000LEm}cC)Nf
z>z;2n$JX^-Ak94WJuu4?ljX^;xq^~p_7-61C_wB0vCVu74*OGx9IE=582|tP00000
z006G%*0+Yy_XfW%Kv|{s-52<Dy)V4YQP+L&;N@jQHY4k%u<O-MZBj-23oMrNha-l%
zDb#kHXa{tG_HGjw;BvmI29Ws2kd~+b3?2Z$z}x@|;Vb%J18Fe;0000<MNUMnLSTZ&
Ct~Eyh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/meta.json
rename to Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/meta.json
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/unshaded.png b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/unshaded.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/unshaded.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/unshaded.png
diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/icon-open.png b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/icon-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..40e8f2b6c9df7a216f6c281748f00493ebe52076
GIT binary patch
literal 770
zcmV+d1O5DoP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_a9QplX(p
zipRukZbb~fB7h+T(T#qInR+6<kb&p;x`&UicTt|@eeTcEqvTBn_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w@T5zI<Vb#+LZJY>pV2qvfWBLxYt`+oxsTHaAVXa(-2exN
zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb5I7vi7R9J=WmN82MK@@~PC6&TO6H^?d
zkpnSpIIyu2>;$nD^d|)T6KMr2YyW^vx`2%~!f|b`3272ih@yhFNp)f6B0CES5!|Vk
zx5L}v?d~w}-?65UjvKX!#5+2m`|u1vxA!9TE-8nfG<TI=Y}a-$xD!Q$RX~or<ke0}
z9s#(Ft7==;W#*C~PXM5@Rkm{8-aniK$P-Wwci}k;SQfkh`4L8&-vFG&b?%d4VgF}6
zSge3fI+(4qQ9yrO^aQg$Z~r$~oho<2-uP2)+6V(W=|Hk$`3m}98@d3Q`3D}MEI@TQ
zS0{9`V%O#hR(=KY1lp(eOmNt`=IQ2&Y^47f=^M_gn;|9l2{RFamWreaL}4*tnC29P
zRc_DsxENMuT-A&gnhE3PK1rGZdM5Pn@bFkUrt3vtUUgA=y#N3J07*qoM6N<$g6mCX
AegFUf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..014cccd617a905dd5bb55b827fd1ebc6dbae70e6
GIT binary patch
literal 717
zcmV;;0y6!HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_a9QplX(p
zipRukZbb~fB7h+T(T#qInR+6<kb&p;x`&UicTt|@eeTcEqvTBn_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w@T5zI<Vb#+LZJY>pV2qvfWBLxYt`+oxsTHaAVXa(-2exN
zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb514%?dR9J;$U>F6XU=)mkkq#J%QRJ#A
z`kz#TcVB-^l-VrASngw_NR*|4IpqxNr*y)&|A}z~6Hz8(u_!R7oE)u`I{?{YYB+)<
z2f!>`Kcy2M)Ra1cU>ZQS94UU`4#6cyEFd}r@L52v<qQl&hJc1NA5n%0%c{ZEZaGIq
z2lQ;dNR(k0zg9Br-bb8Tk{qBcDa;UPBEzu$%o8|`4gyVN7+!LTFqHV}Gps-JgyHV<
zw?sLBU_pVa6fE)8hqGZJ<mzP3uzTN0xHvHd5z!%l4v?coSyGr`MwA*u>=PllTB?Nr
z0|W7Ofr*g@!<ln87#J9cuM0-OC>RB!V88(YmwHnfCDv2K00000NkvXXu0mjfEDS(*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb4fbdc2b9d1721ebd81a3f608c575c35f235f88
GIT binary patch
literal 665
zcmV;K0%rY*P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_a9QplX(p
zipRukZbb~fB7h+T(T#qInR+6<kb&p;x`&UicTt|@eeTcEqvTBn_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w@T5zI<Vb#+LZJY>pV2qvfWBLxYt`+oxsTHaAVXa(-2exN
zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb4&q+i<RCt{2+A$7-Fcik|r*U>69T*9V
zT{(gY8wc@#Zr;I_$v83?7cWp(MQX&nLL2_Stt5Q3ukG{@0RR9100026BrEN}+8Xyd
zKDD>MzoD7sv(^q25oxMInyQE{Ye<j+q=W*@J%PDxLWCaA*C?|90000000000RP{T$
zv0Hp=EZG9o*0`b5=6mj=+8aFVcka^NH6y<&^GwP-`&jIlIRt5rPRZumw{hD&M!m0g
z1!`+1-F+=;Cm_WCJHHsa<9$hAffP?103aq$)IKiGu4GLE00000NkvXXu0mjffF~}6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4739488625621f387d4a799df6d4e824b81b79f
GIT binary patch
literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_a9QplX(p
zipRukZbb~fB7h+T(T#qInR+6<kb&p;x`&UicTt|@eeTcEqvTBn_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w@T5zI<Vb#+LZJY>pV2qvfWBLxYt`+oxsTHaAVXa(-2exN
zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb4*-1n}RCt{2+C2_}KoExE)mYmQ3Q9r)
zEk_`s;~*T#gV>pP1Y2y3C55r^0?^_g>%?&Zd7p#=*pP3B*=pAq000000001Uvgmu6
zCw|kt-&L31@nay(ytI9=NJCSk;kUV*l4Q0P;NMYzp#uzUWgD<PoL%HlHO0&T00000
z00000=z84x)-e0M!H)}&Cw}wl54?Lm71qtst|;(K6nIaQJ=IseL>6ThH=F%Y?WBr$
z2_(V#?ixaw#cCZV>VPrO?ly4&s`{oHK;jpNv_u7Pxz+&y4z$97EZcVNoCN>?002ov
JPDHLkV1lAQHxK{-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/meta.json
rename to Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/meta.json
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/unshaded.png b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/unshaded.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/unshaded.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/unshaded.png
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/icon-open.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/icon-open.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/icon-open.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/icon-open.png
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/icon.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/icon.png
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/inhand-left.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/inhand-left.png
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/inhand-right.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/inhand-right.png
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/meta.json
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/meta.json
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/unshaded.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/unshaded.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/unshaded.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/unshaded.png
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/icon-open.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/icon-open.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/icon-open.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/icon-open.png
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/icon.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/icon.png
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/inhand-left.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/inhand-left.png
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/inhand-right.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/inhand-right.png
diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/meta.json
new file mode 100644
index 000000000000..a8107eefdfb2
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/obj/storage/case.dmi , held sprites and open sprite made by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-open"
+    },
+    {
+      "name": "unshaded",
+      "delays": [
+        [ 0.2, 0.1, 0.1, 0.2 ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/unshaded.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/unshaded.png
new file mode 100644
index 0000000000000000000000000000000000000000..d598b670413157f0259516fe86eaad1df968563e
GIT binary patch
literal 5576
zcmeHLd0Z3M79KYO2#6Kh*V<|b`fy>g3|YrSgb*P}5P?>fTAd`51+qCA2w+82Tq#wQ
z@|2>2#VT5<xS}Frg}Sg56xS9jDr)OewNz={-kpFNUw!uZ`@Q~W@(Y<c_dDM?_q*rZ
z%VbehWT?CAJFXA}xy!>sqQUn#>f`JL{%+JyKL<g5PG-c$k<plqZXwJXy#c3_=@y)h
zr|C5ily>&U<V5272)Bn??`?gD`3x&Kxb5eg(+UD<-`|kimTmmu=&ChkEBFKA!-7Md
z(T4rAHs5+{$Ul$zl%+F8q2jXAZ@k}IawTR-p%VT1qWqNKCu^>@KdPa-B#0KQW<8><
zGWF8Nv>X@AshT?U?5_(5{j^yFYqh@LuWcLpuVTXGjj@5v!;4qfFWz0bZ%Xjz+A%{$
z-~QEoZ}=m_-MtkDW=KmySFB$e((3>5JM{aCpi!s`FK2dMZOcU3@bK#F13p84A6Z>7
zs%kB9@9LmG`j3c8ZSLdzT~mYYzR#-8d6_P53vzzc6=Wu7u2reOu1~K@b{~-3Xieea
zmE5U08U7ttXIC8PAR_8V%%9w{>kBWh0SnK091gu+Q9_QY&B7<G4f^cO#xHKPV#*6g
zva(l>sSmP_i>;jCR-;$t>nh}Vy;|eY^WIUv@0{ncuOsTzk&-k|VMRUK$?*E7{87m7
zvCRo%E-hO7WA&UVRdYQxhD)jLOepx;z|ag~*QAfu<Zgn3BtKk_o0faSt0lku^x5gd
zXwALH%Vyl<ZJq9tl~bIExw&{QTp2PlhO6<NGxWW#SZBiEWy;EmO|J=$WW0S|Xl`4f
zB5!TIBOl+?+jCUBTeDYL%_yG=pG<#|a>GVl^og&&ESDu06m7j+1pjhrvci950zY7v
z@<iS8O<KXd^L5GXjId7=h>8pA@)Jt72NQMIUFRnZ7U;|L^^JwQjwOY5b++!fVrrAJ
z_IV6Jmimn!!v8pblAj{`SVW9=HGgJ7{9D1sBjFP!f3)-C&)zq;jwsqvJ$h<r?vM?)
zXSZs$59USiW-KgT6-la`YJ~$mcjZF83k8~%k;6R(@5zn#|71#u+vt?J0Xko&zQ>21
zlnGKFGwx+4hW(USdArZ<EhYB{9iHdj=687Cp&NZ#za4AL$hXk9?`ls?@-hUnBfh?#
zGBjzb>EJJsT?0FPuil@N0Ou@jkNa@>!pXjgCp^!MZtyt_b0TF8iQB}763(obCyzc+
zc3R^iuFG@U^0{|e?frL4PbSq1$E6fhWrVHYS>!jo&ivz<>eD}m)z7%L9S&;xc8D?g
zaN)rZm|JLfId_S{?oKx+O%OI7ihDnA{Tm+3kqm847;Q)U&fUu+HW=NE{ECL``4eX{
zrj0S=PBlm$G`a-N$?W^k`H%1VHYQ1~eWKF#o><mco?IX~YTUuKvA$Z?@5=qtqCP7l
z!`E2dO_dqv6Y?(C!Y922gMN$cXLCLwx~A)I%id^gDch2L?87Ck12676duvLs$D@O~
z{I-pEc?{hlE;Cy;iJBm&*F3#c8YP!XpL96r>!O)?lCXp0-mRN@JX|)~;{(r>!%?gJ
z7cLftd*@6m+3uZ?!rt8})g4<}S}Alb??(%KbCU<NX%AZII_ErX;kLQU*XHDR?JsR+
zd^`7IX4T$%l{0A0zacS=HNxVgg1p6tY7HitTQwugr*BJc=AxAujD1UIU+LPjV9D3E
zNvk_%-u$lRi%SZpu8<4yUk-lrHhR1B%XQXsejeMFm3pojwB&6v=t5|DJ#+tbChC8y
zVN0I8ao~bQb;`l@#)k0u;bPgllVWr4%=@a|^$OgSwEJk`y-O^&jvXD`Q+f~IPi4cF
zW;?(AzM<Hy|D*(7bVR8x@N)Z5@`0Q<a_KDOdq_Mg%14xWE3m6=bNq@T%kp4O@x{8G
zf#b8zGn+S@xqGj|D2Rj}2Uynac<>p@{#Bl_d7bRjtaHZm7xt_>GNY!$gMF)X!u(5N
znT5e6P}Q0iK}S|~VsY|`8=H48IZmTXr@(CxZ9$DLZ|f=XxwbRszTdAceE1NOnuz>9
zR>Nut8c?JMTW*{p0#%ufOiXQ7;><Lo1#HO>Bo0ioV5(%Cq$_c)-XvlCvUfj&u2)MK
zlX(iZ!Xm|W`mhWFkI9IPRb?crL~2IhSXXfx3J8oiiP6)H29p&{lQ8VOD7dD~EC$^U
zA(JJHI7Jj)Y9??xm&s+aVOg3!6=95ZrHcu*28|9G-$McJBn%x%T2L0tX0tJE0ZcQY
zWpP9z5sQtm5CjGY*qUx4u{79Z^`$7fIYMx&iqKm~z1c*kI5DL;g_JNDV4U7V4n|e7
zG+^urK;7Hvt)!YI2RB?W9{^w>Y_<?)BQPRjIr@W9h2p8V$=ahL(36#hSy&t<n`JaU
z=V2vfsn6oQ(8C%FPCiyNZZ)S6DqNO|n@C^BpcX@l)iGv@6{k%0ybWp%3nXQa?C29J
zS42Jap=8wRjTXBHg?2=$RZnr26vAM~s8uZ7fEz&~R=~`84o~Ve&lc#p`A{Q&N(6*^
z%KsetiC*?x?7E^MW>pFmR30K>Q2C;2vr4Z<?U!ssrAByo0L;b&ILuWG*|1Qg=D<P$
z!sg-Z01l6<bfA)(tR!Yq;S?1hXX*iuh>wdfp@s`%z!T;wMFJS(fh)E^g@|w*K`@@c
zfnp+|2c3W!9J8XR)PM@%AbfrRhXX6sY5~mU^HqQp5x@alzEX&BG(x2kvr|#)fCfd$
zB@BegerAa>V5G)O7(sjKO=`2v`fMmxZ^UCrjFOEb;Bb)ugwGXl1OYrQ?-}R=oUnp2
zr&u{`CW6>U)GBm5;KV?=>5Z5cXIV^I`vA2tD3}hA7NfcYFx%~5HmH=qG15%Ln#~3Y
zgUXgpQQDh|F79a;G{UU1JKDjxn(DZoo(smbEc>mP^)m3Em|}Eho9Tb!c?NyT5=4+T
zGm$)zn5ay`RpiTgUIc#16b*JeD@mlw|6)@AffIKZY#8u06X_1|WAN$Scimf(L2s9e
zPPcCZD5mO`--@N;YWorZ9lM8AI?SZS!G7D*Y)|a^7Zfs=qf`rd7!G5YN(plXJOsx0
z2o4JZL~IqCuNETQfalq*W({e>2s}s&Y5=S=XfFFY(?|5w-^l0jHXTkC7aQTiY%Yul
zVmU&T%SG7&M)zvd#Vl%veKK1ywFfB_sG}ZYYL7zYR3XNsSS$uTPCT#Ele+mYI0yfp
z8vQGGM_9MF)NDxyU92M~+DtDE{{mn)Lxf(1o2=%SrS1snmc`*90y%fvzySx&OV-l^
zv!_a^M*16HJ=OO&MgY{WgS?WyujP6z*DERTO5oSk^;)i1Qs9-qudD0-CYS58M{e8%
z{_nGa2WrLUJN?1KxRY{1Xb6-;y*JFt=K+h0B`n?wLH!3&pI%U5(LaEZM#>d3+SR^;
z2l&&jMnCWYCR8306bpVmZJF%?(cStSXll=DYH7Ua5j?QnG<!iQ^@A*w)&D2)O|u_$
h30^f@I+5NG^jKK5tlvY)HP#i%D3?Wslm}0n^KWb?CSL#m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/icon-open.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/icon-open.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/icon-open.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/icon-open.png
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/icon.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/icon.png
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/inhand-left.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/inhand-left.png
diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/inhand-right.png
rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/inhand-right.png
diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/meta.json
new file mode 100644
index 000000000000..a8107eefdfb2
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/obj/storage/case.dmi , held sprites and open sprite made by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-open"
+    },
+    {
+      "name": "unshaded",
+      "delays": [
+        [ 0.2, 0.1, 0.1, 0.2 ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/unshaded.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/unshaded.png
new file mode 100644
index 0000000000000000000000000000000000000000..d598b670413157f0259516fe86eaad1df968563e
GIT binary patch
literal 5576
zcmeHLd0Z3M79KYO2#6Kh*V<|b`fy>g3|YrSgb*P}5P?>fTAd`51+qCA2w+82Tq#wQ
z@|2>2#VT5<xS}Frg}Sg56xS9jDr)OewNz={-kpFNUw!uZ`@Q~W@(Y<c_dDM?_q*rZ
z%VbehWT?CAJFXA}xy!>sqQUn#>f`JL{%+JyKL<g5PG-c$k<plqZXwJXy#c3_=@y)h
zr|C5ily>&U<V5272)Bn??`?gD`3x&Kxb5eg(+UD<-`|kimTmmu=&ChkEBFKA!-7Md
z(T4rAHs5+{$Ul$zl%+F8q2jXAZ@k}IawTR-p%VT1qWqNKCu^>@KdPa-B#0KQW<8><
zGWF8Nv>X@AshT?U?5_(5{j^yFYqh@LuWcLpuVTXGjj@5v!;4qfFWz0bZ%Xjz+A%{$
z-~QEoZ}=m_-MtkDW=KmySFB$e((3>5JM{aCpi!s`FK2dMZOcU3@bK#F13p84A6Z>7
zs%kB9@9LmG`j3c8ZSLdzT~mYYzR#-8d6_P53vzzc6=Wu7u2reOu1~K@b{~-3Xieea
zmE5U08U7ttXIC8PAR_8V%%9w{>kBWh0SnK091gu+Q9_QY&B7<G4f^cO#xHKPV#*6g
zva(l>sSmP_i>;jCR-;$t>nh}Vy;|eY^WIUv@0{ncuOsTzk&-k|VMRUK$?*E7{87m7
zvCRo%E-hO7WA&UVRdYQxhD)jLOepx;z|ag~*QAfu<Zgn3BtKk_o0faSt0lku^x5gd
zXwALH%Vyl<ZJq9tl~bIExw&{QTp2PlhO6<NGxWW#SZBiEWy;EmO|J=$WW0S|Xl`4f
zB5!TIBOl+?+jCUBTeDYL%_yG=pG<#|a>GVl^og&&ESDu06m7j+1pjhrvci950zY7v
z@<iS8O<KXd^L5GXjId7=h>8pA@)Jt72NQMIUFRnZ7U;|L^^JwQjwOY5b++!fVrrAJ
z_IV6Jmimn!!v8pblAj{`SVW9=HGgJ7{9D1sBjFP!f3)-C&)zq;jwsqvJ$h<r?vM?)
zXSZs$59USiW-KgT6-la`YJ~$mcjZF83k8~%k;6R(@5zn#|71#u+vt?J0Xko&zQ>21
zlnGKFGwx+4hW(USdArZ<EhYB{9iHdj=687Cp&NZ#za4AL$hXk9?`ls?@-hUnBfh?#
zGBjzb>EJJsT?0FPuil@N0Ou@jkNa@>!pXjgCp^!MZtyt_b0TF8iQB}763(obCyzc+
zc3R^iuFG@U^0{|e?frL4PbSq1$E6fhWrVHYS>!jo&ivz<>eD}m)z7%L9S&;xc8D?g
zaN)rZm|JLfId_S{?oKx+O%OI7ihDnA{Tm+3kqm847;Q)U&fUu+HW=NE{ECL``4eX{
zrj0S=PBlm$G`a-N$?W^k`H%1VHYQ1~eWKF#o><mco?IX~YTUuKvA$Z?@5=qtqCP7l
z!`E2dO_dqv6Y?(C!Y922gMN$cXLCLwx~A)I%id^gDch2L?87Ck12676duvLs$D@O~
z{I-pEc?{hlE;Cy;iJBm&*F3#c8YP!XpL96r>!O)?lCXp0-mRN@JX|)~;{(r>!%?gJ
z7cLftd*@6m+3uZ?!rt8})g4<}S}Alb??(%KbCU<NX%AZII_ErX;kLQU*XHDR?JsR+
zd^`7IX4T$%l{0A0zacS=HNxVgg1p6tY7HitTQwugr*BJc=AxAujD1UIU+LPjV9D3E
zNvk_%-u$lRi%SZpu8<4yUk-lrHhR1B%XQXsejeMFm3pojwB&6v=t5|DJ#+tbChC8y
zVN0I8ao~bQb;`l@#)k0u;bPgllVWr4%=@a|^$OgSwEJk`y-O^&jvXD`Q+f~IPi4cF
zW;?(AzM<Hy|D*(7bVR8x@N)Z5@`0Q<a_KDOdq_Mg%14xWE3m6=bNq@T%kp4O@x{8G
zf#b8zGn+S@xqGj|D2Rj}2Uynac<>p@{#Bl_d7bRjtaHZm7xt_>GNY!$gMF)X!u(5N
znT5e6P}Q0iK}S|~VsY|`8=H48IZmTXr@(CxZ9$DLZ|f=XxwbRszTdAceE1NOnuz>9
zR>Nut8c?JMTW*{p0#%ufOiXQ7;><Lo1#HO>Bo0ioV5(%Cq$_c)-XvlCvUfj&u2)MK
zlX(iZ!Xm|W`mhWFkI9IPRb?crL~2IhSXXfx3J8oiiP6)H29p&{lQ8VOD7dD~EC$^U
zA(JJHI7Jj)Y9??xm&s+aVOg3!6=95ZrHcu*28|9G-$McJBn%x%T2L0tX0tJE0ZcQY
zWpP9z5sQtm5CjGY*qUx4u{79Z^`$7fIYMx&iqKm~z1c*kI5DL;g_JNDV4U7V4n|e7
zG+^urK;7Hvt)!YI2RB?W9{^w>Y_<?)BQPRjIr@W9h2p8V$=ahL(36#hSy&t<n`JaU
z=V2vfsn6oQ(8C%FPCiyNZZ)S6DqNO|n@C^BpcX@l)iGv@6{k%0ybWp%3nXQa?C29J
zS42Jap=8wRjTXBHg?2=$RZnr26vAM~s8uZ7fEz&~R=~`84o~Ve&lc#p`A{Q&N(6*^
z%KsetiC*?x?7E^MW>pFmR30K>Q2C;2vr4Z<?U!ssrAByo0L;b&ILuWG*|1Qg=D<P$
z!sg-Z01l6<bfA)(tR!Yq;S?1hXX*iuh>wdfp@s`%z!T;wMFJS(fh)E^g@|w*K`@@c
zfnp+|2c3W!9J8XR)PM@%AbfrRhXX6sY5~mU^HqQp5x@alzEX&BG(x2kvr|#)fCfd$
zB@BegerAa>V5G)O7(sjKO=`2v`fMmxZ^UCrjFOEb;Bb)ugwGXl1OYrQ?-}R=oUnp2
zr&u{`CW6>U)GBm5;KV?=>5Z5cXIV^I`vA2tD3}hA7NfcYFx%~5HmH=qG15%Ln#~3Y
zgUXgpQQDh|F79a;G{UU1JKDjxn(DZoo(smbEc>mP^)m3Em|}Eho9Tb!c?NyT5=4+T
zGm$)zn5ay`RpiTgUIc#16b*JeD@mlw|6)@AffIKZY#8u06X_1|WAN$Scimf(L2s9e
zPPcCZD5mO`--@N;YWorZ9lM8AI?SZS!G7D*Y)|a^7Zfs=qf`rd7!G5YN(plXJOsx0
z2o4JZL~IqCuNETQfalq*W({e>2s}s&Y5=S=XfFFY(?|5w-^l0jHXTkC7aQTiY%Yul
zVmU&T%SG7&M)zvd#Vl%veKK1ywFfB_sG}ZYYL7zYR3XNsSS$uTPCT#Ele+mYI0yfp
z8vQGGM_9MF)NDxyU92M~+DtDE{{mn)Lxf(1o2=%SrS1snmc`*90y%fvzySx&OV-l^
zv!_a^M*16HJ=OO&MgY{WgS?WyujP6z*DERTO5oSk^;)i1Qs9-qudD0-CYS58M{e8%
z{_nGa2WrLUJN?1KxRY{1Xb6-;y*JFt=K+h0B`n?wLH!3&pI%U5(LaEZM#>d3+SR^;
z2l&&jMnCWYCR8306bpVmZJF%?(cStSXll=DYH7Ua5j?QnG<!iQ^@A*w)&D2)O|u_$
h30^f@I+5NG^jKK5tlvY)HP#i%D3?Wslm}0n^KWb?CSL#m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffa20a57d268f4d29ec28314badce322048700a1
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ!=5gVArY;~2@<S}6GVEN0u8v_
z4tlWn7`S;XIatre#@4ny-|k_Ej?SU>@OcrY>*pIA#Oy5UpV$ZltZF~LomFqUeqK_-
zMYS+nCB?unE6(2isj;BRL^cQK>HO!?9H+aKE3Q4*&~jh}^8{fnFDZv}j6aH4eE8-b
zWBqV)vx2sh-`w@{>yre;9v)uBsn+iIxQt=dpWf3Q0uACWR#smBC(1f_7d-x?Ug2o+
xM<~(%0P7l)yD|=14xY?Ef{aWVi&9Ov7#>{=Fgv`hx)bOf22WQ%mvv4FO#oAJTB-m5

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b3053fb65b7d9ca79fdee27c179a28a43e33600
GIT binary patch
literal 419
zcmV;U0bKrxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004MNkl<ZScUDC
zL2JS=7=~YmAc3XS)gAP<qWA|K^q_|^_Lp`Lb{crtUm9ZvJqX($5T)*<j2V@tP(9Uy
zq|-EWw(Blio=d(o-}inmp-BLZMx)XEcXFzaw|Cc}h#&5slsU)pomO514W}GZO2Byl
z0B}bPXVxhiPC1l|k|MOOZtM^MI1ljJpXT-qP)bm%S6~(kd&QIzTsjv&^$=03S1=q*
zqIrII(JU6QT&!azmWy@jhO(AC-!pKCcB}X0TBqAYyVXOd+e~N=I7yN$8pxv@|C)hA
z9NMAG42UN32&CVEqyK@l4H6lUPk>o0WOf9Fu6&{*1Dpq#Gaqy2!>(FjGY@vv!b^V)
zt7N2ZysHHO!@&d}Q-uKlcpJY*MOMjxJ7VBGh;By#r6gvG&AeEiN^1*=8(8@S=jCne
zju_a?gH<v>DS?a-5++1*Rjx{F<$ta#9~yCI3!Wd{)DKdYS{lvYWCOv0kP#Azi|POX
N002ovPDHLkV1hU~uQ&hz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3605542d4a866cfef28b83b7d4732439889606c
GIT binary patch
literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SaY;l$RCt_YVHjXA>VQ!Pj5=V{0izBWoDL|fb^Z@ycQx;2q{IS3
zX2Bg`Vj=mTmzR^_^XKni{=GYI8H9v+z~T%P0+?Bju1a9DKz5ut@thIG0U*m&)uk8&
z1ldtEgTzfO6d9-mKz7`|`3%lSi2{)2AKw4Oa0Ez<T!3yCI-lr7SY>+zr(D}%8?Zcx
zCKZsB3y>{BreSjA0IFp}x`Y7Cx9Bto&^!dlwSXiCpyvP(n_5{AW-fY;f;#|IIJ|rN
z1&ozcgc;tx`2?m<pSaH;EW$^&#mHuX0H_Rj{Tzz}K;XgsmvBuWOF<<V$YHS35e7ho
z6S|{7mY}P{W)=i+Vmjc*7fuFINeCOH7-S$wBgisz05b^Y2$<#A)M7L1#}^zSfNUT#
zjqY1)d|c6l&8*kYKVf$OE(<6Dgv_FPd!Q%a0z=6L0}PsO4j>hvH~<z;lz_xJN<i`x
p22IcbSFYS+WVpgWcQD{l007EzvrI&$!5shq002ovPDHLkV1glYt?B>(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/meta.json
new file mode 100644
index 000000000000..8f83f57cf0e2
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/7cb618c69b75873f3ce893022fe08d1233b3152d/icons/obj/structures/crates.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "welded"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..defa0f91f5d2086688db687ebb5c078c0532d850
GIT binary patch
literal 309
zcmV-50m}Y~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002|Nkl<ZScUDB
zzY2m-6vjV8a0$t5YD*Fu3R;4O8XA0qmR_X?@Wt#6axj9%rlM$TvO(0NcJsz<XgEKR
z<K=w!{DX4=hWSU<n`r_7E8j^(e)@@YGO@JmXXQJI-7|5$Jk+Xh!0wrd_YXwTNdo|#
zI=Xfn&d>$`+;2~GEF-rn&{!!&lR6br(eZGG>-BT10*y7B4@y2=aHqz0xogw};i9C?
z&Yx(>7C-}51Ir{5Aw2;g?JNivwGL&b^OFLq$wZ02nTT`&Dr1%|fUcbD_0h46+^Rrh
z6|0z{(ZhILyjG)$SrW$kVt1>)cbck>`m#reVHk#C7zO}dJfdUawMV~300000NkvXX
Hu0mjfXDo#O

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..f07cb52d0fdd6c659cdf3ab38a7e8c8d2c7b572d
GIT binary patch
literal 283
zcmV+$0p$LPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002uNkl<ZScUD-
zv1-CV9LMqRfp7{{?h>EIq2v+nE#eZgIut5&aL!iWA}`_K-oY0T6eI=}GX5P3!B84H
zl+xk<fm`nG|NC(VN-3q3QcC?NBJwM1o~H8CPSbbz81%kgn|Yeb;drDh%XTh=Al^Bw
zwM@O|bUrin9)N4pv{{k&ye^kt`Z^mS1Oc#v0X~k~ppV@SfV!@6&UFHAmkUpm2>{Qt
z8C6w%7Df@9?G}I}NjfuGmbJaTKk%|x$m1)<qY>App(qNI=eYnJ_IrFBV~4}ey|>ls
h+iYWcYn4)e>kh1EaRUSWdB*?%002ovPDHLkV1fY6e6s)m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..a157ca0afdfb427cd5f1f63db62a211c2e06494a
GIT binary patch
literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ-<~dxArY;~2@<S}6GVEN0u8v_
z4tlWn7`S;XIatre#@4ny-|k_Ej?SU>@OcrY>*pIA#Oy5UpV$ZltZF~LomFqUeqK_-
zMYS+nCB?unE6(2isj;BRL^cQK>HO!?9H+aKE3Q4*&~jh}^8{fnFDZv}j6aH4eE8-b
zWBqV)vx2sh-`w@{>yre;9v)uBsn+iIxQt=dpWf3Q0uACWR#smBC(1f_7d-x?ex|7-
zf}wkVe0+=Kjf#6l20-xU{?X$PUa$!s7Z<w0aI*8l6{m>@LHJfH|2e(Y!fl%q7i><|
z4U>|cAj9<i-5%9Y?zo0YY#)}UWHCKCl_A2wpjwmg`KP0RIxrX*JYD@<);T3K0RS^s
BcY6Q;

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..3967169f3a1d30b0633c5d4ed8c94f1b6acaa8ac
GIT binary patch
literal 419
zcmV;U0bKrxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004MNkl<ZScUDC
zL2AN46o!9`AOjsSja}%jqIdxd*_P6Cc!qB3s;jQ-#xwLBrF1K_7Z4?OrIcn=GJ)tS
zUC5-#WUNVa)y@Zj_wwHS?`L3U0F6eY(foG`s-JiF*MW#1A6}F_Y1yY$6hX(T1(XtS
z?gIeq3B#FrijGwa<V9H#T30uX0021m@jjdvVg@KBXtnF87^T=^N(nBli$gtxwAyuy
zN3$?5MvE1rgw=ABFtJ*0au1ZX<oqP9Q1A9B{Gz#t^HSX3vZX)h?#$&{7BcUEh<DYp
zl4}S0gKli#Av=)Tz;A{QA!a~60TrWkv?C~V<r5Ve;M~W8c~~$Hjiw3axM(y@ybY%?
ztL5B-qgntk9?kGIR~P_*kLhQ)$gGxOPZ&7&!`o3nDM^@Oj+^LHX>B1%18a}qyta+)
z2?KLnnAI{UC6Ez9!h{&E>Q!m2y`Q@Bp%Hhs;Pu(g{U9AvOQZRld;{Fom$m>lo^AjD
N002ovPDHLkV1f^vyV(E$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0385c324bf0302a01abf5b0c3c30ff753f95bf41
GIT binary patch
literal 494
zcmV<K0TKR*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<Sph-kQRCt{2mcL5FKpe+^0Z{^NQKLiMEQ&8+A#0KP0zQC?gR6^O
z)J2!N_zXUPFCd6(LB}kjv`z-8QE3BKm+J4r9my|unqH!H$QRoC)7<y_xx3ua2^h0-
zfE*wP$N_SI{|T_Wzc%Fc<HHLhO~6lH0$|lH4~s<;`u#W7Zr^z@YZX{Oq!jn6)ho;k
zGp<{%5dpyP<&_1Po|%da#{R0k2w4d;Zf_n$JF*2B{`&GBgTOvrQ7_s~{1P^HPDQ<W
zvMJiUj-`$g1JHnQTQ__pfbV7;{_WQQ=#1%>=t}z{N)xICpeF$9Ssg*{OHY&lz{}y;
z^Vz4eWP$h8W93z=1J+zgJ2>ox!aJbrN&ryzokuYUL-7VfFn&97;pIf3FoZrQ^9p3f
z0S3Ma^W~t952GOt#4svu#36XN>{*%Dz*nq5*f3nu*~;3gZIXF)-JTpk6(BSG@GY1u
zc&vVTUV_?sGFYmSk74vw1m@L)uP-}z$#BV0&7(7D>}|x#)BrpnD@6eK@@Ao}?Ygv7
k0ys|F00;hDWB*V13AzNr{#|pcI{*Lx07*qoM6N<$g3y`U00000

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..db0912126141e3a635b404608a9d9e7abc554999
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzZBG}+kcif|rxpqVC7CzswLZ8}
xzi!b64iTk5eLF@5h6jO@=fxF&`F7~KnVvfHa#xO<uYuYaJYD@<);T3K0RZHo9m4<s

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/meta.json
new file mode 100644
index 000000000000..ad6f2bd22d55
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/7cb618c69b75873f3ce893022fe08d1233b3152d/icons/obj/structures/crates.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3f526a9ffce5351bf17563b84cefa33dd5ad6cd
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJAD%9bArY;~2@<S}6AYRrcr^d#
z0fN4DUjGYEDksOh>M-mUJXTN=`b%Hu(D4u7&Z?h^@n_)Z{$O}#$DhuJr>0i-fYj@p
z5OO+X!{eoO2*l%&zxO{yKp>_4@)U-Y%?b<;J;hR5PjuzouQ|40l^*MIO~w;xGov&X
zo!I!`LNntjZgHWI%Qxlw7l|D^&fZbRaK<5~P57}xmux`X4uPXdMY^iD8IMGH`COR%
zh9QVYm34sygXQU!tGo?4I5r*5^kUc)*|CO$vFC)0tgK7s(uJqn7kxOE>T=I@`r&14
uv9g<F)(A)eJtxxB6llQZc2FY$2!Q^dmT*%?xEL4&3=E#GelF{r5}E*wx^mwD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/sparks.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/sparks.png
new file mode 100644
index 0000000000000000000000000000000000000000..f95b8e2093e9feeceb9f7424a8c210827378e559
GIT binary patch
literal 450
zcmeAS@N?(olHy`uVBq!ia0vp^4nUm1!3HGP9xZtRq&N#aB8wRq_>O=u<5X=vX$A(y
z5>FS$kcv5P=Q#2mR^VYV5Bh)0{Oi^bOBbgVwk-LE@7~>MPHgg2-d*V+!`)yZ#!#rk
z@F;@e$VP^aWJZDGObUIhKnaJ$sOqhcE952`9%7Q1JY#9UwRQi52D^-99UO{`f15Uo
z+e_~+;WBvC&YH4}L76qvzp*Fwz=Zf;h7}WMF<nJ93yUQ;n71XFI_+wh+I@eK&AB;e
zVkJIiJpH(eHOQ;-&nyS+8_Ev0%weHj=Rf|g$lQ7`d*S1||G(<JaP9y2?$mrS1GZD|
zgkR+!oBMjD=7vu^66fbWZGW&lcYBd|&&z4I6gM3{sefBVwDp=wsOWxPCp?}6I_!YV
znw25#`==h>EVh4-eM0-Pj(NKOtacy%Hh-q`&rcP%zB5bQf1j{<jn$shchisX$u|9O
vsONB$;qHjJ6ZQ7p1mRolQ&uU>XUbQ-wRd?>#MSe_NMZ1F^>bP0l+XkKJB+u6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1430d31a3c30d34660015245654acbc79c66153
GIT binary patch
literal 102
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzT~8Oskcif|rxx-uC<w3|)aPtg
z_!58pVVqJxhvfE?VT=q6A2Qa@?CXgM`*E9b%?IY|mj4P;ff^Y+UHx3vIVCg!06%~q
A?*IS*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..311739a2701db289577b99dbe6910bad2a1f9010
GIT binary patch
literal 294
zcmV+>0oneEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#;7LS5R9J=W&@pPmFcik|zaXFl(jeJ6O@`tl=oZdmyk;mg&>^$8<QBd}hwL44
zfj|PqF-gJW>rgN@rKUr+ydP+h^u7-Xlu}A5rBsKA++{7(RQ}s(h7P+y+uhDA(^O99
zGi6z}b0Gxr&S9-(?meHE3v=%QxHV0i6?xC=di|@fw-G`R06QAt<G2m_I2-_|>l)`=
zFW~EXWjdPy@Vr=1Rn<>n6!E^_1CS(1ZzjvKws-IcUREpVzT#;z;np-1MPc$h7l708
sh>v6Jc-*`9w%PodZOmY;Qc69TZ;Wzr1AKHN?EnA(07*qoM6N<$f;^dk6951J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bbae3f80f96ad214d498e2480e638754258736c
GIT binary patch
literal 354
zcmV-o0iFJdP)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px$97#k$R9J;$U>F6XU=)mkQ7{Td!2knB1_lNO8#|Z(=n{qbnQ(Uh#OYMG_{gC>
zj0_A63@k8#*RP(VD5$Egqq?OqASxyaXEV{v79s(P1HOOzMpMhMnLoHfU?2bsx&W=C
z0UZo@2#h*l)Bz~DfRl@hC{5UM3bA^zI^fOgmkgTP`Y00hHKlNNV@o%R-1Vy$F$_Z2
zj}P3qb{W+HF!1K}D>(b!y?a>285kHCY#rS28j25yh>D@`F$yAL04~cWPwZyM%`at`
zJP{IN=xl6&EC=8MFiVgv!(}l|902nzx})%g0!>1ISaAjhXp`)~fddQ~nYsVpy?YCn
z`1<8DoXyR{OD#7t2nh)@%$Poz(ZRuiYGzUd0E4Jg>sR`&ng9R*07*qoM6N<$f)ePA
AEdT%j

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5f6b18d3b6f46443e9ea4399429b441ca303bce
GIT binary patch
literal 519
zcmV+i0{H!jP)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px$!AV3xR9J=WmA_BIKorNnHBO3K3wsAe5|Yk_Xa{DsKw<)cxH=hkLZV@FFisAP
z1SWp`0}NHsI9}qQQ%959(#0_2VD4yvQd)>Hv7hPPyY_v*_ue%HLPA19LjF4(0H~^p
za-}-5Z(N+8vH0fpZl$8tt1>6cG5}y50Lqo>D4s~dG<5cmD2goRh3Lw}c_Bs*%P|8%
z=(ZXxCWPR!dL5|F!Unpn20ERNBWGV1^H~5uCX)dGD7nIF4N$1SWK3C9n6l<qT*(#K
z$q69<embG#3ckewA042@i}@@w0yytN5PXlI-fW}ZY)=`ZP=kaJXqpC56rpLF!}L-H
z=0U{)K$0X#lEh*+R%(ED#_hDT@O25jn7kjqZlK<5`~DIfBT$ZySZtr0J-;lEPcPF3
zOhbohL{Y2N*hXYy?9HAx4IQb2^i<*geGj}4^EAK<QO7?g&?Pht9nXE0t@l!LkTPQf
z?{BXhfRSYl*hZ;z%Hqw)mS-W$8o>U(8>XRCy|DqCiJ1(CUo1}Tr$@7%+1^Q@|Il--
zLHX1_9BbbrFby5N5XGT#;>g+O>IYB9vxx5|r@An&gCQY*nr{%4oTa|jD$)P|002ov
JPDHLkV1k|;=2HLw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..79068e7670c60dd0c7dde2db7a804a4969101ac7
GIT binary patch
literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px%7D+@wR9J=WmcLKiKorNnK};=Oz)p4#6h%VvjF6h4bBjYHB%+{>Wk9F{TSV0=
z8$%Ukpi;(&OeFjR3_<)5<4KWHrrV88meM&4(Y@R`abi1GJJg@)`JMgV_q}_kGmwyw
zkdW}dlLCNFr-SlwWgstnIov1vNA)z;q?PaGR4$hT04xGP`M5Gz%dW$9Y<kHs46-#n
z9b0lu&xm4EBp?bG=VxRy#_+9j5-Cn#0T<_IXt&#nPkt`#ZUX@F`8)u?Diq@tAP@<>
zwjgL?!9v*NR-s6hGsXZ6J7E=yp_2n4Iv|3VcDG3gpw2=RLT^E%*+Qe)8WScE0vTiA
zoWn2-aLyIca|xJ+NDcs|X~Hy3vi*ovfar{0wUY=ngtPF@$6puFXtqM11Z4}Xt&e2O
z`zHJ6<@)x1T!8D?aGf;j^*Svqy&7qg{jOtU^WFQgz&BTy(Dckq0h*px?wm+N=sGs;
zZaVb5v6+h!W+Xt<GkEBA(eFRe!rtB|vR^N~nHi|xe^S2p!*%Ror+#%u0$j(&T6SG|
z@oV{rZ26{hoyUoRSKnp>U)vA8F4@W!$iX@16aB*q()eKQC_Z^#r{NVDdIrRH0o^fw
zt$Kok!z0wH!;X3FNkke#ziAgq<Yaz{=MvzDsMafLS{Gs!;8*RmF3?}`=lz3$e2o4)
q|0X-gF$~J`@(O;Q*66SJpYs9=$i@a4^Ad9a0000<MNUMnLSTYoY!^EK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..34188570825ff276f8eda97fddad00ff7afca020
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q!^2X+?^QKos)S9<T!b{IEF;D
zzCE{*lR-g%#ZgdRxZ7aUCjHZ=-na<dliPD3Mg9KcASR$n2AiVIGxoO5ZrwC_YQ>bb
hPkuF)uBu@;P%iG;&b}<HX!Sji8c$b0mvv4FO#nPnEr|dC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/meta.json
new file mode 100644
index 000000000000..03349899fe96
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/79665 | Recolored and adjusted sprite size by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 36
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays":
+	  [
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+      ]
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..7338b6c9636e108279d69a1b219b896107ade047
GIT binary patch
literal 350
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q!^2X+?^QKos)S9WJ`FuIEF;D
zCMQTF95`{{z=47X2N>IC?V9%ggi!0xnFVG4kG#~FWwNEjkY`unTceB9wwYWtu(Gf)
z0D%o4;>wk+f85PYG&DHQ-P`w@W6s}aU%lC)v$@+YO>){1QSNVlc=mODNf(!+oka{+
zHun^;@2UJd>EVfk(>1y(Dt<i3iL_)55oY>h$kW=w@Nppna}N&?NX^>ye}C;?r!8vc
z>lt`9#@;p)SUbOacKgF)Ur&P-_?!^p>hf~AxO-dffdflkxU*^SRTTV}Yi?R3<R~@$
z;gJ`|Uo#}}E^Jxm#S!4t-*zB_gJ+k3!fKTzA_~)6bbvNY@M2l3bTC{xh&4ui?>!0D
q#R(!kO@RhnZU;3aSPu&`FeI)hT-L#M@hULD7(8A5T-G@yGywpE6^pF^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/sparking.png
new file mode 100644
index 0000000000000000000000000000000000000000..68d57cddf1982a2590688e756155fa770ca65cb8
GIT binary patch
literal 447
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<@!3HEb(?28wDaPU;cPEB*=VV?2*_ECyjv*Cu
z-rf#e*Q_AWnz(m%q2!K|$hOrR{Z)>wUTN?m@x}kWxBH4;cnC{^%s_y>lEwNF)1EdO
z)o>@?O`7xXYtg*t>#zT_4ZN`4GW%aFOM<|mU6J<93`TEf=SBYPJk5}`W>3({mn+$_
zb&oP`xxi8?`#Z|(wFXzh|106<4{~4DCC@n~^|&K9qiyxuXH(s`FMKt1{l9-M-*^K0
z6s~gERDX*ocUtEj@Xn(m`uqQu(6j4*t}d2s@H+c|)1imq2nQL&nYX(arbn&N+|KrS
z_d>4lcIBuFUqc{=BWTU8lF7Oze@@-qSMr(XgGF82LWKr_YiqwbZWYq)o4<GW*A#Yv
z$0o}jTOL<iasO(#b|lL(!4eylkJq$vYQH`=kiAsB`(x+xHhEFjf;+8SjF@aDtzR;&
n&*tj2zk*BUcJM7|zxbWeLuE7X&o%4+fI`&M)z4*}Q$iB}s}R77

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa4127fcf316a223ea2533ff47571357d42bab2a
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q!^2X+?^QKos)S9<b-;<IEF;D
zCMQU+E=~~XX$mypayzI2<xJ$0IC=HNJjMU=$NpJ9R=oLa!-TgClk0i*PpLE5aQAV-
u56^XqQ!E}lmsDeGGma67v;*rEVPLSo%5!PIKW7Kf0tQc4KbLh*2~7a{J2R*N

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..4615601fc9634cdafc4865921048e167b2b25a60
GIT binary patch
literal 323
zcmV-J0lfZ+P)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px#{YgYYR9J=W(J^YnFcik|zp<fYDA<lWdkUn`L+A(s`wq^UA)vv~93wu2!I$We
zwds%}#LzSb4<6N_)TFK3CJ<<c_XADu>64xWLI@#*5JCv?Us!8TTEAt?vh3%kPn_=x
z$3d&2aAsL%cXdrwRfBtSW9;+cKokT3v|ZQN!XV&&xg6Z*ydSo!YXGi1k6=9RgPyiq
z0Gg)3_kCQ~r7X)YVM&tM+sWkZz%b-ty#_!j^`Y-&zvpqY=`+0J30FnY2j|Avw(E%F
z7=XL!l(y@*9*qWH>?Vr(`h2l)=7U|3rl}no;3QgWtCTwHk1tMZZF6J(_7Xx|(kl{6
Vav;;(?{EMB002ovPDHLkV1jA;l>Gnz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9a919ba41acda8b5c7df22c151c6cf38aebb190
GIT binary patch
literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q!^2X+?^QKos)S9WJ`LwIEF;D
zCMQU+E=~~XX$mypay!Vt?8e5%*2c`vXYj>;-EV(=Z|>sR60$Nf0(>9%xBdSAk5_x|
zn{)w@pJz7|zEuRNWmDUAvx|9w#e;)?t4+4@%>LP|&BDgCVFC9AE2#?y8`=-7V0M#j
zn8Yn2GPUDUi|%rP)#9s}=iU2%=)oJs!v}z%;PEr|w&maVCumFwdy;q|K)m6Tf$rul
z&(xy+-;?zZkY!*tIBRfRfjPx@r{zJ3Pu^i`QXRhYnEmDOPbg&Am7Ks3D}2VNhGBkP
ziot`<f-8(VJV0PuTic`R>iU1aeJ!u(F&~%n^Y^7WoDgQ(@zs8>{;3O>ueaY)u`YPP
v(DmrWhlrkU4=+vamh9XzSL3e%I|IYv$h4$M-CU=EA;#e8>gTe~DWM4f37d*%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..3675061d8be295cbb587ee42c029718ac73fefa1
GIT binary patch
literal 484
zcmV<A0UQ2_P)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px$o=HSOR9J=WRxN15Kp1@)l@&2lEtIIlrbLcXh^gx!3@Qo}lVf6KFlHuZ#?-`^
zoETILMqqO@fifnK#wO}0G*r}7#Al{S^VjB@wseC$le_Qky?ftxmt24X1qu`>uxD@p
zFc=IX!N;dtFFx_|;*Mh#W#KoQO#nbCPI9OVwN*`sUiErjMJQ)3&cY9yDfx?cI~s^-
z000zO4cdO+vUNxzpJ^bAugI#OEC&DwOo}_i|1zM+YVb^J=RqlZ$^!nrhW9tz-noIa
zOo?ek;+C!N&cL#4H>twfXJFa>=RF4-RbU%uVehYDY6XOv1feG77F~xQF>rEx4mz^%
z{_zaUo&|A9<k9VDOrlwQI<k@m9O{CY2KsOM(#z!G{uLFW42Qb7zByevzKSo2JRIt#
zSAZ47G|+!BgMRl+&LguhK!!sOfH!fb^KdeQi8IAE#vOX-uLod$C5F+~8Xozf2?6Cu
zz^DGrwY7#PiF~30mOTr`SMlR<=D(aks9yKfRyFeBA*KQ2YaGdp6>AfG6Y*G{#S0Yp
a6Zi#X<jJA}K!M}{0000<MNUMnLSTZi4b)%&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b6c06812193e92a3790b58969da46cb23083a47
GIT binary patch
literal 551
zcmV+?0@(eDP)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px$;Ymb6R9J=WS3O9>Kp1_IjvcZ%wNNr8YoVh<p^KwXM8S%Kqc|7};^N>ULWzPp
zIut7?QgG}N=-?R4noLKbM~5yQve(7SUz6sVwiF?6>E-U;cklbT^b3$7Lxv0)HVgp(
z`u%=j^8WF98s2zuek1T2<>6PWRRBOPOrpd=ZMQgMw5h7of|O4@oQLlhlVgWB4(l*X
z9RN@%*W59Cw(KqxSxgj=#IKZV%vk{dwzw>=5&ug-rCf7=qsD2FOWxvv<<*~G|9I^J
zqC7QBJuq+C-Sr8G^LCjiEL;O|`A=I1OGRK6wXpGP7#RVnq(CYusf{ke4+z-bI|CV5
z`22c?Wl!9BMHbOGtaBMn;*)_jD}WLQhN+|T-i`e;xw~znAmu@cgUhRvx$E=ziY$T>
zCprSWFiaht7t?)ioR-s=@dOm4JoMfWBRc+@p7mfv$17Q<WE%x3597xtzzbUumOTl0
z2LQ%5P}z~7$YLP3e)!kt@c}^Z4TBM2u<QvaaUw&?NR&8GWDyTfP456xck`OW5BC(Y
zH4v_129_?p*ADCtcS~{nFj5sEPiw}DjlT&uE+7X0Elm@esygMrW=WWT4O^Nfu(mw%
pyWr^Hc&4v^`*`L4F5uxa0ly!y|3<sQ&oBT0002ovPDHLkV1nal@(Ta}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..34188570825ff276f8eda97fddad00ff7afca020
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q!^2X+?^QKos)S9<T!b{IEF;D
zzCE{*lR-g%#ZgdRxZ7aUCjHZ=-na<dliPD3Mg9KcASR$n2AiVIGxoO5ZrwC_YQ>bb
hPkuF)uBu@;P%iG;&b}<HX!Sji8c$b0mvv4FO#nPnEr|dC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/meta.json
new file mode 100644
index 000000000000..03349899fe96
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/79665 | Recolored and adjusted sprite size by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 36
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays":
+	  [
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+      ]
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..c115a2915568d3760d38fd622198e2719f1d3748
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q!^2X+?^QKos)S9Wb=8tIEF;D
zCZ{AMBv=$YU|=?SF+b+}d`4c8XJ&?rx*swfc~M?a0F(rRgUdA4lqA+KyzylEnuya4
z{&JD_o020ECY_jNbz3}1A|Ouk`~e^+c=jib&9#!3t^U5qjyuQB7E731VU_UVnalag
zy@*GdxyQiJ=n#idO~SFBG9LDnl#oeDEQe<nKbMe{n6T)<)!E-&viJS}z;?JrQ&poT
z=u3Ae$Dx}#Cxp1Vym<KE-B<Py7xzDqWw7zrL`Gqwc8Rk<@q*JAGJ|xF7cgvW3vhZ|
z%CJ^fp11L$fW#C<2K_Ei&666eNlHy07R{L0$QUG>yxJ*~m8*ERMB>$t8WOCF6GVEN
g0u8v_4gxt0HfmFL&gzJH01PGuPgg&ebxsLQ0Ax~s*#H0l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/sparking.png
new file mode 100644
index 0000000000000000000000000000000000000000..68d57cddf1982a2590688e756155fa770ca65cb8
GIT binary patch
literal 447
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<@!3HEb(?28wDaPU;cPEB*=VV?2*_ECyjv*Cu
z-rf#e*Q_AWnz(m%q2!K|$hOrR{Z)>wUTN?m@x}kWxBH4;cnC{^%s_y>lEwNF)1EdO
z)o>@?O`7xXYtg*t>#zT_4ZN`4GW%aFOM<|mU6J<93`TEf=SBYPJk5}`W>3({mn+$_
zb&oP`xxi8?`#Z|(wFXzh|106<4{~4DCC@n~^|&K9qiyxuXH(s`FMKt1{l9-M-*^K0
z6s~gERDX*ocUtEj@Xn(m`uqQu(6j4*t}d2s@H+c|)1imq2nQL&nYX(arbn&N+|KrS
z_d>4lcIBuFUqc{=BWTU8lF7Oze@@-qSMr(XgGF82LWKr_YiqwbZWYq)o4<GW*A#Yv
z$0o}jTOL<iasO(#b|lL(!4eylkJq$vYQH`=kiAsB`(x+xHhEFjf;+8SjF@aDtzR;&
n&*tj2zk*BUcJM7|zxbWeLuE7X&o%4+fI`&M)z4*}Q$iB}s}R77

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa4127fcf316a223ea2533ff47571357d42bab2a
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q!^2X+?^QKos)S9<b-;<IEF;D
zCMQU+E=~~XX$mypayzI2<xJ$0IC=HNJjMU=$NpJ9R=oLa!-TgClk0i*PpLE5aQAV-
u56^XqQ!E}lmsDeGGma67v;*rEVPLSo%5!PIKW7Kf0tQc4KbLh*2~7a{J2R*N

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d185bef25d85e2735300c29731e5737270f64de
GIT binary patch
literal 297
zcmV+^0oMMBP)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px#<4Ht8R9J=W(yea8Fc84;e_+8tq)Ht-Sc5)9q`W}hqGLw`3OcDEG|G$QO;+GZ
zre-bZ$Uvb-mS|hLOqwQ*+z(m4^L<DLV~jDz7-Nhv?^HFZYMRTbs%kd=u-(qa0Ur1J
zPdORDuC9|00TJPDvEa}&+0d}>`|*6gT5&p`8ScIgSC%Eu-m}befUyoh*L4Zt<#OTa
zcpPht3A?&Zho;GjqDXGNW|`;s5ZE|}4}qb%h|sp}%>e*Jgc##wa}fcUyqy&Kxb3jX
v>-BoG>338$#TeN*_pA4R?x(+H%)fdAz_D43Uod`T00000NkvXXu0mjf4D5%+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..9aa5cb2aec673c734b903991c2d613f3c7d2e0d3
GIT binary patch
literal 360
zcmV-u0hj)XP)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px$B1uF+R9J=WmM?OIFc`&OI&12%HA{yIj)15^<pO9t2FEetI06R41yC_PM8q;p
zD>^Y9L}x0g3cKN7BX&zgekzlEFYo1pFaQpR!{Kl^c7^}|=Nx5O4wnm0->>8NbpLo&
z(>%{f9LMJXNs<hG-(S^a3(xb=Gz|fOyFYVX!3fZG-A&Dw_WxfU*n`7#;?|F0%I+O-
z0bBs%76d_HC0e>Ew%Wx2Qc6%t0RTb>NGWH9zV9Op!_|$VD6-bKZEFV5XfdS}4{tBy
z{KxUx5M^05GpOqt)5Bb%_0vPlK17=L&#!aQaoKDOA;dV|>fG)xp$l*T0LB<8iegYo
ztrjY!u(kdhS}&ypW6b;|<D47CX_^kx4XUalwq`bZ9pDE63T(7*@xnO(0000<MNUMn
GLSTYZZIgEZ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..efa5d5e5b5a3598f01189599632bf25e51dbb271
GIT binary patch
literal 524
zcmV+n0`vWeP)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px$#z{m$R9J=WmOpF4Kp4iKl$6q`OBX>*j}Et#!hyKBIOPMFC5s=yP4F`~=Oehd
z=m&6e5lRrQ>kTD6DcC@VZlxfki+3jRU$lxX<hLaE-ut}w+@Ej(a&mHVa?Xqa0He_;
z5%fGSy8n9B?U(C2G@DH$Yf;bhqI4{+uhnV*05dI;Qo^=v6s8|K*(_1CTCK>ktet}^
zeVVvFZpKuDyRHk)IRJn$hWF`Miy31OLV!}b(}2oXwbFXVn3}8s02i4mo{;}#ps?7M
z!gRd${SeIEDNAOhYT}uGKe>T*Go6*HiMYV+=?rX|Z6YqjUIz9)1Dp2$&~xys6*$IO
zIQwU~b_EC_C_X;u_9Y>E6(xj#WYi=K)a!KwL4d(vfcf*&GU@XMuIpwhs`Mgu7%8P%
z9|Xaw0VyRo=jio%8!wYirvuBfAf-gR-QL>2O;0I>lydzFWQB8%Znvx3jYi{;GD`!K
z$;1E<g<-fcF$_Z-qhCs?#sjdp65}|I6ZyW6;?-Qo-o8y#Di!qmeZz5_h*G+;0zwGg
z@B99W0i{pJGyml%%H?uo+cp?uI>tH2a5zlNEGv5pl!<igkim0u{sceHo7qXWk&=)A
O0000<MNUMnLSTX^T=GEx

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c03e77917b828365e44b7124f1f1facd3affa96a
GIT binary patch
literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px%7D+@wR9J=WSG|hcKoI^E6hf*r*BB0MM2c-fK#dzWuKWP5)aVi13H%HO;YN?J
zjVnKZDmMp*F>D~!7C{*&;0QuU5lD03G}+b9Nw(}eV*>gbX=mpfeLFiVjergvI&|o8
zWmo{PTCGaPIF9%4{(Ldx&#&KNGMQLygT`^ZuiC2o;cy55u&X2@!e}%?Z~MbI+YUz<
zhI_`?(T8h(6-9ngjIAH;`#z+U007VP@O^t{$e!mxDFx2?Q32Xt$Exx@&(n*w0N_Qd
zh!@2FC7}0jTYB5O+WT{0A9u;Ia|Wer_5R`l>Q=gQ1|_?~&E*6%t+r%W>LdXt*Fe+$
zpIZk{%D{8f!qtyqZ3bM|#qEdpX8h81PYUX~F5H%!l7R7ej5JNLTrTnO@jiF@^#;E0
zw+gEHs!)uabHh*5^sxXUf|L@A#iH?JGMml77y}VuI-MSzKg8#pgNW)g&=yik2qDZk
z2!eCM<N_FDNRk9umNhzNS@taRL<GhdHk(Z@pqMtL6oe4Cef40--#!WS`+acEOM6>H
zalV)x09dcrW*z{NBq?V=Ln#F!LJ$O{7t78W7!nbIbB_6ZZsw(wW?wbG3eB(f6pc0T
z_2=*0$;s_{yNavO_Ud9Z4mC1o6=9p!tSzqoCcL@;8vvpxvcfRjKjoMmL-80!QDo`1
qy!O8!2!cm_y%3`He?c3*7VsCHSQ5?)E<$Pm0000<MNUMnLSTaD=o6~|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..34188570825ff276f8eda97fddad00ff7afca020
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q!^2X+?^QKos)S9<T!b{IEF;D
zzCE{*lR-g%#ZgdRxZ7aUCjHZ=-na<dliPD3Mg9KcASR$n2AiVIGxoO5ZrwC_YQ>bb
hPkuF)uBu@;P%iG;&b}<HX!Sji8c$b0mvv4FO#nPnEr|dC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/meta.json
new file mode 100644
index 000000000000..03349899fe96
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/79665 | Recolored and adjusted sprite size by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 36
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "sparking",
+      "delays":
+	  [
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+      ]
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6d7f32e967bcaa25a3ebc878a616420c098aa9e
GIT binary patch
literal 351
zcmV-l0igbgP)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px$8A(JzR9J=Wm7#8gKoExiZ7`?TR+K$~CgA~i1ssonSqsmA!K~pCaJ&Mx2?<Yd
zP*IDnyb~9;+vSd1a&1yEpI{g!|IB1aW*7i;T?Z4T)cN@Jq5ae04N^)5N0d@$`<tzg
z;}`(o-4dl~ir4A8sZT#%#ci6V!B*VVo6UGj&=i$rY02MF6a@fa7zX&hk0eQSv~61i
zL4Ys}@93fRMl%e{BZ{Kc$hN5KdeuOdWqVSf?|TLqzhItcXYn*msH*CRzemqG*YBPg
z5JF%a$A>o0^P7oX^(HT-<02M9=wi0rTYS}kYm#T|W&?j+oF+gM_?HvVt9Z{Qdlt^Q
xUd0T!o@4uj+UNK;ky5hd91{dV5ClOG#0BI_pA9$vXRQDL002ovPDHLkV1h}{m|Fk<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/sparking.png
new file mode 100644
index 0000000000000000000000000000000000000000..68d57cddf1982a2590688e756155fa770ca65cb8
GIT binary patch
literal 447
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<@!3HEb(?28wDaPU;cPEB*=VV?2*_ECyjv*Cu
z-rf#e*Q_AWnz(m%q2!K|$hOrR{Z)>wUTN?m@x}kWxBH4;cnC{^%s_y>lEwNF)1EdO
z)o>@?O`7xXYtg*t>#zT_4ZN`4GW%aFOM<|mU6J<93`TEf=SBYPJk5}`W>3({mn+$_
zb&oP`xxi8?`#Z|(wFXzh|106<4{~4DCC@n~^|&K9qiyxuXH(s`FMKt1{l9-M-*^K0
z6s~gERDX*ocUtEj@Xn(m`uqQu(6j4*t}d2s@H+c|)1imq2nQL&nYX(arbn&N+|KrS
z_d>4lcIBuFUqc{=BWTU8lF7Oze@@-qSMr(XgGF82LWKr_YiqwbZWYq)o4<GW*A#Yv
z$0o}jTOL<iasO(#b|lL(!4eylkJq$vYQH`=kiAsB`(x+xHhEFjf;+8SjF@aDtzR;&
n&*tj2zk*BUcJM7|zxbWeLuE7X&o%4+fI`&M)z4*}Q$iB}s}R77

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa4127fcf316a223ea2533ff47571357d42bab2a
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q!^2X+?^QKos)S9<b-;<IEF;D
zCMQU+E=~~XX$mypayzI2<xJ$0IC=HNJjMU=$NpJ9R=oLa!-TgClk0i*PpLE5aQAV-
u56^XqQ!E}lmsDeGGma67v;*rEVPLSo%5!PIKW7Kf0tQc4KbLh*2~7a{J2R*N

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d185bef25d85e2735300c29731e5737270f64de
GIT binary patch
literal 297
zcmV+^0oMMBP)<h;3K|Lk000e1NJLTq001BW001Ni1^@s6=<7J*00001b5ch_0Itp)
z=>Px#<4Ht8R9J=W(yea8Fc84;e_+8tq)Ht-Sc5)9q`W}hqGLw`3OcDEG|G$QO;+GZ
zre-bZ$Uvb-mS|hLOqwQ*+z(m4^L<DLV~jDz7-Nhv?^HFZYMRTbs%kd=u-(qa0Ur1J
zPdORDuC9|00TJPDvEa}&+0d}>`|*6gT5&p`8ScIgSC%Eu-m}befUyoh*L4Zt<#OTa
zcpPht3A?&Zho;GjqDXGNW|`;s5ZE|}4}qb%h|sp}%>e*Jgc##wa}fcUyqy&Kxb3jX
v>-BoG>338$#TeN*_pA4R?x(+H%)fdAz_D43Uod`T00000NkvXXu0mjf4D5%+

literal 0
HcmV?d00001


From 99a66283a9d445d3b0bf2446698287fdcee21468 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Thu, 15 Aug 2024 18:16:48 +0000
Subject: [PATCH 32/39] Automatic Changelog (#1821)

---
 Resources/Changelog/Changelog.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 423c99282f96..992a1b71db88 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6313,3 +6313,14 @@ Entries:
         resolved.
   id: 5202
   time: '2024-08-15T15:50:30.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: >-
+        Added ammo crates and cases to expedition loot pools: weapons should
+        become slightly less common, however probability of getting better
+        weapons were increased (slightly).
+    - type: Tweak
+      message: 'Doubled the sell price for vendor restock boxes: 200 -> 400.'
+  id: 5203
+  time: '2024-08-15T18:16:23.0000000+00:00'

From bbe7b6ed294f454b9de465cfddccd05bd7e65909 Mon Sep 17 00:00:00 2001
From: "Alice \"Arimah\" Heurlin" <30327355+arimah@users.noreply.github.com>
Date: Thu, 15 Aug 2024 21:15:30 +0200
Subject: [PATCH 33/39] Fix Frontier Outpost's medical cross (#1865)

---
 Resources/Maps/_NF/Outpost/frontier.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
index f317a19dfb56..58d1d2fbde51 100644
--- a/Resources/Maps/_NF/Outpost/frontier.yml
+++ b/Resources/Maps/_NF/Outpost/frontier.yml
@@ -2558,11 +2558,6 @@ entities:
             2443: -34,12
             2444: -32,12
             2445: -31,12
-        - node:
-            color: '#334E6DC8'
-            id: FullTileOverlayGreyscale
-          decals:
-            2041: -50,3
         - node:
             color: '#35526FFF'
             id: FullTileOverlayGreyscale
@@ -2576,6 +2571,7 @@ entities:
             478: -50,2
             479: -51,3
             480: -49,3
+            2041: -50,3
         - node:
             color: '#9FED5896'
             id: HalfTileOverlayGreyscale

From 0c8b0c67ae932db4d62f3eec9bbe61538033c411 Mon Sep 17 00:00:00 2001
From: Tabitha <64847293+KyuPolaris@users.noreply.github.com>
Date: Sat, 17 Aug 2024 00:59:55 +1000
Subject: [PATCH 34/39] CMO Turtleneck Added to Loadout (#1867)

Co-authored-by: KyuPolaris <tabi@kyuudev.me>
---
 .../_NF/Loadouts/Jobs/Contractor/jumpsuit.yml | 29 +++++++++++++++++++
 .../Loadouts/contractor_loadout_groups.yml    |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml
index f29a6b9c6828..8ff622675d42 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml
@@ -1352,6 +1352,35 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtCMO
 
+- type: loadout
+  id: ContractorClothingUniformTurtleneckCMO
+  equipment: ContractorClothingUniformTurtleneckCMO
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  hideEffects:
+  - !type:GroupLoadoutEffect
+    proto: PantsCapableNF
+  price: 1000
+
+- type: startingGear
+  id: ContractorClothingUniformTurtleneckCMO
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitCMOTurtle
+
+- type: loadout
+  id: ContractorClothingUniformTurtleskirtCMO
+  equipment: ContractorClothingUniformTurtleskirtCMO
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1000
+
+- type: startingGear
+  id: ContractorClothingUniformTurtleskirtCMO
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtCMOTurtle
+
 - type: loadout
   id: ContractorClothingUniformJumpsuitSeniorResearcher
   equipment: ContractorClothingUniformJumpsuitSeniorResearcher
diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
index 52ee98986c2a..210915d63d79 100644
--- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
@@ -102,6 +102,8 @@
   - ContractorClothingUniformJumpskirtSeniorPhysician
   - ContractorClothingUniformJumpsuitCMO
   - ContractorClothingUniformJumpskirtCMO
+  - ContractorClothingUniformTurtleneckCMO
+  - ContractorClothingUniformTurtleskirtCMO
   - ContractorClothingUniformJumpsuitSeniorResearcher
   - ContractorClothingUniformJumpskirtSeniorResearcher
   - ContractorClothingUniformJumpsuitResearchDirector

From ddb94c36bfd6479e340b8b98bc9603191669139d Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Fri, 16 Aug 2024 15:00:24 +0000
Subject: [PATCH 35/39] Automatic Changelog (#1867)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 992a1b71db88..2b3cb2b0cd97 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6324,3 +6324,9 @@ Entries:
       message: 'Doubled the sell price for vendor restock boxes: 200 -> 400.'
   id: 5203
   time: '2024-08-15T18:16:23.0000000+00:00'
+- author: KyuPolaris
+  changes:
+    - type: Add
+      message: CMO's new turtleneck added to Contractor, Pilot, and Mercenary loadouts.
+  id: 5204
+  time: '2024-08-16T14:59:55.0000000+00:00'

From b48a2f3e55a38a2454e020681998ce3da1277d5e Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Sat, 17 Aug 2024 19:23:11 +0300
Subject: [PATCH 36/39] Mercenary tech fab (#1854)

* initial commit

* more weapons

* stuff

* sprites, weapons, recipes, research

* cases

* recharger, antique laser

* sorting

* limited ammo selection

* hacked merc lathe draft (no recipes)

* category shuffle, punk clothes to lathe

* lights, clothes changes

* exped loot

* eh

* moving recipes to categories

* ammo fab flatpack to exped loot

* explosion resistance to explosives case

* fix maybe

* hyper power cell

* fix

* ugh

* Update Resources/Locale/en-US/_NF/research/technologies.ftl

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* parenting, turned off hypercap powercell recipe

* Recyclable randomized clothing

* nyanotrasen techfabs

* ftl

* unanchorable punk vendomats

---------

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 .../en-US/_NF/lathe/lathe-categories.ftl      |   6 +
 .../en-US/_NF/research/technologies.ftl       |   7 +-
 .../Locale/en-US/lathe/lathe-categories.ftl   |   3 -
 .../Objects/Power/portable_recharger.yml      |   3 +-
 .../Entities/Structures/Machines/lathe.yml    |   3 +-
 .../Entities/Structures/Machines/lathe.yml    | 443 ++++++++++------
 .../Prototypes/Recipes/Lathes/categories.yml  |   8 -
 .../Prototypes/Recipes/Lathes/cooking.yml     |  15 +
 Resources/Prototypes/Research/arsenal.yml     |   1 +
 .../Prototypes/Research/experimental.yml      |   1 -
 .../Inventories/expeditionaryflatpackvend.yml |   1 +
 .../_NF/Entities/Clothing/Belt/belts_punk.yml |   2 +-
 .../Entities/Clothing/Eyes/glasses_punks.yml  |   4 +-
 .../_NF/Entities/Clothing/Eyes/hud.yml        |  10 +
 .../Entities/Clothing/Masks/masks_punk.yml    |   2 +-
 .../Clothing/OuterClothing/armor_punk.yml     |   4 +-
 .../Clothing/OuterClothing/coats_punk.yml     |  26 +-
 .../Entities/Clothing/Shoes/boots_punk.yml    |   2 +-
 .../Clothing/Uniforms/jumpsuits_punk.yml      |  10 +-
 .../Clothing/recyclable_clothing_base.yml     |  77 +++
 .../Spawners/Random/dungeon_items_general.yml |   4 +-
 .../Random/dungeon_items_mercenary.yml        |  12 +
 .../Entities/Objects/Devices/flatpacks.yml    |  17 +-
 .../Entities/Objects/Devices/production.yml   |  35 ++
 .../Entities/Objects/Storage/weapon_cases.yml |   4 +-
 .../Structures/Holographic/graffiti.yml       |  30 ++
 .../Entities/Structures/Machines/lathe.yml    | 499 ++++++++++++++++--
 .../Structures/Machines/vending_machines.yml  |  58 +-
 .../Prototypes/_NF/Recipes/Lathes/ammo.yml    |  34 +-
 .../Prototypes/_NF/Recipes/Lathes/armor.yml   | 150 ++++++
 .../_NF/Recipes/Lathes/categories.yml         |  23 +
 .../Prototypes/_NF/Recipes/Lathes/clothes.yml | 199 +++++++
 .../Prototypes/_NF/Recipes/Lathes/devices.yml |  46 --
 .../_NF/Recipes/Lathes/electronics.yml        |  10 +
 .../Prototypes/_NF/Recipes/Lathes/eva.yml     |  28 +
 .../Prototypes/_NF/Recipes/Lathes/medical.yml |  18 +
 .../Prototypes/_NF/Recipes/Lathes/misc.yml    | 121 +++--
 .../Prototypes/_NF/Recipes/Lathes/service.yml |  11 +
 .../Prototypes/_NF/Recipes/Lathes/storage.yml |  82 +++
 .../Prototypes/_NF/Recipes/Lathes/tools.yml   |  64 +++
 .../Prototypes/_NF/Recipes/Lathes/weapons.yml | 157 ++++++
 Resources/Prototypes/_NF/Research/arsenal.yml |  74 +++
 .../_NF/Research/civilianservices.yml         |  13 +
 .../Prototypes/_NF/Research/experimental.yml  |  14 +
 .../Structures/Machines/techfab.rsi/meta.json |   3 -
 .../Structures/Machines/techfab.rsi/nfsd.png  | Bin 275 -> 0 bytes
 .../Devices/flatpack.rsi/mercenary.png        | Bin 0 -> 383 bytes
 .../Objects/Devices/flatpack.rsi/meta.json    |   3 +
 .../Misc/module.rsi/hacked-merc-fab-board.png | Bin 0 -> 944 bytes
 .../_NF/Objects/Misc/module.rsi/meta.json     |  14 +
 .../Machines/techfab.rsi/mercenary.png        | Bin 0 -> 717 bytes
 .../Structures/Machines/techfab.rsi/meta.json |   6 +
 .../Machines/techfab.rsi/salvage.png          | Bin 0 -> 662 bytes
 53 files changed, 1940 insertions(+), 417 deletions(-)
 create mode 100644 Resources/Locale/en-US/_NF/lathe/lathe-categories.ftl
 create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/recyclable_clothing_base.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Lathes/armor.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Lathes/categories.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Lathes/clothes.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Lathes/medical.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Lathes/storage.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml
 delete mode 100644 Resources/Textures/Structures/Machines/techfab.rsi/nfsd.png
 create mode 100644 Resources/Textures/_NF/Objects/Devices/flatpack.rsi/mercenary.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/module.rsi/hacked-merc-fab-board.png
 create mode 100644 Resources/Textures/_NF/Objects/Misc/module.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Structures/Machines/techfab.rsi/mercenary.png
 create mode 100644 Resources/Textures/_NF/Structures/Machines/techfab.rsi/salvage.png

diff --git a/Resources/Locale/en-US/_NF/lathe/lathe-categories.ftl b/Resources/Locale/en-US/_NF/lathe/lathe-categories.ftl
new file mode 100644
index 000000000000..1edcfb71f7ad
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/lathe/lathe-categories.ftl
@@ -0,0 +1,6 @@
+lathe-category-evasuits = EVA
+lathe-category-armor-nf = Armor
+lathe-category-storage-nf = Storage
+lathe-category-kitchen-nf = Kitchen
+lathe-category-clothes-nf = Clothes
+lathe-category-medical-nf = Medical
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_NF/research/technologies.ftl b/Resources/Locale/en-US/_NF/research/technologies.ftl
index d7d99f285973..9384075b9a08 100644
--- a/Resources/Locale/en-US/_NF/research/technologies.ftl
+++ b/Resources/Locale/en-US/_NF/research/technologies.ftl
@@ -7,4 +7,9 @@ research-technology-hardsuits-experimental-industrial = Experimental Salvager Ha
 research-technology-hardsuits-armored = Armored Hardsuits
 research-technology-hardsuits-armored-advanced = Advanced Armored Hardsuits
 research-technology-hardsuits-experimental-rd = Experimental Research Hardsuit
-research-technology-construction-bags = Construction Bags
\ No newline at end of file
+research-technology-construction-bags = Construction Bags
+research-technology-bounty-hunting = Bounty Hunting
+research-technology-arsenal-style = Punk Gear
+research-techology-advanced-topicals = Advanced Topicals
+research-technology-magnets-tech-advanced = Advanced Localized Magnetism
+research-technology-magnets-tech-combat = Localized Magnetism Combat Application
\ No newline at end of file
diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl
index 5f04bdd18a9e..a7261c2b5112 100644
--- a/Resources/Locale/en-US/lathe/lathe-categories.ftl
+++ b/Resources/Locale/en-US/lathe/lathe-categories.ftl
@@ -6,6 +6,3 @@ lathe-category-parts = Parts
 lathe-category-robotics = Robotics
 lathe-category-tools = Tools
 lathe-category-weapons = Weapons
-# Frontier lines below
-lathe-category-evasuits = EVA
-lathe-category-armor-nf = Armor
diff --git a/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml b/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml
index e3213ac8c9ee..dd32a94a9eba 100644
--- a/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml
@@ -5,7 +5,7 @@
   description: High-tech recharger adapted for portability
   components:
   - type: Item
-    size: Huge
+    size: Ginormous # Frontier Huge<Ginormous
   - type: Sprite
     sprite: Objects/Power/portable_recharger.rsi
     state: charging
@@ -15,6 +15,7 @@
     slots:
     - back
   - type: Charger
+    chargeRate: 50 # Frontier: chargeRate: 50 
     slotId: charger_slot
     portable: true
   - type: PowerChargerVisuals
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index b075a8f92d84..25afdf7576b9 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -334,7 +334,6 @@
       - SynthesizerInstrument
       - RPED
       - ClothingShoesBootsMagSci
-      - ClothingShoesBootsMagAdv # Frontier
       - ClothingShoesBootsMoon
       - ClothingShoesBootsSpeed
       - NodeScanner
@@ -1019,6 +1018,8 @@
       - Jug
       - SyringeCryostasis
       - ClothingOuterHardsuitMedical # Frontier
+      - OintmentAdvancedNF # Frontier
+      - BrutepackAdvancedNF # Frontier
   - type: Machine
     board: MedicalTechFabCircuitboard
   - type: StealTarget
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
index 90857ff282bd..7ad1c24f5ede 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
@@ -24,22 +24,71 @@
     idleState: icon
     runningState: icon
     staticRecipes: #Frontier
+    # Shared lathe recipes
+    ## Basic tools
+      - Wirecutter #Frontier
+      - Screwdriver #Frontier
+      - Welder #Frontier
+      - Wrench #Frontier
+      - Crowbar #Frontier
+      - Multitool #Frontier
+      - FlashlightLantern #Frontier
+      - AppraisalTool #Frontier
+      - HandLabeler #Frontier
+      - Signaller #Frontier
+      - ClothingMaskWeldingGas #Frontier
+    ## Basic storage
+      - ToolboxArtisticNF #Frontier
+      - ToolboxElectricalNF #Frontier
+      - ToolboxMechanicalNF #Frontier
+      - ToolboxEmergencyNF #Frontier
+    ## Basic parts
+      - CableStack #Frontier
+      - LightTube #Frontier
+      - LedLightTube #Frontier
+      - SodiumLightTube #Frontier
+      - ExteriorLightTube #Frontier
+      - LightBulb #Frontier
+      - LedLightBulb #Frontier
+      - ConveyorBeltAssembly #Frontier
+      - PowerCellSmall #Frontier
+      - PowerCellMedium #Frontier
+    ## Basic electronics
+      - SignalTimerElectronics #Frontier
+      - CellRechargerCircuitboard #Frontier
+      - BorgChargerCircuitboard #Frontier
+      - WeaponCapacitorRechargerCircuitboard #Frontier
+    ## Basic EVA:
+      - ClothingOuterEVASuitContractor #Frontier
+      - ClothingOuterEVASuitPilot #Frontier
+      - AirTank #Frontier
+      - HandheldGPSBasic #Frontier
+    # Science techfab
+    ## Tools
+      - NodeScanner
+    ## Basic EVA:
       - ClothingOuterEVASuitScientist #Frontier
     dynamicRecipes:
+    # Shared lathe recipes #Frontier
+    ## Advanced tools #Frontier
+      - WelderExperimental #Frontier
+      - JawsOfLife #Frontier
+      - PowerDrill #Frontier
+      - JetpackVoid #Frontier
+      - PowerCellHigh #Frontier
+      #- PowerCellHyperNF #Frontier
+      - PowerCellMicroreactor #Frontier
       - BluespaceBeaker
       - CryostasisBeaker
       - ClothingBackpackHolding
       - ClothingBackpackSatchelHolding
       - ClothingBackpackDuffelHolding
       - ClothingBackpackMessengerHolding # Frontier
-      - ChemicalPayload #Below = shared
-      - FlashlightLantern
+      - ChemicalPayload
       - Bucket
       - MopItem
       - SprayBottle
       - FireExtinguisher
-      - LightTube
-      - LightBulb
       - SheetSteel
       - SheetPlastic
       - SheetPlasteel
@@ -49,7 +98,6 @@
       - CableStack
       - CableMVStack
       - CableHVStack
-      - NodeScanner
       - ClothingOuterHardsuitBasic # Frontier
       - ClothingOuterHardsuitRd # Frontier
   - type: MaterialStorage
@@ -58,11 +106,6 @@
         - Sheet
         - RawMaterial
         - Ingot
-    materialWhiteList:
-    - Glass
-    - Plastic
-    - Steel
-    - Durathread
 
 - type: entity
   parent: Protolathe
@@ -90,26 +133,75 @@
     idleState: icon
     runningState: icon
     staticRecipes: #Frontier
+    # Shared lathe recipes
+    ## Basic tools
+      - Wirecutter #Frontier
+      - Screwdriver #Frontier
+      - Welder #Frontier
+      - Wrench #Frontier
+      - Crowbar #Frontier
+      - Multitool #Frontier
+      - FlashlightLantern #Frontier
+      - AppraisalTool #Frontier
+      - HandLabeler #Frontier
+      - Signaller #Frontier
+      - ClothingMaskWeldingGas #Frontier
+    ## Basic storage
+      - ToolboxArtisticNF #Frontier
+      - ToolboxElectricalNF #Frontier
+      - ToolboxMechanicalNF #Frontier
+      - ToolboxEmergencyNF #Frontier
+    ## Basic parts
+      - CableStack #Frontier
+      - LightTube #Frontier
+      - LedLightTube #Frontier
+      - SodiumLightTube #Frontier
+      - ExteriorLightTube #Frontier
+      - LightBulb #Frontier
+      - LedLightBulb #Frontier
+      - ConveyorBeltAssembly #Frontier
+      - PowerCellSmall #Frontier
+      - PowerCellMedium #Frontier
+    ## Basic electronics
+      - SignalTimerElectronics #Frontier
+      - CellRechargerCircuitboard #Frontier
+      - BorgChargerCircuitboard #Frontier
+      - WeaponCapacitorRechargerCircuitboard #Frontier
+    ## Basic EVA:
+      - ClothingOuterEVASuitContractor #Frontier
+      - ClothingOuterEVASuitPilot #Frontier
+      - AirTank #Frontier
+      - HandheldGPSBasic #Frontier
+    # Service techfab
+    ## Tools
+      - LightReplacer #Frontier
+      - MopBucket #Frontier
+      - TrashBag #Frontier
+      - Bucket #Frontier
+      - MopItem #Frontier
+      - SprayBottle #Frontier
+      - MiniHoe #Frontier
+      - HydroponicsToolScythe #Frontier
+      - HydroponicsToolHatchet #Frontier
+      - Spade #Frontier
+      - Clippers #Frontier
+      - ServiceSelectiveDropper # Frontier
+      - Beaker # Frontier
+      - LargeBeaker # Frontier
+      - Jug # Frontier
       - MailCapsule #Frontier
-      - SprayBottle #Frontier, moved some recipes from dynamicRecipes, so the service fab wouldn't need a server for the basic stuff
-      - FlashlightLantern
-      - FireExtinguisher
-      - LightTube
-      - LightBulb
-      - DrinkMug
-      - DrinkMugMetal
-      - DrinkGlass
-      - CableStack
-      - CableMVStack
-      - CableHVStack
-      - LightReplacer
-      - MopBucket
-      - TrashBag
-      - Bucket
-      - MopItem
-      - WetFloorSign
-      - KitchenKnife
-      - ButchCleaver
+      - LanternNF # Frontier
+      - PillCanister # Frontier
+      - ChemistryEmptyBottle01 # Frontier
+      - Mousetrap # Frontier
+      - Holoprojector #Frontier
+      - Shovel #Frontier
+    ## Kitchen
+      - DrinkMug #Frontier
+      - DrinkMugMetal #Frontier
+      - DrinkGlass #Frontier
+      - KitchenKnife #Frontier
+      - ButchCleaver #Frontier
       - ServiceRollingPin # Frontier
       - ServiceSpoon # Frontier
       - ServiceFork # Frontier
@@ -119,11 +211,14 @@
       - ServiceFoodPlateSmall # Frontier
       - ServiceFoodPlateTin # Frontier
       - ServiceFoodKebabSkewer # Frontier
-      - NapkinDrum
-      - Napkin
-      - Beaker # Frontier
-      - LargeBeaker # Frontier
-      - ServiceSelectiveDropper # Frontier
+      - DrinkShotGlass # Frontier
+      - DrinkGlassCoupeShaped # Frontier
+      - CustomDrinkJug # Frontier
+      - FoodPlatePlastic # Frontier
+      - FoodPlateSmallPlastic # Frontier
+      - NapkinDrum # Frontier
+      - Napkin # Frontier
+    ## EVA
       - ClothingOuterEVASuitHydro # Frontier
       - ClothingOuterEVASuitJanitor # Frontier
       - ClothingOuterEVASuitMailman # Frontier
@@ -133,39 +228,40 @@
       - ClothingOuterEVASuitBoxerGreen # Frontier
       - ClothingOuterEVASuitBoxerBlue # Frontier
       - ClothingOuterEVASuitBoxerYellow # Frontier
+    ## Misc
+      - ClothingHeadHatCone #Frontier
+      - FireExtinguisher #Frontier
+      - WetFloorSign #Frontier
     dynamicRecipes:
-      - Holoprojector
-      - HydroponicsToolScythe
-      - HydroponicsToolHatchet
-      - SynthesizerInstrument
-      - MiniHoe
-      - HydroponicsToolScythe
-      - HydroponicsToolHatchet
-      - Spade
-      - Clippers
-      - Shovel # Below is shared with other lathes
-      - SheetSteel
-      - SheetPlasteel
-      - SheetPlasma
-      - SheetGlass1
-      - SheetRGlass
-      - SheetPlastic
+    # Shared lathe recipes # Frontier
+    ## Advanced tools # Frontier
+      - WelderExperimental # Frontier
+      - JawsOfLife # Frontier
+      - PowerDrill # Frontier
+      - JetpackVoid # Frontier
+      - PowerCellHigh # Frontier
+      # - PowerCellHyperNF # Frontier
+      - PowerCellMicroreactor #Frontier
+    # Service techfab
+      - SynthesizerInstrument #Frontier
       - ClothingOuterHardsuitBasic # Frontier
       - ClothingOuterHardsuitPilot # Frontier
       - ClothingOuterHardsuitClown # Frontier
       - ClothingOuterHardsuitMime # Frontier
-  - type: MaterialStorage
+      - AdvMopItem # Frontier
+      - WeaponSprayNozzle # Frontier
+      - ClothingBackpackWaterTank # Frontier
+      - MegaSprayBottle # Frontier
+      - TimerTrigger # Frontier
+      - ChemicalPayload # Frontier
+      - BluespaceBeaker # Frontier
+      - SyringeBluespace # Frontier
+  - type: MaterialStorage # Frontier
     whitelist:
       tags:
         - Sheet
         - RawMaterial
         - Ingot
-    materialWhiteList:
-    - Steel
-    - Plastic
-    - Glass
-    - Durathread
-    - Wood
 
 - type: entity
   parent: Protolathe
@@ -192,69 +288,78 @@
   - type: Lathe
     idleState: icon
     runningState: icon
-    # Frontier Start
     staticRecipes:
-      - Wirecutter
-      - Igniter
-      - Signaller
-      - Screwdriver
-      - Welder
-      - Wrench
-      - Crowbar
-      - Multitool
-      - NetworkConfigurator
-      - SprayPainter
-      - FlashlightLantern
-      - CableStack
-      - CableMVStack
-      - CableHVStack
-      - HandheldGPSBasic
-      - TRayScanner
-      - AirTank
-      - GasAnalyzer
-      - UtilityBelt
-      - SheetRGlass
-      - LightTube
-      - SodiumLightTube
-      - ExteriorLightTube
-      - LightBulb
-      - Bucket
-      - MopItem
-      - Holoprojector
-      - Mousetrap
-      - LightReplacer
-      - TrashBag
-      - PowerCellSmall
-      - PowerCellMedium
-      - MicroManipulatorStockPart
-      - MatterBinStockPart
-      - CapacitorStockPart
-      - ConveyorBeltAssembly
-      - IntercomElectronics
-      - FirelockElectronics
-      - DoorElectronics
-      - AirAlarmElectronics
-      - StationMapElectronics
-      - FireAlarmElectronics
-      - MailingUnitElectronics
-      - SignalTimerElectronics
-      - APCElectronics
-      - SMESMachineCircuitboard
-      - SubstationMachineCircuitboard
-      - CellRechargerCircuitboard
-      - BorgChargerCircuitboard
-      - WeaponCapacitorRechargerCircuitboard
-      - Durathread
-      - Plasteel
-      - ClothingOuterSuitEmergency # Frontier
-      - ClothingHeadHelmetEVA # Frontier
-      - ClothingHeadHelmetEVALarge # Frontier
-      - ClothingOuterHardsuitEVA # Frontier
-      - ClothingOuterEVASuitEngineer # Frontier
-      - ClothingOuterEVASuitAtmosTech # Frontier
-      - WelderIndustrial # Frontier
-      - WelderIndustrialAdvanced # Frontier
-      # Engi fab has shuttle power and tech at base
+    # Shared lathe recipes
+    ## Basic tools
+      - Wirecutter #Frontier
+      - Screwdriver #Frontier
+      - Welder #Frontier
+      - Wrench #Frontier
+      - Crowbar #Frontier
+      - Multitool #Frontier
+      - FlashlightLantern #Frontier
+      - AppraisalTool #Frontier
+      - HandLabeler #Frontier
+      - Signaller #Frontier
+      - ClothingMaskWeldingGas #Frontier
+    ## Basic storage
+      - ToolboxArtisticNF #Frontier
+      - ToolboxElectricalNF #Frontier
+      - ToolboxMechanicalNF #Frontier
+      - ToolboxEmergencyNF #Frontier
+    ## Basic parts
+      - CableStack #Frontier
+      - LightTube #Frontier
+      - LedLightTube #Frontier
+      - SodiumLightTube #Frontier
+      - ExteriorLightTube #Frontier
+      - LightBulb #Frontier
+      - LedLightBulb #Frontier
+      - ConveyorBeltAssembly #Frontier
+      - PowerCellSmall #Frontier
+      - PowerCellMedium #Frontier
+    ## Basic electronics
+      - SignalTimerElectronics #Frontier
+      - CellRechargerCircuitboard #Frontier
+      - BorgChargerCircuitboard #Frontier
+      - WeaponCapacitorRechargerCircuitboard #Frontier
+    ## Basic EVA
+      - ClothingOuterEVASuitContractor #Frontier
+      - ClothingOuterEVASuitPilot #Frontier
+      - AirTank #Frontier
+      - HandheldGPSBasic #Frontier
+    # Engineering techfab
+    ## Tools
+      - NetworkConfigurator #Frontier
+      - SprayPainter #Frontier
+      - TRayScanner #Frontier
+      - GasAnalyzer #Frontier
+      - Holoprojector #Frontier
+      - LightReplacer #Frontier
+      - WelderIndustrial #Frontier
+      - WelderIndustrialAdvanced #Frontier
+      - HolofanProjector #Frontier
+    ## Parts
+      - MicroManipulatorStockPart #Frontier
+      - MatterBinStockPart #Frontier
+      - CapacitorStockPart #Frontier
+      - Igniter #Frontier
+      - CableMVStack #Frontier
+      - CableHVStack #Frontier
+    ## Electronics
+      - IntercomElectronics #Frontier
+      - FirelockElectronics #Frontier
+      - DoorElectronics #Frontier
+      - AirAlarmElectronics #Frontier
+      - StationMapElectronics #Frontier
+      - FireAlarmElectronics #Frontier
+      - MailingUnitElectronics #Frontier
+      - APCElectronics #Frontier
+      - SMESMachineCircuitboard #Frontier
+      - SubstationMachineCircuitboard #Frontier
+      - SmallThrusterMachineCircuitboard # Frontier
+      - SmallGyroscopeMachineCircuitboard # Frontier
+      - WallmountSubstationElectronics # Frontier
       - SolarControlComputerCircuitboard # Frontier
       - SolarTrackerElectronics # Frontier
       - SolarAssemblyFlatpack # Frontier
@@ -265,59 +370,57 @@
       - ThrusterMachineCircuitboard # Frontier
       - GyroscopeMachineCircuitboard # Frontier
       - MiniGravityGeneratorCircuitboard # Frontier
+    ## Clothing
+      - UtilityBelt
       - ConstructionBag # Frontier
-      - SmallThrusterMachineCircuitboard # Frontier
-      - SmallGyroscopeMachineCircuitboard # Frontier
-      - WallmountSubstationElectronics # Frontier
+    ## EVA
+      - ClothingOuterSuitEmergency # Frontier
+      - ClothingHeadHelmetEVA # Frontier
+      - ClothingHeadHelmetEVALarge # Frontier
+      - ClothingOuterHardsuitEVA # Frontier
+      - ClothingOuterEVASuitEngineer # Frontier
+      - ClothingOuterEVASuitAtmosTech # Frontier
+    ## Misc
       - ClothingHeadHatCone # Frontier
-    # Frontier end
-    dynamicRecipes:
-      - Flash
-      - MicroManipulatorStockPart
-      - NanoManipulatorStockPart
-      - PicoManipulatorStockPart
-      - FemtoManipulatorStockPart
-      - MatterBinStockPart
-      - AdvancedMatterBinStockPart
-      - SuperMatterBinStockPart
-      - BluespaceMatterBinStockPart
-      - CapacitorStockPart
-      - AdvancedCapacitorStockPart
-      - SuperCapacitorStockPart
-      - QuadraticCapacitorStockPart
-      - FirelockElectronics
-      - DoorElectronics
-      - APCElectronics
-      - AirAlarmElectronics
-      - FireAlarmElectronics
-      - MailingUnitElectronics
-      - IntercomElectronics
-      - HolofanProjector
-      - ConveyorBeltAssembly
-      - RPED
-      - PowerDrill
-      - MiningDrill
-      - RCDAmmo # Below is shared with other lathes
-      - FlashlightLantern
-      - Bucket
-      - MopItem
-      - SprayBottle
-      - FireExtinguisher
-      - LightTube
-      - LightBulb
-      - SheetSteel
-      - SheetPlasteel
-      - SheetPlasma
-      - SheetGlass1
+      - Durathread
+      - Plasteel
       - SheetRGlass
-      - SheetPlastic
-      - CableStack
-      - CableMVStack
-      - CableHVStack
+    dynamicRecipes:
+    # Shared lathe recipes
+    ## Advanced tools
+      - WelderExperimental #Frontier
+      - JawsOfLife #Frontier
+      - PowerDrill #Frontier
+      - JetpackVoid #Frontier
+      - PowerCellHigh #Frontier
+      # - PowerCellHyperNF #Frontier
+      - PowerCellMicroreactor #Frontier
+    # Engineering techfab
+      - Flash #Frontier
+      - MicroManipulatorStockPart #Frontier
+      - NanoManipulatorStockPart #Frontier
+      - PicoManipulatorStockPart #Frontier
+      - FemtoManipulatorStockPart #Frontier
+      - MatterBinStockPart #Frontier
+      - AdvancedMatterBinStockPart #Frontier
+      - SuperMatterBinStockPart #Frontier
+      - BluespaceMatterBinStockPart #Frontier
+      - CapacitorStockPart #Frontier
+      - AdvancedCapacitorStockPart #Frontier
+      - SuperCapacitorStockPart #Frontier
+      - QuadraticCapacitorStockPart #Frontier
+      - RPED #Frontier
+      - MiningDrill #Frontier
+      - SprayBottle #Frontier
+      - FireExtinguisher #Frontier
+      - SheetSteel #Frontier
+      - SheetPlasteel #Frontier
+      - SheetPlasma #Frontier
+      - SheetGlass1 #Frontier
+      - SheetRGlass #Frontier
+      - SheetPlastic #Frontier
       - ShipyardRCD # Frontier
       - ShipyardRCDAmmo # Frontier
-      - WelderExperimental # Frontier
-      - JawsOfLife # Frontier
       - SignallerAdvanced # Frontier
       - ClothingOuterHardsuitBasic # Frontier
       - ClothingOuterHardsuitAtmos # Frontier
@@ -332,9 +435,3 @@
         - Sheet
         - RawMaterial
         - Ingot
-    materialWhiteList:
-    - Glass
-    - Plastic
-    - Steel
-    - Gold # Frontier
-    - Silver # Frontier
diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml
index d904f24ca7ea..8faa67af1b3e 100644
--- a/Resources/Prototypes/Recipes/Lathes/categories.yml
+++ b/Resources/Prototypes/Recipes/Lathes/categories.yml
@@ -29,11 +29,3 @@
 - type: latheCategory
   id: Weapons
   name: lathe-category-weapons
-
-- type: latheCategory # Frontier
-  id: EVASuits # Frontier
-  name: lathe-category-evasuits # Frontier
-
-- type: latheCategory # Frontier
-  id: ArmorNF # Frontier
-  name: lathe-category-armor-nf # Frontier
diff --git a/Resources/Prototypes/Recipes/Lathes/cooking.yml b/Resources/Prototypes/Recipes/Lathes/cooking.yml
index 577d8299dab0..67d3f46d4a44 100644
--- a/Resources/Prototypes/Recipes/Lathes/cooking.yml
+++ b/Resources/Prototypes/Recipes/Lathes/cooking.yml
@@ -1,6 +1,7 @@
 - type: latheRecipe
   id: ButchCleaver
   result: ButchCleaver
+  category: KitchenNF # Frontier
   completetime: 2
   materials:
     Steel: 300
@@ -9,6 +10,7 @@
 - type: latheRecipe
   id: KitchenKnife
   result: KitchenKnife
+  category: KitchenNF # Frontier
   completetime: 2
   materials:
     Steel: 200
@@ -17,6 +19,7 @@
 - type: latheRecipe
   id: DrinkMug
   result: DrinkMug
+  category: KitchenNF # Frontier
   completetime: 0.8
   materials:
     Glass: 100
@@ -24,6 +27,7 @@
 - type: latheRecipe
   id: DrinkMugMetal
   result: DrinkMugMetal
+  category: KitchenNF # Frontier
   completetime: 0.8
   materials:
     Steel: 100
@@ -31,6 +35,7 @@
 - type: latheRecipe
   id: DrinkGlass
   result: DrinkGlass
+  category: KitchenNF # Frontier
   completetime: 0.8
   materials:
     Glass: 100
@@ -38,6 +43,7 @@
 - type: latheRecipe
   id: DrinkShotGlass
   result: DrinkShotGlass
+  category: KitchenNF # Frontier
   completetime: 0.4
   materials:
     Glass: 100
@@ -45,6 +51,7 @@
 - type: latheRecipe
   id: DrinkGlassCoupeShaped
   result: DrinkGlassCoupeShaped
+  category: KitchenNF # Frontier
   completetime: 0.8
   materials:
     Glass: 100
@@ -52,6 +59,7 @@
 - type: latheRecipe 
   id: CustomDrinkJug 
   result: CustomDrinkJug 
+  category: KitchenNF # Frontier
   completetime: 2 
   materials: 
     Plastic: 200
@@ -59,6 +67,7 @@
 - type: latheRecipe
   id: FoodPlate
   result: FoodPlate
+  category: KitchenNF # Frontier
   completetime: 0.8
   materials:
     Glass: 100
@@ -66,6 +75,7 @@
 - type: latheRecipe
   id: FoodPlateSmall
   result: FoodPlateSmall
+  category: KitchenNF # Frontier
   completetime: 0.4
   materials:
     Glass: 50
@@ -73,6 +83,7 @@
 - type: latheRecipe
   id: FoodPlatePlastic
   result: FoodPlatePlastic
+  category: KitchenNF # Frontier
   completetime: 0.8
   materials:
     Plastic: 100
@@ -80,6 +91,7 @@
 - type: latheRecipe
   id: FoodPlateSmallPlastic
   result: FoodPlateSmallPlastic
+  category: KitchenNF # Frontier
   completetime: 0.4
   materials:
     Plastic: 50
@@ -87,6 +99,7 @@
 - type: latheRecipe
   id: FoodBowlBig
   result: FoodBowlBig
+  category: KitchenNF # Frontier
   completetime: 0.8
   materials:
     Glass: 100
@@ -94,6 +107,7 @@
 - type: latheRecipe
   id: FoodPlateTin
   result: FoodPlateTin
+  category: KitchenNF # Frontier
   completetime: 0.4
   materials:
     Steel: 100
@@ -101,6 +115,7 @@
 - type: latheRecipe
   id: FoodKebabSkewer
   result: FoodKebabSkewer
+  category: KitchenNF # Frontier
   completetime: 0.4
   materials:
     Steel: 100
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index cf375ee3ef62..9b900ce79907 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -185,6 +185,7 @@
   tier: 3
   cost: 15000
   recipeUnlocks:
+  - WeaponAntiqueLaserNF # Frontier
   - WeaponAdvancedLaser
   - PortableRecharger
 
diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml
index 69375c830ad8..960cd07a93b6 100644
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -68,7 +68,6 @@
   cost: 7500
   recipeUnlocks:
   - ClothingShoesBootsMagSci
-  - ClothingShoesBootsMagAdv # Frontier
   - ClothingShoesBootsMoon
 
 - type: technology
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml
index b9283607ef68..d0dc62501bf1 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml
@@ -6,4 +6,5 @@
     PowerCellRechargerFlatpack: 4294967295 # Infinite
     WeaponCapacitorRechargerFlatpack: 4294967295 # Infinite
     BorgChargerFlatpack: 4294967295 # Infinite
+    MercenaryTechFabFlatpack: 4294967295 # Infinite
     ComputerIFFFlatpack: 1
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml
index 5dcaa8b8c859..0e3470579334 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml
@@ -1,7 +1,7 @@
 
 - type: entity
-  parent: ClothingBeltStorageBase
   id: ClothingBeltPunkRandomized
+  parent: [ ClothingBeltStorageBase, RecyclableItemClothBasic ]
   name: punk belt
   description: A webbing with functional pockets.
   suffix: Random visuals
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml
index df05daaec3a6..ec1af85491f4 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml
@@ -1,7 +1,7 @@
 # Glasses
 - type: entity
-  parent: ClothingEyesGlassesMeson
   id: ClothingEyesPunkGoggles
+  parent: [ ClothingEyesGlassesMeson, RecyclableItemClothDevice ]
   name: punk goggles
   description: How can you see anything in this with all the lights?
   components:
@@ -36,8 +36,8 @@
 
 # HUDs
 - type: entity
-  parent: ClothingEyesHudMedical
   id: ClothingEyesPunkInfoShades
+  parent: [ ClothingEyesHudMedical, RecyclableItemClothDevice ]
   name: punk infoshades
   description: How can you see anything in this with all the lights?
   components:
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml
index 765cc63baf59..c5ca7d83d058 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml
@@ -45,3 +45,13 @@
     sprite: _NF/Clothing/Eyes/Hud/nfsd_patch.rsi
   - type: Clothing
     sprite: _NF/Clothing/Eyes/Hud/nfsd_patch.rsi
+
+- type: entity
+  parent: ClothingEyesHudSecurity
+  id: ClothingEyesHudBountyHunter
+  name: bounty hunter hud
+  description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status, criminal records and health status.
+  components:
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_punk.yml
index 05145c70c04c..e2255d662068 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_punk.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_punk.yml
@@ -1,7 +1,7 @@
 
 - type: entity
-  parent: ClothingMaskGasSecurity
   id: ClothingMaskPunkHalf
+  parent: [ ClothingMaskGasSecurity, RecyclableItemClothDevice ]
   name: punk halfmask
   description: A close-fitting breathing mask with gamer lights!
   suffix: Random visuals
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor_punk.yml
index c20ccc21e3bd..81cfa695c653 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor_punk.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor_punk.yml
@@ -1,7 +1,7 @@
 
 - type: entity
-  parent: ClothingOuterVestWebMercenary
   id: ClothingOuterArmorPunkGreen
+  parent: [ ClothingOuterVestWebMercenary, RecyclableItemClothArmor ]
   name: punk armor
   components:
   - type: Sprite
@@ -80,8 +80,8 @@
         #mask_null: ""
 
 - type: entity
-  parent: ClothingOuterArmorBulletproof
   id: ClothingOuterArmorElitePunkRandomized
+  parent: [ ClothingOuterStorageBase, ClothingOuterArmorBulletproof, RecyclableItemClothArmor ]
   name: punk heavy armor
   suffix: Random visuals
   components:
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml
index b8a7038cfad7..4426946c2d02 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml
@@ -1,8 +1,8 @@
 
 # Acid raincoat
 - type: entity
-  parent: ClothingOuterStorageToggleableBase
   id: ClothingOuterCoatAcidRaincoat
+  parent: [ ClothingOuterStorageToggleableBase, RecyclableItemClothDurable ]
   name: acid raincoat
   description: Mostly transparent raincoat made out of acid resistant polymers. Please, for the love of Space God, do wear undergarments.
   components:
@@ -67,8 +67,8 @@
 
 # Jackets
 - type: entity
-  parent: ClothingOuterStorageBase
   id: ClothingOuterCoatBomberPunkRed
+  parent: [ ClothingOuterStorageBase, RecyclableItemClothDurable ]
   name: red punk bomber
   description: Ya gotta 'ave style on dem streets.
   components:
@@ -78,8 +78,8 @@
     sprite: _NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
   id: ClothingOuterCoatJacketLeather
+  parent: [ ClothingOuterStorageBase, RecyclableItemClothDurable ]
   name: leather jacket
   description: Rock'n'roll, babe!
   components:
@@ -89,8 +89,8 @@
     sprite: _NF/Clothing/OuterClothing/Coats/jacket_leather.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
   id: ClothingOuterCoatJacketBiker
+  parent: [ ClothingOuterStorageBase, RecyclableItemClothDurable ]
   name: biker jacket
   description: Made out of toughest synthleather for toughest badasses.
   components:
@@ -100,8 +100,8 @@
     sprite: _NF/Clothing/OuterClothing/Coats/jacket_biker.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
   id: ClothingOuterCoatJacketJamrock
+  parent: [ ClothingOuterStorageBase, RecyclableItemClothDurable ]
   name: jamrock blazer
   description: Welcome to jamrock.
   components:
@@ -111,8 +111,8 @@
     sprite: _NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
   id: ClothingOuterCoatBomberAerostatic
+  parent: [ ClothingOuterStorageBase, RecyclableItemClothDurable ]
   name: aerostatic bomber
   description: When you wear it, you can always hear the sickest guitar solo in your mind.
   components:
@@ -122,8 +122,8 @@
     sprite: _NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
   id: ClothingOuterCoatJacketLettermanBlue
+  parent: [ ClothingOuterStorageBase, RecyclableItemClothDurable ]
   name: blue letterman jacket
   description: Where is your lacrosse stick?
   components:
@@ -133,8 +133,8 @@
     sprite: _NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
   id: ClothingOuterCoatJacketLettermanBrown
+  parent: [ ClothingOuterStorageBase, RecyclableItemClothDurable ]
   name: brown letterman jacket
   description: Where is your lacrosse stick?
   components:
@@ -144,8 +144,8 @@
     sprite: _NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
   id: ClothingOuterCoatJacketLettermanRed
+  parent: [ ClothingOuterStorageBase, RecyclableItemClothDurable ]
   name: red letterman jacket
   description: Where is your lacrosse stick?
   components:
@@ -155,8 +155,8 @@
     sprite: _NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
   id: ClothingOuterCoatJacketLettermanMagenta
+  parent: [ ClothingOuterStorageBase, RecyclableItemClothDurable ]
   name: magenta letterman jacket
   description: Where is your holocrosse joystick?
   components:
@@ -166,8 +166,8 @@
     sprite: _NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
   id: ClothingOuterCoatBomberPinkSleeves
+  parent: [ ClothingOuterStorageBase, RecyclableItemClothDurable ]
   name: bomber jacket
   description: Oi! Whatcha lookin' at?
   components:
@@ -178,8 +178,8 @@
 
 # Procedural punk jackets
 - type: entity
-  parent: ClothingOuterStorageBase
   id: ClothingOuterCoatBomberRandomized
+  parent: [ ClothingOuterStorageBase, RecyclableItemClothDurable ]
   name: punk jacket
   description: Oi! Whatcha lookin' at?
   suffix: Random visuals
@@ -226,8 +226,8 @@
         mask_null: ""
 
 - type: entity
-  parent: ClothingOuterStorageBase
   id: ClothingOuterCoatLettermanRandomized
+  parent: [ ClothingOuterStorageBase, RecyclableItemClothDurable ]
   name: punk letterman jacket
   description: Where is your holocrosse joystick?
   suffix: Random visuals
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml
index ae33ba162e8a..63d90d8c2d5f 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml
@@ -1,7 +1,7 @@
 
 - type: entity
-  parent: ClothingShoesBaseButcherable
   id: ClothingShoesBootsPunkRandomized
+  parent: [ ClothingShoesMilitaryBase, RecyclableItemClothSmall ]
   name: punk boots
   description: Deez boots were made for stompin', an' stompin' on ya bucket dey'll do.
   suffix: Random visuals
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits_punk.yml
index 235f7d782fa6..bb78424362e8 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits_punk.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits_punk.yml
@@ -1,7 +1,7 @@
 # PANTS
 - type: entity
-  parent: ClothingUniformBase
   id: ClothingUniformRandomPunkCroptop
+  parent: [ ClothingUniformBase, RecyclableItemClothBasic ]
   name: punk croptop jumpsuit
   description: Generated by neural networks based on the latest fashion trends.
   suffix: Random visuals
@@ -46,8 +46,8 @@
           mask_null: ""
 
 - type: entity
-  parent: ClothingUniformRandomPunkCroptop
   id: ClothingUniformRandomPunkTanktop
+  parent: ClothingUniformRandomPunkCroptop
   name: punk tanktop jumpsuit
   components:
   - type: RandomSprite
@@ -68,8 +68,8 @@
           mask_null: ""
 
 - type: entity
-  parent: ClothingUniformRandomPunkCroptop
   id: ClothingUniformRandomArmlessNoSkirt
+  parent: ClothingUniformRandomPunkCroptop
   name: colorful armless jumpsuit
   components:
   - type: Sprite
@@ -96,8 +96,8 @@
 
 # SHORTS
 - type: entity
-  parent: ClothingUniformBase
   id: ClothingUniformRandomPunkCroptopShorts
+  parent: [ ClothingUniformBase, RecyclableItemClothBasic ]
   name: punk croptop short jumpsuit
   description: Generated by neural networks based on the latest fashion trends.
   suffix: Random visuals
@@ -141,8 +141,8 @@
           mask_null: ""
 
 - type: entity
-  parent: ClothingUniformRandomPunkCroptopShorts
   id: ClothingUniformRandomPunkTanktopShorts
+  parent: ClothingUniformRandomPunkCroptopShorts
   name: punk tanktop short jumpsuit
   components:
   - type: RandomSprite
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/recyclable_clothing_base.yml b/Resources/Prototypes/_NF/Entities/Clothing/recyclable_clothing_base.yml
new file mode 100644
index 000000000000..f32d0d0f882e
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/recyclable_clothing_base.yml
@@ -0,0 +1,77 @@
+# Clothes
+- type: entity # Gloves, boots
+  id: RecyclableItemClothSmall
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Cloth: 100
+  - type: Butcherable # Yields ~30% more if it rounds to whole up
+    butcheringType: Knife
+    spawned:
+    - id: MaterialCloth1
+      amount: 1
+
+- type: entity # Wearable devices: HUDs, glasses, gasmasks etc.
+  id: RecyclableItemClothDevice
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
+      Glass: 100
+  - type: Butcherable # Yields ~30% more if it rounds to whole up
+    butcheringType: Knife # Would rather use screwdriver, but looks like butcheringType has hardcoded list of types
+    spawned:
+    - id: SheetSteel1
+      amount: 1
+    - id: SheetGlass1
+      amount: 1
+
+- type: entity # Jumpsuits, backpacks, belts etc.
+  id: RecyclableItemClothBasic
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Cloth: 200
+  - type: Butcherable # Yields ~30% more if it rounds to whole up
+    butcheringType: Knife
+    spawned:
+    - id: MaterialCloth1
+      amount: 3
+
+- type: entity # Coats and jackets
+  id: RecyclableItemClothDurable
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Cloth: 200
+      Durathread: 100
+  - type: Butcherable # Yields ~30% more if it rounds to whole up
+    butcheringType: Knife
+    spawned:
+    - id: MaterialCloth1
+      amount: 3
+    - id: MaterialDurathread1
+      amount: 1
+
+- type: entity # Armor
+  id: RecyclableItemClothArmor
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Durathread: 500
+      Plasteel: 200
+      Steel: 200
+  - type: Butcherable # Yields ~30% more if it rounds to whole up
+    butcheringType: Knife
+    spawned:
+    - id: MaterialDurathread1
+      amount: 7
+    - id: SheetSteel1
+      amount: 3
+    - id: SheetPlasteel1
+      amount: 3
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
index 4f856692969f..37c2b7af22c4 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
@@ -674,6 +674,7 @@
     - DawInstrumentMachineCircuitboard
     - ComputerIFFCircuitboard
     - SpawnDungeonLootFlatpacks
+    - MercenaryTechFabCircuitboardNF
     chance: 1
     offset: 0.0
     rarePrototypes:
@@ -1034,11 +1035,12 @@
     - ComputerResearchAndDevelopmentFlatpack
     - ResearchAndDevelopmentServerFlatpack
     - AmmoTechFabFlatpack
+    - MercenaryTechFabFlatpack
     chance: 0.95
     offset: 0.0
     rarePrototypes:
     - VendingMachineSyndieContrabandFlatpack
-    rareChance: 0.01
+    rareChance: 0.005
 
 - type: entity
   name: random restock box
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
index d6febd2a05d4..9d56cd1edd72 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
@@ -583,5 +583,17 @@
   - type: RandomSpawner
     prototypes:
     - AmmoTechFab
+    - MercenaryTechFab
+    - MercenaryTechFabFlatpack
+    - MercenaryTechFabCircuitboardNF
+    - AmmoTechFabFlatpack
     chance: 1
     offset: 0.0
+    rarePrototypes:
+    - MercenaryTechFab
+    - MercenaryTechFabFlatpack
+    - MercenaryTechFabCircuitboardNF
+    - AmmoTechFabFlatpack
+    - MercenaryTechFabCircuitboardHackedNF
+    - MercenaryTechFabHacked
+    rareChance: 0.005
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
index 120ce238e0e0..4124dcbc2df5 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
@@ -498,14 +498,29 @@
   - type: Flatpack
     entity: OreProcessorIndustrial
 
+# Mercenary
 - type: entity
-  parent: OreProcessorFlatpack
+  parent: BaseNFFlatpack
   id: AmmoTechFabFlatpack
   name: ammo techfab flatpack
   description: A flatpack used for constructing an ammo techfab.
   components:
   - type: Flatpack
     entity: AmmoTechFab
+  - type: Sprite
+    layers:
+    - state: mercenary
+
+- type: entity
+  parent: AmmoTechFabFlatpack
+  id: MercenaryTechFabFlatpack
+  name: mercenary techfab flatpack
+  description: A flatpack used for constructing a mercenary techfab.
+  components:
+  - type: Flatpack
+    entity: MercenaryTechFab
+  - type: StaticPrice
+    price: 600
 
 # Consoles
 - type: entity
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
index 4d89fa756c7f..a57f0eb63133 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
@@ -45,6 +45,41 @@
           amount: 2
           defaultPrototype: Beaker
 
+- type: entity
+  id: MercenaryTechFabCircuitboardNF
+  parent: SecurityTechFabCircuitboard
+  name: mercenary techfab machine board
+  description: A machine printed circuit board for a mercenary techfab
+  components:
+    - type: MachineBoard
+      prototype: MercenaryTechFab
+      requirements:
+        MatterBin: 2
+        Manipulator: 2
+      tagRequirements:
+        GlassBeaker:
+          amount: 2
+          defaultPrototype: Beaker
+
+- type: entity
+  id: MercenaryTechFabCircuitboardHackedNF
+  parent: SecurityTechFabCircuitboard
+  name: hacked mercenary techfab machine board
+  description: A spray painted circuit board for a mercenary techfab with some doodads attached to it. Don't worry 'bout it, choomba.
+  components:
+    - type: Sprite
+      sprite: _NF/Objects/Misc/module.rsi
+      state: hacked-merc-fab-board
+    - type: MachineBoard
+      prototype: MercenaryTechFabHacked
+      requirements:
+        MatterBin: 2
+        Manipulator: 2
+      tagRequirements:
+        GlassBeaker:
+          amount: 2
+          defaultPrototype: Beaker
+
 # TechFab
 - type: entity
   id: NfsdTechFabCircuitboard
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml b/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml
index f85e21f16aba..526ae330d4a1 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml
@@ -5,8 +5,6 @@
   description: A reinforced casing for storing long weapons and accessories.
   suffix: Long
   components:
-  - type: ExplosionResistance
-    damageCoefficient: 0.3
   - type: Sprite
     sprite: _NF/Objects/Storage/Cases/guncaselong.rsi
     layers:
@@ -87,6 +85,8 @@
   description: A reinforced casing for storing explosives.
   suffix: Short
   components:
+  - type: ExplosionResistance
+    damageCoefficient: 0.2
   - type: Sprite
     sprite: _NF/Objects/Storage/Cases/explosivescaseshort.rsi
   - type: Item
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Holographic/graffiti.yml b/Resources/Prototypes/_NF/Entities/Structures/Holographic/graffiti.yml
index 71b958ac7683..5d057880ae93 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Holographic/graffiti.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Holographic/graffiti.yml
@@ -1,4 +1,34 @@
 # Random graffiti
+- type: entity # Used as overlay for "vandalised" machines
+  abstract: true
+  id: PunkHoloGraffitiOverlay
+  components:
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti01: CyberpunkNeon
+        holograffiti02: CyberpunkNeon
+        holograffiti03: CyberpunkNeon
+        holograffiti04: CyberpunkNeon
+        holograffiti05: CyberpunkNeon
+        holograffiti06: CyberpunkNeon
+        holograffiti07: CyberpunkNeon
+        holograffiti08: CyberpunkNeon
+        holograffiti09: CyberpunkNeon
+        holograffiti10: CyberpunkNeon
+        holograffiti11: CyberpunkNeon
+        holograffiti12: CyberpunkNeon
+        holograffiti13: CyberpunkNeon
+        holograffiti14: CyberpunkNeon
+        holograffiti15: CyberpunkNeon
+        holograffiti16: CyberpunkNeon
+        holograffiti17: CyberpunkNeon
+        holograffiti18: CyberpunkNeon
+        holograffiti19: CyberpunkNeon
+        holograffiti20: CyberpunkNeon
+        holograffiti21: CyberpunkNeon
+        holograffiti22: CyberpunkNeon
+
 - type: entity
   name: holograffiti
   id: SpawnerHoloGraffitiRandom
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index 2bc17f53564b..9df21cd3a130 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -233,11 +233,11 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Structures/Machines/techfab.rsi
+    sprite: _NF/Structures/Machines/techfab.rsi
     layers:
     - state: icon
       map: ["enum.LatheVisualLayers.IsRunning"]
-    - state: cargo
+    - state: salvage
     - state: unlit
       shader: unshaded
       map: ["enum.PowerDeviceVisualLayers.Powered"]
@@ -251,49 +251,50 @@
     idleState: icon
     runningState: icon
     staticRecipes:
-      #- Durathread
-      #- Plasteel
-      #- SheetSteel
-      #- SheetPlasteel
-      #- SheetPlasma30
-      #- SheetUranium30
-      #- SheetGlass30
-      #- SheetRGlass
-      #- SheetPlastic
-      - ClothingOuterEVASuitCargo
-      - ClothingOuterEVASuitSalvage
+    # Shared lathe recipes
+    ## Basic tools
       - Wirecutter
-      - Signaller
       - Screwdriver
       - Welder
       - Wrench
       - Crowbar
       - Multitool
-      - NetworkConfigurator
       - FlashlightLantern
-      - HandheldGPSBasic
-      - TRayScanner
-      - AirTank
-      - GasAnalyzer
-      - ClothingBeltSalvageWebbing
-      - Pickaxe
       - AppraisalTool
       - HandLabeler
+      - Signaller
+      - ClothingMaskWeldingGas
+    ## Basic storage
+      - ToolboxArtisticNF
+      - ToolboxElectricalNF
+      - ToolboxMechanicalNF
+      - ToolboxEmergencyNF
+    ## Basic parts
+      - CableStack
       - LightTube
+      - LedLightTube
       - SodiumLightTube
       - ExteriorLightTube
       - LightBulb
-      - DrinkMugMetal
+      - LedLightBulb
+      - ConveyorBeltAssembly
       - PowerCellSmall
       - PowerCellMedium
-      - EmergencyRollerBedSpawnFolded
-      - CableStack
-      - ConveyorBeltAssembly
-      - DoorElectronics
-      - StationMapElectronics
+    ## Basic electronics
+      - SignalTimerElectronics
       - CellRechargerCircuitboard
       - BorgChargerCircuitboard
       - WeaponCapacitorRechargerCircuitboard
+    ## Basic EVA:
+      - ClothingOuterEVASuitContractor
+      - ClothingOuterEVASuitPilot
+      - AirTank
+      - HandheldGPSBasic
+    # Salvage techfab
+      - ClothingOuterEVASuitCargo
+      - ClothingOuterEVASuitSalvage
+      - ClothingBeltSalvageWebbing
+      - Pickaxe
       - RadioHandheld
       - Floodlight
       - FlareLathe
@@ -311,15 +312,20 @@
       - ClothingNeckIFFBlue
       - ClothingNeckIFFOrange
       - ClothingNeckIFFPurple
+      - LanternNF
     dynamicRecipes:
-      - Bucket
-      - MopItem
-      - SprayBottle
-      - FireExtinguisher
-      - CableMVStack
-      - CableHVStack
+    # Shared lathe recipes
+    ## Advanced tools
+      - WelderExperimental
+      - JawsOfLife
+      - PowerDrill
+      - JetpackVoid
       - PowerCellHigh
+      #- PowerCellHyperNF
       - PowerCellMicroreactor
+    # Salvage techfab
+      - CableMVStack
+      - CableHVStack
       - WeaponCrusher
       - WeaponCrusherDagger
       - WeaponCrusherGlaive
@@ -329,9 +335,6 @@
       - ClothingBackpackDuffelHolding
       - ClothingBackpackMessengerHolding
       - OreBagOfHolding
-      - WelderExperimental
-      - JawsOfLife
-      - JetpackVoid
       - ClothingOuterHardsuitBasic
       - ClothingOuterHardsuitSpatio
       - ClothingOuterHardsuitSalvage
@@ -341,28 +344,19 @@
       - ClothingOuterHardsuitAncientEVA
   - type: EmagLatheRecipes
     emagStaticRecipes:
-#       - CartridgePistol
-#       - CartridgeMagnum
-#       - ShellShotgun
-#       - ShellShotgunFlare
        - ShellTranquilizer
-#       - CartridgeLightRifle
-#       - CartridgeRifle
        - MagazineBoxPistol
        - MagazineBoxMagnum
        - MagazineBoxRifle
        - MagazineBoxLightRifle
        - GrenadeBlast
        - ClothingHeadHelmetCosmonaut
-#       - ClothingHeadHelmetSyndicate # Frontier
-#       - ClothingOuterHardsuitSyndicate # Frontier
   - type: MaterialStorage
     whitelist:
       tags:
         - Sheet
         - RawMaterial
         - Ingot
-#        - Ore
 
 - type: entity
   id: NfsdTechFab
@@ -385,3 +379,418 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Machine
     board: NfsdTechFabCircuitboard
+
+- type: entity
+  id: MercenaryTechFab
+  parent: BaseLatheLube
+  name: mercenary techfab
+  description: Prints the bare minimum of tools of the trade that any budget mercenary or private security could need. Nothing fancy.
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Machines/techfab.rsi
+    layers:
+    - state: icon
+      map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: mercenary
+    - state: unlit
+      shader: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: inserting
+      map: ["enum.MaterialStorageVisualLayers.Inserting"]
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Machine
+    board: MercenaryTechFabCircuitboardNF
+  - type: MaterialStorage
+    whitelist:
+      tags:
+      - Sheet
+      - RawMaterial
+      - Ingot
+  - type: Lathe
+    idleState: icon
+    runningState: icon
+    staticRecipes:
+    # Shared lathe recipes
+    ## Basic tools
+      - Wirecutter
+      - Screwdriver
+      - Welder
+      - Wrench
+      - Crowbar
+      - Multitool
+      - FlashlightLantern
+      - AppraisalTool
+      - HandLabeler
+      - Signaller
+      - ClothingMaskWeldingGas
+    ## Basic storage
+      - ToolboxArtisticNF
+      - ToolboxElectricalNF
+      - ToolboxMechanicalNF
+      - ToolboxEmergencyNF
+    ## Basic parts
+      - CableStack
+      - LightTube
+      - LedLightTube
+      - SodiumLightTube
+      - ExteriorLightTube
+      - LightBulb
+      - LedLightBulb
+      - ConveyorBeltAssembly
+      - PowerCellSmall
+      - PowerCellMedium
+    ## Basic electronics
+      - SignalTimerElectronics
+      - CellRechargerCircuitboard
+      - BorgChargerCircuitboard
+      - WeaponCapacitorRechargerCircuitboard
+    ## Basic EVA:
+      - ClothingOuterEVASuitContractor
+      - ClothingOuterEVASuitPilot
+      - AirTank
+      - HandheldGPSBasic
+    # Mercenary techfab
+    ## Clothing / Armor
+      - RiotShield
+      - ClothingNeckIFFNeutral
+      - ClothingNeckIFFGreen
+      - ClothingNeckIFFRed
+      - ClothingNeckIFFBlue
+      - ClothingNeckIFFOrange
+      - ClothingNeckIFFPurple
+      - ClothingHeadHelmetMercenary
+      - ClothingHeadHelmetBasic
+      - ClothingOuterVestWebMercenary
+      - ClothingOuterVestWebMercenaryBlack
+      - ClothingBeltMercenaryWebbing
+      - ClothingBeltMilitaryWebbing
+      - ClothingHandsMercenaryGlovesCombat
+      - ClothingHandsGlovesCombat
+      - ClothingShoesBootsMercenary
+      - ClothingShoesBootsCombat
+      - ClothingShoesBootsJack
+      - ClothingEyesGlassesMercenary
+      - ClothingEyesGlassesSunglasses
+      - ClothingMaskGasMercenary
+      - ClothingMaskBreathMedicalSecurity
+      - ClothingMaskGasSecurity
+      - ClothingBeltBandolier
+    ## EVA / Hardsuits
+      - ClothingOuterEVASuitMercenary
+      - ClothingOuterEVASuitPrivateSec
+    ## Storage
+      - MedkitCombat
+      - WeaponCaseShort
+      - WeaponCaseLong
+      - WeaponCaseHeavy
+      - WeaponCaseShortAmmo
+      - WeaponCaseShortExplosives
+    ## Weapons
+      - CombatKnife
+      - WeaponLaserSvalinn # After the changes made to windows shouldn't be that much of an issue now if it's widely available
+      - WeaponLaserPistolNF # After the changes made to windows shouldn't be that much of an issue now if it's widely available
+      - WeaponRevolverArgenti
+      - WeaponPistolMk58NF
+      - WeaponShotgunDoubleBarreled
+      - WeaponRifleNovaliteC1
+      - WeaponRifleGestio
+      - BaseBallBatNF
+    ## Ammo boxes
+      - BoxLethalshot
+      - MagazineBoxLightRifle
+      - MagazineBoxPistol
+      - MagazineBoxRifle
+    ## Mags / Speedloaders / Clips
+      - MagazineNovaliteC1Empty
+      - MagazineNovaliteC1
+      - MagazineLightRifleLowCapacityEmpty
+      - MagazineLightRifleLowCapacity
+      - MagazineLightRifle
+      - MagazineLightRifleEmpty
+      - MagazineRifle
+      - MagazineRifleEmpty
+      - MagazinePistol
+      - MagazinePistolEmpty
+      - SpeedLoaderRifleHeavy
+      - SpeedLoaderRifleHeavyEmpty
+    dynamicRecipes:
+    # Shared lathe recipes
+    ## Advanced tools
+      - WelderExperimental
+      - JawsOfLife
+      - PowerDrill
+      - JetpackVoid
+      - PowerCellHigh
+      # - PowerCellHyperNF
+      - PowerCellMicroreactor
+    # Mercenary techfab
+    ## Armor
+      - TelescopicShield
+      - ClothingOuterArmorBulletproofNF
+      - ClothingOuterCoatBHTrench
+      - ClothingOuterArmorPunkRandomized
+      - ClothingOuterArmorPunkRed
+      - ClothingOuterArmorPunkGreen
+      - ClothingOuterArmorPunkOrange
+      - ClothingOuterArmorElitePunkRandomized
+      - ClothingBeltPunkRandomized
+      - ClothingShoesBootsPunkRandomized
+      - ClothingEyesPunkGoggles
+      - ClothingEyesPunkInfoShades
+      - ClothingMaskPunkHalf
+      - ClothingUniformRandomPunkTanktop
+      - ClothingUniformRandomPunkTanktopShorts
+      - ClothingUniformRandomPunkCroptop
+      - ClothingUniformRandomPunkCroptopShorts
+      - ClothingOuterCoatLettermanRandomized
+      - ClothingOuterCoatBomberRandomized
+    ## EVA / Hardsuits
+      - ClothingOuterHardsuitCap
+      - ClothingOuterHardsuitMercenary
+      - ClothingOuterHardsuitPrivateSecurity
+      - ClothingOuterHardsuitScaf
+      - ClothingShoesBootsMagCombat
+      - ClothingShoesBootsMagMercenary
+    ## Utilities
+      - ForensicPad
+      - ClothingEyesHudBountyHunter
+      - ClothingEyesPunkInfoShades
+      - PinpointerUniversalNF
+      - Handcuffs
+      - SignalTrigger
+      - PortableRecharger
+      - TimerTrigger
+      - VoiceTrigger
+      - TurboItemRechargerCircuitboard
+      - ClothingBackpackHolding
+      - ClothingBackpackSatchelHolding
+      - ClothingBackpackDuffelHolding
+      - ClothingBackpackMessengerHolding
+      - FlashlightSecliteNF
+    ## Weapons
+      - WeaponGrapplingGun
+      - KatanaNF
+      - KukriKnifeNF
+      - MacheteNF
+      - Stunbaton
+      - BolaNF
+      - ExplosivePayload
+      - FlashPayload
+      - ChemicalPayload
+      - WeaponShotgunKammererNF
+      - WeaponAdvancedLaser # After the changes made to windows shouldn't be that much of an issue now if it's widely available
+      - WeaponAntiqueLaserNF # After the changes made to windows shouldn't be that much of an issue now if it's widely available
+      - WeaponLaserCarbine
+      - WeaponDisabler
+    ## Mags / Speedloaders / Clips
+    ## Ammo boxes
+      - BoxBeanbag
+      - BoxShellTranquilizer
+      - MagazineBoxLightRifleRubber
+      - MagazineBoxMagnumRubber
+      - MagazineBoxPistolRubber
+      - MagazineBoxRifleRubber
+      - MagazineShotgunBeanbag
+
+- type: entity
+  id: MercenaryTechFabHacked
+  parent:
+  - MercenaryTechFab
+  - BaseHyperlathe
+  - PunkHoloGraffitiOverlay # Prototype can be located at \Resources\Prototypes\_NF\Entities\Structures\Holographic\graffiti.yml
+  name: hacked mercenary techfab
+  description: Prints the bare minimum of tools of the trade that any budget mercenary or private security could need. Nothing fancy.
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Machines/techfab.rsi
+    layers:
+    - state: icon
+      map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: mercenary
+    - state: unlit
+      shader: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: inserting
+      map: ["enum.MaterialStorageVisualLayers.Inserting"]
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+    - sprite: _NF/Structures/Holo/graffiti/simple.rsi
+      state: holograffiti01
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.7, 0.7
+  - type: Machine
+    board: MercenaryTechFabCircuitboardHackedNF
+  - type: MaterialStorage
+    whitelist:
+      tags:
+      - Sheet
+      - RawMaterial
+      - Ingot
+  - type: PointLight
+    radius: 1.5
+    energy: 2
+  - type: RgbLightController
+    layers: [ 0 ]
+  - type: Lathe
+    idleState: icon
+    runningState: icon
+    staticRecipes:
+    # Shared lathe recipes
+    ## Basic tools
+      - Wirecutter
+      - Screwdriver
+      - Welder
+      - Wrench
+      - Crowbar
+      - Multitool
+      - HandLabeler
+      - Signaller
+      - ClothingMaskWeldingGas
+    ## Basic storage
+      - ToolboxArtisticNF
+      - ToolboxElectricalNF
+      - ToolboxMechanicalNF
+      - ToolboxEmergencyNF
+    ## Basic parts
+      - CableStack
+      - LightTube
+      - LedLightTube
+      - SodiumLightTube
+      - ExteriorLightTube
+      - LightBulb
+      - LedLightBulb
+      - ConveyorBeltAssembly
+      - PowerCellSmall
+      - PowerCellMedium
+    ## Basic electronics
+      - SignalTimerElectronics
+      - CellRechargerCircuitboard
+      - BorgChargerCircuitboard
+      - WeaponCapacitorRechargerCircuitboard
+    ## Basic EVA:
+      - ClothingOuterEVASuitContractor
+      - ClothingOuterEVASuitPilot
+      - AirTank
+      - HandheldGPSBasic
+    # Mercenary techfab
+    ## Utility
+      - ColoredLightTubeRedNF
+      - ColoredLightTubeBlackLightNF
+      - ColoredLightTubeFrostyBlueNF
+    ## Clothing / Armor
+      - RiotShield
+      - ClothingHandsMercenaryGlovesCombat
+      - ClothingHandsGlovesCombat
+      - ClothingOuterArmorPunkRandomized
+      - ClothingOuterArmorPunkRed
+      - ClothingOuterArmorPunkGreen
+      - ClothingOuterArmorPunkOrange
+      - ClothingOuterArmorElitePunkRandomized
+      - ClothingBeltPunkRandomized
+      - ClothingShoesBootsPunkRandomized
+      - ClothingEyesPunkGoggles
+      - ClothingEyesPunkInfoShades
+      - ClothingMaskPunkHalf
+      - ClothingUniformRandomPunkTanktop
+      - ClothingUniformRandomPunkTanktopShorts
+      - ClothingUniformRandomPunkCroptop
+      - ClothingUniformRandomPunkCroptopShorts
+      - ClothingOuterCoatLettermanRandomized
+      - ClothingOuterCoatBomberRandomized
+    ## Storage
+      - MedkitCombat
+      - WeaponCaseShort
+      - WeaponCaseLong
+      - WeaponCaseHeavy
+      - WeaponCaseShortAmmo
+      - WeaponCaseShortExplosives
+    ## Weapons
+      - WeaponLaserSvalinn # After the changes made to windows shouldn't be that much of an issue now if it's widely available
+      - WeaponLaserPistolNF
+      - WeaponPistolMk58NF
+      - WeaponRifleNovaliteC1
+      - WeaponRifleGestio
+      - BaseBallBatNF
+      - KatanaNF
+      - KukriKnifeNF
+    ## Ammo boxes
+      - BoxLethalshot
+      - MagazineBoxLightRifle
+      - MagazineBoxPistol
+      - MagazineBoxRifle
+    ## Mags / Speedloaders / Clips
+      - MagazineNovaliteC1Empty
+      - MagazineNovaliteC1
+      - MagazineLightRifleLowCapacityEmpty
+      - MagazineLightRifleLowCapacity
+      - MagazineLightRifle
+      - MagazineLightRifleEmpty
+      - MagazineRifle
+      - MagazineRifleEmpty
+      - MagazinePistol
+      - MagazinePistolEmpty
+      - SpeedLoaderRifleHeavy
+      - SpeedLoaderRifleHeavyEmpty
+    dynamicRecipes:
+    # Shared lathe recipes
+    ## Advanced tools
+      - WelderExperimental
+      - JawsOfLife
+      - PowerDrill
+      - JetpackVoid
+      - PowerCellHigh
+      # - PowerCellHyperNF
+      - PowerCellMicroreactor
+    # Mercenary techfab
+    ## Armor
+      - TelescopicShield
+      - ClothingOuterArmorBulletproofNF
+      - ClothingOuterCoatBHTrench
+    ## EVA / Hardsuits
+      - ClothingOuterHardsuitCap
+      - ClothingOuterHardsuitMercenary
+      - ClothingOuterHardsuitPrivateSecurity
+      - ClothingOuterHardsuitScaf
+      - ClothingShoesBootsMagCombat
+      - ClothingShoesBootsMagMercenary
+    ## Utilities
+      - PinpointerUniversalNF
+      - Handcuffs
+      - SignalTrigger
+      - PortableRecharger
+      - TimerTrigger
+      - VoiceTrigger
+      - TurboItemRechargerCircuitboard
+      - ClothingBackpackHolding
+      - ClothingBackpackSatchelHolding
+      - ClothingBackpackDuffelHolding
+      - ClothingBackpackMessengerHolding
+      - FlashlightSecliteNF
+    ## Weapons
+      - GrenadeBlast
+      - GrenadeEMP
+      - GrenadeFlash
+      - Truncheon
+      - MacheteNF
+      - Stunbaton
+      - BolaNF
+      - ChemicalPayload
+      - WeaponShotgunKammererNF
+      - WeaponAdvancedLaser # After the changes made to windows shouldn't be that much of an issue now if it's widely available
+      - WeaponAntiqueLaserNF # After the changes made to windows shouldn't be that much of an issue now if it's widely available
+      - WeaponLaserCarbine
+      - WeaponDisabler
+      - WeaponLaserCannon
+    ## Ammo boxes
+      - BoxShotgunIncendiary
+      - MagazineBoxLightRifleIncendiary
+      - MagazineBoxMagnumIncendiary
+      - MagazineBoxPistolIncendiary
+      - MagazineBoxRifleIncendiary
+      - BoxShotgunUranium
+      - MagazineBoxLightRifleUranium
+      - MagazineBoxMagnumUranium
+      - MagazineBoxPistolUranium
+      - MagazineBoxRifleUranium
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
index cc1f3822d798..8888ec5bc9a6 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
@@ -456,7 +456,9 @@
 
 # Punk stuff
 - type: entity
-  parent: VendingMachineClothing
+  parent:
+  - VendingMachine
+  - PunkHoloGraffitiOverlay # Prototype can be located at \Resources\Prototypes\_NF\Entities\Structures\Holographic\graffiti.yml
   id: VendingMachineClothingPunk
   name: ThreadsChoom
   description: A vandalized ClothesMate.
@@ -487,34 +489,11 @@
       map: [ "graffiti" ]
       shader: unshaded
       scale: 0.7, 0.7
-  - type: RandomSprite
-    available:
-    - graffiti:
-        holograffiti01: Cyberpunk
-        holograffiti02: Cyberpunk
-        holograffiti03: Cyberpunk
-        holograffiti04: Cyberpunk
-        holograffiti05: Cyberpunk
-        holograffiti06: Cyberpunk
-        holograffiti07: Cyberpunk
-        holograffiti08: Cyberpunk
-        holograffiti09: Cyberpunk
-        holograffiti10: Cyberpunk
-        holograffiti11: Cyberpunk
-        holograffiti12: Cyberpunk
-        holograffiti13: Cyberpunk
-        holograffiti14: Cyberpunk
-        holograffiti15: Cyberpunk
-        holograffiti16: Cyberpunk
-        holograffiti17: Cyberpunk
-        holograffiti18: Cyberpunk
-        holograffiti19: Cyberpunk
-        holograffiti20: Cyberpunk
-        holograffiti21: Cyberpunk
-        holograffiti22: Cyberpunk
 
 - type: entity
-  parent: VendingMachineBountyVend
+  parent:
+  - VendingMachine
+  - PunkHoloGraffitiOverlay # Prototype can be located at \Resources\Prototypes\_NF\Entities\Structures\Holographic\graffiti.yml
   id: VendingMachineBountyVendPunk
   name: BonanzaMatic
   description: A vandalised BountyVend.
@@ -541,31 +520,6 @@
       map: [ "graffiti" ]
       shader: unshaded
       scale: 0.7, 0.7
-  - type: RandomSprite
-    available:
-    - graffiti:
-        holograffiti01: Cyberpunk
-        holograffiti02: Cyberpunk
-        holograffiti03: Cyberpunk
-        holograffiti04: Cyberpunk
-        holograffiti05: Cyberpunk
-        holograffiti06: Cyberpunk
-        holograffiti07: Cyberpunk
-        holograffiti08: Cyberpunk
-        holograffiti09: Cyberpunk
-        holograffiti10: Cyberpunk
-        holograffiti11: Cyberpunk
-        holograffiti12: Cyberpunk
-        holograffiti13: Cyberpunk
-        holograffiti14: Cyberpunk
-        holograffiti15: Cyberpunk
-        holograffiti16: Cyberpunk
-        holograffiti17: Cyberpunk
-        holograffiti18: Cyberpunk
-        holograffiti19: Cyberpunk
-        holograffiti20: Cyberpunk
-        holograffiti21: Cyberpunk
-        holograffiti22: Cyberpunk
   - type: PointLight
     radius: 1.1
     energy: 1.2
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml b/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
index fb792004c9c0..e2428e23baf8 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
@@ -1,3 +1,35 @@
+- type: latheRecipe # novalite mag
+  id: MagazineNovaliteC1Empty
+  result: MagazineNovaliteC1Empty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 20
+
+- type: latheRecipe # novalite mag
+  id: MagazineNovaliteC1
+  result: MagazineNovaliteC1
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 245 # 20 [empty mag] + 15 [bullets] * 15 [steel per bullet]
+
+- type: latheRecipe # gestio mag
+  id: MagazineLightRifleLowCapacityEmpty
+  result: MagazineLightRifleLowCapacityEmpty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 20
+
+- type: latheRecipe # gestio mag
+  id: MagazineLightRifleLowCapacity
+  result: MagazineLightRifleLowCapacity
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 245 # 20 [empty mag] + 15 [bullets] * 15 [steel per bullet]
+
 # these were added By VividPups for the AMMOfab for; added in with PR 1770
 
 - type: latheRecipe
@@ -6,7 +38,7 @@
   category: Ammo
   completetime: 5
   materials:
-    Steel: 25
+    Steel: 170 # 20 [empty mag] + 10 [bullets] * 15 [steel per bullet]: no free ammo
 
 - type: latheRecipe
   id: 10roundmagazineempty
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/armor.yml b/Resources/Prototypes/_NF/Recipes/Lathes/armor.yml
new file mode 100644
index 000000000000..331d6a17ddb3
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/armor.yml
@@ -0,0 +1,150 @@
+# Helmets
+- type: latheRecipe
+  id: ClothingHeadHelmetMercenary
+  result: ClothingHeadHelmetMercenary
+  completetime: 3
+  category: ArmorNF
+  materials:
+    Cloth: 100
+    Durathread: 100
+    Steel: 500
+    Plasteel: 500
+
+- type: latheRecipe
+  id: ClothingHeadHelmetBasic
+  result: ClothingHeadHelmetBasic
+  completetime: 3
+  category: ArmorNF
+  materials:
+    Cloth: 100
+    Durathread: 100
+    Steel: 500
+    Plasteel: 500
+
+# Vests
+- type: latheRecipe
+  id: ClothingOuterVestWebMercenary
+  result: ClothingOuterVestWebMercenary
+  completetime: 5
+  category: ArmorNF
+  materials:
+    Durathread: 1200
+    Steel: 500
+    Plasteel: 500
+
+- type: latheRecipe
+  id: ClothingOuterVestWebMercenaryBlack
+  result: ClothingOuterVestWebMercenaryBlack
+  completetime: 5
+  category: ArmorNF
+  materials:
+    Durathread: 1200
+    Steel: 500
+    Plasteel: 500
+
+- type: latheRecipe
+  id: ClothingOuterArmorBulletproofNF
+  result: ClothingOuterArmorBulletproof
+  completetime: 5
+  category: ArmorNF
+  materials:
+    Durathread: 500
+    Steel: 300
+    Plasteel: 1000
+
+- type: latheRecipe
+  id: ClothingOuterCoatBHTrench
+  result: ClothingOuterCoatBHTrench
+  completetime: 5
+  category: ArmorNF
+  materials:
+    Durathread: 500
+    Steel: 300
+    Plasteel: 1000
+
+- type: latheRecipe
+  id: ClothingOuterArmorPunkRandomized
+  result: ClothingOuterArmorPunkRandomized
+  completetime: 5
+  category: ArmorNF
+  materials:
+    Durathread: 1200
+    Steel: 500
+    Plasteel: 500
+
+- type: latheRecipe
+  id: ClothingOuterArmorPunkRed
+  result: ClothingOuterArmorPunkRed
+  completetime: 5
+  category: ArmorNF
+  materials:
+    Durathread: 1200
+    Steel: 500
+    Plasteel: 500
+
+- type: latheRecipe
+  id: ClothingOuterArmorPunkGreen
+  result: ClothingOuterArmorPunkGreen
+  completetime: 5
+  category: ArmorNF
+  materials:
+    Durathread: 1200
+    Steel: 500
+    Plasteel: 500
+
+- type: latheRecipe
+  id: ClothingOuterArmorPunkOrange
+  result: ClothingOuterArmorPunkOrange
+  completetime: 5
+  category: ArmorNF
+  materials:
+    Durathread: 1200
+    Steel: 500
+    Plasteel: 500
+
+- type: latheRecipe
+  id: ClothingOuterArmorElitePunkRandomized
+  result: ClothingOuterArmorElitePunkRandomized
+  completetime: 5
+  category: ArmorNF
+  materials:
+    Durathread: 1200
+    Steel: 500
+    Plasteel: 500
+
+# Masks
+- type: latheRecipe
+  id: ClothingMaskGasMercenary
+  result: ClothingMaskGasMercenary
+  completetime: 2
+  materials:
+    Durathread: 300
+    Plastic: 200
+    Glass: 200
+
+- type: latheRecipe
+  id: ClothingMaskBreathMedicalSecurity
+  result: ClothingMaskBreathMedicalSecurity
+  completetime: 2
+  materials:
+    Durathread: 300
+    Plastic: 200
+    Steel: 200
+
+- type: latheRecipe
+  id: ClothingMaskGasSecurity
+  result: ClothingMaskGasSecurity
+  completetime: 2
+  materials:
+    Durathread: 300
+    Plastic: 200
+    Steel: 200
+
+- type: latheRecipe
+  id: ClothingMaskPunkHalf
+  result: ClothingMaskPunkHalf
+  completetime: 2
+  materials:
+    Durathread: 300
+    Plastic: 200
+    Steel: 200
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/categories.yml b/Resources/Prototypes/_NF/Recipes/Lathes/categories.yml
new file mode 100644
index 000000000000..668aec2d0e51
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/categories.yml
@@ -0,0 +1,23 @@
+- type: latheCategory
+  id: EVASuits
+  name: lathe-category-evasuits
+
+- type: latheCategory
+  id: ArmorNF
+  name: lathe-category-armor-nf
+
+- type: latheCategory
+  id: StorageNF
+  name: lathe-category-storage-nf
+
+- type: latheCategory
+  id: KitchenNF
+  name: lathe-category-kitchen-nf
+
+- type: latheCategory
+  id: ClothesNF
+  name: lathe-category-clothes-nf
+
+- type: latheCategory
+  id: MedicalNF
+  name: lathe-category-medical-nf
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/clothes.yml b/Resources/Prototypes/_NF/Recipes/Lathes/clothes.yml
new file mode 100644
index 000000000000..38762b9f5480
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/clothes.yml
@@ -0,0 +1,199 @@
+# Jumpsuits
+- type: latheRecipe
+  id: ClothingUniformRandomPunkTanktop
+  result: ClothingUniformRandomPunkTanktop
+  completetime: 3
+  category: ClothesNF
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformRandomPunkTanktopShorts
+  result: ClothingUniformRandomPunkTanktopShorts
+  completetime: 3
+  category: ClothesNF
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformRandomPunkCroptop
+  result: ClothingUniformRandomPunkCroptop
+  completetime: 3
+  category: ClothesNF
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformRandomPunkCroptopShorts
+  result: ClothingUniformRandomPunkCroptopShorts
+  completetime: 3
+  category: ClothesNF
+  materials:
+    Cloth: 300
+
+# Coats
+- type: latheRecipe
+  id: ClothingOuterCoatBomberRandomized
+  result: ClothingOuterCoatBomberRandomized
+  completetime: 3
+  category: ClothesNF
+  materials:
+    Cloth: 300
+    Durathread: 400
+
+- type: latheRecipe
+  id: ClothingOuterCoatLettermanRandomized
+  result: ClothingOuterCoatLettermanRandomized
+  completetime: 3
+  category: ClothesNF
+  materials:
+    Cloth: 300
+    Durathread: 400
+
+# Belts / Webbings
+- type: latheRecipe
+  id: ClothingBeltSalvageWebbing
+  result: ClothingBeltSalvageWebbing
+  completetime: 1
+  category: ClothesNF
+  materials:
+    Cloth: 400
+
+- type: latheRecipe
+  id: ClothingBeltMercenaryWebbing
+  result: ClothingBeltMercenaryWebbing
+  completetime: 4
+  category: ClothesNF
+  materials:
+    Cloth: 400
+
+- type: latheRecipe
+  id: ClothingBeltMilitaryWebbing
+  result: ClothingBeltMilitaryWebbing
+  completetime: 4
+  category: ClothesNF
+  materials:
+    Cloth: 400
+
+- type: latheRecipe
+  id: ClothingBeltBandolier
+  result: ClothingBeltBandolier
+  completetime: 4
+  category: ClothesNF
+  materials:
+    Cloth: 400
+
+- type: latheRecipe
+  id: ClothingBeltPunkRandomized
+  result: ClothingBeltPunkRandomized
+  completetime: 4
+  category: ClothesNF
+  materials:
+    Cloth: 400
+
+# Gloves
+- type: latheRecipe
+  id: ClothingHandsMercenaryGlovesCombat
+  result: ClothingHandsMercenaryGlovesCombat
+  completetime: 3
+  category: ClothesNF
+  materials:
+    Cloth: 100
+    Durathread: 100
+
+- type: latheRecipe
+  id: ClothingHandsGlovesCombat
+  result: ClothingHandsGlovesCombat
+  completetime: 3
+  category: ClothesNF
+  materials:
+    Cloth: 100
+    Durathread: 100
+
+# Boots
+- type: latheRecipe
+  id: ClothingShoesBootsMercenary
+  result: ClothingShoesBootsMercenary
+  completetime: 3
+  category: ClothesNF
+  materials:
+    Cloth: 100
+    Durathread: 100
+
+- type: latheRecipe
+  id: ClothingShoesBootsCombat
+  result: ClothingShoesBootsCombat
+  completetime: 3
+  category: ClothesNF
+  materials:
+    Cloth: 100
+    Durathread: 100
+
+- type: latheRecipe
+  id: ClothingShoesBootsJack
+  result: ClothingShoesBootsJack
+  completetime: 3
+  category: ClothesNF
+  materials:
+    Cloth: 100
+    Durathread: 100
+
+- type: latheRecipe
+  id: ClothingShoesBootsPunkRandomized
+  result: ClothingShoesBootsPunkRandomized
+  completetime: 3
+  category: ClothesNF
+  materials:
+    Cloth: 100
+    Durathread: 100
+
+# Glasses
+- type: latheRecipe
+  id: ClothingEyesGlassesMercenary
+  result: ClothingEyesGlassesMercenary
+  category: ClothesNF
+  completetime: 2
+  materials:
+    Steel: 200
+    Plastic: 300
+    Glass: 500
+
+- type: latheRecipe
+  id: ClothingEyesGlassesSunglasses
+  result: ClothingEyesGlassesSunglasses
+  category: ClothesNF
+  completetime: 2
+  materials:
+    Steel: 200
+    Plastic: 300
+    Glass: 500
+
+- type: latheRecipe
+  id: ClothingEyesHudBountyHunter
+  result: ClothingEyesHudBountyHunter
+  category: ClothesNF
+  completetime: 2
+  materials:
+    Gold: 200
+    Plastic: 300
+    Glass: 500
+
+- type: latheRecipe
+  id: ClothingEyesPunkGoggles
+  result: ClothingEyesPunkGoggles
+  category: ClothesNF
+  completetime: 2
+  materials:
+    Steel: 200
+    Plastic: 300
+    Glass: 500
+
+- type: latheRecipe
+  id: ClothingEyesPunkInfoShades
+  result: ClothingEyesPunkInfoShades
+  category: ClothesNF
+  completetime: 2
+  materials:
+    Gold: 200
+    Plastic: 300
+    Glass: 500
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml b/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml
index b1625042f93a..2fd977706e2d 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml
@@ -18,52 +18,6 @@
     Plasma: 1500
     Uranium: 150
 
-- type: latheRecipe
-  id: WeaponCrusher
-  result: WeaponCrusher
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 250
-    Plastic: 100
-
-- type: latheRecipe
-  id: WeaponCrusherDagger
-  result: WeaponCrusherDagger
-  completetime: 5
-  materials:
-    Steel: 500
-    Glass: 250
-    Plastic: 50
-
-- type: latheRecipe
-  id: WeaponCrusherGlaive
-  result: WeaponCrusherGlaive
-  completetime: 5
-  materials:
-    Steel: 1500
-    Glass: 500
-    Plastic: 50
-    Gold: 100
-
-- type: latheRecipe
-  id: ShipyardRCD
-  result: ShipyardRCDEmpty
-  category: Tools
-  completetime: 4
-  materials:
-    Steel: 1000
-    Plastic: 300
-
-- type: latheRecipe
-  id: ShipyardRCDAmmo
-  result: ShipyardRCDAmmo
-  category: Tools
-  completetime: 2.4
-  materials:
-    Steel: 500
-    Plastic: 250
-
 - type: latheRecipe
   id: SolarAssemblyFlatpack
   result: SolarAssemblyFlatpack
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
index da126a77f87a..c55ddb1ff1c1 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
@@ -1,6 +1,7 @@
 - type: latheRecipe
   id: TilePrinterNFMachineCircuitboard
   result: TilePrinterNFMachineCircuitboard
+  category: Circuitry
   completetime: 4
   materials:
     Steel: 700
@@ -9,6 +10,7 @@
 - type: latheRecipe
   id: SalvageTechFabCircuitboardNF
   result: SalvageTechFabCircuitboardNF
+  category: Circuitry
   completetime: 4
   materials:
     Steel: 800
@@ -18,6 +20,7 @@
 - type: latheRecipe
   id: ThrusterSecurityMachineCircuitboard
   result: ThrusterSecurityMachineCircuitboard
+  category: Circuitry
   completetime: 4
   materials:
     Steel: 400
@@ -26,6 +29,7 @@
 - type: latheRecipe
   id: ThrusterNfsdMachineCircuitboard
   result: ThrusterNfsdMachineCircuitboard
+  category: Circuitry
   completetime: 4
   materials:
     Steel: 400
@@ -34,6 +38,7 @@
 - type: latheRecipe
   id: SmallThrusterMachineCircuitboard
   result: SmallThrusterMachineCircuitboard
+  category: Circuitry
   completetime: 4
   materials:
     Steel: 140
@@ -43,6 +48,7 @@
 - type: latheRecipe
   id: GyroscopeSecurityMachineCircuitboard
   result: GyroscopeSecurityMachineCircuitboard
+  category: Circuitry
   completetime: 4
   materials:
     Steel: 400
@@ -51,6 +57,7 @@
 - type: latheRecipe
   id: SmallGyroscopeSecurityMachineCircuitboard
   result: SmallGyroscopeSecurityMachineCircuitboard
+  category: Circuitry
   completetime: 4
   materials:
     Steel: 50
@@ -59,6 +66,7 @@
 - type: latheRecipe
   id: GyroscopeNfsdMachineCircuitboard
   result: GyroscopeNfsdMachineCircuitboard
+  category: Circuitry
   completetime: 4
   materials:
     Steel: 400
@@ -67,6 +75,7 @@
 - type: latheRecipe
   id: SmallGyroscopeNfsdMachineCircuitboard
   result: SmallGyroscopeNfsdMachineCircuitboard
+  category: Circuitry
   completetime: 4
   materials:
     Steel: 50
@@ -75,6 +84,7 @@
 - type: latheRecipe
   id: SmallGyroscopeMachineCircuitboard
   result: SmallGyroscopeMachineCircuitboard
+  category: Circuitry
   completetime: 4
   materials:
     Steel: 50
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml
index 8fd1cdaef18f..f348492e0831 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml
@@ -591,3 +591,31 @@
     Durathread: 2000
     Silver: 1000
     Gold: 2000
+
+# Magboots
+- type: latheRecipe
+  id: ClothingShoesBootsMagAdv
+  result: ClothingShoesBootsMagAdv
+  category: EVASuits
+  completetime: 12
+  materials:
+    Silver: 1000
+    Gold: 500
+
+- type: latheRecipe
+  id: ClothingShoesBootsMagCombat
+  result: ClothingShoesBootsMagCombat
+  category: EVASuits
+  completetime: 12
+  materials:
+    Silver: 1000
+    Gold: 500
+
+- type: latheRecipe
+  id: ClothingShoesBootsMagMercenary
+  result: ClothingShoesBootsMagMercenary
+  category: EVASuits
+  completetime: 12
+  materials:
+    Silver: 1000
+    Gold: 500
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml b/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml
new file mode 100644
index 000000000000..389c68ab84f7
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml
@@ -0,0 +1,18 @@
+- type: latheRecipe
+  id: BrutepackAdvancedNF
+  result: BrutepackAdvanced1
+  category: MedicalNF
+  completetime: 1
+  materials:
+    Durathread: 100
+    Silver: 50
+
+- type: latheRecipe
+  id: OintmentAdvancedNF
+  result: OintmentAdvanced1
+  category: MedicalNF
+  completetime: 1
+  materials:
+    Durathread: 100
+    Silver: 30
+    Biomass: 10
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
index 07f013c5602c..2e34d1d977d2 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
@@ -1,11 +1,3 @@
-- type: latheRecipe
-  id: ClothingShoesBootsMagAdv
-  result: ClothingShoesBootsMagAdv 
-  completetime: 12
-  materials:
-    Silver: 1000
-    Gold: 500
-
 - type: latheRecipe
   id: MailCapsule
   result: MailCapsulePrimed
@@ -14,20 +6,31 @@
     Glass: 100
     Plastic: 100
 
-# Salvage Techfab
 - type: latheRecipe
-  id: RadioHandheld
-  result: RadioHandheld
-  completetime: 1
-  category: Tools
+  id: LanternNF
+  result: Lantern
+  category: Lights
+  completetime: 2
   materials:
-    Plastic: 500
+    Steel: 100
+    Glass: 100
+    Plastic: 100
 
 - type: latheRecipe
   id: Floodlight
   result: Floodlight
   completetime: 1
-  category: Tools
+  category: Lights
+  materials:
+    Glass: 500
+    Plastic: 1000
+    Steel: 1500
+
+- type: latheRecipe
+  id: FlashlightSecliteNF
+  result: FlashlightSeclite
+  completetime: 1
+  category: Lights
   materials:
     Glass: 500
     Plastic: 1000
@@ -37,7 +40,7 @@
   id: FlareLathe
   result: Flare
   completetime: 0.5
-  category: Tools
+  category: Lights
   materials:
     Steel: 150
 
@@ -45,7 +48,7 @@
   id: GlowstickBlue
   result: GlowstickBlue
   completetime: 0.5
-  category: Tools
+  category: Lights
   materials:
     Plastic: 50
 
@@ -53,7 +56,7 @@
   id: GlowstickBase
   result: GlowstickBase
   completetime: 0.5
-  category: Tools
+  category: Lights
   materials:
     Plastic: 50
 
@@ -61,7 +64,7 @@
   id: GlowstickPurple
   result: GlowstickPurple
   completetime: 0.5
-  category: Tools
+  category: Lights
   materials:
     Plastic: 50
 
@@ -69,7 +72,7 @@
   id: GlowstickRedLathe
   result: GlowstickRed
   completetime: 0.5
-  category: Tools
+  category: Lights
   materials:
     Plastic: 50
 
@@ -77,41 +80,15 @@
   id: GlowstickYellow
   result: GlowstickYellow
   completetime: 0.5
-  category: Tools
+  category: Lights
   materials:
     Plastic: 50
 
-- type: latheRecipe
-  id: ClothingBeltSalvageWebbing
-  result: ClothingBeltSalvageWebbing
-  completetime: 1
-  category: Tools
-  materials:
-    Steel: 500
-
-- type: latheRecipe
-  id: OreBag
-  result: OreBag
-  completetime: 1
-  category: Tools
-  materials:
-    Steel: 500
-    Cloth: 500
-
-- type: latheRecipe
-  id: ConstructionBag
-  result: ConstructionBag
-  completetime: 1
-  category: Tools
-  materials:
-    Steel: 500
-    Cloth: 500
-
 - type: latheRecipe
   id: ClothingNeckIFFNeutral
   result: ClothingNeckIFFNeutral
   completetime: 1
-  category: Tools
+  category: Lights
   materials:
     Steel: 500
     Plastic: 500
@@ -121,7 +98,7 @@
   id: ClothingNeckIFFGreen
   result: ClothingNeckIFFGreen
   completetime: 1
-  category: Tools
+  category: Lights
   materials:
     Steel: 500
     Plastic: 500
@@ -131,7 +108,7 @@
   id: ClothingNeckIFFRed
   result: ClothingNeckIFFRed
   completetime: 1
-  category: Tools
+  category: Lights
   materials:
     Steel: 500
     Plastic: 500
@@ -141,7 +118,7 @@
   id: ClothingNeckIFFBlue
   result: ClothingNeckIFFBlue
   completetime: 1
-  category: Tools
+  category: Lights
   materials:
     Steel: 500
     Plastic: 500
@@ -151,7 +128,7 @@
   id: ClothingNeckIFFOrange
   result: ClothingNeckIFFOrange
   completetime: 1
-  category: Tools
+  category: Lights
   materials:
     Steel: 500
     Plastic: 500
@@ -161,8 +138,46 @@
   id: ClothingNeckIFFPurple
   result: ClothingNeckIFFPurple
   completetime: 1
-  category: Tools
+  category: Lights
   materials:
     Steel: 500
     Plastic: 500
     Silver: 100
+
+- type: latheRecipe
+  id: ColoredLightTubeRedNF
+  result: ColoredLightTubeRed
+  category: Lights
+  completetime: 2
+  materials:
+    Steel: 50
+    Glass: 50
+
+- type: latheRecipe
+  id: ColoredLightTubeBlackLightNF
+  result: ColoredLightTubeBlackLight
+  category: Lights
+  completetime: 2
+  materials:
+    Steel: 50
+    Glass: 50
+
+- type: latheRecipe
+  id: ColoredLightTubeFrostyBlueNF
+  result: ColoredLightTubeFrostyBlue
+  category: Lights
+  completetime: 2
+  materials:
+    Steel: 50
+    Glass: 50
+
+- type: latheRecipe
+  id: PowerCellHyperNF
+  result: PowerCellHyperPrinted
+  category: Parts
+  completetime: 10
+  materials:
+    Steel: 500
+    Glass: 400
+    Plasma: 200
+    Gold: 100
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
index 5ee0c07e1579..f76800beddf9 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
@@ -1,6 +1,7 @@
 - type: latheRecipe
   id: ServiceRollingPin
   result: RollingPin
+  category: KitchenNF
   completetime: 1
   materials:
     Wood: 200
@@ -8,6 +9,7 @@
 - type: latheRecipe
   id: ServiceSpoon
   result: Spoon
+  category: KitchenNF
   completetime: 1
   materials:
     Steel: 75
@@ -15,6 +17,7 @@
 - type: latheRecipe
   id: ServiceFork
   result: Fork
+  category: KitchenNF
   completetime: 1
   materials:
     Steel: 75
@@ -22,6 +25,7 @@
 - type: latheRecipe
   id: ServicePairedChopsticks
   result: PairedChopsticks
+  category: KitchenNF
   completetime: 1
   materials:
     Glass: 100
@@ -29,6 +33,7 @@
 - type: latheRecipe
   id: ServiceFoodBowlBig
   result: FoodBowlBig
+  category: KitchenNF
   completetime: 1
   materials:
     Glass: 100
@@ -36,6 +41,7 @@
 - type: latheRecipe
   id: ServiceFoodPlate
   result: FoodPlate
+  category: KitchenNF
   completetime: 1
   materials:
     Glass: 150
@@ -43,6 +49,7 @@
 - type: latheRecipe
   id: ServiceFoodPlateSmall
   result: FoodPlateSmall
+  category: KitchenNF
   completetime: 1
   materials:
     Glass: 75
@@ -50,6 +57,7 @@
 - type: latheRecipe
   id: ServiceFoodPlateTin
   result: FoodPlateTin
+  category: KitchenNF
   completetime: 1
   materials:
     Steel: 150
@@ -57,6 +65,7 @@
 - type: latheRecipe
   id: ServiceFoodKebabSkewer
   result: FoodKebabSkewer
+  category: KitchenNF
   completetime: 1
   materials:
     Steel: 75
@@ -64,6 +73,7 @@
 - type: latheRecipe
   id: NapkinDrum
   result: NapkinDrum
+  category: KitchenNF
   completetime: 1
   materials:
     Steel: 75
@@ -71,6 +81,7 @@
 - type: latheRecipe
   id: Napkin
   result: Napkin
+  category: KitchenNF
   completetime: 0.1
   materials:
     Wood: 10
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml b/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml
new file mode 100644
index 000000000000..b018f786db8d
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml
@@ -0,0 +1,82 @@
+# Toolboxes
+- type: latheRecipe
+  id: ToolboxArtisticNF
+  result: ToolboxArtistic
+  name: toolbox (artistic, empty)
+  category: StorageNF
+  completetime: 3
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: ToolboxElectricalNF
+  result: ToolboxElectrical
+  name: toolbox (electrical, empty)
+  category: StorageNF
+  completetime: 3
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: ToolboxMechanicalNF
+  result: ToolboxMechanical
+  name: toolbox (mechanical, empty)
+  category: StorageNF
+  completetime: 3
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: ToolboxEmergencyNF
+  result: ToolboxEmergency
+  name: toolbox (emergency, empty)
+  category: StorageNF
+  completetime: 3
+  materials:
+    Steel: 300
+
+# Weapon cases
+- type: latheRecipe
+  id: WeaponCaseShort
+  result: WeaponCaseShort
+  name: weapon case (small, empty)
+  category: StorageNF
+  completetime: 3
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: WeaponCaseLong
+  result: WeaponCaseLong
+  name: weapon case (empty)
+  category: StorageNF
+  completetime: 5
+  materials:
+    Steel: 600
+
+- type: latheRecipe
+  id: WeaponCaseHeavy
+  result: WeaponCaseHeavy
+  name: weapon case (heavy, empty)
+  category: StorageNF
+  completetime: 8
+  materials:
+    Steel: 1200
+
+- type: latheRecipe
+  id: WeaponCaseShortAmmo
+  result: WeaponCaseShortAmmo
+  name: ammo case (small, empty)
+  category: StorageNF
+  completetime: 3
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  id: WeaponCaseShortExplosives
+  result: WeaponCaseShortExplosives
+  name: explosives case (small, empty)
+  category: StorageNF
+  completetime: 3
+  materials:
+    Steel: 300
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/tools.yml b/Resources/Prototypes/_NF/Recipes/Lathes/tools.yml
index 8b348d26ba87..c4cc661a3fb2 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/tools.yml
@@ -16,3 +16,67 @@
     Steel: 600
     Glass: 200
     Plastic: 200
+
+- type: latheRecipe
+  id: ContrabandAppraisalTool
+  result: ContrabandAppraisalTool
+  category: Tools
+  completetime: 3.5
+  materials:
+    Steel: 500
+    Glass: 300
+
+- type: latheRecipe
+  id: PinpointerUniversalNF
+  result: PinpointerUniversal
+  category: Tools
+  completetime: 3.5
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 500
+    Silver: 500
+
+- type: latheRecipe
+  id: RadioHandheld
+  result: RadioHandheld
+  completetime: 1
+  category: Tools
+  materials:
+    Plastic: 500
+
+- type: latheRecipe
+  id: OreBag
+  result: OreBag
+  completetime: 1
+  category: Tools
+  materials:
+    Steel: 500
+    Cloth: 500
+
+- type: latheRecipe
+  id: ConstructionBag
+  result: ConstructionBag
+  completetime: 1
+  category: Tools
+  materials:
+    Steel: 500
+    Cloth: 500
+
+- type: latheRecipe
+  id: ShipyardRCD
+  result: ShipyardRCDEmpty
+  category: Tools
+  completetime: 4
+  materials:
+    Steel: 1000
+    Plastic: 300
+
+- type: latheRecipe
+  id: ShipyardRCDAmmo
+  result: ShipyardRCDAmmo
+  category: Tools
+  completetime: 2.4
+  materials:
+    Steel: 500
+    Plastic: 250
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml b/Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml
new file mode 100644
index 000000000000..de4a82b4973d
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml
@@ -0,0 +1,157 @@
+# Ranged weapons
+- type: latheRecipe
+  id: WeaponLaserPistolNF
+  result: WeaponLaserPistolNF
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 1200
+    Glass: 800
+    Silver: 850
+
+- type: latheRecipe
+  id: WeaponRevolverArgenti
+  result: WeaponRevolverArgenti
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 1500
+    Plasteel: 500
+
+- type: latheRecipe
+  id: WeaponPistolMk58NF
+  result: WeaponPistolMk58
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 1000
+    Plasteel: 1200
+    Plastic: 1500
+
+- type: latheRecipe
+  id: WeaponShotgunDoubleBarreled
+  result: WeaponShotgunDoubleBarreled
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 2000
+    Plasteel: 800
+    Wood: 1000
+
+- type: latheRecipe
+  id: WeaponShotgunKammererNF
+  result: WeaponShotgunKammerer
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 500
+    Plasteel: 1500
+    Wood: 800
+    Plastic: 500
+
+- type: latheRecipe
+  id: WeaponRifleNovaliteC1
+  result: WeaponRifleNovaliteC1
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 2500
+    Plasteel: 1200
+    Plastic: 1500
+
+- type: latheRecipe
+  id: WeaponRifleGestio
+  result: WeaponRifleGestio
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 2500
+    Plasteel: 1200
+    Plastic: 1500
+
+- type: latheRecipe
+  id: WeaponAntiqueLaserNF
+  result: WeaponAntiqueLaser
+  category: Weapons
+  completetime: 5
+  materials:
+    Plasteel: 1500
+    Glass: 1000
+    Gold: 850
+    Plastic: 1000
+
+# Melee weapons
+- type: latheRecipe
+  id: BaseBallBatNF
+  result: BaseBallBat
+  category: Weapons
+  completetime: 4
+  materials:
+    Wood: 700
+
+- type: latheRecipe
+  id: BolaNF
+  result: Bola
+  category: Weapons
+  completetime: 2
+  materials:
+    Durathread: 200
+    Plasteel: 600
+
+- type: latheRecipe
+  id: KukriKnifeNF
+  result: KukriKnife
+  category: Weapons
+  completetime: 4
+  materials:
+    Plasteel: 500
+    Plastic: 200
+
+- type: latheRecipe
+  id: MacheteNF
+  result: Machete
+  category: Weapons
+  completetime: 4
+  materials:
+    Steel: 500
+    Plastic: 200
+
+- type: latheRecipe
+  id: KatanaNF
+  result: Katana
+  category: Weapons
+  completetime: 6
+  materials:
+    Plasteel: 500
+    Plastic: 300
+
+- type: latheRecipe
+  id: WeaponCrusher
+  result: WeaponCrusher
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 1000
+    Glass: 250
+    Plastic: 100
+
+- type: latheRecipe
+  id: WeaponCrusherDagger
+  result: WeaponCrusherDagger
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 500
+    Glass: 250
+    Plastic: 50
+
+- type: latheRecipe
+  id: WeaponCrusherGlaive
+  result: WeaponCrusherGlaive
+  category: Weapons
+  completetime: 5
+  materials:
+    Steel: 1500
+    Glass: 500
+    Plastic: 50
+    Gold: 100
diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml
index 4a99b0f76839..052168e9570d 100644
--- a/Resources/Prototypes/_NF/Research/arsenal.yml
+++ b/Resources/Prototypes/_NF/Research/arsenal.yml
@@ -1,5 +1,46 @@
+# Tier 1
+
+- type: technology
+  id: BountyHunting
+  name: research-technology-bounty-hunting
+  icon:
+    sprite: Objects/Weapons/Throwable/bola.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 1
+  cost: 10000
+  recipeUnlocks:
+  - Stunbaton
+  - BolaNF
+  - Handcuffs
+  - ClothingOuterArmorBulletproofNF
+  - ClothingOuterCoatBHTrench
+  - ContrabandAppraisalTool
+  - PinpointerUniversalNF
+  - ClothingEyesHudBountyHunter
+  - WeaponShotgunKammererNF
+  - ForensicPad
+  - FlashlightSecliteNF
+  technologyPrerequisites:
+  - AdvancedRiotControl
+
 # Tier 2
 
+- type: technology
+  id: MagnetsTechCombat
+  name: research-technology-magnets-tech-combat
+  icon:
+    sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi
+    state: icon
+  discipline: Experimental
+  tier: 1
+  cost: 9000
+  recipeUnlocks:
+  - ClothingShoesBootsMagCombat
+  - ClothingShoesBootsMagMercenary
+  technologyPrerequisites:
+  - MagnetsTech
+
 - type: technology
   id: HardsuitsArmored
   name: research-technology-hardsuits-armored
@@ -17,6 +58,39 @@
   - AdvancedRiotControl
   - HardsuitsAdvanced
 
+- type: technology
+  id: ArsenalStyle
+  name: research-technology-arsenal-style
+  icon:
+    sprite: Objects/Weapons/Melee/katana.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 2
+  cost: 15000
+  recipeUnlocks:
+  - KatanaNF
+  - KukriKnifeNF
+  - MacheteNF
+  - ClothingEyesPunkInfoShades
+  - ClothingOuterArmorPunkRandomized
+  - ClothingOuterArmorPunkRed
+  - ClothingOuterArmorPunkGreen
+  - ClothingOuterArmorPunkOrange
+  - ClothingOuterArmorElitePunkRandomized
+  - ClothingBeltPunkRandomized
+  - ClothingShoesBootsPunkRandomized
+  - ClothingEyesPunkGoggles
+  - ClothingEyesPunkInfoShades
+  - ClothingMaskPunkHalf
+  - ClothingUniformRandomPunkTanktop
+  - ClothingUniformRandomPunkTanktopShorts
+  - ClothingUniformRandomPunkCroptop
+  - ClothingUniformRandomPunkCroptopShorts
+  - ClothingOuterCoatLettermanRandomized
+  - ClothingOuterCoatBomberRandomized
+  technologyPrerequisites:
+  - BountyHunting
+
 # Tier 3
 
 - type: technology
diff --git a/Resources/Prototypes/_NF/Research/civilianservices.yml b/Resources/Prototypes/_NF/Research/civilianservices.yml
index 2956fadfc812..6197c0d97a9e 100644
--- a/Resources/Prototypes/_NF/Research/civilianservices.yml
+++ b/Resources/Prototypes/_NF/Research/civilianservices.yml
@@ -11,3 +11,16 @@
   cost: 15000
   recipeUnlocks:
   - JetpackVoid
+
+- type: technology
+  id: AdvancedTopicals
+  name: research-techology-advanced-topicals
+  icon:
+    sprite: Objects/Specific/Medical/medical.rsi
+    state: medicated-suture
+  discipline: CivilianServices
+  tier: 3
+  cost: 15000
+  recipeUnlocks:
+  - BrutepackAdvancedNF
+  - OintmentAdvancedNF
diff --git a/Resources/Prototypes/_NF/Research/experimental.yml b/Resources/Prototypes/_NF/Research/experimental.yml
index ec5d7f6e209f..cf01524265df 100644
--- a/Resources/Prototypes/_NF/Research/experimental.yml
+++ b/Resources/Prototypes/_NF/Research/experimental.yml
@@ -1,5 +1,19 @@
 # Tier 3
 
+- type: technology
+  id: MagnetsTechAdvanced
+  name: research-technology-magnets-tech-advanced
+  icon:
+    sprite: Clothing/Shoes/Boots/magboots-advanced.rsi
+    state: icon
+  discipline: Experimental
+  tier: 3
+  cost: 10000
+  recipeUnlocks:
+  - ClothingShoesBootsMagAdv
+  technologyPrerequisites:
+  - MagnetsTech
+
 - type: technology
   id: HardsuitsExperimentalRD
   name: research-technology-hardsuits-experimental-rd
diff --git a/Resources/Textures/Structures/Machines/techfab.rsi/meta.json b/Resources/Textures/Structures/Machines/techfab.rsi/meta.json
index ec90ace0e575..701516a92e21 100644
--- a/Resources/Textures/Structures/Machines/techfab.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/techfab.rsi/meta.json
@@ -31,9 +31,6 @@
     {
       "name": "cargo"
     },
-    {
-      "name": "nfsd"
-    },
     {
       "name": "ammo"
     },
diff --git a/Resources/Textures/Structures/Machines/techfab.rsi/nfsd.png b/Resources/Textures/Structures/Machines/techfab.rsi/nfsd.png
deleted file mode 100644
index ae2e88fc7b65fe49239673d35fb90ac78f20372d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 275
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1D-C9ArYK!Ct33yau9GX*05Sq
z(!mrsaZ*#;Jnn**dk-jy>qn(Z^DuiPD)oL7?tg1x%=0saDUGT9b;Nzm;C1cu-yg5q
z^)^oH>#3UaS$7;ZnFM;x^xaxrAhhiIgx3ovbVMxS@YtgJ?qJOohC?0Op0Ag3n6cG2
zb1tXA&ai#6w${1}o$<GiJl5+m?aBFh&b$)yk{7B7oX*;Cvf)%lXX~f^$&tL<{-#EU
zx_RrE@TM@?`zOpX3l+7#b#fYK3e*2N2bljJYu~n&d8<0mFMO#Ho@u_m3|c@o2M~k6
RrQpdR%G1@)Wt~$(697bFXtV$T

diff --git a/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/mercenary.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/mercenary.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b0e4a1fc3aa6fd50716aa1b957295a0d732ff5f
GIT binary patch
literal 383
zcmV-_0f7FAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$IY~r8R9J=Wl`(3=Fc^hjO9>gA!IL%((h@Z32r+>kz*}z6BNehcTh@Z1kRy1~
zW)0r{$wNGtEXfcQXd$xfHtnKse&{_tq5lUWkx1m9c?uB;u{cjPu=eQncnLA*JRNP^
zG%Yw!VeQeY^9B%NaaM|fu@rSpXqxt}mh%)+G7z;ehM*Kf*PRA~dIPwd*EJzYW>AWG
z4|BRPjSW75yUk{^9z1Nf`-CwxD!_BF@<9wX@SXYm6?vYcsw!A(A%uX|8b$H;_yEov
z0JPT7T2C^a9H8$@?Dx1eV9fj925=2bt^3CT`o2U_l)q*U1pI<5TLujj0O-0CvTQjj
zKu`lxGHkaWNRpY?T*|M5$~QTK0}!=f>^fMCp}RUae2Chcc4!d+0o!o3;*&Pv;m`za
d+DIf4xd3mlX{%tF=PCdI002ovPDHLkV1mJ^p1J@4

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/meta.json
index 646834c689a5..d161dc6857e6 100644
--- a/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/meta.json
@@ -78,6 +78,9 @@
         },
         {
             "name": "supply_lathe"
+        },
+        {
+            "name": "mercenary"
         }
     ]
 }
diff --git a/Resources/Textures/_NF/Objects/Misc/module.rsi/hacked-merc-fab-board.png b/Resources/Textures/_NF/Objects/Misc/module.rsi/hacked-merc-fab-board.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0c7acb395372c16d40472eb2a3279bbd5c61c06
GIT binary patch
literal 944
zcmV;h15f;kP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&YDq*vR9J=WmThQLR~W~CS8BUf$xD~kmqf;}t*u2-(iFicPCJFsF&7l+K5SFL
zC_0cC#7`m$3Zr0bKh;vYO~%{?fzEZTPMj~Pu8Bo)+7_dmoA*|mT#Q%S8yl7DhcwA*
znwnO>nLixvd3~PWdG2}6z3`?>$av;rv~)vdRht2rD|G^3vFHI1MTJ}Dr2yP$ZW+^8
z<^cQB18B7{uW2*8gcjWSJ6J7T0pO&z2!J&w?*s6oB}o78r$+hA$ru2j4Y-^N?flN6
ztsu-67r1-i@6Qi&^}s<+MD6Uq+KdSJt90-%)#St?&<3{4sYAX?;H+~Xssohi-l1c4
zA&}g8ysh-~r9@y##sDK)GDe9zZ{ORQ;yCU+ohA$b@F&m+LcBD6?*YJB?*L%a4|`BW
ziIR<<p^6f!C^26;OQrDN>j3~_Sus+abuq`*_hKL$T8>g+F>|x^8wxCD*3JnfGUG)}
z>=6E6A0?|zwH};x4%*t6VkvmcGc^LhkSMWGxQ%Mj(|ojR%=0#R07ztoun)kK><=WX
z(o0Od8o)R*&YqFDH^Th`X|wI605*5M2H>;1s5aEo(CngNn+soUJq_(H#H}~AVw0Yr
ztPprRY3^+6d8QZX84M}o+D}XN>-t3+K;zCMocm-;qTeJBC+eCZ$`>2o=lCy|2x?D8
ztse|234rk;kTwfycI#Mv%$jKHD;H31%%M2nM7g1iazhzHj*hB@a|voss909QU`U~2
zS;@FNeo<*(!Ktqv0^P9lQvjx3zlJP728IYm<dpe-Pd7G)6~CvO=|y9w+=KvXcI${P
zD5bF*%8fagLS`_Go+B4Yywy5~nfYec%$UZvUteH*>AU<U-9u1^DSrA0K^-PM8Gv{M
z_72+lut(%y#MnT=$P)D_gn(I4cxNhIQxxVI3+a*-jCuJ4NA7}Gj=*0Z!--XH0z+Y{
z4^6}C4`8>I;`Ilp?5G5w@4*cKG~q!;PBQ|CN5F_3fN-RryONHu97;UB)-&XG6!GQ!
zbpTYGVn7$eO}MZ1alB?FD}QdE9KZ)ZT@e6|*sf~>k^B6S+lhF(0<W)^pse8a^<uBC
z0BbDIy}n)s?!>-=XF~s=MkAcN7etL__9|YxOu2cQDK{_eUsP6EWtCM{aXkmYe@4h+
Smbf<n0000<MNUMnLSTXfIk$BH

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Misc/module.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/module.rsi/meta.json
new file mode 100644
index 000000000000..5e6c267e481a
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Misc/module.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473 | resprited by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "hacked-merc-fab-board"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Machines/techfab.rsi/mercenary.png b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/mercenary.png
new file mode 100644
index 0000000000000000000000000000000000000000..96f20c8641d8819467a98062a13f49dd25fc17d9
GIT binary patch
literal 717
zcmV;;0y6!HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vm2Qx@<$WWauh+jBL6^me@v=v%)FuC*#ni!H4
z7e~Rh;NZt%)xpJCR|i)?5c~jfbaGO3krMxx6k5c1aNLh~_a1le0HIN3n$<N1Xu55t
z6LBe*Uy(wu2qFX#5lqR<GLo5vEPTh;Jpz2ai}5V~bAOILwO}zIAQ8_p!?cOliKjPh
zgY!PI$jY)xd`>)S(glehxvqHp#<}FOz%xZNo1P;UiKS8pD;><rrbawT991=)@`aqo
zD(5ZETD8Vn_v9}O7xd)}*J%zRfkh;df&>LMR8WPD7_B-f7SgmI_wh$ue~MfRxhi1f
zn8yY*$gUs!4}N!R6(`2Mq;MSQesP?SVIZ^%H0zG@ee5{R6Cn5uT<LB9Mgy4nB)#6&
zqDMggHgIv>)|5Tqat9cEGGtSBr65hASOnhB=$rDuz%9_b>h;#z$LRx*rLLB4fP+I|
zq(s?kKJV`7?Csw(t^R%hpFMK95|x%T00035Nkl<ZScUDBJr05}7=~Ysvoi<K6A%wz
zoJeG0V>UenGe>ZeosEg4li>hH(gQd-xtSOy7aX+2f>Hb9p!S){mwbI6`UhD4ot|vN
zd_Jmm0`q()WDaB}2*VkQVxts3olXFtzL$^|0D!~c1jiW)wbg3dj2UBCE*G7iM<@yK
zz%0vz+WoiZMF4;x2mk=SKQ=4C;Q{S2hY<H^e_uD85V!er#u$L>N)Y0{3<oq;fKTpu
zQ6mC~XW<>Rw}8?Zl*S#gcTw7c_6^YKQC@*0DWxB=Bq=*JtwU%6C4t+EW(4UiNYk~k
za3z7NIvW-E&NE;Ieo8?47VP)OPk2}?mOthK^TI_fF_?wp00000NkvXXu0mjfOD#Cg

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Machines/techfab.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/meta.json
index f46fa24636dc..056008423e6a 100644
--- a/Resources/Textures/_NF/Structures/Machines/techfab.rsi/meta.json
+++ b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/meta.json
@@ -13,6 +13,12 @@
     {
       "name": "nfsd"
     },
+    {
+      "name": "mercenary"
+    },
+    {
+      "name": "salvage"
+    },
     {
       "name": "panel"
     },
diff --git a/Resources/Textures/_NF/Structures/Machines/techfab.rsi/salvage.png b/Resources/Textures/_NF/Structures/Machines/techfab.rsi/salvage.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a65f7404acaafe9f792fd67194bb64573981bf8
GIT binary patch
literal 662
zcmV;H0%`q;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@I4ug6$yUkfAzRDJtS9RV;#q(pG5I!Q|2}Xws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;qmz@Oi<J1krqCkBgX4a@yZ5+z2MCP{Q%zqKP&La)
z#baVNw<`Ky;lm(;m_Srwrk+SIX5c!$?&0C<U4&=3pZjz4D|wRv9+7yC>4rtTK|Hf*
z>74h8L#!kz#OK8023?T&k?XR<Z=8!Q7I<dJ$fV|pL&RdSi{&n6B|{~iCJrmAM)^Y4
zVTJP+XSGse?R)YU2J+fUn(H)25XTY{NJ4~+8p^1^LWEY06cZ`hkGc4VTmB@uWO9|k
z$gzMbR7fp9_#gc4)+|g-I!S>T(DP#3AESVO7iiXP`}^3on<s$x8Mx9q{%Ql5{Up8K
z(ZWZ-z&3Dk-O=Pd;Bp5TdeS9BYDr$2LZJY>pV2qvfZ#3Ax90TL-pA<!kfE-YZ-9eC
zV5~^l>n`u^?e6X0GwuF<0N`D6)Bk!mX8-^I%t=H+R9J;$U>F4>9Waurp(;lIKP48n
zExCwdCkv?txLT?*eERr-EX(=$1sE6@82%$Wf{7f1PF{OWH9cfG0GFYDmAe`IDt8lQ
zF;yIZ4mP#BGTgm;7sC;BbAVsvZicI?GDy-xH3#@r?q=B3?#jTxzyPOd?f`QwQ8*iy
zrO0Zi<^V#5lA?#?asUSWtM-swh+zX%O@wrF0JKD-3LrTOb|1e@HOt9zz~h&nsOo^B
wnFdB3FsvLvaxQrP={qglF$zY(C>X&20ICZzcFn}LsQ>@~07*qoM6N<$f?r}VdH?_b

literal 0
HcmV?d00001


From d509fe42cc0210c8afb11b451e71e134232329cf Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Sat, 17 Aug 2024 16:23:36 +0000
Subject: [PATCH 37/39] Automatic Changelog (#1854)

---
 Resources/Changelog/Changelog.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2b3cb2b0cd97..87baef23a266 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6330,3 +6330,27 @@ Entries:
       message: CMO's new turtleneck added to Contractor, Pilot, and Mercenary loadouts.
   id: 5204
   time: '2024-08-16T14:59:55.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added mercenary techfab and additional arsenal research.
+    - type: Add
+      message: >-
+        Added T3 medical tech research that unlocks printing of advanced
+        topicals.
+    - type: Add
+      message: >-
+        Added new sorting categories to some lathes: Clothing, Kitchen, Medical,
+        Storage.
+    - type: Tweak
+      message: >-
+        Portable recharger no longer fits in backpacks/duffels, but charges
+        twice as fast. It can be works as a backpack.
+    - type: Tweak
+      message: Made combat magboots researchable. Moved advanced magboots to T3.
+    - type: Tweak
+      message: Randomized punk clothes can now be recycled and butchered.
+    - type: Tweak
+      message: ThreadsChoom and BonanzaMatic vending machines now can be unanchored.
+  id: 5205
+  time: '2024-08-17T16:23:11.0000000+00:00'

From df5581cc819a647ee178e57dab573a6bb74c7258 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Sat, 17 Aug 2024 12:38:47 -0400
Subject: [PATCH 38/39] Pacified Zone: filter immune users by playtime (#1855)

* Pacified Zone: filter immune users by playtime

* Panic Bunker pacified zone variants

* PacifiedZoneGeneratorSystem: use cached info
---
 .../PacifiedZoneGeneratorComponent.cs         |   3 +
 .../PacifiedZoneGeneratorSystem.cs            | 110 +++++++++---------
 Resources/Maps/_NF/Outpost/frontier.yml       |   2 +-
 Resources/Maps/_NF/Shuttles/Bus/publicts.yml  |   2 +-
 .../_NF/Entities/Markers/pacified_zone.yml    |  41 +++++++
 5 files changed, 102 insertions(+), 56 deletions(-)

diff --git a/Content.Server/_NF/PacifiedZone/PacifiedZoneGeneratorComponent.cs b/Content.Server/_NF/PacifiedZone/PacifiedZoneGeneratorComponent.cs
index bf26f399f956..2a6269dd6a67 100644
--- a/Content.Server/_NF/PacifiedZone/PacifiedZoneGeneratorComponent.cs
+++ b/Content.Server/_NF/PacifiedZone/PacifiedZoneGeneratorComponent.cs
@@ -23,5 +23,8 @@ public sealed partial class PacifiedZoneGeneratorComponent : Component
 
         [DataField]
         public List<ProtoId<JobPrototype>> ImmuneRoles = new();
+
+        [DataField]
+        public TimeSpan? ImmunePlaytime = null;
     }
 }
\ No newline at end of file
diff --git a/Content.Server/_NF/PacifiedZone/PacifiedZoneGeneratorSystem.cs b/Content.Server/_NF/PacifiedZone/PacifiedZoneGeneratorSystem.cs
index da6591a6237f..fcdcb3da5c08 100644
--- a/Content.Server/_NF/PacifiedZone/PacifiedZoneGeneratorSystem.cs
+++ b/Content.Server/_NF/PacifiedZone/PacifiedZoneGeneratorSystem.cs
@@ -1,9 +1,12 @@
+using Robust.Server.Player;
 using Robust.Shared.Timing;
+using Content.Server.Administration.Systems;
 using Content.Shared.Alert;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Humanoid;
 using Content.Shared.Mind;
 using Content.Shared.Roles.Jobs;
+using Content.Server.Players.PlayTimeTracking;
 
 namespace Content.Server._NF.PacifiedZone
 {
@@ -14,6 +17,9 @@ public sealed class PacifiedZoneGeneratorSystem : EntitySystem
         [Dependency] private readonly SharedMindSystem _mindSystem = default!;
         [Dependency] private readonly SharedJobSystem _jobSystem = default!;
         [Dependency] private readonly AlertsSystem _alerts = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly PlayTimeTrackingManager _playtimeTracking = default!;
+        [Dependency] private readonly AdminSystem _admin = default!;
 
         private const string Alert = "PacifiedZone";
 
@@ -26,26 +32,7 @@ public override void Initialize()
 
         private void OnComponentInit(EntityUid uid, PacifiedZoneGeneratorComponent component, ComponentInit args)
         {
-            foreach (var humanoidUid in _lookup.GetEntitiesInRange<HumanoidAppearanceComponent>(Transform(uid).Coordinates, component.Radius))
-            {
-                if (HasComp<PacifiedComponent>(humanoidUid))
-                    continue;
-
-                if (!_mindSystem.TryGetMind(humanoidUid, out var mindId, out var _))
-                    continue;
-
-                _jobSystem.MindTryGetJobId(mindId, out var jobId);
-
-                if (jobId != null && component.ImmuneRoles.Contains(jobId.Value))
-                    continue;
-
-                var pacifiedComponent = AddComp<PacifiedComponent>(humanoidUid);
-                EnableAlert(humanoidUid, pacifiedComponent);
-                AddComp<PacifiedByZoneComponent>(humanoidUid);
-                component.TrackedEntities.Add(humanoidUid);
-            }
-
-            component.NextUpdate = _gameTiming.CurTime + component.UpdateInterval;
+            UpdatePacifiedState(uid, component);
         }
 
         private void OnComponentShutdown(EntityUid uid, PacifiedZoneGeneratorComponent component, ComponentShutdown args)
@@ -65,55 +52,70 @@ public override void Update(float frameTime)
             var genQuery = AllEntityQuery<PacifiedZoneGeneratorComponent>();
             while (genQuery.MoveNext(out var genUid, out var component))
             {
-                List<EntityUid> newEntities = new List<EntityUid>();
                 // Not yet update time, skip this 
                 if (_gameTiming.CurTime < component.NextUpdate)
                     continue;
 
-                var query = _lookup.GetEntitiesInRange<HumanoidAppearanceComponent>(Transform(genUid).Coordinates, component.Radius);
-                foreach (var humanoidUid in query)
-                {
-                    if (!_mindSystem.TryGetMind(humanoidUid, out var mindId, out var mind))
-                        continue;
+                UpdatePacifiedState(genUid, component);
+            }
+        }
+
+        private void UpdatePacifiedState(EntityUid genUid, PacifiedZoneGeneratorComponent component)
+        {
+            List<EntityUid> newEntities = new List<EntityUid>();
+            var query = _lookup.GetEntitiesInRange<HumanoidAppearanceComponent>(Transform(genUid).Coordinates, component.Radius);
+            foreach (var humanoidUid in query)
+            {
+                // Check preconditions for an entity to be pacified at all.
+                // If player matches an immune role, or has playtime above a zone's threshold, it should not be pacified.
+                if (!_mindSystem.TryGetMind(humanoidUid, out var mindId, out var mind))
+                    continue;
 
-                    _jobSystem.MindTryGetJobId(mindId, out var jobId);
+                _jobSystem.MindTryGetJobId(mindId, out var jobId);
 
-                    // Player matches an immune role, should not be pacified.
-                    if (jobId != null && component.ImmuneRoles.Contains(jobId.Value))
-                        continue;
+                if (jobId != null && component.ImmuneRoles.Contains(jobId.Value))
+                    continue;
 
-                    if (component.TrackedEntities.Contains(humanoidUid))
-                    {
-                        // Entity still in zone.
-                        newEntities.Add(humanoidUid);
-                        component.TrackedEntities.Remove(humanoidUid);
-                    }
-                    else
+                if (component.ImmunePlaytime != null)
+                {
+                    var playerInfo = _admin.GetCachedPlayerInfo(mind?.UserId);
+                    if (playerInfo != null && playerInfo.OverallPlaytime >= component.ImmunePlaytime)
                     {
-                        // Player is pacified (either naturally or by another zone), skip them.
-                        if (HasComp<PacifiedComponent>(humanoidUid))
-                            continue;
-
-                        // New entity in zone, needs the Pacified comp.
-                        var pacifiedComponent = AddComp<PacifiedComponent>(humanoidUid);
-                        EnableAlert(humanoidUid, pacifiedComponent);
-                        AddComp<PacifiedByZoneComponent>(humanoidUid);
-                        newEntities.Add(humanoidUid);
+                        continue;
                     }
                 }
 
-                // Anything left in our old set has left the zone, remove their pacified status.
-                foreach (var humanoid_net_uid in component.TrackedEntities)
+                // Existing entity, note it still exists.
+                if (component.TrackedEntities.Contains(humanoidUid))
                 {
-                    RemComp<PacifiedComponent>(humanoid_net_uid);
-                    RemComp<PacifiedByZoneComponent>(humanoid_net_uid);
-                    DisableAlert(humanoid_net_uid);
+                    // Entity still in zone.
+                    newEntities.Add(humanoidUid);
+                    component.TrackedEntities.Remove(humanoidUid);
                 }
+                else
+                {
+                    // Player is pacified (either naturally or by another zone), skip them.
+                    if (HasComp<PacifiedComponent>(humanoidUid))
+                        continue;
 
-                // Update state for next run.
-                component.TrackedEntities = newEntities;
-                component.NextUpdate = _gameTiming.CurTime + component.UpdateInterval;
+                    // New entity in zone, needs the Pacified comp.
+                    var pacifiedComponent = AddComp<PacifiedComponent>(humanoidUid);
+                    EnableAlert(humanoidUid, pacifiedComponent);
+                    AddComp<PacifiedByZoneComponent>(humanoidUid);
+                    newEntities.Add(humanoidUid);
+                }
             }
+
+            // Anything left in our old set has left the zone, remove their pacified status.
+            foreach (var humanoid_net_uid in component.TrackedEntities)
+            {
+                RemComp<PacifiedComponent>(humanoid_net_uid);
+                RemComp<PacifiedByZoneComponent>(humanoid_net_uid);
+                DisableAlert(humanoid_net_uid);
+            }
+            // Update state for next run.
+            component.TrackedEntities = newEntities;
+            component.NextUpdate = _gameTiming.CurTime + component.UpdateInterval;
         }
 
         // Overrides the default Pacified alert with one for the pacified zone.
diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
index 58d1d2fbde51..e73311761822 100644
--- a/Resources/Maps/_NF/Outpost/frontier.yml
+++ b/Resources/Maps/_NF/Outpost/frontier.yml
@@ -28055,7 +28055,7 @@ entities:
     - type: Transform
       pos: -35.5,6.5
       parent: 2173
-- proto: PacifiedZone100
+- proto: PacifiedZonePanicBunker100
   entities:
   - uid: 2054
     components:
diff --git a/Resources/Maps/_NF/Shuttles/Bus/publicts.yml b/Resources/Maps/_NF/Shuttles/Bus/publicts.yml
index f43aa3851243..a77bfbfb66e0 100644
--- a/Resources/Maps/_NF/Shuttles/Bus/publicts.yml
+++ b/Resources/Maps/_NF/Shuttles/Bus/publicts.yml
@@ -678,7 +678,7 @@ entities:
       parent: 8756
     - type: Physics
       bodyType: Static
-- proto: PacifiedZone10
+- proto: PacifiedZonePanicBunker10
   entities:
   - uid: 84
     components:
diff --git a/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml b/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml
index 6b780f6caafc..b0468cd284fb 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml
@@ -56,3 +56,44 @@
   components:
   - type: PacifiedZoneGenerator
     radius: 100
+
+- type: entity
+  parent: BasePacifiedZone
+  id: BasePacifiedZonePanicBunker
+  abstract: true
+  components:
+  - type: PacifiedZoneGenerator
+    immunePlaytime: 36000 # 10h
+
+- type: entity
+  parent: BasePacifiedZonePanicBunker
+  id: PacifiedZonePanicBunker10
+  description: New players will not be able to attack living things within a 10 block radius of this point.
+  suffix: Panic Bunker, 10
+
+- type: entity
+  parent: BasePacifiedZonePanicBunker
+  id: PacifiedZonePanicBunker20
+  description: New players will not be able to attack living things within a 20 block radius of this point.
+  suffix: Panic Bunker, 20
+  components:
+  - type: PacifiedZoneGenerator
+    radius: 20
+
+- type: entity
+  parent: BasePacifiedZonePanicBunker
+  id: PacifiedZonePanicBunker50
+  description: New players will not be able to attack living things within a 50 block radius of this point.
+  suffix: Panic Bunker, 50
+  components:
+  - type: PacifiedZoneGenerator
+    radius: 50
+
+- type: entity
+  parent: BasePacifiedZonePanicBunker
+  id: PacifiedZonePanicBunker100
+  description: New players will not be able to attack living things within a 100 block radius of this point.
+  suffix: Panic Bunker, 100
+  components:
+  - type: PacifiedZoneGenerator
+    radius: 100
\ No newline at end of file

From 240bbe2889d255ba796efdd1f6ff33f8c906fae0 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Sat, 17 Aug 2024 16:39:16 +0000
Subject: [PATCH 39/39] Automatic Changelog (#1855)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 87baef23a266..15d05a331e25 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6354,3 +6354,11 @@ Entries:
       message: ThreadsChoom and BonanzaMatic vending machines now can be unanchored.
   id: 5205
   time: '2024-08-17T16:23:11.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Tweak
+      message: >-
+        Frontier's pacified zone now only affects users with 10 hours of
+        playtime or less.
+  id: 5206
+  time: '2024-08-17T16:38:47.0000000+00:00'