Merge branch 'refs/heads/master' into AI_Overseer

# Conflicts:
#	Resources/Prototypes/_Sunrise/Entities/Structures/Decoration/posters.yml

.github/workflows/validate-locale.yml

@@ -4,7 +4,9 @@ on:
   push:
     branches: [ staging, trying ]
   pull_request:
-    types: [ opened, reopened, synchronize, ready_for_review ]
+    paths:
+      - '**.yml'
+      - '**.ftl'
 
 jobs:
   validate_ymls:
@@ -21,4 +23,4 @@ jobs:
           pip install --no-cache-dir PyYAML
       - name: Validate Locales
         run: |
-          python3 Tools/_sunrise/Schemas/validate_yml.py Resources/Prototypes/
+          python3 Tools/_sunrise/Schemas/validate_yml.py Resources/Locale/ Resources/Prototypes/ --ignore Tools/_sunrise/Schemas/ignore_list.yml

.github/workflows/validate-rsis.yml

@@ -14,6 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
       - name: Install Python dependencies
         run: |
           pip3 install --ignore-installed --user pillow jsonschema

Content.Client/_Sunrise/Roadmap/Roadmap.xaml.cs

@@ -55,8 +55,8 @@ private void PopulateRoadmap(RoadmapVersionsPrototype roadmapVersions)
                 {
                     var roadmapItem = new RoadmapItem()
                     {
-                        HeaderText = goal.Value.Name,
-                        Text = goal.Value.Desc,
+                        HeaderText = Loc.TryGetString($"{goal.Value.Id}-name", out var name) ? name : goal.Value.Name,
+                        Text = Loc.TryGetString($"{goal.Value.Id}-desc", out var desc) ? desc : goal.Value.Desc,
                         ItemState = goal.Value.State,
                     };
 

Content.Server/Radio/EntitySystems/RadioSystem.cs

@@ -199,7 +199,7 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
     private string GetIdCardName(EntityUid senderUid)
     {
         var idCardTitle = Loc.GetString("chat-radio-no-id");
-        idCardTitle = GetIdCard(senderUid)?.JobTitle ?? idCardTitle;
+        idCardTitle = GetIdCard(senderUid)?.LocalizedJobTitle ?? idCardTitle;
 
         var textInfo = CultureInfo.CurrentCulture.TextInfo;
         idCardTitle = textInfo.ToTitleCase(idCardTitle);

Content.Server/Supermatter/Components/SupermatterComponent.cs

@@ -1,11 +1,41 @@
-using Content.Shared.Atmos;
+using Content.Shared.Atmos;
 using Robust.Shared.Audio;
 
 namespace Content.Server.Supermatter.Components;
 
 [RegisterComponent]
 public sealed partial class SupermatterComponent : Component
 {
+    /// <summary>
+    ///     The damage taken from direct hits, e.g. laser weapons
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public float AVExternalDamage = 0f;
+
+    //
+    [ViewVariables(VVAccess.ReadOnly)]
+    public float HeatAccumulatorRate = 0.5f;
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public float AVHeatAccumulator = 0f;
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public float RadiationAccumulatorRate = 0.3f;
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public float AVRadiationAccumulator = 0f;
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public float LightingAccumulatorThreshold = 2f;
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public float LightingAccumulatorRate = 0.1f;
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public float AVLightingAccumulator = 0f;
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public float InternalEnergyAccumulatorRate = 0.1f;
     /// <summary>
     ///     Lightning prototype IDs that the supermatter should spit out.
     /// </summary>
@@ -64,8 +94,6 @@ public sealed partial class SupermatterComponent : Component
 
     public float UpdateTimerAccumulator = 0f;
 
-    public float ZapTimerAccumulator = 0f;
-
     public float AnnouncementTimerAccumulator = 0f;
 
     /// <summary>
@@ -74,12 +102,6 @@ public sealed partial class SupermatterComponent : Component
     [DataField("updateTimer")]
     public float UpdateTimer = 1f;
 
-    /// <summary>
-    ///     Amount of seconds to pass before SM does it's zap.
-    /// </summary>
-    [DataField("zapTimer")]
-    public float ZapTimer = 10f;
-
     /// <summary>
     ///     Amount of seconds to pass before makes an announcement.
     /// </summary>
@@ -123,12 +145,6 @@ public sealed partial class SupermatterComponent : Component
     /// </summary>
     public float DamageArchive = 0f;
 
-    /// <summary>
-    ///     The damage taken from direct hits, e.g. laser weapons
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    public float ExternalDamage = 0f;
-
     /// <summary>
     ///     The temperature at which the supermatter crystal will begin to take damage.
     /// </summary>
@@ -168,11 +184,8 @@ public sealed partial class SupermatterComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadOnly)]
     public float GasPowerlossInhibition = 0f;
-    /// <summary>
-    ///     Affects the amount of power the main SM zap makes.
-    /// </summary>
     [ViewVariables(VVAccess.ReadOnly)]
-    public float PowerTransmissionRate = 0f;
+    public float ThermalСonductivity = 0f;
     /// <summary>
     ///     Affects the power gain the SM experiences from heat.
     /// </summary>
@@ -199,15 +212,15 @@ public sealed partial class SupermatterComponent : Component
     [ViewVariables(VVAccess.ReadOnly)]
     public GasFact[] GasFacts =
     {
-        new (transmissionRate: .15f, heatPowerGeneration: 1f), // o2
-        new (heatModifier: -2.5f, heatPowerGeneration: -1), // n2
-        new (heatModifier: 1f, heatPowerGeneration: 1f, powerlossInhibition: 1f), // co2
-        new (transmissionRate: .4f, heatModifier: 14f, heatPowerGeneration: 1f), // plasma
-        new (transmissionRate: 3f, heatModifier: 9f, heatPowerGeneration: 1f), // tritium
-        new (transmissionRate: -.25f, heatModifier: 11f, heatPowerGeneration: 1f), // vapor
-        new (heatPowerGeneration: .5f), // ommonium
-        new (heatResistance: 5f), // n2o
-        new (transmissionRate: -3f, heatModifier: 9f, heatResistance: 1f, heatPowerGeneration: 1f), // frezon
+        new (thermalConductivity: 2.4f, heatPowerGeneration: 1f), // o2
+        new (thermalConductivity: 2.0f, heatModifier: -2.5f, heatPowerGeneration: -1), // n2
+        new (thermalConductivity: 1.2f, heatModifier: 1f, heatPowerGeneration: 1f, powerlossInhibition: 1f), // co2
+        new (thermalConductivity: 6.0f, heatModifier: 14f, heatPowerGeneration: 1f), // plasma
+        new (thermalConductivity: 3.0f, heatModifier: 9f, heatPowerGeneration: 1f), // tritium
+        new (thermalConductivity: 1.4f, heatModifier: 11f, heatPowerGeneration: 1f), // vapor
+        new (thermalConductivity: 1.6f, heatPowerGeneration: .5f), // ommonium
+        new (thermalConductivity: 1.3f, heatResistance: 5f), // n2o
+        new (thermalConductivity: 9.9f, heatModifier: 9f, heatResistance: 1f, heatPowerGeneration: 1f), // frezon
     };
 }
 
@@ -222,7 +235,7 @@ public sealed partial class GasFact
     ///     Affects the amount of power the main SM zap makes.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    public float PowerTransmissionRate;
+    public float ThermalСonductivity;
     /// <summary>
     ///     Affects the heat SM makes.
     /// </summary>
@@ -244,9 +257,9 @@ public sealed partial class GasFact
     [ViewVariables(VVAccess.ReadWrite)]
     public float PowerlossInhibition;
 
-    public GasFact(float? transmissionRate = null, float? heatModifier = null, float? heatResistance = null, float? heatPowerGeneration = null, float? powerlossInhibition = null)
+    public GasFact(float? thermalConductivity = null, float? heatModifier = null, float? heatResistance = null, float? heatPowerGeneration = null, float? powerlossInhibition = null)
     {
-        PowerTransmissionRate = transmissionRate ?? 1;
+        ThermalСonductivity = thermalConductivity ?? 1;
         HeatModifier = heatModifier ?? 1;
         HeatResistance = heatResistance ?? 0;
         HeatPowerGeneration = heatPowerGeneration ?? 0;