Merge remote-tracking branch 'refs/remotes/sunrise_public/master'

space-sunrise · Feb 5, 2025 · e340522 · e340522
2 parents 10feb3e + 6682cfa
commit e340522
Show file tree

Hide file tree

Showing 492 changed files with 205,895 additions and 200,473 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -8,16 +8,34 @@ on:
 
 jobs:
   build:
-    if: false
     runs-on: ubuntu-latest
 
     steps:
-    - name: Install dependencies
-      run: sudo apt-get install -y python3-paramiko python3-lxml
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+
+    - name: Install Dependencies
+      run: pip install pyyaml requests
 
     - uses: actions/[email protected]
       with:
         submodules: 'recursive'
+
+    - name: Checkout SunrisePrivate
+      uses: actions/checkout@v2
+      with:
+        repository: ${{ secrets.SUNRISE_PRIVATE_REPO_URL }}
+        path: SunrisePrivate
+        ssh-key: ${{ secrets.SUNRISE_SSH_KEY }}
+
+    - name: Move SunrisePrivate files
+      run: python3 Tools/_sunrise/move_sunrise_private.py
+      env:
+        SUNRISE_SSH_KEY: ${{ secrets.SUNRISE_SSH_KEY }}
+        SUNRISE_PRIVATE_REPO_URL: ${{ secrets.SUNRISE_PRIVATE_REPO_URL }}
+
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
@@ -46,13 +64,25 @@ jobs:
         PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
-    - name: Publish changelog (Discord)
+    - name: Publish discord changelog (SUNRISE)
       run: Tools/actions_changelogs_since_last_run.py
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK_SUNRISE }}
 
-    - name: Publish changelog (RSS)
-      run: Tools/actions_changelog_rss.py
+    - name: Publish discord changelog (LUST)
+      run: Tools/actions_changelogs_since_last_run.py
       env:
-        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK_LUST }}
+
+    - name: Publish discord changelog (FISH)
+      run: Tools/actions_changelogs_since_last_run.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK_FISH }}
+
+#    - name: Publish changelog (RSS)
+#      run: Tools/actions_changelog_rss.py
+#      env:
+#        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "RobustToolbox"]
 	path = RobustToolbox
 	url = https://github.com/space-wizards/RobustToolbox.git
-	branch = master
+	branch = master
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
@@ -1,3 +1,4 @@
+using Content.Client._Sunrise.Entry;
 using Content.Client._Sunrise.ServersHub;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
@@ -25,6 +26,8 @@
 using Content.Shared.Ame.Components;
 using Content.Shared.Gravity;
 using Content.Shared.Localizations;
+using Content.Sunrise.Interfaces.Client;
+using Content.Sunrise.Interfaces.Shared;
 using Robust.Client;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -141,6 +144,10 @@ public override void Init()
 
             _serversHubManager.Initialize(); // Sunrise-Hub
 
+            // Sunrise-Sponsors-Start
+            SunriseClientEntry.Init();
+            // Sunrise-Sponsors-End
+
             //AUTOSCALING default Setup!
             _configManager.SetCVar("interface.resolutionAutoScaleUpperCutoffX", 1080);
             _configManager.SetCVar("interface.resolutionAutoScaleUpperCutoffY", 720);
@@ -177,6 +184,10 @@ public override void PostInit()
             _documentParsingManager.Initialize();
             _titleWindowManager.Initialize();
 
+            // Sunrise-Sponsors-Start
+            SunriseClientEntry.PostInit();
+            // Sunrise-Sponsors-End
+
             _baseClient.RunLevelChanged += (_, args) =>
             {
                 if (args.NewLevel == ClientRunLevel.Initialize)

diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
@@ -1,4 +1,5 @@
-using Content.Client._Sunrise.ServersHub;
+using Content.Client._Sunrise.IoC;
+using Content.Client._Sunrise.ServersHub;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -61,9 +62,10 @@ public static void Register()
             collection.Register<SharedPlayerRateLimitManager, PlayerRateLimitManager>();
             collection.Register<TitleWindowManager>();
 
-            // Sunrise
-
-            collection.Register<ServersHubManager>(); // Sunrise-Hub
+            // Sunrise-Start
+            collection.Register<ServersHubManager>();
+            SunriseClientContentIoC.Register();
+            // Sunrise-End
         }
     }
 }
