Merge pull request #169 from Skies-Of-Blue/this-is-niche-but-I-promis…

…e-there's-purpose

Wet, Wild, and Political:  Two New Lung Options & Shoredress Tweaks

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)

modular_iris/modules/customization/modules/client/augment/organs.dm

@@ -0,0 +1,18 @@
+//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
+	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

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."

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))
 

modular_nova/modules/customization/modules/client/augment/organs.dm

@@ -32,9 +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
+//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"
@@ -45,17 +44,16 @@
 	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
-/datum/augment_item/organ/lungs/cybernetic
-	name = "Cybernetic lungs"
-	path = /obj/item/organ/lungs/cybernetic
 
 //LIVERS
 /datum/augment_item/organ/liver

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"