From 5e1fe8a01e8a4a553dbf779f46f6d2bcc08e0025 Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Thu, 17 Oct 2024 23:59:15 +0300
Subject: [PATCH 1/6] Folding Plastic Table (#2191)

* Folding Table

* non climable

* don't tread on me (folding table)

* Add foldable fixture system

* Unfolded/folded fixtures

* Make item fixture soft by default for folding tbl

* Remove comments, unneeded folded component

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
---
 .../_NF/Foldable/FoldableFixtureComponent.cs  |  10 ++
 .../_NF/Foldable/FoldableFixtureSystem.cs     |  56 ++++++++
 .../Entities/Structures/Furniture/tables.yml  | 123 ++++++++++++++++++
 .../Graphs/furniture/folding_table.yml        |  31 +++++
 .../_NF/Recipes/Construction/furniture.yml    |  18 +++
 .../Furniture/folding_table.rsi/folding.png   | Bin 0 -> 553 bytes
 .../folding_table.rsi/folding_folded.png      | Bin 0 -> 459 bytes
 .../folding_table.rsi/inhand-left.png         | Bin 0 -> 760 bytes
 .../folding_table.rsi/inhand-right.png        | Bin 0 -> 746 bytes
 .../Furniture/folding_table.rsi/meta.json     |  25 ++++
 10 files changed, 263 insertions(+)
 create mode 100644 Content.Shared/_NF/Foldable/FoldableFixtureComponent.cs
 create mode 100644 Content.Shared/_NF/Foldable/FoldableFixtureSystem.cs
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/tables.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/folding_table.yml
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding_folded.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/meta.json

diff --git a/Content.Shared/_NF/Foldable/FoldableFixtureComponent.cs b/Content.Shared/_NF/Foldable/FoldableFixtureComponent.cs
new file mode 100644
index 00000000000..a35cf433cb6
--- /dev/null
+++ b/Content.Shared/_NF/Foldable/FoldableFixtureComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared._NF.Foldable.Systems;
+
+[RegisterComponent]
+public sealed partial class FoldableFixtureComponent : Component
+{
+    [DataField(required: true)]
+    public List<string> FoldedFixtures;
+    [DataField(required: true)]
+    public List<string> UnfoldedFixtures;
+}
diff --git a/Content.Shared/_NF/Foldable/FoldableFixtureSystem.cs b/Content.Shared/_NF/Foldable/FoldableFixtureSystem.cs
new file mode 100644
index 00000000000..1ebbfcac260
--- /dev/null
+++ b/Content.Shared/_NF/Foldable/FoldableFixtureSystem.cs
@@ -0,0 +1,56 @@
+using Content.Shared.Foldable;
+using Robust.Shared.Physics.Systems;
+
+namespace Content.Shared._NF.Foldable.Systems;
+
+public sealed class FoldableFixtureSystem : EntitySystem
+{
+    [Dependency] private readonly FixtureSystem _fixtures = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<FoldableFixtureComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<FoldableFixtureComponent, FoldedEvent>(OnFolded);
+    }
+
+    private void OnMapInit(EntityUid uid, FoldableFixtureComponent component, MapInitEvent args)
+    {
+        if (TryComp<FoldableComponent>(uid, out var foldable))
+            SetFoldedFixtures(uid, foldable.IsFolded, component);
+    }
+
+    private void OnFolded(EntityUid uid, FoldableFixtureComponent? component, ref FoldedEvent args)
+    {
+        SetFoldedFixtures(uid, args.IsFolded, component);
+    }
+
+    // Sets all relevant fixtures for the entity to an appropriate hard/soft state.
+    private void SetFoldedFixtures(EntityUid uid, bool isFolded, FoldableFixtureComponent? component)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        if (isFolded)
+        {
+            SetAllFixtureHardness(uid, component.FoldedFixtures, true);
+            SetAllFixtureHardness(uid, component.UnfoldedFixtures, false);
+        }
+        else
+        {
+            SetAllFixtureHardness(uid, component.FoldedFixtures, false);
+            SetAllFixtureHardness(uid, component.UnfoldedFixtures, true);
+        }
+    }
+
+    // Sets all fixtures on an entity in a list to either be hard or soft.
+    void SetAllFixtureHardness(EntityUid uid, List<string> fixtures, bool hard)
+    {
+        foreach (var fixName in fixtures)
+        {
+            var fixture = _fixtures.GetFixtureOrNull(uid, fixName);
+            if (fixture != null)
+                _physics.SetHard(uid, fixture, hard);
+        }
+    }
+}
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/tables.yml
new file mode 100644
index 00000000000..895c91fad28
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Furniture/tables.yml
@@ -0,0 +1,123 @@
+
+- type: entity
+  parent: BaseDeployFoldable
+  id: TableFolding
+  name: folding table
+  description: If you carry six of these you become the coolest kid at church.
+  components:
+  # Table bits
+  - type: SpriteFade
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Climbable
+  - type: GlassTable
+    climberDamage:
+      types:
+        Blunt: 15
+    tableDamage:
+      types:
+        Blunt: 25
+    tableMassLimit: 60
+  - type: PlaceableSurface
+  - type: Physics
+    bodyType: Dynamic
+    fixedRotation: true
+  - type: Pullable
+  - type: Fixtures
+    fixtures:
+      table: # For the unfolded table
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        density: 55
+        mask:
+        - TableMask
+        layer:
+        - TableLayer
+        hard: true
+      item: # For the folded, carriable table
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+        hard: false
+  - type: Bonkable
+    bonkDamage:
+      types:
+        Blunt: 4
+    bonkSound: !type:SoundCollectionSpecifier
+      collection: TrayHit
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepHull
+  # Item bits
+  - type: MovedByPressure
+  - type: Item
+    size: Huge
+  - type: Sprite
+    sprite: _NF/Structures/Furniture/folding_table.rsi
+    layers:
+    - state: folding
+      map: ["unfoldedLayer"]
+    - state: folding_folded
+      map: ["foldedLayer"]
+      visible: false
+    noRot: true
+  - type: Appearance
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 8
+    soundHit:
+      collection: MetalThud
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 15
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound:
+            collection: MetalBreak
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlastic1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: StaticPrice
+    price: 20
+  - type: Construction
+    graph: TableFoldingGraph
+    node: TableFolding
+  - type: DamageExaminable
+  - type: FoldableFixture
+    foldedFixtures:
+    - item
+    unfoldedFixtures:
+    - table
+
+- type: entity
+  parent: TableFolding
+  id: TableFoldingSpawnFolded
+  suffix: folded
+  components:
+  - type: Foldable
+    folded: true
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/folding_table.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/folding_table.yml
new file mode 100644
index 00000000000..942dc82df93
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/folding_table.yml
@@ -0,0 +1,31 @@
+- type: constructionGraph
+  id: TableFoldingGraph
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity {}
+      edges:
+
+        - to: TableFolding
+          steps:
+            - material: Plastic
+              amount: 4
+              doAfter: 1
+            - material: MetalRod
+              amount: 4
+
+    - node: TableFolding
+      entity: TableFolding
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetPlastic1
+              amount: 4
+            - !type:SpawnPrototype
+              prototype: PartRodMetal1
+              amount: 4
+          steps:
+            - tool: Screwing
+              doAfter: 2
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml b/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml
index bd4dc5bce53..d4df40dd662 100644
--- a/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml
@@ -1126,3 +1126,21 @@
   canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
