Crescent (Update)

.github/mapchecker/whitelist.yml

@@ -64,9 +64,6 @@ RosebudMKII:
   - EncryptionKeyEngineering
   - EncryptionKeyScience
   - EncryptionKeyService
-Crescent:
-  - EncryptionKeyScience
-  - IntercomCommand
 Pathfinder:
   - IntercomCommand
 Schooner:

Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs

@@ -35,7 +35,7 @@ private void FixGridAtmosCommand(IConsoleShell shell, string argstr, string[] ar
             return;
         }
 
-        var mixtures = new GasMixture[10]; // Add one per added array
+        var mixtures = new GasMixture[11]; // Add one per added array
         for (var i = 0; i < mixtures.Length; i++)
             mixtures[i] = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C };
 
@@ -76,6 +76,13 @@ private void FixGridAtmosCommand(IConsoleShell shell, string argstr, string[] ar
         mixtures[9].Clear();
         mixtures[9].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellShuttle);
 
+        // Frontier - 10: Sauna (GM)
+        mixtures[10].Clear();
+        mixtures[10].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesStandard);
+        mixtures[10].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard);
+        mixtures[10].AdjustMoles(Gas.WaterVapor, Atmospherics.NitrogenMolesStandard);
+        mixtures[10].Temperature = 340f; // Sauna
+
         foreach (var arg in args)
         {
             if (!NetEntity.TryParse(arg, out var netEntity) || !TryGetEntity(netEntity, out var euid))

Resources/Prototypes/_NF/Entities/Markers/atmos_blocker.yml

@@ -51,3 +51,20 @@
           state: plasma
     - type: AtmosFixMarker
       mode: 9
+
+- type: entity
+  name: Atmos Fix Sauna Marker
+  id: AtmosFixSaunaMarker
+  description: "Sauna"
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - sprite: Markers/atmos.rsi # {
+          state: base
+          shader: unshaded
+        - sprite: Markers/atmos.rsi
+          shader: unshaded # }
+          state: oxygen
+    - type: AtmosFixMarker
+      mode: 10

Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml

@@ -61,7 +61,25 @@
   components:
   - type: ShipyardListing
     shuttles:
-    - pioneer
+    - Pioneer
     - Prospector
     - Chisel
-
+
+# The crescent console
+- type: entity
+  id: CrescentMothershipComputer
+  name: Crescent mothership console
+  parent: BaseMothershipComputer
+  components:
+  - type: ShipyardListing
+    shuttles:
+    - Bocadillo
+    - Pulse
+    - PTS
+    - Construct
+    - Pioneer
+    - Loader
+    - Legman
+    - Liquidator
+    - Mission
+    - Honker

Resources/Prototypes/_NF/Shipyard/crescent.yml

@@ -1,16 +1,26 @@
+# Author Info
+# GitHub: Kesiath (https://github.com/Kesiath)
+# Discord: @kesiath
+
+# Maintainer Info
+# GitHub: ???
+# Discord: ???
+
+# Shuttle Notes:
+#
 - type: vessel
   id: Crescent
   name: KC Crescent
   description: The Crescent, named for its exterior shape, is a vessel focused on providing service, medical aide, and scientific breakthroughs for smaller vessels.
   price: 208020
   category: Large
   group: Civilian
-  shuttlePath: /Maps/Shuttles/crescent.yml
+  shuttlePath: /Maps/_NF/Shuttles/crescent.yml
 
 - type: gameMap
   id: Crescent
   mapName: 'KC Crescent'
-  mapPath: /Maps/Shuttles/crescent.yml
+  mapPath: /Maps/_NF/Shuttles/crescent.yml
   minPlayers: 0
   stations:
     Crescent:
@@ -39,3 +49,4 @@
             AtmosphericTechnician: [ 0, 0 ]
             StationEngineer: [ 0, 0 ]
             Musician: [ 0, 0 ]
+            Pilot: [ 0, 0 ]

Resources/Prototypes/_NF/Shipyard/legman.yml

@@ -9,7 +9,7 @@
 # Shuttle Notes:
 #
 - type: vessel
-  id: legman
+  id: Legman
   name: NC Legman
   description: A small maneuverable shuttle with low operational costs for reporters who want to be first on a scene.
   price: 13050
@@ -18,12 +18,12 @@
   shuttlePath: /Maps/_NF/Shuttles/legman.yml
 
 - type: gameMap
-  id: legman
+  id: Legman
   mapName: 'NC Legman'
   mapPath: /Maps/_NF/Shuttles/legman.yml
   minPlayers: 0
   stations:
-    legman:
+    Legman:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup

Resources/Prototypes/_NF/Shipyard/liquidator.yml

@@ -9,7 +9,7 @@
 # Shuttle Notes:
 #
 - type: vessel
-  id: liquidator
+  id: Liquidator
   name: NT Liquidator
   description: A small vessel equipped with everything you need to make even the dirtiest ship squeaky clean (ducky slippers included).
   price: 31600 # 27480+4120 from 15% markup
@@ -18,12 +18,12 @@
   shuttlePath: /Maps/_NF/Shuttles/liquidator.yml
 
 - type: gameMap
-  id: liquidator
+  id: Liquidator
   mapName: 'NC Liquidator'
   mapPath: /Maps/_NF/Shuttles/liquidator.yml
   minPlayers: 0
   stations:
-    liquidator:
+    Liquidator:
       stationProto: StandardFrontierExpeditionVessel
       components:
         - type: StationNameSetup

Resources/Prototypes/_NF/Shipyard/pioneer.yml

@@ -9,7 +9,7 @@
 # Shuttle Notes:
 #
 - type: vessel
-  id: pioneer
+  id: Pioneer
   name: NC Pioneer
   description: A cargo container outfitted to be space-capable and equipped for salvaging and mining either on its own or as part of a fleet.
   price: 16500
@@ -18,12 +18,12 @@
   shuttlePath: /Maps/_NF/Shuttles/pioneer.yml
 
 - type: gameMap
-  id: pioneer
+  id: Pioneer
   mapName: 'NC Pioneer'
   mapPath: /Maps/_NF/Shuttles/pioneer.yml
   minPlayers: 0
   stations:
-    pioneer:
+    Pioneer:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup