new-frontiers-14 · dvir001 · Sep 21, 2024 · Sep 21, 2024 · Sep 21, 2024 · Sep 21, 2024
diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
@@ -31815,7 +31815,19 @@ entities:
     - type: Transform
       pos: 38.5,21.5
       parent: 2173
-- proto: SignShipDock
+- proto: NFSignBus
+  entities:
+  - uid: 2096
+    components:
+    - type: Transform
+      pos: -16.5,17.5
+      parent: 2173
+  - uid: 2100
+    components:
+    - type: Transform
+      pos: -8.5,17.5
+      parent: 2173
+- proto: NFSignDock
   entities:
   - uid: 472
     components:
@@ -31859,16 +31871,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,30.5
       parent: 2173
-  - uid: 2096
-    components:
-    - type: Transform
-      pos: -16.5,17.5
-      parent: 2173
-  - uid: 2100
-    components:
-    - type: Transform
-      pos: -8.5,17.5
-      parent: 2173
   - uid: 2579
     components:
     - type: Transform

diff --git a/Resources/Maps/_NF/POI/anomalousgeode.yml b/Resources/Maps/_NF/POI/anomalousgeode.yml
@@ -4163,7 +4163,7 @@ entities:
     - type: Transform
       pos: -2.5,-7.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 771
     components:

diff --git a/Resources/Maps/_NF/POI/arena.yml b/Resources/Maps/_NF/POI/arena.yml
@@ -18013,7 +18013,7 @@ entities:
     - type: Transform
       pos: -12.5,-1.5
       parent: 2
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 2976
     components:

diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml
@@ -15718,7 +15718,7 @@ entities:
     - type: Transform
       pos: -1.5,24.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 360
     components:

diff --git a/Resources/Maps/_NF/POI/trade.yml b/Resources/Maps/_NF/POI/trade.yml
@@ -26973,27 +26973,29 @@ entities:
     - type: Transform
       pos: 50.5,-1.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignBus
   entities:
-  - uid: 6377
+  - uid: 6379
     components:
     - type: Transform
-      pos: -16.5,25.5
+      pos: -4.5,-15.5
       parent: 1
-  - uid: 6378
+  - uid: 6380
     components:
     - type: Transform
-      pos: -12.5,25.5
+      pos: -1.5,-15.5
       parent: 1
-  - uid: 6379
+- proto: NFSignDock
+  entities:
+  - uid: 6377
     components:
     - type: Transform
-      pos: -4.5,-15.5
+      pos: -16.5,25.5
       parent: 1
-  - uid: 6380
+  - uid: 6378
     components:
     - type: Transform
-      pos: -1.5,-15.5
+      pos: -12.5,25.5
       parent: 1
   - uid: 6383
     components:

diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
@@ -2955,7 +2955,7 @@ entities:
     - type: Transform
       pos: 5.5,-5.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 363
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Bus/publicts.yml b/Resources/Maps/_NF/Shuttles/Bus/publicts.yml
@@ -832,7 +832,7 @@ entities:
     - type: Transform
       pos: -1.5,3.5
       parent: 8756
-- proto: SignShipDock
+- proto: NFSignBus
   entities:
   - uid: 1
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml
@@ -14394,7 +14394,7 @@ entities:
     - type: Transform
       pos: 7.5,24.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 2517
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
@@ -10581,7 +10581,7 @@ entities:
     - type: Transform
       pos: -2.5,-3.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 74
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml
@@ -4133,7 +4133,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,7.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 655
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml b/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml
@@ -12269,7 +12269,7 @@ entities:
     - type: Transform
       pos: -8.5,-2.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 1526
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/rosebudmkii.yml b/Resources/Maps/_NF/Shuttles/Expedition/rosebudmkii.yml
@@ -9214,7 +9214,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,9.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 1343
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Scrap/bison.yml b/Resources/Maps/_NF/Shuttles/Scrap/bison.yml
@@ -15436,7 +15436,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-28.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 1976
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Scrap/point.yml b/Resources/Maps/_NF/Shuttles/Scrap/point.yml
@@ -2022,7 +2022,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,9.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 101
     components:

diff --git a/Resources/Maps/_NF/Shuttles/apothecary.yml b/Resources/Maps/_NF/Shuttles/apothecary.yml
@@ -2763,7 +2763,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-4.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 289
     components:

diff --git a/Resources/Maps/_NF/Shuttles/bazaar.yml b/Resources/Maps/_NF/Shuttles/bazaar.yml
@@ -5912,7 +5912,7 @@ entities:
     - type: Transform
       pos: -4.5,5.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 604
     components:

diff --git a/Resources/Maps/_NF/Shuttles/caduceus.yml b/Resources/Maps/_NF/Shuttles/caduceus.yml
@@ -8190,7 +8190,7 @@ entities:
     - type: Transform
       pos: -6.5,3.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 1362
     components:

