From 4dfaf11698777fc7339a95c15a467743ef97bdea Mon Sep 17 00:00:00 2001
From: NotAlwaysTrue <77662224+NotAlwaysTrue@users.noreply.github.com>
Date: Fri, 19 Jun 2026 13:32:12 +0800
Subject: [PATCH] V1.2.2(v1.13.4.0)
Sync with upstream
---
.../ClientSource/Items/Components/ItemComponent.cs | 2 +-
Barotrauma/BarotraumaClient/LinuxClient.csproj | 2 +-
Barotrauma/BarotraumaClient/MacClient.csproj | 2 +-
Barotrauma/BarotraumaClient/WindowsClient.csproj | 2 +-
Barotrauma/BarotraumaServer/LinuxServer.csproj | 2 +-
Barotrauma/BarotraumaServer/MacServer.csproj | 2 +-
.../ServerSource/Networking/Voip/VoipServer.cs | 1 +
Barotrauma/BarotraumaServer/WindowsServer.csproj | 2 +-
Barotrauma/BarotraumaShared/changelog.txt | 11 +++++++++++
9 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemComponent.cs
index e33660954..10985ffef 100644
--- a/Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemComponent.cs
+++ b/Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemComponent.cs
@@ -678,7 +678,7 @@ namespace Barotrauma.Items.Components
{
color = GuiFrameSource.GetAttributeColor("color", Color.White);
}
- string style = GuiFrameSource.Attribute("style") == null ? null : GuiFrameSource.GetAttributeString("style", "");
+ string style = GuiFrameSource.GetAttribute("style") == null ? null : GuiFrameSource.GetAttributeString("style", "");
GuiFrame = new GUIFrame(RectTransform.Load(GuiFrameSource, GUI.Canvas, Anchor.Center), style, color);
GuiFrame.RectTransform.ScreenSpaceOffset = GuiFrameOffset;
diff --git a/Barotrauma/BarotraumaClient/LinuxClient.csproj b/Barotrauma/BarotraumaClient/LinuxClient.csproj
index 2fbdb22d0..5374da7a9 100644
--- a/Barotrauma/BarotraumaClient/LinuxClient.csproj
+++ b/Barotrauma/BarotraumaClient/LinuxClient.csproj
@@ -6,7 +6,7 @@
Barotrauma
FakeFish, Undertow Games
Barotrauma
- 1.13.3.1
+ 1.13.4.0
Copyright © FakeFish 2018-2024
AnyCPU;x64
Barotrauma
diff --git a/Barotrauma/BarotraumaClient/MacClient.csproj b/Barotrauma/BarotraumaClient/MacClient.csproj
index fad9a9f91..4cf721584 100644
--- a/Barotrauma/BarotraumaClient/MacClient.csproj
+++ b/Barotrauma/BarotraumaClient/MacClient.csproj
@@ -6,7 +6,7 @@
Barotrauma
FakeFish, Undertow Games
Barotrauma
- 1.13.3.1
+ 1.13.4.0
Copyright © FakeFish 2018-2024
AnyCPU;x64
Barotrauma
diff --git a/Barotrauma/BarotraumaClient/WindowsClient.csproj b/Barotrauma/BarotraumaClient/WindowsClient.csproj
index cef4dfb03..932d85aed 100644
--- a/Barotrauma/BarotraumaClient/WindowsClient.csproj
+++ b/Barotrauma/BarotraumaClient/WindowsClient.csproj
@@ -6,7 +6,7 @@
Barotrauma
FakeFish, Undertow Games
Barotrauma
- 1.13.3.1
+ 1.13.4.0
Copyright © FakeFish 2018-2024
AnyCPU;x64
Barotrauma
diff --git a/Barotrauma/BarotraumaServer/LinuxServer.csproj b/Barotrauma/BarotraumaServer/LinuxServer.csproj
index 4fc23a8d8..6b7073cfa 100644
--- a/Barotrauma/BarotraumaServer/LinuxServer.csproj
+++ b/Barotrauma/BarotraumaServer/LinuxServer.csproj
@@ -6,7 +6,7 @@
Barotrauma
FakeFish, Undertow Games
Barotrauma Dedicated Server
- 1.13.3.1
+ 1.13.4.0
Copyright © FakeFish 2018-2023
AnyCPU;x64
DedicatedServer
diff --git a/Barotrauma/BarotraumaServer/MacServer.csproj b/Barotrauma/BarotraumaServer/MacServer.csproj
index df4100226..16115c927 100644
--- a/Barotrauma/BarotraumaServer/MacServer.csproj
+++ b/Barotrauma/BarotraumaServer/MacServer.csproj
@@ -6,7 +6,7 @@
Barotrauma
FakeFish, Undertow Games
Barotrauma Dedicated Server
- 1.13.3.1
+ 1.13.4.0
Copyright © FakeFish 2018-2023
AnyCPU;x64
DedicatedServer
diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/Voip/VoipServer.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/Voip/VoipServer.cs
index f32931dc7..784e63ca2 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/Networking/Voip/VoipServer.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/Voip/VoipServer.cs
@@ -107,6 +107,7 @@ namespace Barotrauma.Networking
if (canUse != null)
{
+ isRadio = canUse.Value;
return canUse.Value;
}
diff --git a/Barotrauma/BarotraumaServer/WindowsServer.csproj b/Barotrauma/BarotraumaServer/WindowsServer.csproj
index 40f449182..02f222033 100644
--- a/Barotrauma/BarotraumaServer/WindowsServer.csproj
+++ b/Barotrauma/BarotraumaServer/WindowsServer.csproj
@@ -6,7 +6,7 @@
Barotrauma
FakeFish, Undertow Games
Barotrauma Dedicated Server
- 1.13.3.1
+ 1.13.4.0
Copyright © FakeFish 2018-2023
AnyCPU;x64
DedicatedServer
diff --git a/Barotrauma/BarotraumaShared/changelog.txt b/Barotrauma/BarotraumaShared/changelog.txt
index 9f31a1e87..ee86bc6eb 100644
--- a/Barotrauma/BarotraumaShared/changelog.txt
+++ b/Barotrauma/BarotraumaShared/changelog.txt
@@ -1,4 +1,15 @@
-------------------------------------------------------------------------------------------------------------------------------------------------
+v1.13.4.0 (Summer Update 2026 Hotfix 1)
+-------------------------------------------------------------------------------------------------------------------------------------------------
+
+- Fixed a missing gap in the reworked Typhon + other minor fixes.
+- Minor visual fixes to Orca 2.
+- Adjustments to Azimuth's lighting.
+- Tweaked Azimuth's stealth mode circuit to make piloting smoother.
+- Fixed "style" attribute in item GuiFrame XML being case-sensitive.
+- Fixed battery cells not being visible when charged in a battery or shuttle battery.
+
+-------------------------------------------------------------------------------------------------------------------------------------------------
v1.13.3.1 (Summer Update 2026)
-------------------------------------------------------------------------------------------------------------------------------------------------