Merge branch 'main' into release

# Conflicts:
#	.gitea/workflows/deploy.yml

Data/campaignsettings.xml

@@ -3,7 +3,7 @@
   <CampaignSettingDefinitions>
     <StartingBalanceAmount high="10000" medium="8500" low="6000" />
     <ExtraEventManagerDifficulty low="-15.0" medium="0.0" high="20.0" hellish="60.0" />
-    <LevelDifficultyMultiplier low="0.6" medium="1.0" high="2.0" hellish="10.0" />
+    <LevelDifficultyMultiplier low="0.6" medium="1.0" high="1.6" hellish="10.0" />
     <PatdownProbabilityMin off="0" low="0.2" medium="0.3" high="0.4" />
     <PatdownProbabilityMax off="0" low="0.9" medium="0.9" high="1.0" />
   </CampaignSettingDefinitions>

Data/forbiddenwordlist.txt

@@ -0,0 +1,427 @@
+4r5e
+5h1t
+5hit
+Dumbcunt
+a$$
+a$$hole
+a2m
+a54
+a55
+a55hole
+a_s_s
+adolf
+ahole
+ anal 
+anus
+anuses
+arrse
+arse
+ ass 
+asses
+asshat
+asshole
+assshole
+b!tch
+b17ch
+b1tch
+ballsack
+beatch
+bitch
+bitchass
+bitched
+bitcher
+bitchers
+bitches
+bitches
+bitching
+bitchy
+blowjob
+blowjobs
+bulldyke
+bullshit
+bullshits
+bullshitted
+bullturds
+bung
+bunghole
+buttfucker
+butthole
+buttmuch
+buttmunch
+c-0-c-k
+c.0.c.k
+c.o.c.k.
+c.u.n.t
+c0ck
+carpetmuncher
+ chinc 
+chincs
+chink
+chinky
+clitoris
+ cock 
+cock sucker
+cock-sucker
+cocks
+cocksucker
+cocksuckers
+cocksucking
+cocksucks
+coochie
+coochy
+ coon 
+coonnass
+ coons 
+cracker
+crackwhore
+crap
+cumbubble
+cumdump
+cumdump
+cumdumpster
+cumguzzler
+cumjockey
+cummer
+cummin
+cumming
+ cums 
+cumshot
+cumshots
+cumslut
+cumstain
+cumtart
+cunilingus
+cunillingus
+cunnie
+cunnilingus
+ cunny 
+cunt
+cuntass
+cuntbag
+cuntbag
+cuntface
+cunthole
+cunthunter
+cuntlick
+cuntlick
+cuntlicker
+cuntlicker
+cuntlicking
+cuntlicking
+cuntrag
+cunts
+cunts
+cuntsicle
+cuntsicle
+cuntslut
+d0uch3
+d0uche
+d1ck
+d1ld0
+d1ldo
+deepthroat
+dick
+dick-ish
+dick-sneeze
+dickbag
+dickbeaters
+dickdipper
+dickface
+dickflipper
+dickfuck
+dickfucker
+dickhead
+dickheads
+dickhole
+dickish
+dickjuice
+dickmilk
+dickmonger
+dickripper
+dicks
+dicks
+dicksipper
+dickslap
+dicksucker
+dicksucking
+dicktickler
+dickwad
+dickweasel
+dickweed
+dickwhipper
+dickwod
+dickzipper
+diddle
+dike
+dildo
+dildos
+douche
+douchebag
+dumbass
+dumbasses
+dumbfuck
+dumbshit
+dyke
+dykes
+ejaculate
+ejaculated
+ejaculates
+ejaculates
+ejaculating
+ejaculating
+ejaculatings
+ejaculation
+ejakulate
+erect
+f u c k
+f u c k e r
+f.u.c.k
+f4nny
+f_u_c_k
+ fag 
+fagbag
+fagfucker
+fagg
+fagged
+fagging
+faggit
+faggitt
+faggot
+faggot*
+faggotcock
+faggots
+faggots
+faggs
+fagot
+fagots
+ fags 
+fagtard
+fatass
+fcuk
+fcuker
+fcuking
+feck
+fecker
+fistfuck
+fistfucked
+fistfucked
+fistfucker
+fistfucker
+fistfuckers
+fistfuckers
+fistfucking
+fistfucking
+fistfuckings
+fistfuckings
+fistfucks
+fistfucks
+fuck
+fuck-ass
+fuck ass
+fuck-bitch
+fuck bitch
+fucktard
+fuck tard
+fucka
+fuckass
+fuckbag
+fuckboy
+fuckbrain
+fuckbutt
+fuckbutter
+fucked
+fuckedup
+fucker
+fuckers
+fuckersucker
+fuckface
+fuckhead
+fuckheads
+fuckhole
+fuckin
+fucking
+fuckings
+fuckingshitmotherfucker
+fuckme
+fuckme
+fuckmeat
+fucknugget
+fucknut
+fucknutt
+fuckoff
+fucks
+fuckstick
+fucktard
+fucktards
+fucktart
+fucktoy
+fucktoy
+fucktwat
+fuckup
+fuckwad
+fuckwhit
+fuckwit
+fuckwitt
+gay
+gayass
+gaybob
+gaydo
+gayfuck
+gayfuckist
+gaylord
+gays
+god-dam
+god-damned
+godamn
+godamnit
+goddam
+goddammit
+goddamn
+goddamned
+goddamnit
+godsdamn
+hitler
+homo
+homodumbshit
+homoerotic
+homoey
+homos
+honkey
+honky
+jack-off
+jackass
+jackass
+jackasses
+jackasses
+jackhole
+jackhole
+jackoff
+jackoff
+jaggi
+jagoff
+jailbait
+jailbait
+ jap 
+japs
+ jerk 
+jerk-off
+jerkoff
+jerk off
+jerk0ff
+jerkass
+jerked
+jerkoff
+jew
+jews
+jism
+jiz
+jiz
+jizm
+jizm
+jizz
+jizzed
+kike
+kikes
+knob
+ kum 
+kummer
+kumming
+kums
+lesbian
+lesbians
+lesbo
+lesbos
+lez
+lezzie
+master-bate
+master-bate
+masterbat*
+masterbat3
+masterbate
+masterbating
+masterbation
+masterbations
+masturbate
+masturbating
+masturbation
+mothafuck
+mothafucka
+mothafuckas
+mothafuckaz
+mothafucked
+mothafucked
+mothafucker
+mothafuckers
+mothafuckin
+mothafucking
+mothafuckings
+mothafucks
+motherfuck
+motherfucka
+motherfucked
+motherfucker
+motherfucker
+motherfuckers
+motherfuckin
+motherfucking
+motherfuckings
+motherfuckka
+motherfucks
+mudslime*
+mudslimes*
+nazi
+nazis
+ nig 
+nig-nog
+nigg3r
+nigg4h
+nigga
+nigga
+niggah
+niggas
+niggas
+niggaz
+nigger
+nigger
+niggers
+niggle
+niglet
+negroid
+negroids
+penis
+pigfucker
+ piss 
+piss-off
+pissed
+pisser
+pissers
+pisses
+pisses
+pissflaps
+pissin
+pissin
+pissing
+pissoff
+pissoff
+pussies
+pussy
+queaf
+queaf
+queef
+queer
+queers
+ rape 
+raped
+raper
+rapey
+raping
+rapist
+slut
+sluts
+twat
+twats
+vagina
+vaginas
+white power
+whore
+whores

