Merge pull request #180 from Gorox221/remap

Ремап

Content.Benchmarks/MapLoadBenchmark.cs

@@ -46,7 +46,7 @@ public async Task Cleanup()
         PoolManager.Shutdown();
     }
 
-    public static readonly string[] MapsSource = { "Empty", "Box", "Bagel", "Dev", "CentComm", "Atlas", "Core", "TestTeg", "Saltern", "Packed", "Omega", "Cluster", "Reach", "Origin", "Meta", "Marathon", "Europa", "MeteorArena", "Fland", "Barratry", "Oasis" };
+    public static readonly string[] MapsSource = { "Empty", "Box", "Bagel", "Dev", "CentComm", "Atlas", "AtlasGanimed", "Core", "TestTeg", "Saltern", "SalternGanimed", "Packed", "Omega", "Cluster", "Reach", "Origin", "Meta", "Marathon", "Europa", "MeteorArena", "Fland", "Barratry", "Oasis" };
 
     [ParamsSource(nameof(MapsSource))]
     public string Map;

Content.Server/Shuttles/Components/StationCentcommComponent.cs

@@ -16,7 +16,7 @@ public sealed partial class StationCentcommComponent : Component
     public float ShuttleIndex;
 
     [DataField]
-    public ResPath Map = new("/Maps/centcomm.yml");
+    public ResPath Map = new("/Maps/Ganimed/centcom.yml");
 
     /// <summary>
     /// Centcomm entity that was loaded.

Resources/Maps/Ganimed/centcom.yml

@@ -49733,7 +49733,6 @@ entities:
           - 1145
           - 1144
           - 1143
-          - 1142
           - 1152
       type: ContainerContainer
   - uid: 1153

Resources/Prototypes/Corvax/Parallax/silly.yml

@@ -0,0 +1,28 @@
+- type: parallax
+  id: SillyIsland
+  layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Corvax/Parallax/SillyOcean.png"
+      slowness: 0.5
+      scale: "1, 1"
+      scrolling: "0, -0.05"
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Corvax/Parallax/SillyOcean_Overlay2.png"
+      slowness: 0.3
+      scale: "0.5, 0.5"
+      scrolling: "0.08, 0.08"
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Corvax/Parallax/SillyOcean_Overlay.png"
+      slowness: 0.05
+      scale: "0.4, 0.4"
+      scrolling: "-0.1, -0.1"
+  layersLQ:
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: ""
+        configPath: "/Prototypes/Parallaxes/parallax_config.toml"
+        slowness: 0.875
+  layersLQUseHQ: false

Resources/Prototypes/Maps/Ganimed/cluster.yml → Resources/Prototypes/Maps/Ganimed/atlas.yml

@@ -1,23 +1,21 @@
 - type: gameMap
-  id: ClusterGanimed
-  mapName: 'Cluster'
-  mapPath: /Maps/Ganimed/cluster.yml
+  id: AtlasGanimed
+  mapName: Atlas
+  mapPath: /Maps/Ganimed/atlas.yml
   minPlayers: 5
-  maxPlayers: 30
+  maxPlayers: 20
   stations:
-    ClusterGanimed:
+    Atlas:
       stationProto: StandardNanotrasenStation
       components:
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_transit.yml
         - type: StationNameSetup
-          mapNameTemplate: '{0} Кластер {1}'
+          mapNameTemplate: '{0} Атлас {1}'
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: 'ИСН'
+        - type: StationCargoShuttle
+          path: /Maps/Shuttles/cargo_small.yml
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
@@ -28,39 +26,38 @@
             Janitor: [ 1, 1 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
-            Lawyer: [ 1, 1 ]
             ServiceWorker: [ 1, 1 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 2, 2 ]
-            StationEngineer: [ 3, 3 ]
-            TechnicalAssistant: [ 2, 2 ]
+            StationEngineer: [ 2, 2 ]
+            TechnicalAssistant: [ 1, 3 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
             Chemist: [ 1, 1 ]
             MedicalDoctor: [ 2, 2 ]
-            MedicalIntern: [ 2, 2 ]
+            MedicalIntern: [ 1, 3 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            Scientist: [ 3, 3 ]
-            ResearchAssistant: [ 2, 2 ]
-            Borg: [ 1, 1 ]
+            Scientist: [ 2, 2 ]
+            ResearchAssistant: [ 1, 3 ]
+            Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            Detective: [ 1, 1 ]
             SecurityOfficer: [ 3, 3 ]
-            SecurityCadet: [ 2, 2 ]
+            SecurityCadet: [ 1, 3 ]
+            Detective: [ 1, 1 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 2, 2 ]
-            CargoTechnician: [ 1, 1 ]
+            CargoTechnician: [ 2, 2 ]
             #civillian
             Passenger: [ -1, -1 ]
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #enterprise-rework
+            #ent
             SeniorPhysician: [ 1, 1 ]
             SeniorEngineer: [ 1, 1 ]
             SeniorResearcher: [ 1, 1 ]
@@ -71,5 +68,5 @@
             Prisoner: [ 3, 0 ]
             IAA: [ 1, 1 ]
             Coroner: [ 1, 1 ]
-            Boxer: [ 1, 1 ]
-            BridgeOfficer: [ 0, 1 ]
+            Zookeeper: [ 1, 1 ]
+            BridgeOfficer: [ 0, 1 ]

Resources/Prototypes/Maps/Ganimed/saltern.yml

@@ -30,7 +30,7 @@
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 2, 2 ]
+            AtmosphericTechnician: [ 1, 3 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical
@@ -69,4 +69,4 @@
             IAA: [ 1, 1 ]
             Coroner: [ 1, 1 ]
             Zookeeper: [ 1, 1 ]
-            BridgeOfficer: [ 0, 1 ]
+            BridgeOfficer: [ 0, 1 ]

Resources/Prototypes/Maps/Pools/default.yml

@@ -1,15 +1,14 @@
 - type: gameMapPool
   id: DefaultMapPool
   maps:
-  - Gemini
-  - Atlas
+  - AtlasGanimed
   - Bagel
   - Core
-  - Marathon
   - Meta
   - Oasis
   - Omega
   - Origin
   - Packed
   - Cluster
-  - Saltern
+  - SalternGanimed
+  - SillyGanimed

Resources/Textures/Corvax/Parallax/attributions.yml

@@ -7,3 +7,18 @@
   license: "CC0-1.0"
   copyright: "adapted from Soluna Software"
   source: "https://opengameart.org/content/space-backgrounds-with-stars-and-nubular"
+
+- files: ["SillyOcean.png"]
+  license: "CC0-1.0"
+  copyright: "Created by TheShuEd"
+  source: "https://github.com/space-syndicate/space-station-14/pull/1938"
+
+- files: ["SillyOcean_Overlay.png"]
+  license: "CC0-1.0"
+  copyright: "Created by TheShuEd"
+  source: "https://github.com/space-syndicate/space-station-14/pull/1938"
+
+- files: ["SillyOcean_Overlay2.png"]
+  license: "CC0-1.0"
+  copyright: "Created by TheShuEd"
+  source: "https://github.com/space-syndicate/space-station-14/pull/1938"