diff --git a/modular_zzplurt/code/datums/quirks/positive_quirks/breathless.dm b/modular_zzplurt/code/datums/quirks/positive_quirks/breathless.dm index 2e029c4901bca..837ae38215453 100644 --- a/modular_zzplurt/code/datums/quirks/positive_quirks/breathless.dm +++ b/modular_zzplurt/code/datums/quirks/positive_quirks/breathless.dm @@ -8,3 +8,4 @@ mob_trait = TRAIT_NOBREATH hardcore_value = -4 icon = FA_ICON_LUNGS + hidden_quirk = TRUE diff --git a/modular_zzplurt/code/modules/customization/modules/client/augment/organs.dm b/modular_zzplurt/code/modules/customization/modules/client/augment/organs.dm new file mode 100644 index 0000000000000..0aaaf4f28c920 --- /dev/null +++ b/modular_zzplurt/code/modules/customization/modules/client/augment/organs.dm @@ -0,0 +1,11 @@ +/datum/augment_item/organ/lungs/elite + name = "Elite Cybernetic Lungs" + slot = AUGMENT_SLOT_LUNGS + path = /obj/item/organ/internal/lungs/cybernetic/elite + cost = 4 + +/datum/augment_item/organ/lungs/hot + name = "Recycler Cybernetic Lungs" + slot = AUGMENT_SLOT_LUNGS + path = /obj/item/organ/internal/lungs/cybernetic/tier2/recycler + cost = 4 diff --git a/modular_zzplurt/code/modules/organs/code/lungs.dm b/modular_zzplurt/code/modules/organs/code/lungs.dm new file mode 100644 index 0000000000000..c3550fe4b81a9 --- /dev/null +++ b/modular_zzplurt/code/modules/organs/code/lungs.dm @@ -0,0 +1,36 @@ +/obj/item/organ/internal/lungs/cybernetic/elite + name = "elite cybernetic lungs" + desc = "An experimental version of the upgraded cybernetic lungs. Features maximum tolerance against heat, cold, plasma, and carbon dioxide." + icon_state = "lungs-c-u2" + + // Slightly better than upgraded cybernetic lungs (13) + safe_oxygen_min = 10 + + // Slightly better than toxin-adapted lungs (27) + safe_co2_max = 25 + safe_plasma_max = 25 + + // Copied from cold-adapted lungs + cold_message = "a slightly painful, though bearable, cold sensation" + cold_level_1_threshold = 208 + cold_level_2_threshold = 200 + cold_level_3_threshold = 170 + + // Copied from heat-adapted lungs + hot_message = "a slightly painful, though bearable, warmth" + heat_level_1_threshold = 373 + heat_level_2_threshold = 473 + heat_level_3_threshold = 523 + +/obj/item/organ/internal/lungs/cybernetic/tier2/recycler + name = "recycler cybernetic lungs" + desc = "An upgraded version of standard cybernetic lungs. Alleviates the need for oxygen by recycling it from the user's blood." + + // No oxygen requirement + safe_oxygen_min = 0 + + low_threshold_passed = span_warning("Your lungs struggle to recycle the oxygen in your blood.") + high_threshold_passed = span_warning("You feel some sort of constriction around your chest as your lugs struggle to filter your blood.") + now_fixed = span_warning("Your lungs seem to once again be recycling oxygen.") + low_threshold_cleared = span_info("Your lungs start functioning normally again.") + high_threshold_cleared = span_info("The constriction around your chest loosens as your lungs start functioning normally again.") diff --git a/tgstation.dme b/tgstation.dme index e0241b176c1ce..e8b7c15f2ac69 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9475,6 +9475,7 @@ #include "modular_zzplurt\code\modules\clothing\underwear\~generated_files\shirt_edits.dm" #include "modular_zzplurt\code\modules\clothing\underwear\~generated_files\socks.dm" #include "modular_zzplurt\code\modules\clothing\underwear\~generated_files\socks_edits.dm" +#include "modular_zzplurt\code\modules\customization\modules\client\augment\organs.dm" #include "modular_zzplurt\code\modules\discord\tgs_commands.dm" #include "modular_zzplurt\code\modules\discord\verbs.dm" #include "modular_zzplurt\code\modules\hud\_hud.dm" @@ -9517,6 +9518,7 @@ #include "modular_zzplurt\code\modules\modular_items\lewd_items\code\lewd_organs\breasts.dm" #include "modular_zzplurt\code\modules\movespeed\modifiers\components.dm" #include "modular_zzplurt\code\modules\movespeed\modifiers\innate.dm" +#include "modular_zzplurt\code\modules\organs\code\lungs.dm" #include "modular_zzplurt\code\modules\reagents\chemistry\machinery\chem_dispenser.dm" #include "modular_zzplurt\code\modules\reagents\chemistry\reagents\food_reagents.dm" #include "modular_zzplurt\code\modules\reagents\chemistry\reagents\other_reagents.dm"