From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Mon, 8 Dec 2025 10:14:13 +0000 (+0100)
Subject: Merge stable into master (#41781)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=406231cdb3343a742bb0948937a11b7942d4f4ec;p=space-station-14.git

Merge stable into master (#41781)

Revert "Trip APCs when they exceed a power limit (#41377)" (#41766)

This reverts commit a5c223c0

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---

406231cdb3343a742bb0948937a11b7942d4f4ec
diff --cc Content.IntegrationTests/Tests/Power/StationPowerTests.cs
index 542a4645c6,3a0af28e48..59975443e1
--- a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
+++ b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
@@@ -4,10 -4,9 +4,9 @@@ using Content.Server.GameTicking
  using Content.Server.Power.Components;
  using Content.Server.Power.NodeGroups;
  using Content.Server.Power.Pow3r;
 +using Content.Shared.Maps;
  using Content.Shared.Power.Components;
  using Content.Shared.NodeContainer;
- using Robust.Server.GameObjects;
  using Robust.Shared.EntitySerialization;
  
  namespace Content.IntegrationTests.Tests.Power;