fix upstream

b

fix

fix yaml linter

Update swords.yml

fix

fix

map resave

Update ServerConsciousnessSystem.cs

typo fix

fix AllTechPrintableTest

local test fix

fix

fix maps

Author: MightBeNotReal

Content.Client/Lobby/UI/LobbyGui.xaml

@@ -31,21 +31,21 @@
                             <BoxContainer Orientation="Vertical" HorizontalAlignment="Center" MaxWidth="800">
                                 <info:LinkBanner Name="LinkBanner" VerticalExpand="false" HorizontalAlignment="Center"
                                                  Margin="3 3 3 3" />
-                                <controls:StripeBack>
+                                <!--<controls:StripeBack>
                                     <BoxContainer Orientation="Horizontal" SeparationOverride="6" Margin="3 3 3 3">
                                         <Label Name="StartTime"
                                                Access="Public"
                                                Align="Left"
                                                FontColorOverride="{x:Static maths:Color.DarkGray}"
                                                StyleClasses="LabelBig" HorizontalExpand="True" />
                                     </BoxContainer>
-                                </controls:StripeBack>
+                                </controls:StripeBack>-->
                                 <RichTextLabel Name="PlaytimeComment" Visible="False" Access="Public" HorizontalAlignment="Center" />
                             </BoxContainer>
                         </PanelContainer>
                         <!-- Voting Popups -->
-                        <BoxContainer Orientation="Vertical" SeparationOverride="4" Name="VoteContainer"
-                                      Access="Public" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0 8" />
+                        <!--<BoxContainer Orientation="Vertical" SeparationOverride="4" Name="VoteContainer"
+                                      Access="Public" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0 8" />-->
                     </BoxContainer>
 
                     <!-- Character Setup State -->

Content.IntegrationTests/PoolTestLogHandler.cs

@@ -62,6 +62,10 @@ public void Log(string sawmillName, LogEvent message)
         if (FailureLevel == null || level < FailureLevel)
             return;
 
+        // tests no have config file!
+        if(rendered == "Cannot save the config file, because one was never loaded.")
+            return;
+
         testContext.Flush();
         Assert.Fail($"{line} Exception: {message.Exception}");
     }

Content.IntegrationTests/Tests/Backmen/Lathe/LatheRecipyCostTest.cs

