]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Merge stable into master (#41781)
authorslarticodefast <161409025+slarticodefast@users.noreply.github.com>
Mon, 8 Dec 2025 10:14:13 +0000 (11:14 +0100)
committerGitHub <noreply@github.com>
Mon, 8 Dec 2025 10:14:13 +0000 (11:14 +0100)
commit406231cdb3343a742bb0948937a11b7942d4f4ec
tree3728c9435b94057c02063df2ad47539b60c2183d
parent32c1c44367baa69bfa0c792e0729cfc3c04749cd
parentc867adb9379d439b808fdcd9402578e2b6287215
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>
Content.IntegrationTests/Tests/Power/StationPowerTests.cs