Train station

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -60,7 +60,8 @@ public sealed class PostMapInitTest
             "Marathon",
             "MeteorArena",
             "Atlas",
-            "Reach"    
+            "Reach",
+            "Train"
         };
 
         /// <summary>

Resources/Audio/Ambience/attributions.yml

@@ -97,8 +97,22 @@
   copyright: "Taken from /vg/station"
   source: "https://github.com/vgstation-coders/vgstation13/commit/23303188abe6fe31b114a218a1950d7325a23730"
 
+- files: ["ambitrain1.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Created by Badgie42 on Freesound.com, converted to Mono by TheShuEd"
+  source: "https://freesound.org/people/Badgie42/sounds/399876/"
+
+- files: ["ambitrain2.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by Hallkom on Freesound.com, cropped and converted to Mono by TheShuEd"
+  source: "https://freesound.org/people/Hallkom/sounds/588486/"
+
+- files: ["ambitrain3.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by ldezem on Freesound.com, cropped and converted to Mono by TheShuEd"
+  source: "https://freesound.org/people/ldezem/sounds/528238/"
 
 - files: ["anomaly_scary.ogg"]
   license: "CC0-1.0"
-  copyright: "Created by dimbark1, edited and converted to mono by TheShuEd (github)"
-  source: "https://freesound.org/people/dimbark1/sounds/316797/"
+  copyright: "Created by dimbark1, edited and converted to mono by TheShuEd"
+  source: "https://freesound.org/people/dimbark1/sounds/316797/"

Resources/Locale/en-US/tiles/tiles.ftl

@@ -1,6 +1,7 @@
 tiles-space = space
 tiles-plating = plating
 tiles-lattice = lattice
+tiles-lattice-train = train lattice
 tiles-steel-floor = steel tile
 tiles-steel-floor-mini = steel mini-tile
 tiles-steel-floor-pavement = steel pavement

Resources/Prototypes/Entities/Effects/portal.yml

@@ -69,6 +69,38 @@
   - type: Portal
     canTeleportToOtherMaps: true
 
+- type: entity
+  id: PortalGatewayBlue
+  parent: BasePortal
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: Structures/Machines/gateway.rsi
+    color: SkyBlue
+    layers:
+    - state: portal
+  - type: PointLight
+    color: SkyBlue
+    radius: 3
+    energy: 1
+    netsync: false
+
+- type: entity
+  id: PortalGatewayOrange
+  parent: BasePortal
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: Structures/Machines/gateway.rsi
+    color: OrangeRed
+    layers:
+    - state: portal
+  - type: PointLight
+    color: OrangeRed
+    radius: 3
+    energy: 1
+    netsync: false
+
 - type: entity
   id: ShadowPortal
   name: shadow rift
@@ -90,4 +122,4 @@
     range: 6
     volume: -3
     sound:
-      path: /Audio/Ambience/anomaly_scary.ogg
+      path: /Audio/Ambience/anomaly_scary.ogg

Resources/Prototypes/Entities/Structures/Decoration/statues.yml

@@ -6,6 +6,7 @@
   description: An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a red toolbox.
   components:
   - type: Sprite
+    noRot: true
     sprite: Structures/Decoration/statues.rsi
     state: venus_red
     drawdepth: Mobs
@@ -19,6 +20,7 @@
   description: An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a blue toolbox.
   components:
   - type: Sprite
+    noRot: true
     sprite: Structures/Decoration/statues.rsi
     state: venus_blue
     drawdepth: Mobs
@@ -31,6 +33,7 @@
   description: A bananium statue. It portrays the return of the savior who will rise up and lead the clowns to the great honk.
   components:
   - type: Sprite
+    noRot: true
     sprite: Structures/Decoration/statues.rsi
     state: bananium_clown
     drawdepth: Mobs

Resources/Prototypes/Entities/Structures/Furniture/bench.yml

@@ -49,3 +49,18 @@
   - type: Construction
     graph: Seat
     node: redComfBench
+
+- type: entity
+  id: BenchBlueComfy
+  suffix: Solo. Blue
+  parent: BenchComfy
+  components:
+  - type: Sprite
+    layers:
+    - state: bench_solo_base
+      color: "#767e82"
+    - state: bench_solo_cover
+      color: "#334e6d"
+  - type: Construction
+    graph: Seat
+    node: blueComfBench

Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml

@@ -148,6 +148,11 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 15
+    energy: 1
+    softness: 0.9
+    color: "#EEEEFF"
 
 - type: entity
   parent: AlwaysPoweredWallLight
@@ -196,6 +201,11 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 10
+    energy: 2.5
+    softness: 0.9
+    color: "#FFAF38"
 
 - type: entity
   parent: AlwaysPoweredWallLight
@@ -368,6 +378,11 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#47f8ff"
 
 - type: entity
   id: AlwaysPoweredlightCyan
@@ -390,6 +405,11 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#39a1ff"
 
 - type: entity
   id: AlwaysPoweredlightBlue
@@ -412,6 +432,11 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#ff66cc"
 
 - type: entity
   id: AlwaysPoweredlightPink
@@ -434,6 +459,11 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#ff8227"
 
 - type: entity
   id: AlwaysPoweredlightOrange
@@ -456,6 +486,11 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#fb4747"
 
 - type: entity
   id: AlwaysPoweredlightRed
@@ -478,6 +513,11 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#52ff39"
 
 - type: entity
   id: AlwaysPoweredlightGreen

Resources/Prototypes/Entities/Structures/Windows/window.yml

@@ -235,4 +235,4 @@
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: windowDiagonal
+    node: windowDiagonal

Resources/Prototypes/Maps/Pools/default.yml

@@ -14,3 +14,4 @@
   - Saltern
   - Packed
   - Reach
+  #- Train <- return after station anchoring PR is finished and merged

Resources/Prototypes/Maps/train.yml

@@ -0,0 +1,62 @@
+- type: gameMap
+  id: Train
+  mapName: 'Train'
+  mapPath: /Maps/train.yml
+  minPlayers: 10
+  maxPlayers: 50
+  stations:
+    Train:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Train "Sentipode" {0}-{1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: 'ED'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml # To do - add railway station
+        - type: StationJobs
+          overflowJobs:
+            - Passenger
+          availableJobs:
+            #service
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            Bartender: [ 1, 1 ]
+            Botanist: [ 2, 2 ]
+            Chef: [ 1, 1 ]
+            Janitor: [ 1, 2 ]
+            Chaplain: [ 1, 1 ]
+            Librarian: [ 1, 1 ]
+            ServiceWorker: [ 2, 3 ]
+            Detective: [ 1, 1 ]
+            #engineering
+            ChiefEngineer: [ 1, 1 ]
+            AtmosphericTechnician: [ 3, 3 ]
+            StationEngineer: [ 5, 5 ]
+            TechnicalAssistant: [ 3, 3 ]
+            #medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            Chemist: [ 2, 2 ]
+            MedicalDoctor: [ 3, 3 ]
+            MedicalIntern: [ 2, 2 ]
+            #science
+            ResearchDirector: [ 1, 1 ]
+            Scientist: [ 4, 4 ]
+            ResearchAssistant: [ 2, 2 ]
+            #security
+            HeadOfSecurity: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            SecurityOfficer: [ 4, 4 ]
+            SecurityCadet: [ 2, 3 ]
+            Lawyer: [ 1, 2 ]
+            #supply
+            Quartermaster: [ 1, 1 ]
+            SalvageSpecialist: [ 2, 2 ]
+            CargoTechnician: [ 2, 2 ]
+            #civilian
+            Passenger: [ -1, -1 ]
+            Clown: [ 1, 1 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 1, 1 ]
+            Borg: [ 2, 2 ]

Resources/Prototypes/Parallaxes/train.yml

@@ -0,0 +1,68 @@
+- type: parallax
+  id: TrainStation
+  layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/AspidParallaxBG.png"
+      slowness: 0.998046875
+      scale: "0.5, 0.5"
+      scrolling: "0, -0.098046875"
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml"
+      slowness: 0.996625
+      scrolling: "0, -0.196625"
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars_dim"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml"
+      slowness: 0.989375
+      scrolling: "0, -0.209375"
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars_faster"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars-2.toml"
+      slowness: 0.987265625
+      scrolling: "0, -0.287265625"
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars_dim_faster"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim-2.toml"
+      slowness: 0.984352
+      scrolling: "0, -0.384352"
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/AspidParallaxBG.png"
+      slowness: 0.978046875
+      scrolling: "0, -0.578046875"
+      scale: "1, 1"
+      tiled: false
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/Asteroids.png"
+      slowness: 0.968046875
+      scrolling: "0, -0.568046875"
+      scale: "1.3, 1.3"
+      worldHomePosition: "-624, 333"
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/AspidParallaxNeb.png"
+      slowness: 0.969046875
+      scrolling: "0, -0.569046875"
+      scale: "0.5, 0.5"
+      worldHomePosition: "0, 0"
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/Asteroids.png"
+      slowness: 0.938046875
+      scrolling: "0, -0.708046875"
+      scale: "1, 1"
+  layersLQ:
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: ""
+        configPath: "/Prototypes/Parallaxes/parallax_config.toml"
+        slowness: 0.875
+      scrolling: "0, -0.475"
+  layersLQUseHQ: false