From 5c1709cf6f3b1d9639afa6f06b5d49cad68e8605 Mon Sep 17 00:00:00 2001 From: Skies-Of-Blue Date: Tue, 17 Dec 2024 23:47:23 -0800 Subject: [PATCH 1/8] azulean technology can now make non-akulans wet --- modular_nova/modules/akula/code/wetsuit.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modular_nova/modules/akula/code/wetsuit.dm b/modular_nova/modules/akula/code/wetsuit.dm index c3bacec26a45..6438dce727c6 100644 --- a/modular_nova/modules/akula/code/wetsuit.dm +++ b/modular_nova/modules/akula/code/wetsuit.dm @@ -20,8 +20,9 @@ /datum/component/wetsuit/proc/apply_wetsuit_status_effect(obj/item/source, mob/living/user, slot) if(slot == ITEM_SLOT_HANDS) return FALSE - if(!HAS_TRAIT(user, TRAIT_SLICK_SKIN)) - return FALSE +//IRIS EDIT: Removes the species-lock that prevents azulean technology from making non-akulans wet +// if(!HAS_TRAIT(user, TRAIT_SLICK_SKIN)) +// return FALSE user.apply_status_effect(/datum/status_effect/grouped/wetsuit, REF(source)) From 846534df31a00b67b24d6cb89244751d608d5dd3 Mon Sep 17 00:00:00 2001 From: Skies-Of-Blue Date: Wed, 18 Dec 2024 01:52:16 -0800 Subject: [PATCH 2/8] when the scope is crept (adds two new lungs) --- .../dna_infuser/organ_sets/fish_organs.dm | 18 +++++++++++++++- .../modules/client/augment/organs.dm | 21 ++++++++++++++++--- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm index aa479f1d316d..f70256ea2604 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm @@ -267,7 +267,6 @@ gills = new() AddElement(/datum/element/noticable_organ, "%PRONOUN_Theyve a set of gills on %PRONOUN_their neck.", BODY_ZONE_PRECISE_MOUTH) AddComponent(/datum/component/bubble_icon_override, "fish", BUBBLE_ICON_PRIORITY_ORGAN) - AddComponent(/datum/component/speechmod, replacements = strings("crustacean_replacement.json", "crustacean")) /obj/item/organ/lungs/fish/Destroy() QDEL_NULL(gills) @@ -324,6 +323,17 @@ layer = image_layer, ) +/// IRIS ADDITION: Subtype of gills used for the augments tab. No overlay. +/obj/item/organ/lungs/fish/no_overlay + name = "gills" + desc = "An aquatic-adapted respiratory organ that requires its host to breathe water vapor, or keep themselves covered in water." + +/obj/item/organ/lungs/fish/no_overlay/on_bodypart_insert(obj/item/bodypart/limb) + . = ..() + if(gills) + limb.remove_bodypart_overlay(gills) +//IRIS ADDITION END + /// Subtype of gills that allow the mob to optionally breathe water. /obj/item/organ/lungs/fish/amphibious name = "mutated semi-aquatic lungs" @@ -362,6 +372,12 @@ return return ..() +// IRIS ADDITION: Subtype of semi-aquatic lungs used for the augments tab. +/obj/item/organ/lungs/fish/amphibious/no_overlay + name = "semi-aquatic lungs" + desc = "A set of semi-aquatic lungs, formerly owned by some hapless amphibian. Enjoy breathing underwater without drowning outside water." +//IRIS ADDITION END + ///Fish infuser organ, allows mobs to safely eat raw fish. /obj/item/organ/stomach/fish name = "mutated fish-stomach" diff --git a/modular_nova/modules/customization/modules/client/augment/organs.dm b/modular_nova/modules/customization/modules/client/augment/organs.dm index ab9142e23181..8c479e8abe42 100644 --- a/modular_nova/modules/customization/modules/client/augment/organs.dm +++ b/modular_nova/modules/customization/modules/client/augment/organs.dm @@ -36,6 +36,17 @@ name = "Organic lungs" path = /obj/item/organ/lungs +/datum/augment_item/organ/lungs/cybernetic + name = "Cybernetic lungs" + path = /obj/item/organ/lungs/cybernetic + +//IRIS ADDITION START +/datum/augment_item/organ/lungs/fish/no_overlay + name = "Gills" + path = /obj/item/organ/lungs/fish/no_overlay + cost = -4 +//IRIS ADDITION END + /datum/augment_item/organ/lungs/hot name = "Lungs Adapted to Heat" path = /obj/item/organ/lungs/hot @@ -53,9 +64,13 @@ name = "Low-Pressure Adapted Lungs" path = /obj/item/organ/lungs/oxy cost = 1 -/datum/augment_item/organ/lungs/cybernetic - name = "Cybernetic lungs" - path = /obj/item/organ/lungs/cybernetic + +//IRIS ADDITION START + /datum/augment_item/organ/lungs/fish/amphibious/no_overlay + name = "Semi-Aquatic Lungs" + path = /obj/item/organ/lungs/fish/amphibious/no_overlay + cost = 1 +//IRIS ADDITION END //LIVERS /datum/augment_item/organ/liver From f5a10689a3b09c46a6047daacb1cc98b91b4a7d6 Mon Sep 17 00:00:00 2001 From: Skies-Of-Blue Date: Wed, 18 Dec 2024 02:11:33 -0800 Subject: [PATCH 3/8] actually these are better than the rest --- .../modules/customization/modules/client/augment/organs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_nova/modules/customization/modules/client/augment/organs.dm b/modular_nova/modules/customization/modules/client/augment/organs.dm index 8c479e8abe42..7ff8d0ef621e 100644 --- a/modular_nova/modules/customization/modules/client/augment/organs.dm +++ b/modular_nova/modules/customization/modules/client/augment/organs.dm @@ -69,7 +69,7 @@ /datum/augment_item/organ/lungs/fish/amphibious/no_overlay name = "Semi-Aquatic Lungs" path = /obj/item/organ/lungs/fish/amphibious/no_overlay - cost = 1 + cost = 2 //IRIS ADDITION END //LIVERS From 0c3bb59c6487ba022df7238ff35f29aee07aa54d Mon Sep 17 00:00:00 2001 From: Skies-Of-Blue Date: Wed, 18 Dec 2024 02:28:36 -0800 Subject: [PATCH 4/8] linters --- .../modules/customization/modules/client/augment/organs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_nova/modules/customization/modules/client/augment/organs.dm b/modular_nova/modules/customization/modules/client/augment/organs.dm index 7ff8d0ef621e..8cfe2ee535d2 100644 --- a/modular_nova/modules/customization/modules/client/augment/organs.dm +++ b/modular_nova/modules/customization/modules/client/augment/organs.dm @@ -66,7 +66,7 @@ cost = 1 //IRIS ADDITION START - /datum/augment_item/organ/lungs/fish/amphibious/no_overlay +/datum/augment_item/organ/lungs/fish/amphibious/no_overlay name = "Semi-Aquatic Lungs" path = /obj/item/organ/lungs/fish/amphibious/no_overlay cost = 2 From 6eb837f98801cc849646416be4c5de38a2cf879a Mon Sep 17 00:00:00 2001 From: Skies-Of-Blue Date: Wed, 18 Dec 2024 02:53:53 -0800 Subject: [PATCH 5/8] grammar --- code/game/machinery/dna_infuser/organ_sets/fish_organs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm index f70256ea2604..1ba417755fa9 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm @@ -265,7 +265,7 @@ AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/fish) if(has_gills) gills = new() - AddElement(/datum/element/noticable_organ, "%PRONOUN_Theyve a set of gills on %PRONOUN_their neck.", BODY_ZONE_PRECISE_MOUTH) + AddElement(/datum/element/noticable_organ, "%PRONOUN_They have a set of gills on %PRONOUN_their neck.", BODY_ZONE_PRECISE_MOUTH) AddComponent(/datum/component/bubble_icon_override, "fish", BUBBLE_ICON_PRIORITY_ORGAN) /obj/item/organ/lungs/fish/Destroy() From 7aec696bd2164020a0f344f9c6268e240be29962 Mon Sep 17 00:00:00 2001 From: Skies-Of-Blue Date: Wed, 18 Dec 2024 02:59:23 -0800 Subject: [PATCH 6/8] whoops --- code/game/machinery/dna_infuser/organ_sets/fish_organs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm index 1ba417755fa9..f70256ea2604 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm @@ -265,7 +265,7 @@ AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/fish) if(has_gills) gills = new() - AddElement(/datum/element/noticable_organ, "%PRONOUN_They have a set of gills on %PRONOUN_their neck.", BODY_ZONE_PRECISE_MOUTH) + AddElement(/datum/element/noticable_organ, "%PRONOUN_Theyve a set of gills on %PRONOUN_their neck.", BODY_ZONE_PRECISE_MOUTH) AddComponent(/datum/component/bubble_icon_override, "fish", BUBBLE_ICON_PRIORITY_ORGAN) /obj/item/organ/lungs/fish/Destroy() From 6ff03701dad55ab3afcfa021f0e6de4785dc805c Mon Sep 17 00:00:00 2001 From: Skies-Of-Blue Date: Wed, 18 Dec 2024 10:01:20 -0800 Subject: [PATCH 7/8] modularizes the two added lung options --- .../dna_infuser/organ_sets/fish_organs.dm | 17 ----------------- .../modules/client/augment/organs.dm | 10 ++++++++++ modular_iris/modules/organs/code/lungs.dm | 14 ++++++++++++++ .../modules/client/augment/organs.dm | 12 ------------ tgstation.dme | 2 ++ 5 files changed, 26 insertions(+), 29 deletions(-) create mode 100644 modular_iris/modules/customization/modules/client/augment/organs.dm create mode 100644 modular_iris/modules/organs/code/lungs.dm diff --git a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm index f70256ea2604..9a5e70f6ead5 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm @@ -323,17 +323,6 @@ layer = image_layer, ) -/// IRIS ADDITION: Subtype of gills used for the augments tab. No overlay. -/obj/item/organ/lungs/fish/no_overlay - name = "gills" - desc = "An aquatic-adapted respiratory organ that requires its host to breathe water vapor, or keep themselves covered in water." - -/obj/item/organ/lungs/fish/no_overlay/on_bodypart_insert(obj/item/bodypart/limb) - . = ..() - if(gills) - limb.remove_bodypart_overlay(gills) -//IRIS ADDITION END - /// Subtype of gills that allow the mob to optionally breathe water. /obj/item/organ/lungs/fish/amphibious name = "mutated semi-aquatic lungs" @@ -372,12 +361,6 @@ return return ..() -// IRIS ADDITION: Subtype of semi-aquatic lungs used for the augments tab. -/obj/item/organ/lungs/fish/amphibious/no_overlay - name = "semi-aquatic lungs" - desc = "A set of semi-aquatic lungs, formerly owned by some hapless amphibian. Enjoy breathing underwater without drowning outside water." -//IRIS ADDITION END - ///Fish infuser organ, allows mobs to safely eat raw fish. /obj/item/organ/stomach/fish name = "mutated fish-stomach" diff --git a/modular_iris/modules/customization/modules/client/augment/organs.dm b/modular_iris/modules/customization/modules/client/augment/organs.dm new file mode 100644 index 000000000000..ed8679ccac95 --- /dev/null +++ b/modular_iris/modules/customization/modules/client/augment/organs.dm @@ -0,0 +1,10 @@ +//LUNGS +/datum/augment_item/organ/lungs/fish/no_overlay + name = "Gills" + path = /obj/item/organ/lungs/fish/no_overlay + cost = -4 + +/datum/augment_item/organ/lungs/fish/amphibious/no_overlay + name = "Semi-Aquatic Lungs" + path = /obj/item/organ/lungs/fish/amphibious/no_overlay + cost = 2 diff --git a/modular_iris/modules/organs/code/lungs.dm b/modular_iris/modules/organs/code/lungs.dm new file mode 100644 index 000000000000..2252b3ba18fd --- /dev/null +++ b/modular_iris/modules/organs/code/lungs.dm @@ -0,0 +1,14 @@ +//Subtype for use in augments +/obj/item/organ/lungs/fish/no_overlay + name = "gills" + desc = "An aquatic-adapted respiratory organ that requires its host to breathe water vapor, or keep themselves covered in water." + +/obj/item/organ/lungs/fish/no_overlay/on_bodypart_insert(obj/item/bodypart/limb) + . = ..() + if(gills) + limb.remove_bodypart_overlay(gills) + +//Subtype for use in augments +/obj/item/organ/lungs/fish/amphibious/no_overlay + name = "semi-aquatic lungs" + desc = "A set of semi-aquatic lungs, formerly owned by some hapless amphibian. Enjoy breathing underwater without drowning outside water." diff --git a/modular_nova/modules/customization/modules/client/augment/organs.dm b/modular_nova/modules/customization/modules/client/augment/organs.dm index 8cfe2ee535d2..70e3ed11e4fc 100644 --- a/modular_nova/modules/customization/modules/client/augment/organs.dm +++ b/modular_nova/modules/customization/modules/client/augment/organs.dm @@ -40,12 +40,6 @@ name = "Cybernetic lungs" path = /obj/item/organ/lungs/cybernetic -//IRIS ADDITION START -/datum/augment_item/organ/lungs/fish/no_overlay - name = "Gills" - path = /obj/item/organ/lungs/fish/no_overlay - cost = -4 -//IRIS ADDITION END /datum/augment_item/organ/lungs/hot name = "Lungs Adapted to Heat" @@ -65,12 +59,6 @@ path = /obj/item/organ/lungs/oxy cost = 1 -//IRIS ADDITION START -/datum/augment_item/organ/lungs/fish/amphibious/no_overlay - name = "Semi-Aquatic Lungs" - path = /obj/item/organ/lungs/fish/amphibious/no_overlay - cost = 2 -//IRIS ADDITION END //LIVERS /datum/augment_item/organ/liver diff --git a/tgstation.dme b/tgstation.dme index c764b76ccb1e..64ed8a071e8c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6611,11 +6611,13 @@ #include "modular_iris\master_files\code\modules\mob\living\carbon\human\human.dm" #include "modular_iris\modules\bodyparts\code\_mutant_bodyparts.dm" #include "modular_iris\modules\customization\game\objects\items\plushes.dm" +#include "modular_iris\modules\customization\modules\client\augment\organs.dm" #include "modular_iris\modules\customization\modules\clothing\head\costume.dm" #include "modular_iris\modules\customization\modules\clothing\under\costume.dm" #include "modular_iris\modules\emotes\code\iris_laugh_datums.dm" #include "modular_iris\modules\modular_vending\code\autodrobe.dm" #include "modular_iris\modules\modular_vending\code\vending.dm" +#include "modular_iris\modules\organs\code\lungs.dm" #include "modular_iris\monke_ports\code\game\turfs\open\floor\misc_floor.dm" #include "modular_iris\monke_ports\code\modules\aesthetics\mapping\tilecoloring.dm" #include "modular_iris\monke_ports\code\modules\buckshotroulette\buckshotroulette.dm" From dcffaf28f632ce4ad74c1090fd0264b1487a2c5e Mon Sep 17 00:00:00 2001 From: Skies-Of-Blue Date: Wed, 18 Dec 2024 10:48:16 -0800 Subject: [PATCH 8/8] moves normal&cybernetic lungs to make it prettier --- .../customization/modules/client/augment/organs.dm | 8 ++++++++ .../customization/modules/client/augment/organs.dm | 13 ++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/modular_iris/modules/customization/modules/client/augment/organs.dm b/modular_iris/modules/customization/modules/client/augment/organs.dm index ed8679ccac95..92d9c5d2ef4b 100644 --- a/modular_iris/modules/customization/modules/client/augment/organs.dm +++ b/modular_iris/modules/customization/modules/client/augment/organs.dm @@ -1,4 +1,12 @@ //LUNGS +/datum/augment_item/organ/lungs/normal + name = "Organic Lungs" + path = /obj/item/organ/lungs + +/datum/augment_item/organ/lungs/cybernetic + name = "Cybernetic Lungs" + path = /obj/item/organ/lungs/cybernetic + /datum/augment_item/organ/lungs/fish/no_overlay name = "Gills" path = /obj/item/organ/lungs/fish/no_overlay diff --git a/modular_nova/modules/customization/modules/client/augment/organs.dm b/modular_nova/modules/customization/modules/client/augment/organs.dm index 70e3ed11e4fc..eba29d8fe0ce 100644 --- a/modular_nova/modules/customization/modules/client/augment/organs.dm +++ b/modular_nova/modules/customization/modules/client/augment/organs.dm @@ -32,14 +32,8 @@ slot = AUGMENT_SLOT_LUNGS allowed_biotypes = MOB_ORGANIC | MOB_ROBOTIC -/datum/augment_item/organ/lungs/normal - name = "Organic lungs" - path = /obj/item/organ/lungs - -/datum/augment_item/organ/lungs/cybernetic - name = "Cybernetic lungs" - path = /obj/item/organ/lungs/cybernetic - +//IRIS EDIT: /datum/augment_item/organ/lungs/normal moved to modular_iris/modules/customization/modules/client/augment/organs.dm to preserve the organization +//IRIS EDIT: /datum/augment_item/organ/lungs/cybernetic moved to modular_iris/modules/customization/modules/client/augment/organs.dm to preserve the organization /datum/augment_item/organ/lungs/hot name = "Lungs Adapted to Heat" @@ -50,16 +44,17 @@ name = "Cold-Adapted Lungs" path = /obj/item/organ/lungs/cold cost = 1 + /datum/augment_item/organ/lungs/toxin name = "Lungs Adapted to Toxins" path = /obj/item/organ/lungs/toxin cost = 1 + /datum/augment_item/organ/lungs/oxy name = "Low-Pressure Adapted Lungs" path = /obj/item/organ/lungs/oxy cost = 1 - //LIVERS /datum/augment_item/organ/liver slot = AUGMENT_SLOT_LIVER