From d34bbce3b0fd8bbf138b33b7f7c848c925a8ac14 Mon Sep 17 00:00:00 2001 From: nikothedude <59709059+nikothedude@users.noreply.github.com> Date: Fri, 29 Sep 2023 01:24:07 -0400 Subject: [PATCH] [MODULAR] Puts waterbreathing on the species quirks page, adds a waterbreathing quirk (#23989) * awdawd * wasr --- .../master_files/code/datums/traits/good.dm | 10 ++++++++++ .../code/modules/mob/living/human/species.dm | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/modular_skyrat/master_files/code/datums/traits/good.dm b/modular_skyrat/master_files/code/datums/traits/good.dm index 22987f7705d..08f265145a9 100644 --- a/modular_skyrat/master_files/code/datums/traits/good.dm +++ b/modular_skyrat/master_files/code/datums/traits/good.dm @@ -68,6 +68,16 @@ right_arm.unarmed_miss_sound = initial(right_arm.unarmed_miss_sound) right_arm.unarmed_sharpness = initial(right_arm.unarmed_sharpness) +/datum/quirk/water_breathing + name = "Water breathing" + desc = "You are able to breathe underwater!" + value = 2 + mob_trait = TRAIT_WATER_BREATHING + 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." + icon = FA_ICON_FISH + // AdditionalEmotes *turf quirks /datum/quirk/water_aspect name = "Water aspect (Emotes)" 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 b2b9eaeecba..30df82a7f11 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 @@ -32,3 +32,14 @@ /datum/species/proc/apply_supplementary_body_changes(mob/living/carbon/human/target, datum/preferences/preferences, visuals_only = FALSE) return + +/datum/species/create_pref_traits_perks() + . = ..() + + if (TRAIT_WATER_BREATHING in inherent_traits) + . += list(list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = FA_ICON_FISH, + SPECIES_PERK_NAME = "Waterbreathing", + SPECIES_PERK_DESC = "[plural_form] can breathe in water, making pools a lot safer to be in!", + ))