diff --git a/Resources/Maps/_NF/Shuttles/investigator.yml b/Resources/Maps/_NF/Shuttles/investigator.yml
@@ -4436,7 +4436,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-2.5
       parent: 2
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 481
     components:

diff --git a/Resources/Maps/_NF/Shuttles/metastable.yml b/Resources/Maps/_NF/Shuttles/metastable.yml
@@ -7836,7 +7836,7 @@ entities:
     - type: Transform
       pos: -7.5,1.5
       parent: 2
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 1334
     components:

diff --git a/Resources/Maps/_NF/Shuttles/phoenix.yml b/Resources/Maps/_NF/Shuttles/phoenix.yml
@@ -5420,7 +5420,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,8.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 665
     components:

diff --git a/Resources/Maps/_NF/Shuttles/stasis.yml b/Resources/Maps/_NF/Shuttles/stasis.yml
@@ -4023,7 +4023,7 @@ entities:
     - type: Transform
       pos: 10.5,-5.5
       parent: 1
-- proto: SignShipDock
+- proto: NFSignDock
   entities:
   - uid: 486
     components:

diff --git a/Resources/Maps/_NF/Shuttles/stratos.yml b/Resources/Maps/_NF/Shuttles/stratos.yml
@@ -5717,7 +5717,7 @@ entities:
           - type: Transform
             pos: -7.5,9.5
             parent: 1
-  - proto: SignShipDock
+  - proto: NFSignDock
     entities:
       - uid: 306
         components:

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -82,14 +82,14 @@
 # Directional Station Guide Signs
 - type: entity
   parent: BaseSign
-  id: BaseSignNF
+  id: NFBaseSign
   abstract: true
   components:
     - type: Sprite
       sprite: _NF/Structures/Wallmounts/signs.rsi
 
 - type: entity
-  parent: BaseSignNF
+  parent: NFBaseSign
   id: SignNfsd
   name: nfsd sign
   description: A sign that marks the area beyond as an NFSD area.
@@ -98,7 +98,7 @@
     state: nfsd
 
 - type: entity
-  parent: BaseSignNF
+  parent: NFBaseSign
   id: SignNfsdArmoury
   name: armoury sign
   description: A sign that marks the area beyond as an NFSD armoury.
@@ -107,7 +107,7 @@
     state: armoury
 
 - type: entity
-  parent: BaseSignNF
+  parent: NFBaseSign
   id: SignNfsdBrief
   name: briefing sign
   description: A sign that marks the area beyond as an NFSD briefing room.
@@ -116,7 +116,7 @@
     state: brief
 
 - type: entity
-  parent: BaseSignNF
+  parent: NFBaseSign
   id: SignNfsdBrig
   name: brig sign
   description: A sign that marks the area beyond as an NFSD brig.
@@ -125,7 +125,7 @@
     state: brig
 
 - type: entity
-  parent: BaseSignNF
+  parent: NFBaseSign
   id: SignNfsdBrigmed
   name: medbay sign
   description: A sign that marks the area beyond as an NFSD medbay.
@@ -134,7 +134,7 @@
     state: brigmed
 
 - type: entity
-  parent: BaseSignNF
+  parent: NFBaseSign
   id: SignNfsdDetective
   name: detective sign
   description: A sign that marks the area beyond as an NFSD detective's office.
@@ -143,7 +143,7 @@
     state: detective
 
 - type: entity
-  parent: BaseSignNF
+  parent: NFBaseSign
   id: SignNfsdLaw
   name: lawyer sign
   description: A sign that marks the area beyond as an NFSD lawyer's office.
@@ -152,7 +152,7 @@
     state: law
 
 - type: entity
-  parent: BaseSignNF
+  parent: NFBaseSign
   id: SignNfsdRange
   name: shooting range sign
   description: A sign that marks the area beyond as an NFSD shooting range.
@@ -161,10 +161,28 @@
     state: range
 
 - type: entity
-  parent: BaseSignNF
+  parent: NFBaseSign
   id: SignNfsdEvidence
   name: evidence sign
   description: A sign that marks the area beyond as an NFSD evidence room.
   components:
   - type: Sprite
-    state: evidence
+    state: evidence
+
+- type: entity
+  parent: NFBaseSign
+  id: NFSignDock
+  name: dock sign
+  description: A sign that indicates shuttle docking nearby.
+  components:
+  - type: Sprite
+    state: dock
+
+- type: entity
+  parent: NFBaseSign
+  id: NFSignBus
+  name: bus sign
+  description: A sign that indicates that the transit shuttle docks nearby.
+  components:
+  - type: Sprite
+    state: bus
diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/bus.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/bus.png
diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/dock.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/dock.png