Merge remote-tracking branch 'space-wizards/master'

.github/workflows/publish-testing.yml

@@ -0,0 +1,45 @@
+name: Publish Testing
+
+concurrency:
+  group: publish-testing
+
+on:
+  workflow_dispatch:
+  schedule:
+  - cron: '0 10 * * *'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/[email protected]
+      with:
+        submodules: 'recursive'
+    - name: Setup .NET Core
+      uses: actions/[email protected]
+      with:
+        dotnet-version: 9.0.x
+
+    - name: Get Engine Tag
+      run: |
+        cd RobustToolbox
+        git fetch --depth=1
+
+    - name: Install dependencies
+      run: dotnet restore
+
+    - name: Build Packaging
+      run: dotnet build Content.Packaging --configuration Release --no-restore /m
+
+    - name: Package server
+      run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+
+    - name: Package client
+      run: dotnet run --project Content.Packaging client --no-wipe-release
+
+    - name: Publish version
+      run: Tools/publish_multi_request.py --fork-id wizards-testing
+      env:
+        PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+        GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}

Content.Benchmarks/MapLoadBenchmark.cs

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

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -60,14 +60,13 @@ public sealed class PostMapInitTest
             "Reach",
             "Train",
             "Oasis",
-            "Cog",
             "Gate",
             "Amber",
             "Loop",
             "Plasma",
             "Elkridge",
-            "Convex"
-
+            "Convex",
+            "Relic"
         };
 
         // Sunrise-Start

Content.Server/Damage/Components/DamageOnLandComponent.cs

@@ -5,10 +5,16 @@ namespace Content.Server.Damage.Components
     [RegisterComponent]
     public sealed partial class DamageOnLandComponent : Component
     {
+        /// <summary>
+        /// Should this entity be damaged when it lands regardless of its resistances?
+        /// </summary>
         [DataField("ignoreResistances")]
         [ViewVariables(VVAccess.ReadWrite)]
         public bool IgnoreResistances = false;
 
+        /// <summary>
+        /// How much damage.
+        /// </summary>
         [DataField("damage", required: true)]
         [ViewVariables(VVAccess.ReadWrite)]
         public DamageSpecifier Damage = default!;

Content.Server/Damage/Systems/DamageOnLandSystem.cs

@@ -1,10 +1,12 @@
 using Content.Server.Damage.Components;
-using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage;
 using Content.Shared.Throwing;
 
 namespace Content.Server.Damage.Systems
 {
+    /// <summary>
+    /// Damages the thrown item when it lands.
+    /// </summary>
     public sealed class DamageOnLandSystem : EntitySystem
     {
         [Dependency] private readonly DamageableSystem _damageableSystem = default!;
@@ -13,19 +15,6 @@ public override void Initialize()
         {
             base.Initialize();
             SubscribeLocalEvent<DamageOnLandComponent, LandEvent>(DamageOnLand);
-            SubscribeLocalEvent<DamageOnLandComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
-        }
-
-        /// <summary>
-        /// Prevent Pacified entities from throwing damaging items.
-        /// </summary>
-        private void OnAttemptPacifiedThrow(Entity<DamageOnLandComponent> ent, ref AttemptPacifiedThrowEvent args)
-        {
-            // Allow healing projectiles, forbid any that do damage:
-            if (ent.Comp.Damage.AnyPositive())
-            {
-                args.Cancel("pacified-cannot-throw");
-            }
         }
 
         private void DamageOnLand(EntityUid uid, DamageOnLandComponent component, ref LandEvent args)

Content.Server/Medical/DefibrillatorSystem.cs

@@ -6,7 +6,7 @@
 using Content.Server.Ghost;
 using Content.Server.Popups;
 using Content.Server.PowerCell;
-using Content.Server.Traits.Assorted;
+using Content.Shared.Traits.Assorted;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
@@ -193,9 +193,9 @@ public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorCo
             _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-rotten"),
                 InGameICChatType.Speak, true);
         }
-        else if (HasComp<UnrevivableComponent>(target))
+        else if (TryComp<UnrevivableComponent>(target, out var unrevivable))
         {
-            _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-unrevivable"),
+            _chatManager.TrySendInGameICMessage(uid, Loc.GetString(unrevivable.ReasonMessage),
                 InGameICChatType.Speak, true);
         }
         else

Content.Server/Medical/HealthAnalyzerSystem.cs

@@ -2,7 +2,7 @@
 using Content.Server.Medical.Components;
 using Content.Server.PowerCell;
 using Content.Server.Temperature.Components;
-using Content.Server.Traits.Assorted;
+using Content.Shared.Traits.Assorted;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
@@ -218,7 +218,7 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s
             bleeding = bloodstream.BleedAmount > 0;
         }
 
