From 2e3046d1aed6705bbb4e919549a458908ed6f121 Mon Sep 17 00:00:00 2001 From: Jacquerel Date: Thu, 24 Apr 2025 15:12:17 +0100 Subject: [PATCH] [no gbp] Drowning doesn't make you fitter (#90794) ## About The Pull Request Fixes #90790 Decreases the exp gain from swimming and only grants it while you actually have stamina. Even if it doesn't kill you this shouldn't make you stronger ## Changelog :cl: fix: Floating motionless and face down in the water doesn't count as a workout /:cl: --- code/datums/elements/swimming_tile.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/datums/elements/swimming_tile.dm b/code/datums/elements/swimming_tile.dm index 13052d66fa3..153a4c35603 100644 --- a/code/datums/elements/swimming_tile.dm +++ b/code/datums/elements/swimming_tile.dm @@ -85,8 +85,12 @@ if (!HAS_TRAIT(owner, TRAIT_SWIMMER)) var/athletics_skill = (owner.mind?.get_skill_level(/datum/skill/athletics) || 1) - 1 owner.apply_damage((stamina_per_second - athletics_skill) * seconds_between_ticks, STAMINA) - owner.mind?.adjust_experience(/datum/skill/athletics, 10) + // If you can't move you're not swimming + if (!HAS_TRAIT(owner, TRAIT_INCAPACITATED) && !HAS_TRAIT(owner, TRAIT_IMMOBILIZED)) + owner.mind?.adjust_experience(/datum/skill/athletics, 3) + + // You might not be swimming but you can breathe if (HAS_TRAIT(owner, TRAIT_NODROWN) || HAS_TRAIT(owner, TRAIT_NOBREATH) || (owner.mob_size >= MOB_SIZE_HUMAN && owner.body_position == STANDING_UP)) return if (iscarbon(owner))