From c992863685431d28a8d95519c604facac987f38f Mon Sep 17 00:00:00 2001
From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Date: Sun, 22 Oct 2023 20:08:58 -0400
Subject: [PATCH] Update Edge (#212)

* Update Edge

* Update edge.yml
---
 Resources/Maps/edge.yml            | 145 ++++++++++++++++++++---------
 Resources/Prototypes/Maps/edge.yml |   2 +-
 2 files changed, 103 insertions(+), 44 deletions(-)

diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml
index 3a01a54101e..5263ff09525 100644
--- a/Resources/Maps/edge.yml
+++ b/Resources/Maps/edge.yml
@@ -3542,6 +3542,9 @@ entities:
             2489: 3,-8
             2490: 2,-8
             2494: 8,-8
+            2630: 5,-1
+            2631: 7,-1
+            2632: 9,-1
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale180
@@ -3875,6 +3878,7 @@ entities:
             2455: 7,-12
             2458: 8,-11
             2462: 12,-11
+            2634: 15,-1
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale270
@@ -3913,6 +3917,7 @@ entities:
             id: QuarterTileOverlayGreyscale270
           decals:
             2463: 14,-11
+            2633: 10,-1
         - node:
             color: '#D381C996'
             id: QuarterTileOverlayGreyscale270
@@ -7476,6 +7481,9 @@ entities:
     - pos: -41.5,-15.5
       parent: 2
       type: Transform
+    - links:
+      - 1290
+      type: DeviceLinkSink
   - uid: 10939
     components:
     - pos: -44.5,-9.5
@@ -7506,6 +7514,9 @@ entities:
     - pos: -35.5,-16.5
       parent: 2
       type: Transform
+    - links:
+      - 1292
+      type: DeviceLinkSink
   - uid: 10946
     components:
     - pos: -44.5,-8.5
@@ -7516,11 +7527,17 @@ entities:
     - pos: -39.5,-16.5
       parent: 2
       type: Transform
+    - links:
+      - 1281
+      type: DeviceLinkSink
   - uid: 10949
     components:
     - pos: -41.5,-12.5
       parent: 2
       type: Transform
+    - links:
+      - 1278
+      type: DeviceLinkSink
   - uid: 14216
     components:
     - pos: -22.5,22.5
@@ -11392,21 +11409,53 @@ entities:
     - pos: -40.5,-10.5
       parent: 2
       type: Transform
+    - label: CEL-1
+      type: SignalTimer
+    - linkedPorts:
+        10949:
+        - Start: Close
+        - Timer: AutoClose
+        - Timer: Open
+      type: DeviceLinkSource
   - uid: 1281
     components:
     - pos: -38.5,-16.5
       parent: 2
       type: Transform
+    - label: CEL-3
+      type: SignalTimer
+    - linkedPorts:
+        10947:
+        - Start: Close
+        - Timer: AutoClose
+        - Timer: Open
+      type: DeviceLinkSource
   - uid: 1290
     components:
     - pos: -41.5,-13.5
       parent: 2
       type: Transform
+    - label: CEL-2
+      type: SignalTimer
+    - linkedPorts:
+        10938:
+        - Start: Close
+        - Timer: AutoClose
+        - Timer: Open
+      type: DeviceLinkSource
   - uid: 1292
     components:
     - pos: -36.5,-16.5
       parent: 2
       type: Transform
+    - label: CEL-4
+      type: SignalTimer
+    - linkedPorts:
+        10944:
+        - Start: Close
+        - Timer: AutoClose
+        - Timer: Open
+      type: DeviceLinkSource
   - uid: 3064
     components:
     - rot: 3.141592653589793 rad
@@ -39514,9 +39563,9 @@ entities:
       type: Transform
 - proto: CrateFreezer
   entities:
-  - uid: 10677
+  - uid: 659
     components:
-    - pos: -10.5,14.5
+    - pos: 31.5,-12.5
       parent: 2
       type: Transform
 - proto: CrateFunBoxing
@@ -48462,7 +48511,7 @@ entities:
     - pos: -61.46964,-8.387285
       parent: 2
       type: Transform
-- proto: FoodMealTaco
+- proto: FoodMealSoftTaco
   entities:
   - uid: 1247
     components:
@@ -70853,6 +70902,11 @@ entities:
       type: Transform
 - proto: GeigerCounter
   entities:
+  - uid: 4178
+    components:
+    - pos: -48.71885,34.98339
+      parent: 2
+      type: Transform
   - uid: 16657
     components:
     - pos: -20.634808,-28.440205
@@ -76913,6 +76967,21 @@ entities:
             ReagentId: Oxygen
             Quantity: 200
       type: SolutionContainerManager
+- proto: KitchenDeepFryer
+  entities:
+  - uid: 16309
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -9.5,14.5
+      parent: 2
+      type: Transform
+- proto: KitchenElectricGrill
+  entities:
+  - uid: 17045
+    components:
+    - pos: -8.5,17.5
+      parent: 2
+      type: Transform
 - proto: KitchenMicrowave
   entities:
   - uid: 633
@@ -76945,11 +77014,6 @@ entities:
     - pos: 6.5,6.5
       parent: 2
       type: Transform
-  - uid: 17045
-    components:
-    - pos: -9.5,14.5
-      parent: 2
-      type: Transform
   - uid: 17202
     components:
     - pos: 30.5,-12.5
@@ -77253,11 +77317,6 @@ entities:
     - pos: -15.5,13.5
       parent: 2
       type: Transform
-  - uid: 4178
-    components:
-    - pos: 31.5,-12.5
-      parent: 2
-      type: Transform
 - proto: LockerHeadOfPersonnelFilled
   entities:
   - uid: 3611
@@ -78129,6 +78188,13 @@ entities:
     - pos: 1.5,19.5
       parent: 2
       type: Transform
+- proto: OilJarCorn
+  entities:
+  - uid: 17210
+    components:
+    - pos: -10.322607,14.570831
+      parent: 2
+      type: Transform
 - proto: OperatingTable
   entities:
   - uid: 4524
@@ -89815,13 +89881,6 @@ entities:
     - pos: -40.5,41.5
       parent: 2
       type: Transform
-- proto: SpawnPointBorg
-  entities:
-  - uid: 17063
-    components:
-    - pos: 14.5,7.5
-      parent: 2
-      type: Transform
 - proto: SpawnPointBotanist
   entities:
   - uid: 15410
@@ -89836,11 +89895,6 @@ entities:
       type: Transform
 - proto: SpawnPointBoxer
   entities:
-  - uid: 1189
-    components:
-    - pos: 16.5,23.5
-      parent: 2
-      type: Transform
   - uid: 5038
     components:
     - pos: 34.5,7.5
@@ -89894,11 +89948,6 @@ entities:
       type: Transform
 - proto: SpawnPointChef
   entities:
-  - uid: 13983
-    components:
-    - pos: -8.5,17.5
-      parent: 2
-      type: Transform
   - uid: 15212
     components:
     - pos: -7.5,10.5
@@ -89914,6 +89963,11 @@ entities:
     - pos: -7.5,16.5
       parent: 2
       type: Transform
+  - uid: 16629
+    components:
+    - pos: -8.5,16.5
+      parent: 2
+      type: Transform
 - proto: SpawnPointChemist
   entities:
   - uid: 13140
@@ -90547,9 +90601,9 @@ entities:
       pos: -62.70413,-7.8477774
       parent: 2
       type: Transform
-  - uid: 16629
+  - uid: 17063
     components:
-    - pos: -9.696774,16.591303
+    - pos: -10.708023,14.570831
       parent: 2
       type: Transform
 - proto: SprayBottleSpaceCleaner
@@ -92276,6 +92330,11 @@ entities:
     - pos: -36.5,-13.5
       parent: 2
       type: Transform
+  - uid: 1189
+    components:
+    - pos: -8.5,17.5
+      parent: 2
+      type: Transform
   - uid: 1198
     components:
     - pos: -19.5,6.5
@@ -92427,6 +92486,11 @@ entities:
     - pos: -50.5,47.5
       parent: 2
       type: Transform
+  - uid: 10677
+    components:
+    - pos: -9.5,16.5
+      parent: 2
+      type: Transform
   - uid: 10690
     components:
     - pos: 23.5,-18.5
@@ -92509,6 +92573,11 @@ entities:
       pos: -38.5,17.5
       parent: 2
       type: Transform
+  - uid: 13983
+    components:
+    - pos: -9.5,17.5
+      parent: 2
+      type: Transform
   - uid: 15453
     components:
     - pos: 34.5,12.5
@@ -92709,12 +92778,7 @@ entities:
       type: Transform
   - uid: 657
     components:
-    - pos: -9.5,16.5
-      parent: 2
-      type: Transform
-  - uid: 659
-    components:
-    - pos: -9.5,17.5
+    - pos: -10.5,14.5
       parent: 2
       type: Transform
   - uid: 678
@@ -93093,11 +93157,6 @@ entities:
     - pos: 2.5,-7.5
       parent: 2
       type: Transform
-  - uid: 16309
-    components:
-    - pos: -9.5,14.5
-      parent: 2
-      type: Transform
   - uid: 16319
     components:
     - pos: -41.5,39.5
diff --git a/Resources/Prototypes/Maps/edge.yml b/Resources/Prototypes/Maps/edge.yml
index 82ffcfc3aec..0d7c5543d6f 100644
--- a/Resources/Prototypes/Maps/edge.yml
+++ b/Resources/Prototypes/Maps/edge.yml
@@ -2,7 +2,7 @@
   id: Edge
   mapName: 'Edge'
   mapPath: /Maps/edge.yml
-  minPlayers: 15
+  minPlayers: 10
   maxPlayers: 80
   stations:
     Edge: