Merge remote-tracking branch 'upstream/master'

PHCodes · Oct 28, 2023 · 45dc5e3 · 45dc5e3
2 parents a4ee16b + 9bae7ee
commit 45dc5e3
Show file tree

Hide file tree

Showing 167 changed files with 179,623 additions and 1,999,962 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,65 +1,16 @@
 # Last match in file takes precedence.
 
-# Sorting by path instead of by who added it one day :(
-# this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order
-/Resources/ConfigPresets/WizardsDen/  @Chief-Engineer
-
-# Moony's Gargantuan List Of Things She Cares About, or MGLOTSCA for short.
-# You need to add your name to these entries, not make a new one, if you care about them.
-/Content.*/Toolshed/ @moonheart08
-**/Toolshed/** @moonheart08
-*Command.cs @moonheart08
-/Content.*/Administration/ @moonheart08 @DrSmugleaf @Chief-Engineer
-/Content.*/Station/ @moonheart08
-/Content.*/Maps/ @moonheart08
-/Content.*/GameTicking/ @moonheart08 @EmoGarbage404
-/Resources/ServerInfo/ @moonheart08 @Chief-Engineer
-/Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
-/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
-/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
-
-/Resources/Prototypes/Maps/ @Emisse
-
-/Resources/Prototypes/Body/ @DrSmugleaf # suffering
-/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
-/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
-/Content.*/Body/ @DrSmugleaf
-/Content.YAMLLinter @DrSmugleaf
-
-/Content.*/Verbs/ @ElectroJr
-/Content.Client/ContextMenu/ @ElectroJr
-/Content.Shared/Damage/ @ElectroJr @DrSmugleaf
-/Content.Shared/Containers/ItemSlot/ @ElectroJr
-/Content.*/PowerCell/ @ElectroJr
-/Content.*/Doors/ @ElectroJr
-/Content.*/Interaction/ @ElectroJr
-/Content.*/Hands/ @ElectroJr
-/Content.*/Actions/ @ElectroJr
-/Content.*/Explosion/ @ElectroJr
-
-/Content.*/Anomaly/ @EmoGarbage404
-/Content.*/Lathe/ @EmoGarbage404
-/Content.*/Materials/ @EmoGarbage404
-/Content.*/Mech/ @EmoGarbage404
-/Content.*/Research/ @EmoGarbage404
-/Content.*/Stack/ @EmoGarbage404
-/Content.*/Xenoarchaeology/ @EmoGarbage404
-/Content.*/Zombies/ @EmoGarbage404
-/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404
-/Resources/Prototypes/Research/ @EmoGarbage404
-
-/Content.*/Forensics/ @ficcialfaint
-
-# SKREEEE
-/Content.*.Database/ @PJB3005 @DrSmugleaf
-/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer
-/Pow3r/ @PJB3005
-/Content.Server/Power/Pow3r/ @PJB3005
-
-# notafet
-/Content.*/Atmos/ @Partmedia
-/Content.*/Botany/ @Partmedia
-
-#Jezi
-/Content.*/Medical @Jezithyr
-/Content.*/Body @Jezithyr
+/Content.*/DeltaV/ @DebugOk
+/Content.*/Nyanotrasen/ @DebugOk
+/Content.*/SimpleStation14/ @DEATHB4DEFEAT
+
+/Resources/*/DeltaV/ @DebugOk
+/Resources/*/Nyanotrasen/ @DebugOk
+/Resources/*/SimpleStation14/ @DEATHB4DEFEAT
+/Resources/Textures/ @leonardo-dabepis
+/Resources/DeltaV/Textures/ @leonardo-dabepis
+/Resources/Nyanotrasen/Textures/ @leonardo-dabepis
+/Resources/Maps/ @IamVelcroboy
+/Resources/Prototypes/Maps/ @IamVelcroboy
+
+/Tools/ @DebugOk
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -5,8 +5,8 @@ concurrency:
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron: '0 10 * * *'
+  schedule:
+    - cron: '0 10 * * *'
 
 jobs:
   build:
@@ -50,7 +50,7 @@ jobs:
         key: ${{ secrets.PUBLISH_KEY }}
         port: ${{ secrets.PUBLISH_PORT }}
         source: "release/${{ github.sha }}"
-        target: "/var/www/builds.delta-v.org/delta-v-rebase/builds/"
+        target: "/var/www/builds.delta-v.org/delta-v/builds/"
         strip_components: 1
 
     - name: Update manifest JSON
@@ -60,7 +60,7 @@ jobs:
         username: ${{ secrets.PUBLISH_USER }}
         key: ${{ secrets.PUBLISH_KEY }}
         port: ${{ secrets.PUBLISH_PORT }}
-        script: /home/${{ secrets.PUBLISH_USER }}/publish/rebasepush.ps1 ${{ github.sha }}
+        script: /home/${{ secrets.PUBLISH_USER }}/publish/push.ps1 ${{ github.sha }}
 
     - name: Publish changelog (Discord)
       run: Tools/actions_changelogs_since_last_run.py

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -581,6 +581,7 @@ private void UpdateRoleRequirements()
 
                     category.AddChild(selector);
                     _jobPriorities.Add(selector);
+                    EnsureJobRequirementsValid(); // DeltaV
 
                     selector.PriorityChanged += priority =>
                     {
@@ -607,6 +608,28 @@ private void UpdateRoleRequirements()
             }
         }
 
+        /// <summary>
+        /// DeltaV - Make sure that no invalid job priorities get through.
+        /// </summary>
+        private void EnsureJobRequirementsValid()
+        {
+            var changed = false;
+            foreach (var selector in _jobPriorities)
+            {
+                if (_requirements.IsAllowed(selector.Proto, out var _) || selector.Priority == JobPriority.Never)
+                    continue;
+
+                selector.Priority = JobPriority.Never;
+                Profile = Profile?.WithJobPriority(selector.Proto.ID, JobPriority.Never);
+                changed = true;
+            }
+            if (!changed)
+                return;
+
+            _needUpdatePreview = true;
+            Save();
+        }
+
         private void OnFlavorTextChange(string content)
         {
             if (Profile is null)
@@ -729,6 +752,7 @@ private void LoadServerData()
             CharacterSlot = _preferencesManager.Preferences.SelectedCharacterIndex;
 
             UpdateControls();
+            EnsureJobRequirementsValid(); // DeltaV
             _needUpdatePreview = true;
         }
 

diff --git a/Content.Client/SimpleStation14/Overlays/Systems/NearsightedSystems.cs b/Content.Client/SimpleStation14/Overlays/Systems/NearsightedSystems.cs
@@ -32,15 +32,21 @@ private void OnStartup(EntityUid uid, NearsightedComponent component, ComponentS
 
     private void OnEquip(GotEquippedEvent args)
     {
+        // Note: it would be cleaner to check if the glasses are being equipped
+        // to the eyes rather than the pockets using `args.SlotFlags.HasFlag(SlotFlags.EYES)`,
+        // but this field is not present on GotUnequippedEvent. This method is
+        // used for both equip and unequip to make it consistent between checks.
         if (TryComp<NearsightedComponent>(args.Equipee, out var nearsighted) &&
-            EnsureComp<TagComponent>(args.Equipment).Tags.Contains("GlassesNearsight"))
+            EnsureComp<TagComponent>(args.Equipment).Tags.Contains("GlassesNearsight") &&
+            args.Slot == "eyes")
             UpdateShader(nearsighted, true);
     }
 
     private void OnUnEquip(GotUnequippedEvent args)
     {
         if (TryComp<NearsightedComponent>(args.Equipee, out var nearsighted) &&
-            EnsureComp<TagComponent>(args.Equipment).Tags.Contains("GlassesNearsight"))
+            EnsureComp<TagComponent>(args.Equipment).Tags.Contains("GlassesNearsight") &&
+            args.Slot == "eyes")
             UpdateShader(nearsighted, false);
     }
 

diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -45,26 +45,28 @@ public sealed class PostMapInitTest
         {
             "Dev",
             "TestTeg",
-            "Fland",
-            "Meta",
-            "Packed",
-            "Aspid",
-            "Cluster",
-            "Omega",
-            "Bagel",
-            "Origin",
+            //"Fland",
+            //"Meta",
+            //"Packed",
+            //"Aspid",
+            //"Cluster",
+            //"Omega",
+            //"Bagel",
+            //"Origin",
             "CentComm",
-            "Box",
-            "Europa",
-            "Barratry",
-            "Saltern",
-            "Core",
-            "Marathon",
-            "Kettle",
+            //"Box",
+            //"Europa",
+            //"Barratry",
+            //"Saltern",
+            //"Core",
+            //"Marathon",
+            //"Kettle",
             "MeteorArena",
             "Pebble", //DeltaV
             "Edge", //DeltaV
-            "Tortuga" //DeltaV
+            "Tortuga", //DeltaV
+            "Arena" //DeltaV
+
         };
 
         /// <summary>

diff --git a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
@@ -89,13 +89,13 @@ await server.WaitPost(() =>
             await pair.CleanReturnAsync();
         }
 
-        private const string TestMap = "Maps/bagel.yml";
+        private const string TestMap = "Maps/pebble.yml";
 
         /// <summary>
         ///     Loads the default map, runs it for 5 ticks, then assert that it did not change.
         /// </summary>
         [Test]
-        public async Task LoadSaveTicksSaveBagel()
+        public async Task LoadSaveTicksSavePebble()
         {
             await using var pair = await PoolManager.GetServerClient();
             var server = pair.Server;
@@ -106,7 +106,7 @@ public async Task LoadSaveTicksSaveBagel()
             var cfg = server.ResolveDependency<IConfigurationManager>();
             Assert.That(cfg.GetCVar(CCVars.GridFill), Is.False);
 
-            // Load bagel.yml as uninitialized map, and save it to ensure it's up to date.
+            // Load pebble.yml as uninitialized map, and save it to ensure it's up to date.
             server.Post(() =>
             {
                 mapId = mapManager.CreateMap();
@@ -173,11 +173,11 @@ await server.WaitPost(() =>
         /// <remarks>
         ///     Should ensure that entities do not perform randomization prior to initialization and should prevents
         ///     bugs like the one discussed in github.com/space-wizards/RobustToolbox/issues/3870. This test is somewhat
-        ///     similar to <see cref="LoadSaveTicksSaveBagel"/> and <see cref="SaveLoadSave"/>, but neither of these
+        ///     similar to <see cref="LoadSaveTicksSavePebble"/> and <see cref="SaveLoadSave"/>, but neither of these
         ///     caught the mentioned bug.
         /// </remarks>
         [Test]
-        public async Task LoadTickLoadBagel()
+        public async Task LoadTickLoadPebble()
         {
             await using var pair = await PoolManager.GetServerClient();
             var server = pair.Server;

diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs
@@ -10,6 +10,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
+using Content.Shared.Abilities.Psionics; //Nyano - Summary: Makes Mime psionic. 
 
 namespace Content.Server.Abilities.Mime
 {
@@ -19,6 +20,7 @@ public sealed class MimePowersSystem : EntitySystem
         [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
         [Dependency] private readonly AlertsSystem _alertsSystem = default!;
         [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
+        [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly TurfSystem _turf = default!;
         [Dependency] private readonly IMapManager _mapMan = default!;
         [Dependency] private readonly SharedContainerSystem _container = default!;
@@ -55,6 +57,9 @@ private void OnComponentInit(EntityUid uid, MimePowersComponent component, Compo
             EnsureComp<MutedComponent>(uid);
             _alertsSystem.ShowAlert(uid, AlertType.VowOfSilence);
             _actionsSystem.AddAction(uid, ref component.InvisibleWallActionEntity, component.InvisibleWallAction, uid);
+            //Nyano - Summary: Add Psionic Ability to Mime. 
+            if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
+                psionic.PsionicAbility = component.InvisibleWallActionEntity;
         }
 
         /// <summary>
@@ -92,6 +97,9 @@ private void OnInvisibleWall(EntityUid uid, MimePowersComponent component, Invis
                     return;
                 }
             }
+            // Begin Nyano-code: mime powers are psionic.
+            _psionics.LogPowerUsed(uid, "invisible wall");
+            // End Nyano-code.
             _popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-popup", ("mime", uid)), uid);
             // Make sure we set the invisible wall to despawn properly
             Spawn(component.WallPrototype, _turf.GetTileCenter(tile.Value));