Skip to content

Swimming Trait Buff - Hold Still in water #7228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Avalon-Proto wants to merge 6 commits into
base: main
Choose a base branch
from
+2 −2
Open

Swimming Trait Buff - Hold Still in water #7228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ecdc5a
Update water.dm
Avalon-Proto Jul 15, 2026
c4422f8
Merge branch 'main' into Good-Swimmer-Change
Avalon-Proto Jul 15, 2026
2848bcb
Merge branch 'main' into Good-Swimmer-Change
Avalon-Proto Jul 16, 2026
77b050d
Update water.dm
Avalon-Proto Jul 20, 2026
742e8e0
Update other_mobs.dm
Avalon-Proto Jul 20, 2026
4e256ce
Update water.dm
Avalon-Proto Jul 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/_onclick/other_mobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/open/water.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
speed *= 5
if(moving_loop)
moving_loop.direction = current_direction
moving_loop.delay = speed
Expand Down
Loading