From 01678119a540b32053eed01b7f4b53b95ea2748f Mon Sep 17 00:00:00 2001
From: dustylens <truecoffee@gmail.com>
Date: Thu, 9 Jan 2025 19:52:36 -0800
Subject: [PATCH] Lobby update.

- Adds Lobby, MoM's office beacons.
- Slight map updates in accordance with maptainer feedback.
---
 .../_NF/navmap-beacons/station-beacons.ftl    |  4 +-
 Resources/Maps/_NF/POI/medical.yml            | 71 +++++++++++--------
 .../Objects/Devices/station_beacon.yml        | 18 +++++
 3 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/Resources/Locale/en-US/_NF/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/_NF/navmap-beacons/station-beacons.ftl
index 05391f35b16..c4a6876b910 100644
--- a/Resources/Locale/en-US/_NF/navmap-beacons/station-beacons.ftl
+++ b/Resources/Locale/en-US/_NF/navmap-beacons/station-beacons.ftl
@@ -23,6 +23,8 @@ station-beacon-head = Head
 station-beacon-atmos-nf = Atmospherics
 station-beacon-atmos-burn = Burn Chamber
 station-beacon-atmos-collector = Gas Collector Array
+station-beacon-lobby = Lobby
+station-beacon-mom-office = MoM's Office
 
 station-beacon-eva-access = EVA Access
 station-beacon-dock-one = Dock 1
@@ -33,4 +35,4 @@ station-beacon-dock-five = Dock 5
 station-beacon-dock-six = Dock 6
 station-beacon-dock-six-a = Dock 6a
 station-beacon-dock-six-b = Dock 6b
-station-beacon-dock-six-c = Dock 6c
\ No newline at end of file
+station-beacon-dock-six-c = Dock 6c
diff --git a/Resources/Maps/_NF/POI/medical.yml b/Resources/Maps/_NF/POI/medical.yml
index 5170f7ea6f4..6f9da15dda1 100644
--- a/Resources/Maps/_NF/POI/medical.yml
+++ b/Resources/Maps/_NF/POI/medical.yml
@@ -4706,13 +4706,6 @@ entities:
     - type: Transform
       pos: -4.5,-2.5
       parent: 1
-- proto: DefaultStationBeaconCMORoom
-  entities:
-  - uid: 1196
-    components:
-    - type: Transform
-      pos: 8.5,-8.5
-      parent: 1
 - proto: DefaultStationBeaconDisposals
   entities:
   - uid: 1548
@@ -4727,18 +4720,25 @@ entities:
     - type: Transform
       pos: -3.5,-12.5
       parent: 1
-- proto: DefaultStationBeaconFrontierDock
+- proto: DefaultStationBeaconFrontierLobby
   entities:
-  - uid: 301
+  - uid: 289
     components:
     - type: Transform
       pos: 2.5,-17.5
       parent: 1
-  - uid: 727
+  - uid: 897
     components:
     - type: Transform
       pos: 2.5,12.5
       parent: 1
+- proto: DefaultStationBeaconFrontierMOMOffice
+  entities:
+  - uid: 1196
+    components:
+    - type: Transform
+      pos: 8.5,-8.5
+      parent: 1
 - proto: DefaultStationBeaconFrontierVend
   entities:
   - uid: 858
@@ -9209,6 +9209,11 @@ entities:
     - type: Transform
       pos: -7.5,-5.5
       parent: 1
+  - uid: 301
+    components:
+    - type: Transform
+      pos: -2.5,-11.5
+      parent: 1
   - uid: 320
     components:
     - type: Transform
@@ -9318,6 +9323,11 @@ entities:
     - type: Transform
       pos: -5.5,-24.5
       parent: 1
+  - uid: 727
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
   - uid: 978
     components:
     - type: Transform
@@ -10112,13 +10122,6 @@ entities:
     - type: Transform
       pos: 7.323324,-5.377597
       parent: 1
-- proto: PowerCellRecharger
-  entities:
-  - uid: 543
-    components:
-    - type: Transform
-      pos: -4.5,8.5
-      parent: 1
 - proto: Poweredlight
   entities:
   - uid: 212
@@ -10662,6 +10665,11 @@ entities:
     - type: Transform
       pos: 10.5,-10.5
       parent: 1
+  - uid: 931
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
   - uid: 1286
     components:
     - type: Transform
@@ -10678,6 +10686,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-5.5
       parent: 1
+  - uid: 1331
+    components:
+    - type: Transform
+      pos: -2.5,-11.5
+      parent: 1
   - uid: 1402
     components:
     - type: Transform
@@ -11307,6 +11320,13 @@ entities:
         749:
         - On: Forward
         - Off: Off
+- proto: SignAtmos
+  entities:
+  - uid: 1336
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
 - proto: SignBar
   entities:
   - uid: 735
@@ -12842,12 +12862,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-11.5
       parent: 1
-  - uid: 289
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-11.5
-      parent: 1
   - uid: 291
     components:
     - type: Transform
@@ -13280,12 +13294,6 @@ entities:
     - type: Transform
       pos: 11.5,-4.5
       parent: 1
-  - uid: 897
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-11.5
-      parent: 1
   - uid: 1030
     components:
     - type: Transform
@@ -13342,6 +13350,11 @@ entities:
       parent: 1
 - proto: WeaponCapacitorRecharger
   entities:
+  - uid: 543
+    components:
+    - type: Transform
+      pos: -4.5,8.5
+      parent: 1
   - uid: 1518
     components:
     - type: Transform
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/station_beacon.yml
index a534ad1dac6..6567f7f792b 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/station_beacon.yml
@@ -198,6 +198,24 @@
   - type: NavMapBeacon
     defaultText: station-beacon-atmos-collector
 
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconFrontierLobby
+  suffix: Lobby
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-lobby
+    color: "#add8e6"
+
+- type: entity
+  parent: DefaultStationBeaconFrontierSROffice
+  id: DefaultStationBeaconFrontierMOMOffice
+  suffix: MOM's Office
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-mom-office
+    color: "#add8e6"
+
 # Docks
 - type: entity
   parent: DefaultStationBeacon