From 36b53fd257f279a954bf1573a1cd9c6de3b11e33 Mon Sep 17 00:00:00 2001
From: Kennedy <kennedy@pop-os.localdomain>
Date: Fri, 28 Jul 2023 20:28:09 -0600
Subject: [PATCH] four new civilian ships now with fax machines

---
 Resources/Maps/Shuttles/bocadillo.yml | 12 +++++
 Resources/Maps/Shuttles/forge.yml     | 72 ++++++++++++++++++++++++++-
 Resources/Maps/Shuttles/honker.yml    | 14 ++++++
 3 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/Resources/Maps/Shuttles/bocadillo.yml b/Resources/Maps/Shuttles/bocadillo.yml
index 02d06ca113e..b8f5e2856d5 100644
--- a/Resources/Maps/Shuttles/bocadillo.yml
+++ b/Resources/Maps/Shuttles/bocadillo.yml
@@ -578,6 +578,13 @@ entities:
       pos: 2.5,2.5
       parent: 2
       type: Transform
+- proto: FaxMachineBase
+  entities:
+  - uid: 180
+    components:
+    - pos: -8.5,6.5
+      parent: 2
+      type: Transform
 - proto: GeneratorUranium
   entities:
   - uid: 86
@@ -1086,6 +1093,11 @@ entities:
       pos: 1.5,4.5
       parent: 2
       type: Transform
+  - uid: 179
+    components:
+    - pos: -8.5,6.5
+      parent: 2
+      type: Transform
 - proto: Thruster
   entities:
   - uid: 76
diff --git a/Resources/Maps/Shuttles/forge.yml b/Resources/Maps/Shuttles/forge.yml
index f51aec80af4..491809c055f 100644
--- a/Resources/Maps/Shuttles/forge.yml
+++ b/Resources/Maps/Shuttles/forge.yml
@@ -586,6 +586,48 @@ entities:
       type: Transform
     - enabled: True
       type: AmbientSound
+  - uid: 259
+    components:
+    - pos: 9.5,4.5
+      parent: 2
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+  - uid: 260
+    components:
+    - pos: 10.5,4.5
+      parent: 2
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+  - uid: 261
+    components:
+    - pos: 10.5,5.5
+      parent: 2
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+  - uid: 262
+    components:
+    - pos: 9.5,4.5
+      parent: 2
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+  - uid: 263
+    components:
+    - pos: 10.5,4.5
+      parent: 2
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+  - uid: 264
+    components:
+    - pos: 10.5,5.5
+      parent: 2
+      type: Transform
+    - enabled: True
+      type: AmbientSound
 - proto: CableApcStack
   entities:
   - uid: 251
@@ -609,6 +651,20 @@ entities:
       type: Transform
     - enabled: True
       type: AmbientSound
+  - uid: 255
+    components:
+    - pos: 9.5,5.5
+      parent: 2
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+  - uid: 256
+    components:
+    - pos: 9.5,4.5
+      parent: 2
+      type: Transform
+    - enabled: True
+      type: AmbientSound
 - proto: CableHVStack
   entities:
   - uid: 250
@@ -825,6 +881,13 @@ entities:
       pos: -2.5,7.5
       parent: 2
       type: Transform
+- proto: FaxMachineBase
+  entities:
+  - uid: 258
+    components:
+    - pos: 10.5,5.5
+      parent: 2
+      type: Transform
 - proto: GeneratorUranium
   entities:
   - uid: 104
@@ -1530,11 +1593,11 @@ entities:
     - pos: 2.5,5.5
       parent: 2
       type: Transform
-- proto: SubstationBasic
+- proto: SubstationWallBasic
   entities:
   - uid: 105
     components:
-    - pos: 10.5,5.5
+    - pos: 9.5,4.5
       parent: 2
       type: Transform
 - proto: TableGlass
@@ -1561,6 +1624,11 @@ entities:
     - pos: 2.5,6.5
       parent: 2
       type: Transform
+  - uid: 257
+    components:
+    - pos: 10.5,5.5
+      parent: 2
+      type: Transform
 - proto: Thruster
   entities:
   - uid: 153
diff --git a/Resources/Maps/Shuttles/honker.yml b/Resources/Maps/Shuttles/honker.yml
index cb12475eb7f..4c9bc722e90 100644
--- a/Resources/Maps/Shuttles/honker.yml
+++ b/Resources/Maps/Shuttles/honker.yml
@@ -1310,6 +1310,13 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
+- proto: FaxMachineBase
+  entities:
+  - uid: 260
+    components:
+    - pos: 0.5,10.5
+      parent: 2
+      type: Transform
 - proto: FirelockGlass
   entities:
   - uid: 71
@@ -1741,6 +1748,13 @@ entities:
     - pos: 6.5,11.5
       parent: 2
       type: Transform
+- proto: TableReinforced
+  entities:
+  - uid: 259
+    components:
+    - pos: 0.5,10.5
+      parent: 2
+      type: Transform
 - proto: Thruster
   entities:
   - uid: 191