+
+# Folding table
+- type: construction
+  id: TableFolding
+  name: folding table
+  description: A table, but foldable.
+  graph: TableFoldingGraph
+  startNode: start
+  targetNode: TableFolding
+  category: construction-category-furniture
+  icon:
+    sprite: _NF/Structures/Furniture/folding_table.rsi
+    state: folding
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding.png b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e13ff9a81b2838b1bc4f12a7c9baf9be5d7290e
GIT binary patch
literal 553
zcmV+^0@nSBP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000WV@Og>004R>
z004l5008;`004mK004C_008P=0026d000+od=<I@0005RNkl<ZScUDEJx{_=6o#J~
z2bWqtlG{cTMDTMUE;5@KWq0z2xHGu>L!8`ENm!A^I0&ey3`U#yQCW<M)PdZFN{MY%
zjFETgZSOtrdD`Bbp2B~Z^6^4Gzh(OkHq9FVgqZN1aC>{lmD6>S&u`gtb1C0u^?Cz<
zpfTML&Oj!gO3e5+yKbHX1di#381WtXL;7`q(XfF>Cl?e8hXAbR6tbE0U;!HE7p&&i
zobkW`HaBw4Cd_W+!rJ`)9vA`)0fqpf0e1Han3jTRDeUeQLIZ>@M5&oH#liuAQxOLW
zkj<nKTBmoJN`x!J@R#?%cd6$U=*DDVlOQqj1J)OyTrT-G3)2&RlnX!_`jza8zoMSD
z9KeXEwkncDV;arsF}F`G&vl>4h^TgAVTs2Fi<Wui>C<-;Mq?U67h&?cBy>SEruCig
zA(D4Lzc@>!w2wBf(jJSufRd?cpi_*X(~<#PH7)@#?@S&aEJj}Lv7TEjudGu$J@b4D
zo`pyf%j9qESI1Z$g)W?g-E&fJ?N=C!qjh<<+)Mfc2wjj&O;aiDbKAU8I(J#~TKcJs
rh-%9x)~p5yG9s$)f5buieXHI9tCgSZUtHnN00000NkvXXu0mjf3)l0V

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding_folded.png b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding_folded.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1b3745a79387d7cdbb9a4c211d1a1b2f2546f07
GIT binary patch
literal 459
zcmV;+0W|)JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000WV@Og>004R>
z004l5008;`004mK004C_008P=0026d000+od=<I@0004INkl<ZScUDDze@sf7>6It
zT^c&YpQ&-RIJ()8*=-IDQT+!FF5>RsE-n2BE`dXXn^_S?C`3XnA*LmQQ4L1A1>Yv6
z>n`QM&3m@*`@WxhpIh#GU}9oovglZh22$ya0JyE!b^EoOYeUa8G@MFj#B;l&+q2o0
z0C?^94M|KLOeD6%@3XKjvl<KlaD0@XWXED&zn5O;e(J(f=~A^*S0I@@6nb?4IlRex
z?@?7-@odn1s7_rBFdBU`7<{NCY<kNj$;D1w;icOG;G}p?Oo=1e1t5^@>wi)LDH`SN
z)51l$!olA5q~rIkaaJkQXxuRze&O*1R7s71B)O2~AP%Q{Qi~}T+N~!dyUNrzteuvL
zDRKP1(4^*Yx{>7|0M+W1CZiG1BN7e~35RCR?avU@!)iD&XG{T8z!X?KfkL4;`!dRA
zGh+PtoCnQjn@*>zS^lrUSYloRxm@1xkB`aX@B@&nXFJ4TjP3vc002ovPDHLkV1nx(
B$8-Py

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-left.png b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..0549aafb46cbfd0536b47f850f4aac01df86bc31
GIT binary patch
literal 760
zcmV<U0tfwxP)<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)}07GtalnbDySpWb5E=fc|RCt{2*)ej1Fc3h|btdOXnjB-3
zHfO+YT<S<F-PoKVZK7kONiISvc?ba^7%7s6|7IvKXpxo$GqWN900000006dRmpY&^
zP1oPIwq1RVl(DAVr4A?}a@Zf`us>E8YfP2|+!7K{dIF`9fYK8vZSx7Z&k^)|IaL`8
z000000000sFS^@mOw+}5XaA$4n^II?V7RCdRlROY$CeP?7f@BPww*oi@!_dANW?j}
zYGOlEi5yng(hAJd7)i}9%2!pNs!mpzb8hz0U6g>2_qR?&<oV@wG@w78gR1_nuBbut
z6&T$coV$3=#pgtGH1@>v<uv*XdSBn4e|}5#0?a8Y0oJxVW123sps8cEe+N`OIWP1t
q5aMr2=qB7m0z}q-P}N?6Kw&=!*<y&`sBm=v0000<MNUMnLSTZJ%v-|%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-right.png b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..4755db1c7a2edce3662ccc2e6f0a0d18ec453f0f
GIT binary patch
literal 746
zcmV<G0u}v<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)}07GtalnbDySpWb5AW1|)RCt{2+A(s2Fc3h|C6jYFO^%_Y
z%^9#8mmG;QO~M&yVUOV^xd^H7s7TlqVG!8=&A9Mbl2^MzFe5|&00000007*RV(Q1L
zDu?)cT{n~Mw;(m<2W!C7@hqp~`JZ8}D<x(#0k@6><PIP=5|BH9-0nUBk5+?^&-WF=
zSk@k61^@s60001hRovWZ@7TwClD+A3fpPL7gzG1@uf;qUuqyD^A1(DRK?p&f4$sMb
zRMpjXG68V~qQT9~s%p|Q%*k8<b1EP~+!aXGckS@<`u1yL`>q{CM83W+?(sIg2drV2
z2^cHA1oINeO;tsloBz1<Q!c+vC!nsIqN>WlJE6FpcLR34CYN&mjRV=kUBLBJHD};G
cOdf#z0AD;~Pys-*-v9sr07*qoM6N<$f@E4-ApigX

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/meta.json b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/meta.json
new file mode 100644
index 00000000000..077a74633aa
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/9a035f9365bcb74ac40fbe79c74c43c4c80cc1e4",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "folding"
+        },
+        {
+            "name": "folding_folded"
+        },
+        {
+            "name": "inhand-left",
+			"directions": 4
+        },
+        {
+            "name": "inhand-right",
+			"directions": 4
+        }
+    ]
+}