@@ -43,17 +43,24 @@ await server.WaitAssertion(() =>
                     continue;
 
                 matPrice = Math.Round(matPrice);
+                var diff = resultPrice - matPrice;
 
-                if (resultPrice > matPrice + Tolerance)
+                if (diff > Tolerance)
                 {
-                    fails.Add($"ID: {recipe.ID} Materials: {matPrice} Result: {resultPrice} Dif: {resultPrice - matPrice}");
+                    fails.Add($"ID: {recipe.ID}\n" +
+                              $"Materials: {matPrice}\n" +
+                              $"Result: {resultPrice}\n" +
+                              $"Difference: {diff} (max allowed: {Tolerance})\n" +
+                              $"RECOMMENDED FIX: Set result price to ≤ {matPrice + Tolerance}");
                 }
             }
         });
 
         if (fails.Count > 0)
         {
-            var msg = string.Join("\n", fails) + "\n" + "Following RecipePrototypes are giving Arbitrage when printed!";
+            var msg = "Found arbitrage opportunities:\n\n" +
+                      string.Join("\n\n", fails) +
+                      "\n\nAdjust lathe recipe prices or material costs.";
             Assert.Fail(msg);
         }
 

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -68,23 +68,19 @@ public sealed class PostMapInitTest
         private static readonly string[] GameMaps =
         {
             // Corvax-Start
-            "CorvaxAvrite",
             "CorvaxDelta",
             "CorvaxSilly",
             "CorvaxOutpost",
-            "CorvaxAstra",
             "CorvaxGelta",
 			"CorvaxMaus",
 			"CorvaxIshimura",
 			"CorvaxPaper",
 			"CorvaxCute",
             "CorvaxPilgrim",
             "CorvaxSplit",
-            "CorvaxTerra",
             "CorvaxFrame",
             "CorvaxPearl",
             "CorvaxTushkan",
-            "CorvaxAwesome",
             // Corvax-End
             "Dev",
             "TestTeg",

Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs

@@ -699,7 +699,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
         {
             Text = "Dwarf Species Swap",
             Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Objects/Fun/toys.rsi"), "plushie_lizard"),
+            Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Plushies/lizard.rsi"), "icon"),
             Act = () =>
             {
                 _polymorphSystem.PolymorphEntity(args.Target, "BDwarfMorph");
@@ -713,7 +713,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
         {
             Text = "Vox Species Swap",
             Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Objects/Fun/toys.rsi"), "plushie_lizard"),
+            Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Plushies/lizard.rsi"), "icon"),
             Act = () =>
             {
                 _polymorphSystem.PolymorphEntity(args.Target, "BVoxMorph");
@@ -727,7 +727,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
         {
             Text = "Skilet Species Swap",
             Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Objects/Fun/toys.rsi"), "plushie_lizard"),
+            Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Plushies/lizard.rsi"), "icon"),
             Act = () =>
             {
                 _polymorphSystem.PolymorphEntity(args.Target, "BSkeletonMorph");

Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs

@@ -62,14 +62,13 @@ private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentIn
         _actions.AddAction(uid, ref component.MindSwapPowerAction, ActionMindSwap);
 
     #if !DEBUG
-         if (_actions.TryGetActionData(component.MindSwapPowerAction, out var action) && action?.UseDelay != null)
-            _actions.SetCooldown(component.MindSwapPowerAction, _gameTiming.CurTime,
-                _gameTiming.CurTime + (TimeSpan)  action?.UseDelay!);
+        var actionEnt = _actions.GetAction(component.MindSwapPowerAction);
+        if (actionEnt is { Comp.UseDelay: {} delay }) {
+            _actions.SetCooldown(component.MindSwapPowerAction, delay);
+        }
     #endif
         if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
             psionic.PsionicAbility = component.MindSwapPowerAction;
-
-
     }
 
     private void OnShutdown(EntityUid uid, MindSwapPowerComponent component, ComponentShutdown args)

Content.Server/Backmen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs

@@ -26,28 +26,11 @@ public override void Initialize()
         SubscribeLocalEvent<TelegnosisPowerComponent, TelegnosisPowerActionEvent>(OnPowerUsed);
         SubscribeLocalEvent<TelegnosisPowerComponent, MobStateChangedEvent>(OnMobStateChanged);
 
-
-        SubscribeLocalEvent<TelegnosticProjectionComponent, ComponentStartup>(OnProjectionInit);
-        SubscribeLocalEvent<TelegnosticProjectionComponent, ComponentShutdown>(OnProjectionShutdown);
         SubscribeLocalEvent<TelegnosticProjectionComponent, TelegnosisPowerReturnActionEvent>(OnPowerReturnUsed);
-
-
-
         SubscribeLocalEvent<TelegnosticProjectionComponent, MindRemovedMessage>(OnMindRemoved);
     }
 
-    private void OnProjectionShutdown(EntityUid uid, TelegnosticProjectionComponent component, ComponentShutdown args)
-    {
-        _actions.RemoveAction(uid, component.TelegnosisPowerAction);
-    }
-
-    private void OnProjectionInit(EntityUid uid, TelegnosticProjectionComponent component, ComponentStartup args)
-    {
-        _actions.AddAction(uid, ref component.TelegnosisPowerAction, ActionTelegnosisReturn);
-    }
-
     [ValidatePrototypeId<EntityPrototype>] private const string ActionTelegnosis = "ActionTelegnosis";
-    [ValidatePrototypeId<EntityPrototype>] private const string ActionTelegnosisReturn = "ActionTelegnosisReturn";
 
     private void OnInit(EntityUid uid, TelegnosisPowerComponent component, ComponentInit args)
     {

Content.Server/Backmen/Species/Shadowkin/Components/ShadowkinRestPowerComponent.cs

@@ -5,3 +5,6 @@ public sealed partial class ShadowkinRestPowerComponent : Component
 {
     public EntityUid? ShadowkinRestAction;
 }
+
+[RegisterComponent]
+public sealed partial class ShadowkinRestPowerUsedComponent : Component;

Content.Server/Backmen/Species/Shadowkin/Systems/ShadowkinPowerSystem.DarkSwap.cs

@@ -174,6 +174,9 @@ private void DarkSwap(EntityUid uid, ShadowkinDarkSwapPowerComponent component,
 
         var hasComp = HasComp<ShadowkinDarkSwappedComponent>(args.Performer);
 
+        if (hasComp && HasComp<StealthComponent>(args.Performer))
+            return;
+
         SetDarkened(
             args.Performer,
             !hasComp,

Content.Server/Backmen/Species/Shadowkin/Systems/ShadowkinPowerSystem.Rest.cs

@@ -52,22 +52,28 @@ private void OnShutdown(EntityUid uid, ShadowkinRestPowerComponent component, Co
     private void Rest(EntityUid uid, ShadowkinRestPowerComponent component, ShadowkinRestEvent args)
     {
         // Need power to modify power
-        if (!HasComp<ShadowkinComponent>(args.Performer))
+        if (!HasComp<ShadowkinComponent>(args.Performer) || component.ShadowkinRestAction is null)
             return;
 
         // Rest is a funny ability, keep it :)
         // // Don't activate abilities if handcuffed
         // if (_entity.HasComponent<HandcuffComponent>(args.Performer))
         //     return;
 
+        SleepingComponent? sleepingComponent = null;
+
         // Resting
-        if (!TryComp<SleepingComponent>(args.Performer, out var sleepingComponent))
+        var isSleepingByPower = HasComp<ShadowkinRestPowerUsedComponent>(args.Performer);
+        if (!isSleepingByPower)
         {
             if (HasComp<StunnedComponent>(args.Performer))
                 return;
 
             if(!_sleeping.TrySleeping(args.Performer))
                 return;
+
+            EnsureComp<ShadowkinRestPowerUsedComponent>(args.Performer);
+
             // Sleepy time
             EnsureComp<ForcedSleepingComponent>(args.Performer);
             // No waking up normally (it would do nothing)
@@ -79,11 +85,13 @@ private void Rest(EntityUid uid, ShadowkinRestPowerComponent component, Shadowki
             args.Handled = false;
         }
         // Waking
-        else
+        else if(isSleepingByPower && TryComp(args.Performer, out sleepingComponent))
         {
             // Wake up
             // Action cooldown
+            RemCompDeferred<ShadowkinRestPowerUsedComponent>(args.Performer);
             args.Handled = _sleeping.TryWaking((args.Performer,sleepingComponent), true);
+            _actions.SetCooldown(component.ShadowkinRestAction.Value, TimeSpan.FromMinutes(1));
         }
     }
 }