Merge pull request #38 from Alphas00/master

Modular items tweaks, breasts sprite fix, Water Sponge vapor function

GainStation13/code/mechanics/water_sponge.dm

@@ -40,17 +40,22 @@
 				var/mob/living/carbon/L = AM
 				L.reagents.add_reagent(/datum/reagent/water, 3)
 
-/* Disabling this for now.
-/mob/living/carbon/proc/water_check(datum/gas_mixture/breath)
-	if(HAS_TRAIT(src, TRAIT_WATER_SPONGE))
+
+/obj/item/organ/lungs/proc/water_check(datum/gas_mixture/breath, mob/living/carbon/human/H)
+	if(HAS_TRAIT(H, TRAIT_WATER_SPONGE))
 		if(breath)
-			if(breath.gases)
-				var/breath_gases = breath.gases
-				if(breath_gases[/datum/gas/water_vapor])
-					var/H2O_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/water_vapor])
-					reagents.add_reagent(/datum/reagent/water, H2O_pp/10)
-					breath_gases[/datum/gas/water_vapor] -= H2O_pp
-*/
+			var/pressure = breath.return_pressure()
+			var/total_moles = breath.total_moles()
+			#define PP_MOLES(X) ((X / total_moles) * pressure)
+			#define PP(air, gas) PP_MOLES(air.get_moles(gas))
+			var/gas_breathed = PP(breath,GAS_H2O)
+			if(gas_breathed > 0)
+				H.reagents.add_reagent(/datum/reagent/water, gas_breathed)
+				breath.adjust_moles(GAS_H2O, -gas_breathed)
+
+/obj/item/organ/lungs/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H)
+	water_check(breath, H)
+	. = ..()
 
 /obj/structure/sink
 	var/mob/living/attached

GainStation13/code/modules/clothing/under/jobs/modular_items.dm

@@ -1,24 +1,32 @@
 /mob/living/carbon
 	var/modular_items = list()
 
-/mob/living/carbon/adjust_fatness(adjustment_amount, type_of_fattening = FATTENING_TYPE_ITEM)
-	..()
+/mob/living/carbon/proc/handle_modular_items(adjustment_amount, type_of_fattening = FATTENING_TYPE_ITEM)
 	for(var/obj/item/item in modular_items)
 		item.update_modular_overlays(src)
 
 /obj/item
 	var/modular_icon_location = null
 	var/mod_overlays = list()
+	var/mod_breasts_size = 0
+	var/mod_butt_size = 0
+	var/mod_belly_size = 0
 
 /obj/item/equipped(mob/user, slot)
 	if(modular_icon_location != null && slot == slot_flags) //if(slot == ITEM_SLOT_ICLOTHING)
-		update_modular_overlays(user)
+		add_modular_item(user)
 	..()
 
 /obj/item/dropped(mob/user)
-	remove_modular_overlays(user)
+	remove_modular_item(user)
 	..()
 
+/obj/item/proc/add_modular_item(mob/user)
+	mod_breasts_size = 0
+	mod_butt_size = 0
+	mod_belly_size = 0
+	update_modular_overlays(user)
+
 /obj/item/proc/add_modular_overlay(mob/living/carbon/U, modular_icon, modular_layer, sprite_color)
 	var/mutable_appearance/mod_overlay = mutable_appearance(modular_icon_location, modular_icon, -(modular_layer), color = sprite_color)
 	mod_overlays += mod_overlay
@@ -88,25 +96,45 @@
 	if(!iscarbon(user))
 		return
 	var/mob/living/carbon/U = user
+
+	var/list/genitals_list
+	var/build_modular = FALSE
+
+	var/obj/item/organ/genital/O
+	for(O in U.internal_organs)
+		if(istype(O, /obj/item/organ/genital/belly))
+			genitals_list += list(O)
+			if(O.size != mod_belly_size)
+				mod_belly_size = O.size
+				build_modular = TRUE
+		if(istype(O, /obj/item/organ/genital/butt))
+			genitals_list += list(O)
+			if(O.size != mod_butt_size)
+				mod_butt_size = O.size
+				build_modular = TRUE
+		if(istype(O, /obj/item/organ/genital/breasts))
+			genitals_list += list(O)
+			var/obj/item/organ/genital/breasts/G = O
+			if(G.cached_size != mod_breasts_size)
+				mod_breasts_size = G.cached_size
+				build_modular = TRUE
+	if(!build_modular)
+		return
 	delete_modular_overlays(U)
 
 	if(!(src in U.modular_items))
 		U.modular_items += src
-	var/obj/item/organ/O
 	var/obj/item/organ/genital/G
-	for(O in U.internal_organs) //check the user for the organs they have
-		if(istype(O, /obj/item/organ/genital/belly)) //if that organ is a belly
-			G = O //treat that organ as a genital
+	for(G in genitals_list) //check the user for the organs they have
+		if(istype(G, /obj/item/organ/genital/belly)) //if that organ is a belly
 			var/modular_sprite = get_modular_belly(G)
 			add_modular_overlay(U, modular_sprite, MODULAR_BELLY_LAYER, color)
 			add_modular_overlay(U, "[modular_sprite]_SOUTH", BELLY_FRONT_LAYER, color)
-		if(istype(O, /obj/item/organ/genital/butt)) //if that organ is the butt
-			G = O
+		if(istype(G, /obj/item/organ/genital/butt)) //if that organ is the butt
 			var/modular_sprite = get_modular_butt(G)
 			add_modular_overlay(U, modular_sprite, MODULAR_BUTT_LAYER, color)
 			add_modular_overlay(U, "[modular_sprite]_NORTH", BUTT_BEHIND_LAYER, color)
-		if(istype(O, /obj/item/organ/genital/breasts)) //if the organ is the breasts
-			G = O
+		if(istype(G, /obj/item/organ/genital/breasts)) //if the organ is the breasts
 			var/modular_sprite = get_modular_breasts(G)
 			add_modular_overlay(U, modular_sprite, MODULAR_BREASTS_LAYER, color)
 			add_modular_overlay(U, "[modular_sprite]_NORTH", BREASTS_BEHIND_LAYER, color)
@@ -122,7 +150,7 @@
 		U.cut_overlay(overlay)
 	mod_overlays -= mod_overlays
 
-/obj/item/proc/remove_modular_overlays(mob/user)
+/obj/item/proc/remove_modular_item(mob/user)
 	if(!iscarbon(user))
 		return
 	delete_modular_overlays(user)

GainStation13/code/modules/mob/living/species.dm

@@ -222,6 +222,7 @@
 
 /datum/species/proc/handle_fatness(mob/living/carbon/human/H)
 	handle_helplessness(H)
+	H.handle_modular_items()
 
 	// update movement speed
 	var/fatness_delay = 0