From 1c83b5e91448813b125b7718cb912e174d4f3c6b Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Thu, 17 Oct 2024 20:59:40 +0000
Subject: [PATCH 2/6] Automatic Changelog (#2191)

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

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 426ed6d040a..cda4642a3ac 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -4678,3 +4678,9 @@ Entries:
       message: Lubrication now affects base and hyper lathe print times at 0.5x rates.
   id: 5418
   time: '2024-10-17T18:41:39.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added foldable plastic table to compliment folding chairs.
+  id: 5419
+  time: '2024-10-17T20:59:15.0000000+00:00'

From 191c146d59b94f59505509e5bf7e7248d9ba99e4 Mon Sep 17 00:00:00 2001
From: dustylens <54123313+dustylens@users.noreply.github.com>
Date: Thu, 17 Oct 2024 21:35:46 +0000
Subject: [PATCH 3/6] Adds Medical Assembler to FSB Stasis (#2207)

* Adds Medical Assembler to FSB Stasis

* Update stasis.yml

* Fixups

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
---
 Resources/Maps/_NF/Shuttles/stasis.yml       | 453 ++++++++++---------
 Resources/Prototypes/_NF/Shipyard/stasis.yml |   2 +-
 2 files changed, 229 insertions(+), 226 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/stasis.yml b/Resources/Maps/_NF/Shuttles/stasis.yml
index 9f2445f7b9c..4f2f0a55aa7 100644
--- a/Resources/Maps/_NF/Shuttles/stasis.yml
+++ b/Resources/Maps/_NF/Shuttles/stasis.yml
@@ -41,13 +41,13 @@ entities:
     - type: MetaData
       name: Stasis
     - type: Transform
-      pos: -0.546875,-0.53125
+      pos: -0.5,-0.6875
       parent: invalid
     - type: MapGrid
       chunks:
         0,0:
           ind: 0,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAwAAAAAADgAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADgAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
@@ -86,8 +86,8 @@ entities:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            72: 12,10
-            73: 14,10
+            276: 13,10
+            277: 14,10
         - node:
             color: '#FFFFFFFF'
             id: Bot
@@ -418,10 +418,10 @@ entities:
             24: 18,3
             25: 18,-1
         - node:
-            color: '#951710FF'
+            color: '#9C2020FF'
             id: BrickTileWhiteLineE
           decals:
-            179: 14,10
+            274: 14,10
         - node:
             color: '#B3B3B3FF'
             id: BrickTileWhiteLineE
@@ -490,10 +490,10 @@ entities:
             33: 16,3
             34: 16,-1
         - node:
-            color: '#951710FF'
+            color: '#9C2020FF'
             id: BrickTileWhiteLineW
           decals:
-            178: 12,10
+            275: 13,10
         - node:
             color: '#B3B3B3FF'
             id: BrickTileWhiteLineW
@@ -735,11 +735,10 @@ entities:
             id: WarnLineN
           decals:
             212: 13,-8
-            238: 12,9
             239: 13,9
             240: 14,9
             241: 14,11
-            242: 12,11
+            264: 13,11
         - node:
             color: '#B3B3B3FF'
             id: WarnLineS
@@ -752,11 +751,10 @@ entities:
             id: WarnLineW
           decals:
             211: 13,-8
-            243: 12,9
             244: 13,9
             245: 14,9
             246: 14,11
-            247: 12,11
+            265: 13,11
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -780,7 +778,9 @@ entities:
           3,1:
             1: 32631
           3,2:
-            1: 22391
+            1: 26471
+          2,2:
+            0: 32768
           3,0:
             1: 28398
           3,-1:
@@ -884,13 +884,17 @@ entities:
       - 409
       - 145
       - 599
-      - 288
+      - 166
       - 519
       - 345
       - 226
       - 8
-      - 127
+      - 618
       - 218
+      - 342
+      - 400
+      - 434
+      - 348
   - uid: 452
     components:
     - type: Transform
@@ -904,17 +908,6 @@ entities:
       - 536
       - 609
       - 603
-  - uid: 556
-    components:
-    - type: Transform
-      pos: 19.5,7.5
-      parent: 1
-    - type: DeviceList
-      devices:
-      - 434
-      - 342
-      - 400
-      - 348
 - proto: AirlockEngineering
   entities:
   - uid: 46
@@ -934,24 +927,19 @@ entities:
     - type: Transform
       pos: 14.5,9.5
       parent: 1
-  - uid: 383
-    components:
-    - type: Transform
-      pos: 12.5,9.5
-      parent: 1
 - proto: AirlockGlassShuttle
   entities:
-  - uid: 156
+  - uid: 55
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 14.5,11.5
+      pos: 13.5,11.5
       parent: 1
-  - uid: 166
+  - uid: 186
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 12.5,11.5
+      pos: 14.5,11.5
       parent: 1
 - proto: AirlockMedicalGlass
   entities:
@@ -1016,6 +1004,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.5,7.5
       parent: 1
+  - uid: 88
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,11.5
+      parent: 1
   - uid: 110
     components:
     - type: Transform
@@ -1028,12 +1022,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 14.5,11.5
       parent: 1
-  - uid: 172
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.5,11.5
-      parent: 1
   - uid: 176
     components:
     - type: Transform
@@ -1062,6 +1050,11 @@ entities:
     - type: Transform
       pos: 24.5,-7.5
       parent: 1
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 11.5,11.5
+      parent: 1
   - uid: 526
     components:
     - type: Transform
@@ -1154,14 +1147,11 @@ entities:
       parent: 1
 - proto: BannerMedical
   entities:
-  - uid: 550
+  - uid: 172
     components:
     - type: Transform
-      anchored: True
-      pos: 13.5,10.5
+      pos: 12.5,10.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: Bed
   entities:
   - uid: 44
@@ -1261,8 +1251,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,5.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpRight
   entities:
   - uid: 72
@@ -1271,8 +1259,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,4.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BlastDoorOpen
   entities:
   - uid: 312
@@ -1295,8 +1281,7 @@ entities:
   - uid: 130
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.418333,-3.4793668
+      pos: 11.500278,-4.509832
       parent: 1
 - proto: ButtonFrameCaution
   entities:
@@ -1306,6 +1291,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,4.5
       parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,8.5
+      parent: 1
   - uid: 602
     components:
     - type: Transform
@@ -1317,6 +1308,13 @@ entities:
     - type: Transform
       pos: 12.5,-7.5
       parent: 1
+- proto: ButtonFrameCautionSecurity
+  entities:
+  - uid: 127
+    components:
+    - type: Transform
+      pos: 15.5,3.5
+      parent: 1
 - proto: ButtonFrameGrey
   entities:
   - uid: 63
@@ -1895,13 +1893,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,10.5
       parent: 1
-- proto: ClothingBeltUtilityFilled
+- proto: ClothingBeltUtilityEngineering
   entities:
-  - uid: 336
+  - uid: 64
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 14.492705,-1.3393784
+      pos: 14.387511,-1.4651437
       parent: 1
 - proto: ClothingCloakCmo
   entities:
@@ -1924,22 +1922,6 @@ entities:
     - type: Transform
       pos: 22.3211,7.4096994
       parent: 1
-- proto: ClothingNeckScarfStripedLightBlue
-  entities:
-  - uid: 567
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.504137,-4.582796
-      parent: 1
-- proto: ClothingNeckScarfStripedRed
-  entities:
-  - uid: 566
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.504137,-4.520296
-      parent: 1
 - proto: ClothingOuterCoatLabCmo
   entities:
   - uid: 572
@@ -1972,24 +1954,12 @@ entities:
       parent: 1
 - proto: ComputerWallmountWithdrawBankATM
   entities:
-  - uid: 173
+  - uid: 567
     components:
     - type: Transform
-      pos: 15.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: 15.5,7.5
       parent: 1
-    - 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: CrateChemistryD
   entities:
   - uid: 457
@@ -2036,13 +2006,6 @@ entities:
     - type: Transform
       pos: 22.5,-8.5
       parent: 1
-- proto: CrateMaterials
-  entities:
-  - uid: 64
-    components:
-    - type: Transform
-      pos: 11.5,-4.5
-      parent: 1
 - proto: CryoPod
   entities:
   - uid: 334
@@ -2106,11 +2069,11 @@ entities:
       parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 202
+  - uid: 288
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 15.5,-4.5
+      rot: 3.141592653589793 rad
+      pos: 16.5,-5.5
       parent: 1
   - uid: 418
     components:
@@ -2170,12 +2133,12 @@ entities:
     - type: Transform
       pos: 18.5,4.5
       parent: 1
-- proto: EmergencyRollerBed
+- proto: EmergencyRollerBedSpawnFolded
   entities:
   - uid: 568
     components:
     - type: Transform
-      pos: 14.787477,5.497296
+      pos: 14.443597,5.490514
       parent: 1
 - proto: ExtinguisherCabinetFilled
   entities:
@@ -2379,13 +2342,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0FF0FCFF'
-  - uid: 584
-    components:
-    - type: Transform
-      pos: 13.5,10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
 - proto: GasPipeFourway
   entities:
   - uid: 388
@@ -2712,11 +2668,11 @@ entities:
   - uid: 464
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 20.5,-6.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 466
     components:
     - type: Transform
@@ -2901,6 +2857,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 614
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 630
     components:
     - type: Transform
@@ -3152,6 +3116,16 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+- proto: GasPressurePumpOnMax
+  entities:
+  - uid: 173
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasThermoMachineFreezer
   entities:
   - uid: 483
@@ -3175,11 +3149,10 @@ entities:
       - 419
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 127
+  - uid: 166
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-6.5
+      pos: 13.5,10.5
       parent: 1
     - type: DeviceNetwork
       deviceLists:
@@ -3219,17 +3192,6 @@ entities:
       - 419
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 288
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,10.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 419
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 342
     components:
     - type: Transform
@@ -3237,7 +3199,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 556
+      - 419
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 345
@@ -3259,7 +3221,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 556
+      - 419
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 519
@@ -3273,6 +3235,17 @@ entities:
       - 419
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 618
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,-8.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 419
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
   - uid: 145
@@ -3305,7 +3278,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 556
+      - 419
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 400
@@ -3315,7 +3288,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 556
+      - 419
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 409
@@ -3408,12 +3381,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 24.5,-2.5
       parent: 1
-  - uid: 155
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,11.5
-      parent: 1
   - uid: 159
     components:
     - type: Transform
@@ -3582,31 +3549,26 @@ entities:
       parent: 1
     - type: Physics
       bodyType: Static
-- proto: LockerWallChemistryFilled
+- proto: LockerWallColorChemistryFilled
   entities:
-  - uid: 212
+  - uid: 18
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 20.5,-5.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: LockerWallEVAColorMedicalFilled
+- proto: LockerWallColorMedicalDoctorFilled
   entities:
-  - uid: 307
+  - uid: 212
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,7.5
+      rot: 3.141592653589793 rad
+      pos: 19.5,5.5
+      parent: 1
+  - uid: 352
+    components:
+    - type: Transform
+      pos: 19.5,7.5
       parent: 1
 - proto: LockerWallEVAColorParamedicFilled
   entities:
@@ -3622,6 +3584,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,5.5
       parent: 1
+- proto: LockerWallMaterialsBasicFilled
+  entities:
+  - uid: 336
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-4.5
+      parent: 1
 - proto: LockerWallMaterialsFuelUraniumFilled
   entities:
   - uid: 605
@@ -3650,6 +3620,13 @@ entities:
     - type: Transform
       pos: 23.5,-1.5
       parent: 1
+- proto: MedicalAssembler
+  entities:
+  - uid: 566
+    components:
+    - type: Transform
+      pos: 21.5,-1.5
+      parent: 1
 - proto: MedicalBed
   entities:
   - uid: 67
@@ -3679,13 +3656,13 @@ entities:
     - type: Transform
       pos: 20.5,-3.5
       parent: 1
-- proto: Multitool
+- proto: NFPosterContrabandEmsCoords
   entities:
-  - uid: 578
+  - uid: 287
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.544788,-1.8185453
+      rot: 1.5707963267948966 rad
+      pos: 16.5,8.5
       parent: 1
 - proto: NFPosterContrabandFsbLogo
   entities:
@@ -3703,17 +3680,45 @@ entities:
       parent: 1
 - proto: NFSignDock
   entities:
-  - uid: 486
+  - uid: 487
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,11.5
+      pos: 15.5,11.5
       parent: 1
-  - uid: 487
+- proto: NFSignEms1
+  entities:
+  - uid: 407
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 15.5,11.5
+      rot: 3.141592653589793 rad
+      pos: 15.5,5.5
+      parent: 1
+- proto: NFSignEms2
+  entities:
+  - uid: 155
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,11.5
+      parent: 1
+  - uid: 486
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,-5.5
+      parent: 1
+  - uid: 556
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-5.5
+      parent: 1
+  - uid: 560
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,4.5
       parent: 1
 - proto: NitrogenCanister
   entities:
@@ -3759,9 +3764,7 @@ entities:
       pos: 12.5,-8.5
       parent: 1
     - type: FuelGenerator
-      on: False
-    - type: Physics
-      bodyType: Static
+      targetPower: 31000
 - proto: PosterLegitAnatomyPoster
   entities:
   - uid: 208
@@ -3770,14 +3773,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 21.5,3.5
       parent: 1
-- proto: PosterLegitBlessThisSpess
-  entities:
-  - uid: 267
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,8.5
-      parent: 1
 - proto: PosterLegitPeriodicTable
   entities:
   - uid: 163
@@ -3979,14 +3974,6 @@ entities:
     - type: Transform
       pos: 10.5,-6.5
       parent: 1
-- proto: RandomPainting
-  entities:
-  - uid: 287
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,7.5
-      parent: 1
 - proto: SeedExtractor
   entities:
   - uid: 227
@@ -4002,6 +3989,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,-2.5
       parent: 1
+  - uid: 550
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,-5.5
+      parent: 1
 - proto: ShelfRMetal
   entities:
   - uid: 285
@@ -4126,12 +4119,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 20.5,11.5
       parent: 1
-  - uid: 33
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,11.5
-      parent: 1
   - uid: 78
     components:
     - type: Transform
@@ -4233,6 +4220,23 @@ entities:
         - Pressed: Toggle
         312:
         - Pressed: Toggle
+  - uid: 584
+    components:
+    - type: Transform
+      pos: 15.5,3.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        51:
+        - Pressed: DoorBolt
+        462:
+        - Pressed: DoorBolt
+        539:
+        - Pressed: DoorBolt
+        28:
+        - Pressed: DoorBolt
+        292:
+        - Pressed: DoorBolt
   - uid: 604
     components:
     - type: Transform
@@ -4300,14 +4304,34 @@ entities:
         - Pressed: Toggle
         128:
         - Pressed: Toggle
-- proto: SignBridge
-  entities:
-  - uid: 186
+  - uid: 570
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,8.5
       parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        68:
+        - Pressed: Toggle
+        24:
+        - Pressed: Toggle
+        121:
+        - Pressed: Toggle
+        61:
+        - Pressed: Toggle
+        284:
+        - Pressed: Toggle
+        362:
+        - Pressed: Toggle
+        327:
+        - Pressed: Toggle
+        299:
+        - Pressed: Toggle
+        495:
+        - Pressed: Toggle
+        494:
+        - Pressed: Toggle
 - proto: SignChem
   entities:
   - uid: 500
@@ -4316,14 +4340,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 19.5,-0.5
       parent: 1
-- proto: SignCryogenicsMed
-  entities:
-  - uid: 407
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-5.5
-      parent: 1
 - proto: SignEngineering
   entities:
   - uid: 426
@@ -4347,32 +4363,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 22.5,-5.5
       parent: 1
-- proto: SignMedical
-  entities:
-  - uid: 352
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,5.5
-      parent: 1
-  - uid: 560
-    components:
-    - type: Transform
-      pos: 24.5,-5.5
-      parent: 1
-  - uid: 570
-    components:
-    - type: Transform
-      pos: 10.5,-5.5
-      parent: 1
 - proto: SignSpace
   entities:
-  - uid: 18
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,4.5
-      parent: 1
   - uid: 482
     components:
     - type: Transform
@@ -4600,10 +4592,10 @@ entities:
       parent: 1
 - proto: VendingMachineTankDispenserEVA
   entities:
-  - uid: 55
+  - uid: 202
     components:
     - type: Transform
-      pos: 12.5,4.5
+      pos: 12.5,8.5
       parent: 1
 - proto: WallmountTelevision
   entities:
@@ -4643,6 +4635,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,-7.5
       parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,9.5
+      parent: 1
   - uid: 34
     components:
     - type: Transform
@@ -4732,12 +4730,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,9.5
       parent: 1
-  - uid: 88
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,11.5
-      parent: 1
   - uid: 89
     components:
     - type: Transform
@@ -4824,7 +4816,7 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 15.5,-4.5
+      pos: 12.5,11.5
       parent: 1
   - uid: 125
     components:
@@ -4874,6 +4866,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 19.5,4.5
       parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-4.5
+      parent: 1
   - uid: 160
     components:
     - type: Transform
@@ -5171,6 +5169,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 23.5,3.5
       parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 11.5,11.5
+      parent: 1
   - uid: 278
     components:
     - type: Transform
diff --git a/Resources/Prototypes/_NF/Shipyard/stasis.yml b/Resources/Prototypes/_NF/Shipyard/stasis.yml
index d8163f2c046..c3c8e89ce0f 100644
--- a/Resources/Prototypes/_NF/Shipyard/stasis.yml
+++ b/Resources/Prototypes/_NF/Shipyard/stasis.yml
@@ -12,7 +12,7 @@
   id: Stasis
   name: FSB Stasis
   description: A medium medical vessel providing cryogenic and support medical services for the traumas of deep space operations. Designed, developed and deployed by the Far Star Biotech company to render aid wherever it is needed.
-  price: 54000 #Appraise value 50196 with ~8% markup - TODO: fix this value, getting tests to pass - Whatstone
+  price: 55000 # TODO: fix this value, getting tests to pass - Whatstone
   category: Medium
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/stasis.yml

From 6060339f0e5a7bcc20e7b4e3e7a5cda6a0fe1800 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Thu, 17 Oct 2024 21:36:11 +0000
Subject: [PATCH 4/6] Automatic Changelog (#2207)

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

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index cda4642a3ac..cdfc202041c 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -4684,3 +4684,9 @@ Entries:
       message: Added foldable plastic table to compliment folding chairs.
   id: 5419
   time: '2024-10-17T20:59:15.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: FSB Stasis now boasts a medical assembler.
+  id: 5420
+  time: '2024-10-17T21:35:46.0000000+00:00'

From d6ae4e51713d692c36912a050c4f157c2a5f738f Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Thu, 17 Oct 2024 17:55:25 -0400
Subject: [PATCH 5/6] Remove salvage magnet board recipes (#2272)

* Remove station anchor, salv magnet board recipes

* Restore station anchor
---
 Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 1324d7c286d..1058cac7277 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -504,7 +504,7 @@
     - SpaceHeaterMachineCircuitBoard
     - CutterMachineCircuitboard
     - StationAnchorCircuitboard
-    - SalvageMagnetMachineCircuitboard
+    # - SalvageMagnetMachineCircuitboard # Frontier
     - SalvageTechFabCircuitboardNF # Frontier
     - BlueprintLithographMachineCircuitboard # Frontier
     dynamicRecipes:
@@ -1208,7 +1208,7 @@
       - ClothingOuterWinterSci
       - ClothingOuterWinterRobo
 #      - ClothingOuterWinterSec # Frontier
-      - ClothingOuterWinterCoatMail
+      - ClothingOuterWinterCoatMail # Frontier
       # Ties
       - ClothingNeckTieRed
       - ClothingNeckTieDet

From f029ce4aaf5cb7373a9fbf079dfbdf6ee7bba0ff Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Thu, 17 Oct 2024 21:55:51 +0000
Subject: [PATCH 6/6] Automatic Changelog (#2272)

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

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index cdfc202041c..97762b554de 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -4690,3 +4690,9 @@ Entries:
       message: FSB Stasis now boasts a medical assembler.
   id: 5420
   time: '2024-10-17T21:35:46.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Remove
+      message: The salvage magnet is no longer printable from the circuit imprinter.
+  id: 5421
+  time: '2024-10-17T21:55:25.0000000+00:00'