cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaces waterbreathing with TG's NODROWN (#6069)

Browse Source 
## About The Pull Request

TRAIT_NODROWN is basically the same thing, so there's no reason to keep
a weird snowflake check from skyrat.

closes #4623

## Why It's Good For The Game

Less bloated code, and fixes an issue

## Proof Of Testing

I ran around with my akula and it all worked, didn't drown in deep
tiles, and I didn't drown in turf liquids either

## Changelog

🆑
fix: Akulas and other waterbreathers no longer drown in deep water
refactor: TRAIT_NODROWN now fully replaces TRAIT_WATER_BREATHING in the
backend for better consistency for when TG changes stuff.
/🆑

Co-authored-by: Maia <maia@punches.cz>
This commit is contained in:
Waterpig
2026-08-14 19:43:14 +02:00
committed by Maia
co-authored by Maia
parent 0679fd74ed
commit ab5034e97b
10 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/~skyrat_defines/traits/declarations.dm
-3
View File
@@ -48,9 +48,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
// Trait sources
#define TRAIT_GHOSTROLE "ghostrole" // SKYRAT EDIT ADDITION -- Ghost Cafe Traits
/// One can breath under water, you get me?
#define TRAIT_WATER_BREATHING "water_breathing"
/// Trait to assign to pets who've already had a space treat to prevent double-feeding
#define TRAIT_PET_SPACE_TREAT "space_pet_treat"
code/_globalvars/traits/_traits.dm
-1
View File
@@ -947,7 +947,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_SYNTHETIC" = TRAIT_SYNTHETIC,
"TRAIT_TRASHMAN" = TRAIT_TRASHMAN,
"TRAIT_WATER_ASPECT" = TRAIT_WATER_ASPECT,
"TRAIT_WATER_BREATHING" = TRAIT_WATER_BREATHING,
"TRAIT_WEBBING_ASPECT" = TRAIT_WEBBING_ASPECT,
"TRAIT_XENO_ABILITY_GIVEN" = TRAIT_XENO_ABILITY_GIVEN,
"TRAIT_XENOARCH_QUALIFIED" = TRAIT_XENOARCH_QUALIFIED,
code/_globalvars/traits/admin_tooling.dm
-1
View File
@@ -506,7 +506,6 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_SYNTHETIC" = TRAIT_SYNTHETIC,
"TRAIT_TRASHMAN" = TRAIT_TRASHMAN,
"TRAIT_WATER_ASPECT" = TRAIT_WATER_ASPECT,
"TRAIT_WATER_BREATHING" = TRAIT_WATER_BREATHING,
"TRAIT_WEBBING_ASPECT" = TRAIT_WEBBING_ASPECT,
"TRAIT_XENO_ABILITY_GIVEN" = TRAIT_XENO_ABILITY_GIVEN,
"TRAIT_XENOARCH_QUALIFIED" = TRAIT_XENOARCH_QUALIFIED,
code/modules/mob/living/carbon/human/species_types/snail.dm
+1 -1
View File
@@ -6,7 +6,7 @@
TRAIT_MUTANT_COLORS,
// TRAIT_NO_UNDERWEAR, //SKYRAT EDIT REMOVAL - Roundstart Snails - Snails deserve to wear underwear
TRAIT_NO_SLIP_ALL,
TRAIT_WATER_BREATHING, //SKYRAT EDIT ADDITION - Roundstart Snails - Sea snails exist, and land snails can weather being underwater for almost a day.
TRAIT_NODROWN, //SKYRAT EDIT ADDITION - Roundstart Snails - Sea snails exist, and land snails can weather being underwater for almost a day.
)
coldmod = 0.5 //snails only come out when its cold and wet
code/modules/mob/living/carbon/life.dm
+1 -1
View File
@@ -112,7 +112,7 @@
var/turf/our_turf = loc
if(our_turf.liquids && !HAS_TRAIT(src, TRAIT_NOBREATH) && ((body_position == LYING_DOWN && our_turf.liquids.liquid_state >= LIQUID_STATE_WAIST) || (body_position == STANDING_UP && our_turf.liquids.liquid_state >= LIQUID_STATE_FULLTILE)))
//Officially trying to breathe underwater
if(HAS_TRAIT(src, TRAIT_WATER_BREATHING))
if(HAS_TRAIT(src, TRAIT_NODROWN))
failed_last_breath = FALSE
clear_alert("not_enough_oxy")
return FALSE
modular_skyrat/master_files/code/modules/mob/living/human/species.dm
+1 -1
View File
@@ -36,7 +36,7 @@
/datum/species/create_pref_traits_perks()
. = ..()
if (TRAIT_WATER_BREATHING in inherent_traits)
if (TRAIT_NODROWN in inherent_traits)
. += list(list(
SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK,
SPECIES_PERK_ICON = FA_ICON_FISH,
modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm
+1 -1
View File
@@ -22,7 +22,7 @@
TRAIT_ADVANCEDTOOLUSER,
TRAIT_CAN_STRIP,
TRAIT_LITERATE,
TRAIT_WATER_BREATHING,
TRAIT_NODROWN,
TRAIT_SLICK_SKIN,
TRAIT_MUTANT_COLORS,
)
modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm
+1 -1
View File
@@ -5,7 +5,7 @@
TRAIT_ADVANCEDTOOLUSER,
TRAIT_CAN_STRIP,
TRAIT_LITERATE,
TRAIT_WATER_BREATHING,
TRAIT_NODROWN,
TRAIT_MUTANT_COLORS,
)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
modular_skyrat/modules/quirks/good.dm
+1 -1
View File
@@ -72,7 +72,7 @@
name = "Water breathing"
desc = "You are able to breathe underwater!"
value = 2
mob_trait = TRAIT_WATER_BREATHING
mob_trait = TRAIT_NODROWN
gain_text = span_notice("You become acutely aware of the moisture in your lungs and in the air. It feels nice.")
lose_text = span_danger("You suddenly realize the moisture in your lungs feels <i>really weird</i>, and you almost choke on it!")
medical_record_text = "Patient possesses biology compatible with aquatic respiration."
modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm
+1 -1
View File
@@ -20,7 +20,7 @@
TRAIT_ADVANCEDTOOLUSER,
TRAIT_CAN_STRIP,
TRAIT_LITERATE,
TRAIT_WATER_BREATHING,
TRAIT_NODROWN,
TRAIT_SLICK_SKIN,
TRAIT_MUTANT_COLORS,
TRAIT_NIGHT_VISION,