diff --git a/code/__DEFINES/~skyrat_defines/traits/declarations.dm b/code/__DEFINES/~skyrat_defines/traits/declarations.dm index 7e8fd1a1afa..d0c61c34f40 100644 --- a/code/__DEFINES/~skyrat_defines/traits/declarations.dm +++ b/code/__DEFINES/~skyrat_defines/traits/declarations.dm @@ -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" diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index fa212694e37..e6a135a7293 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -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, diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm index 702b9716cf5..9fc4e0ddae3 100644 --- a/code/_globalvars/traits/admin_tooling.dm +++ b/code/_globalvars/traits/admin_tooling.dm @@ -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, diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index a59d433731c..12d63e55b3b 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -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 diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 4b0153e0748..ab3b0e95d0b 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -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 diff --git a/modular_skyrat/master_files/code/modules/mob/living/human/species.dm b/modular_skyrat/master_files/code/modules/mob/living/human/species.dm index f9324affff9..0c65341a233 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/human/species.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/human/species.dm @@ -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, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm index d8e4b4c30c6..865341b4e5a 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm @@ -22,7 +22,7 @@ TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, TRAIT_LITERATE, - TRAIT_WATER_BREATHING, + TRAIT_NODROWN, TRAIT_SLICK_SKIN, TRAIT_MUTANT_COLORS, ) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm index 2cfbff50d92..8ed3302b05a 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm @@ -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 diff --git a/modular_skyrat/modules/quirks/good.dm b/modular_skyrat/modules/quirks/good.dm index b2566289ac5..8643b3cbb3a 100644 --- a/modular_skyrat/modules/quirks/good.dm +++ b/modular_skyrat/modules/quirks/good.dm @@ -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 really weird, and you almost choke on it!") medical_record_text = "Patient possesses biology compatible with aquatic respiration." diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm index 3ab25915db0..b7e738c8bd0 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm @@ -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,