diff --git a/Content.Client/_Sunrise/Entry/SunriseClientEntry.cs b/Content.Client/_Sunrise/Entry/SunriseClientEntry.cs
@@ -0,0 +1,12 @@
+namespace Content.Client._Sunrise.Entry;
+
+public sealed class SunriseClientEntry
+{
+    public static void Init()
+    {
+    }
+
+    public static void PostInit()
+    {
+    }
+}
diff --git a/Content.Client/_Sunrise/IoC/SunriseClientContentIoC.cs b/Content.Client/_Sunrise/IoC/SunriseClientContentIoC.cs
@@ -0,0 +1,11 @@
+
+
+namespace Content.Client._Sunrise.IoC;
+
+internal static class SunriseClientContentIoC
+{
+    public static void Register()
+    {
+
+    }
+}
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
@@ -1,3 +1,4 @@
+using Content.Server._Sunrise.Entry;
 using Content.Server._Sunrise.GuideGenerator;
 using Content.Server._Sunrise.ServersHub;
 using Content.Server._Sunrise.TTS;
@@ -29,6 +30,8 @@
 using Content.Shared.CCVar;
 using Content.Shared.Kitchen;
 using Content.Shared.Localizations;
+using Content.Sunrise.Interfaces.Server;
+using Content.Sunrise.Interfaces.Shared;
 using Robust.Server;
 using Robust.Server.ServerStatus;
 using Robust.Shared.Configuration;
@@ -53,6 +56,7 @@ public sealed class EntryPoint : GameServer
         private IServerDbManager? _dbManager;
         private IWatchlistWebhookManager _watchlistWebhookManager = default!;
         private IConnectionManager? _connectionManager;
+        private ISharedSponsorsManager? _sponsorsManager; // Sunrise-Sponsors
 
         /// <inheritdoc />
         public override void Init()
@@ -119,6 +123,11 @@ public override void Init()
 
                 IoCManager.Resolve<ServersHubManager>().Initialize(); // Sunrise-Hub
 
+                // Sunrise-Sponsors-Start
+                SunriseServerEntry.Init();
+                IoCManager.Instance!.TryResolveType(out _sponsorsManager);
+                // Sunrise-Sponsors-End
+
                 _voteManager.Initialize();
                 _updateManager.Initialize();
                 _playTimeTracking.Initialize();
@@ -172,6 +181,9 @@ public override void PostInit()
                 IoCManager.Resolve<IBanManager>().Initialize();
                 IoCManager.Resolve<IConnectionManager>().PostInit();
                 IoCManager.Resolve<MultiServerKickManager>().Initialize();
+                // Sunrise-Sponsors-Start
+                SunriseServerEntry.PostInit();
+                // Sunrise-Sponsors-End
             }
         }
 
@@ -194,6 +206,7 @@ public override void Update(ModUpdateLevel level, FrameEventArgs frameEventArgs)
                     _watchlistWebhookManager.Update();
                     _connectionManager?.Update();
                     _serversHubManager.Update(); // Sunrise-Edit
+                    _sponsorsManager?.Update(); // Sunrise-Edit
                     break;
             }
         }

diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
@@ -1,3 +1,4 @@
+using Content.Server._Sunrise.IoC;
 using Content.Server._Sunrise.ServersHub;
 using Content.Server._Sunrise.TTS;
 using Content.Server.Administration;
@@ -80,7 +81,10 @@ public static void Register()
             IoCManager.Register<ConnectionManager>();
             IoCManager.Register<MultiServerKickManager>();
 
-            IoCManager.Register<ServersHubManager>(); // Sunrise-Hub
+            // Sunrise-Start
+            IoCManager.Register<ServersHubManager>();
+            SunriseServerContentIoC.Register();
+            // Sunrise-End
         }
     }
 }
