From 2ecdc5ab06c225e01ba34245b484a8ea772d68c8 Mon Sep 17 00:00:00 2001 From: Avalon Date: Wed, 15 Jul 2026 07:21:57 -0400 Subject: [PATCH 1/4] Update water.dm --- code/game/turfs/open/water.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm index c2c7d4e4421..5eccfa2d4e6 100644 --- a/code/game/turfs/open/water.dm +++ b/code/game/turfs/open/water.dm @@ -356,7 +356,7 @@ var/current_direction = movedir || dir var/speed = current_speed if(HAS_TRAIT(moving, TRAIT_SWIMMER)) // more time to swim against the current - speed *= 2 + return if(moving_loop) moving_loop.direction = current_direction moving_loop.delay = speed From 77b050d2aadb22851c6b7f00aa3c003c9cc80eda Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 20 Jul 2026 14:12:18 -0400 Subject: [PATCH 2/4] Update water.dm --- code/game/turfs/open/water.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm index 5eccfa2d4e6..15fe8f36a00 100644 --- a/code/game/turfs/open/water.dm +++ b/code/game/turfs/open/water.dm @@ -356,7 +356,7 @@ var/current_direction = movedir || dir var/speed = current_speed if(HAS_TRAIT(moving, TRAIT_SWIMMER)) // more time to swim against the current - return + speed *= 4 if(moving_loop) moving_loop.direction = current_direction moving_loop.delay = speed From 742e8e020e95e6a159f3b6a5022521f412aaaed7 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 20 Jul 2026 14:59:52 -0400 Subject: [PATCH 3/4] Update other_mobs.dm --- code/_onclick/other_mobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 6ff15c93153..f7b34a42c68 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -544,7 +544,7 @@ changeNext_move(mmb_intent.clickcd) /mob/living/proc/jump_action(atom/A) - if(HAS_TRAIT(src, TRAIT_IMMERSED)) + if(HAS_TRAIT(src, TRAIT_IMMERSED) && !HAS_TRAIT(src, TRAIT_SWIMMER)) to_chat(src, span_warning("I can't jump while floating.")) return From 4e256ceec2bc4db0db9a17293fd6f9b885b0802f Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 20 Jul 2026 15:02:25 -0400 Subject: [PATCH 4/4] Update water.dm --- code/game/turfs/open/water.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm index 15fe8f36a00..104fac9dfa5 100644 --- a/code/game/turfs/open/water.dm +++ b/code/game/turfs/open/water.dm @@ -356,7 +356,7 @@ var/current_direction = movedir || dir var/speed = current_speed if(HAS_TRAIT(moving, TRAIT_SWIMMER)) // more time to swim against the current - speed *= 4 + speed *= 5 if(moving_loop) moving_loop.direction = current_direction moving_loop.delay = speed