-        if (HasComp<UnrevivableComponent>(target))
+        if (TryComp<UnrevivableComponent>(target, out var unrevivableComp) && unrevivableComp.Analyzable)
             unrevivable = true;
 
         _uiSystem.ServerSendUiMessage(healthAnalyzer, HealthAnalyzerUiKey.Key, new HealthAnalyzerScannedUserMessage(

Content.Shared/Traits/Assorted/UnrevivableComponent.cs

@@ -0,0 +1,22 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted;
+
+/// <summary>
+/// This is used for the unrevivable trait as well as generally preventing revival.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UnrevivableComponent : Component
+{
+    /// <summary>
+    /// A field to define if we should display the "Genetic incompatibility" warning on health analysers
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Analyzable = true;
+
+    /// <summary>
+    /// The loc string used to provide a reason for being unrevivable
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId ReasonMessage = "defibrillator-unrevivable";
+}

Resources/Changelog/Changelog.yml

@@ -1,35 +1,4 @@
 Entries:
-- author: ElectroJr
-  changes:
-  - message: Entities within the same container as the player only appear in the context
-      menu when clicking near the container.
-    type: Fix
-  id: 7422
-  time: '2024-09-23T07:28:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32395
-- author: Errant
-  changes:
-  - message: Computers now have a maintenance panel with a Power and AI wire (if AI-connected).
-    type: Tweak
-  - message: Computer deconstruction now begins with the crowbar, not the screwdriver.
-    type: Tweak
-  id: 7423
-  time: '2024-09-23T10:51:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32273
-- author: lzk228
-  changes:
-  - message: Guidebook books now do damage like default writeable books.
-    type: Fix
-  id: 7424
-  time: '2024-09-23T11:12:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32403
-- author: Jophire
-  changes:
-  - message: VIM mech now can open maintenance doors!
-    type: Add
-  id: 7425
-  time: '2024-09-23T13:08:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32302
 - author: lzk228
   changes:
   - message: Cadet PDA now has wanted list cartridge preinstalled.
@@ -3900,3 +3869,31 @@
   id: 7921
   time: '2025-02-09T15:10:11.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/34950
+- author: Spacemann
+  changes:
+  - message: Removed Cog station
+    type: Remove
+  id: 7922
+  time: '2025-02-09T21:01:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34996
+- author: notquitehadouken
+  changes:
+  - message: Added loungewear to uniform printer
+    type: Add
+  id: 7923
+  time: '2025-02-09T22:16:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35008
+- author: Vortebo
+  changes:
+  - message: Added Relic station.
+    type: Add
+  id: 7924
+  time: '2025-02-09T23:24:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34988
+- author: IProduceWidgets
+  changes:
+  - message: Pacifists can throw things that break.
+    type: Fix
+  id: 7925
+  time: '2025-02-10T01:24:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31060

Resources/Locale/en-US/_strings/job/job-description.ftl

@@ -3,7 +3,7 @@ job-description-atmostech = Optimize the station's atmospherics setup, and synth
 job-description-bartender = Manage the bar and keep it lively, give out drinks, and listen to the crew's stories.
 job-description-botanist = Grow food for the chef, drugs for medbay, and other plants to keep yourself entertained.
 job-description-borg = Half-human, Half-machine. Follow your laws, serve the crew, and hound the science team for upgrades.
-job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core, Convex and Cog.
+job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core and Convex.
 job-description-brigmedic = Fight in the rear of the security service, for the lives of your comrades! You are the first and last hope of your squad. Hippocrates bless you.
 job-description-cadet = Learn the basics of arresting criminals and managing the brig. Listen to your supervisors and feel free to ask them for any help.
 job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will.
@@ -34,16 +34,16 @@ job-description-librarian = Manage the library, give out knowledge to any who se
 job-description-mime = Entertain the crew through non-vocal means, and engage with light rivalry with the clown.
 job-description-musician = Entertain the crew with your unique musical talent, and acquire new instruments to mess around with.
 job-description-passenger = Enjoy your stay aboard the station with no obligations!
-job-description-psychologist = Provide emotional support to traumatized crew. Currently available on Box, Marathon, Cog and Oasis.
+job-description-psychologist = Provide emotional support to traumatized crew. Currently available on Box, Marathon and Oasis.
 job-description-qm = Manage the supplies of the station & the cargo department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing.
 job-description-rd = Manage the science department, unlocking technologies, acquiring & researching artifacts, and performing experiments.
 job-description-research-assistant = Learn the basics of how to research various artifacts, anomalies and robotics.
-job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news. Currently available on Bagel Station, Cog, Convex, Core, Train and Oasis.
+job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news. Currently available on Bagel Station, Convex, Core, Train and Oasis.
 job-description-salvagespec = Use the salvage magnet to draw in detatched scraps & asteroids to loot and enrich the station, build a salvage ship and then travel to new planets, while fighting off any space fauna along the way.
 job-description-scientist = Research alien artifacts, unlock new technologies, build newer and better machines around the station, and make everything run more efficiently.
 job-description-security = Catch criminals and enemies of the station, enforce the law, and ensure that the station does not fall into disarray.
 job-description-serviceworker = Learn the basics of bartending, cooking, and growing plants.
 job-description-station-ai = Follow your laws, serve the crew.
 job-description-visitor = Enjoy your visit to the station.
 job-description-warden = Patrol the security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up.
-job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Cog and Oasis.
+job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Oasis.