diff --git a/Content.Server/Store/Conditions/BuyerAntagCondition.cs b/Content.Server/Store/Conditions/BuyerAntagCondition.cs
@@ -27,13 +27,12 @@ public sealed partial class BuyerAntagCondition : ListingCondition
     public override bool Condition(ListingConditionArgs args)
     {
         var ent = args.EntityManager;
-        var minds = ent.System<SharedMindSystem>();
 
-        if (!minds.TryGetMind(args.Buyer, out var mindId, out var mind))
-            return true;
+        if (!ent.HasComponent<MindComponent>(args.Buyer))
+            return true; // inanimate objects don't have minds
 
         var roleSystem = ent.System<SharedRoleSystem>();
-        var roles = roleSystem.MindGetAllRoleInfo(mindId);
+        var roles = roleSystem.MindGetAllRoleInfo(args.Buyer);
 
         if (Blacklist != null)
         {

diff --git a/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs b/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs
@@ -30,14 +30,12 @@ public override bool Condition(ListingConditionArgs args)
         var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
 
         var ent = args.EntityManager;
-        var minds = ent.System<SharedMindSystem>();
 
-        // this is for things like surplus crate
-        if (!minds.TryGetMind(args.Buyer, out var mindId, out _))
-            return true;
+        if (!ent.TryGetComponent<MindComponent>(args.Buyer, out var _))
+            return true; // inanimate objects don't have minds
 
         var jobs = ent.System<SharedJobSystem>();
-        jobs.MindTryGetJob(mindId, out var job);
+        jobs.MindTryGetJob(args.Buyer, out var job);
 
         if (Blacklist != null && job != null)
         {

diff --git a/Content.Server/Store/Conditions/BuyerJobCondition.cs b/Content.Server/Store/Conditions/BuyerJobCondition.cs
@@ -27,14 +27,12 @@ public sealed partial class BuyerJobCondition : ListingCondition
     public override bool Condition(ListingConditionArgs args)
     {
         var ent = args.EntityManager;
-        var minds = ent.System<SharedMindSystem>();
 
-        // this is for things like surplus crate
-        if (!minds.TryGetMind(args.Buyer, out var mindId, out _))
-            return true;
+        if (!ent.TryGetComponent<MindComponent>(args.Buyer, out var _))
+            return true; // inanimate objects don't have minds
 
         var jobs = ent.System<SharedJobSystem>();
-        jobs.MindTryGetJob(mindId, out var job);
+        jobs.MindTryGetJob(args.Buyer, out var job);
 
         if (Blacklist != null)
         {

diff --git a/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs b/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Store;
 using Content.Shared.Humanoid.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
+using Content.Shared.Mind;
 
 namespace Content.Server.Store.Conditions;
 
@@ -27,7 +28,10 @@ public override bool Condition(ListingConditionArgs args)
     {
         var ent = args.EntityManager;
 
-        if (!ent.TryGetComponent<HumanoidAppearanceComponent>(args.Buyer, out var appearance))
+        if (!ent.TryGetComponent<MindComponent>(args.Buyer, out var mind))
+            return true; // needed to obtain body entityuid to check for humanoid appearance
+
+        if (!ent.TryGetComponent<HumanoidAppearanceComponent>(mind.OwnedEntity, out var appearance))
             return true; // inanimate or non-humanoid entities should be handled elsewhere, main example being surplus crates
 
         if (Blacklist != null)

diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
@@ -10,6 +10,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared.Mind;
 
 namespace Content.Server.Store.Systems;
 
@@ -69,10 +70,13 @@ private void OnStoreOpenAttempt(EntityUid uid, StoreComponent component, Activat
         if (!component.OwnerOnly)
             return;
 
-        component.AccountOwner ??= args.User;
+        if (!_mind.TryGetMind(args.User, out var mind, out _))
+            return;
+
+        component.AccountOwner ??= mind;
         DebugTools.Assert(component.AccountOwner != null);
 
-        if (component.AccountOwner == args.User)
+        if (component.AccountOwner == mind)
             return;
 
         _popup.PopupEntity(Loc.GetString("store-not-account-owner", ("store", uid)), uid, args.User);

diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Implants;
 using Content.Shared.Inventory;
+using Content.Shared.Mind;
 using Content.Shared.PDA;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
@@ -20,6 +21,7 @@ public sealed class UplinkSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly StoreSystem _store = default!;
     [Dependency] private readonly SharedSubdermalImplantSystem _subdermalImplant = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly TagSystem _tagSystem = default!;
 
     [ValidatePrototypeId<CurrencyPrototype>]
@@ -63,19 +65,23 @@ public bool AddUplink(
     /// </summary>
     public void SetUplink(EntityUid user, EntityUid uplink, FixedPoint2 balance, bool giveDiscounts)
     {
+        if (!_mind.TryGetMind(user, out var mind, out _))
+            return;
+
         var store = EnsureComp<StoreComponent>(uplink);
-        store.AccountOwner = user;
+
+        store.AccountOwner = mind;
 
         store.Balance.Clear();
         _store.TryAddCurrency(new Dictionary<string, FixedPoint2> { { TelecrystalCurrencyPrototype, balance } },
             uplink,
             store);
 
         var uplinkInitializedEvent = new StoreInitializedEvent(
-            TargetUser: user,
+            TargetUser: mind,
             Store: uplink,
             UseDiscounts: giveDiscounts,
-            Listings: _store.GetAvailableListings(user, uplink, store)
+            Listings: _store.GetAvailableListings(mind, uplink, store)
                 .ToArray());
         RaiseLocalEvent(ref uplinkInitializedEvent);
     }

diff --git a/Content.Server/_Sunrise/Entry/SunriseServerEntry.cs b/Content.Server/_Sunrise/Entry/SunriseServerEntry.cs
@@ -0,0 +1,12 @@
+namespace Content.Server._Sunrise.Entry;
+
+public sealed class SunriseServerEntry
+{
+    public static void Init()
+    {
+    }
+
+    public static void PostInit()
+    {
+    }
+}
diff --git a/Content.Server/_Sunrise/IoC/SunriseServerContentIoC.cs b/Content.Server/_Sunrise/IoC/SunriseServerContentIoC.cs
@@ -0,0 +1,11 @@
+
+
+namespace Content.Server._Sunrise.IoC;
+
+internal static class SunriseServerContentIoC
+{
+    public static void Register()
+    {
+
+    }
+}