bus music

new-frontiers-14 · May 14, 2024 · 5d966eb · 5d966eb
1 parent 4df91f4
commit 5d966eb
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 71 deletions.
diff --git a/Content.Shared/_NF/CCVars/CCVars.cs b/Content.Shared/_NF/CCVars/CCVars.cs
@@ -42,7 +42,7 @@ public sealed class NF14CVars
     /// The map to use for the public bus.
     /// </summary>
     public static readonly CVarDef<string> PublicTransitBusMap =
-        CVarDef.Create("nf14.publictransit.bus_map", "/Maps/_NF/Shuttles/publicts.yml", CVar.SERVERONLY);
+        CVarDef.Create("nf14.publictransit.bus_map", "/Maps/_NF/Shuttles/Bus/publicts.yml", CVar.SERVERONLY);
 
     /// <summary>
     /// The amount of time the bus waits at a station.

diff --git a/Resources/Maps/_NF/Shuttles/publicts.yml → Resources/Maps/_NF/Shuttles/Bus/publicts.yml b/Resources/Maps/_NF/Shuttles/publicts.yml → Resources/Maps/_NF/Shuttles/Bus/publicts.yml
@@ -119,31 +119,36 @@ entities:
       version: 2
       data:
         tiles:
+          -1,-2:
+            0: 16
+            1: 60416
           -1,-1:
-            0: 65535
+            1: 65262
           -1,0:
-            0: 61439
-          0,0:
-            0: 14335
-          0,-1:
-            0: 65535
-          -2,-1:
-            0: 34952
-          -1,-2:
-            0: 65534
-          -1,-3:
-            0: 49152
-          -2,0:
-            0: 136
-          -1,1:
-            0: 206
-          0,1:
-            0: 19
-          0,-3:
-            0: 4096
+            1: 19151
           0,-2:
-            0: 30579
+            1: 12544
+            0: 64
+          0,-1:
+            1: 29491
+          0,0:
+            1: 4631
         uniqueMixes:
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -485,13 +490,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-4.5
       parent: 8756
-- proto: ClosetWallEmergencyFilledRandom
-  entities:
-  - uid: 27
-    components:
-    - type: Transform
-      pos: -2.5,1.5
-      parent: 8756
 - proto: ComputerRadar
   entities:
   - uid: 63
@@ -506,6 +504,13 @@ entities:
     - type: Transform
       pos: 0.5,1.5
       parent: 8756
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 8756
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 76
@@ -521,16 +526,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-6.5
       parent: 8756
-    - type: AtmosDevice
-      joinedGrid: 8756
   - uid: 71
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-6.5
       parent: 8756
-    - type: AtmosDevice
-      joinedGrid: 8756
 - proto: GasPipeBend
   entities:
   - uid: 30
@@ -616,8 +617,6 @@ entities:
     - type: Transform
       pos: -0.5,0.5
       parent: 8756
-    - type: AtmosDevice
-      joinedGrid: 8756
 - proto: GeneratorWallmountAPU
   entities:
   - uid: 51
@@ -699,6 +698,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-6.5
       parent: 8756
+- proto: Jukebox
+  entities:
+  - uid: 77
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 8756
 - proto: PottedPlantRandom
   entities:
   - uid: 49
@@ -717,24 +723,18 @@ entities:
   entities:
   - uid: 4
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-1.5
       parent: 8756
   - uid: 6
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,-1.5
       parent: 8756
   - uid: 8879
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-4.5
@@ -743,8 +743,6 @@ entities:
       powerLoad: 0
   - uid: 8880
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-4.5
@@ -853,114 +851,90 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-6.5
       parent: 8756
+    - type: Thruster
+      originalPowerLoad: 1500
   - uid: 8881
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-6.5
       parent: 8756
+    - type: Thruster
+      originalPowerLoad: 1500
 - proto: WallShuttle
   entities:
   - uid: 20
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,1.5
       parent: 8756
   - uid: 21
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,1.5
       parent: 8756
   - uid: 22
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,2.5
       parent: 8756
   - uid: 23
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,1.5
       parent: 8756
   - uid: 35
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,1.5
       parent: 8756
   - uid: 37
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,-1.5
       parent: 8756
   - uid: 38
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-1.5
       parent: 8756
   - uid: 39
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,2.5
       parent: 8756
   - uid: 8765
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 2.5,-5.5
       parent: 8756
   - uid: 8766
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-5.5
       parent: 8756
   - uid: 8767
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,-6.5
       parent: 8756
   - uid: 8768
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-6.5
       parent: 8756
   - uid: 8779
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,-5.5
       parent: 8756
   - uid: 8781
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,-5.5