DedicatedServer.deps.json

@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v8.0": {},
     ".NETCoreApp,Version=v8.0/linux-x64": {
-      "DedicatedServer/1.12.7.0": {
+      "DedicatedServer/1.13.3.1": {
         "dependencies": {
           "BarotraumaCore": "1.0.0",
           "Basic.Reference.Assemblies.Net80": "1.8.4",
@@ -1050,7 +1050,7 @@
     }
   },
   "libraries": {
-    "DedicatedServer/1.12.7.0": {
+    "DedicatedServer/1.13.3.1": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

changelog.txt

@@ -1,4 +1,58 @@
 -------------------------------------------------------------------------------------------------------------------------------------------------
+v1.13.3.1 (Summer Update 2026)
+-------------------------------------------------------------------------------------------------------------------------------------------------
+
+Submarine reworks:
+- Humpback, Orca 2, Azimuth, Typhon, and Herja have received their visual and gameplay reworks.
+- The command room of the Orca 2 is now located at the center of the submarine.
+- Typhon now comes with valves and pipe weakpoints.
+- Herja has been upgraded with a power distributor, befitting its high-tech theme.
+
+Changes and additions:
+- Added an option to back up your custom submarines in the Steam Cloud. Can be enabled per-submarine using a checkbox in the sub editor's save dialog.
+- Added quality parameter to the give/spawnitem console commands. Allows spawning in items with non-default quality.
+- The teleportsub console command has a parameter for choosing which submarine to teleport.
+- The spawncharacter console command has a parameter for renaming the spawned character.
+- The showseed console command displays the map seed too if used in campaign mode.
+
+Multiplayer:
+- Fixed monster attacks that run over time (e.g. when fractal guardians fire the steam cannon) causing an excessive amount of network usage in multiplayer.
+- Fixed an exploit that allowed modified clients to cause other clients to eventually get out of sync and disconnect.
+- Fixed inability to drag and drop stacks of items to other players in multiplayer.
+- Fixed submarine voting not working in campaign mode.
+
+Miscellaneous fixes:
+- Fixed security (or anyone else) not reacting to attacking stunned/incapacitated characters. 
+- Fixed the item pickup sound playing multiple times, for every item in a stack you're picking up.
+- Fixed the item dropping sound playing twice when dropping an item.
+- Fixed being unable to fabricate certain items with specific combinations of materials. Happened in some cases where the recipe accepted multiple different materials as ingredients: the fabricator would got through the requirements in order, and always take the first available items without considering that the item could've been necessary for another, more strict requirement.
+- Followup to the "infinite explosion" fix in Summer Update 2025: the previous fix only applied to oxygen tank shelves, but it turned out oxygen generators could also cause the same kind of "explosion loop" where tanks keep exploding and getting refilled by the oxygen generator.
+- Fixed "inspirational leader" talent not giving bonus XP like the description says it should. 
+- Fixed characters being able to drop off platforms while using a periscope (inconsistent with other movement inputs being disabled while on a periscope).
+- Fixed bots being unable to extinguish fires in connected subs (e.g. in Remora's drone).
+- Fixed parts of the CPR button not being clickable on the health HUD on certain resolutions (was getting blocked by the limb indicators).
+- Fixed nuclear shells fabricated with the cheaper recipe variant not giving the "I am become death" achievement.
+- Fixed gravity spheres (or more generally, any items with a triggercomponent) taking damage when you cut their trigger area with a plasma cutter, rather than the actual collider of the item.
+- Fixed equip buttons being clickable despite the slot being hidden. Meant that when you had equipped an item in your hand, you could click an invisible button at the left side of the inventory where the hand slots would appear.
+- Fixed turrets not showing the ammo on the HUD if the ammo is inside the turret itself, rather than a linked loader.
+- If one of the unique hireable characters (e.g. Ignatius May, Aunt Doris) dies in the outpost before you hire them, they can no longer appear elsewhere or be hired.
+- Fixed cargo scooter lights working, but not draining the battery, when the battery is in another slot than the battery slot.
+- Fixed custom interaction messages set on items in the sub editor no longer appearing in-game.
+- Allow combining defense bot ammo boxes the same way as other ammo boxes and magazines (merging their ammo together).
+- Fixed the character deconstruction bag staying in the deconstructor if you do a level transition while a character is inside the deconstructor.
+- Fixed items duplicating if a character gets deconstructed without dying first (possible e.g. by taking advantage of the Miracle Worker talent).
+- Fixed crafting blueprint tooltips not showing whether the recipe has been unlocked or not.
+- Fixed valves potentially getting stuck in a non-interactable state if the round ends immediately after one's been toggled.
+
+Modding:
+- Fixed "LockedTalents" PermanentStat locking the talent for everyone (not used in any vanilla talent).
+- Clients are allowed to use colored text in their chat messages when they have the "chat spam immunity" permission. Colored text was disabled in client-sent chat messages in the previous update due to some ways in which it can be abused, but turns out there were some users relying on this functionality.
+- Fixed OnDeconstructed status effect triggering when the item is not deconstructed in some cases (e.g. researching unidentified genetic material without stabilozine).
+- Fixed the special locations at the end of the campaign map generating incorrectly on very short maps.
+- Fixed status effects using OffsetCopiesEntityTransform not taking physics body rotation into account.
+- Fixed TagAction's Team setting being ignored when tagging characters in certain ways (e.g. traitors, non-traitors, bots, human prefab tags).
+
+-------------------------------------------------------------------------------------------------------------------------------------------------
 v1.12.7.0
 -------------------------------------------------------------------------------------------------------------------------------------------------
 

commit

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if [ $# -eq 0 ]; then
+  echo "Usage: $0 <commit message>"
+  exit 1
+fi
+
+git add -A
+git commit -m "$*"
+git push origin main

prep

@@ -10,7 +10,8 @@ PREPARE_LOCAL = os.path.join(BASE, "prepare_local")
 AUTOGEN = os.path.join(BASE, "scripts", "autogen_config.py")
 LOCALMODS_DIR = os.path.join(BASE, "LocalMods")
 
-RSYNC_DEST = "root@barotrauma:/opt/barotrauma/LocalMods/"
+CONFIG_PATH = os.path.join(BASE, "config_player.xml")
+RSYNC_SSH = "ssh -p 22"
 
 
 def log_ok(msg):
@@ -27,31 +28,36 @@ def main():
     msg = " ".join(sys.argv[1:]) if len(sys.argv) > 1 else "Update LocalMods"
 
     print()
-    print("╔═══════════════════════════════════════╗")
-    print("║  Prep: mods → rsync → config → commit ║")
-    print("╚═══════════════════════════════════════╝")
+    print("╔══════════════════════════════════════════╗")
+    print("║  Prep: mods → config → rsync → commit    ║")
+    print("╚══════════════════════════════════════════╝")
     print()
 
-    log_info("Step 1/4: Copy mods from workshop...")
+    log_info("Step 1/5: Copy mods from workshop...")
     subprocess.run([sys.executable, PREPARE_LOCAL], check=True)
     log_ok("LocalMods ready")
     print()
 
-    log_info("Step 2/4: Rsyncing LocalMods/ to server...")
-    subprocess.run([
-        "rsync", "-avz", "--delete",
-        "-e", "ssh -p 22",
-        LOCALMODS_DIR + "/", RSYNC_DEST
-    ], check=True)
-    log_ok("LocalMods synced to homelabvm")
-    print()
-
-    log_info("Step 3/4: Generating config_player.xml...")
+    log_info("Step 2/5: Generating config_player.xml...")
     subprocess.run([sys.executable, AUTOGEN], check=True)
     log_ok("config_player.xml generated")
     print()
 
-    log_ok("Done.")
+    log_info("Step 3/4: Rsyncing LocalMods + config to server...")
+    subprocess.run([
+        "rsync", "-avz", "--delete",
+        "-e", RSYNC_SSH,
+        LOCALMODS_DIR + "/", "baro@barotrauma:/opt/barotrauma/LocalMods/"
+    ], check=True)
+    subprocess.run([
+        "rsync", "-avz",
+        "-e", RSYNC_SSH,
+        CONFIG_PATH, "baro@barotrauma:/opt/barotrauma/config_player.xml"
+    ], check=True)
+    log_ok("Synced to server")
+    print()
+
+    log_ok("Done. Push manually when ready.")
 
 
 if __name__ == "__main__":

release

@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+git checkout release
+git merge main
+git push origin release
+git checkout main

sync_content

@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+"""Rsync Content/ from Steam to server with progress."""
+
+import subprocess
+import sys
+
+SRC = "/mnt/nvme/B/SteamLibrary/steamapps/common/Barotrauma/Content/"
+DST = "root@barotrauma:/opt/barotrauma/Content/"
+SSH = "ssh -p 22"
+
+print("Syncing Content/ to server...")
+subprocess.run([
+    "rsync", "-avz", "--delete", "--info=progress2",
+    "-e", SSH,
+    SRC, DST
+], check=True)
+print("Done.")