Final fixes, finally fixed all problems.

modular_citadel/code/modules/arousal/organs/breasts.dm

@@ -6,8 +6,8 @@
 	zone 					= "chest"
 	slot 					= "breasts"
 	w_class 				= 3
-	size 					= "c"  //SHOULD BE A LETTER, starts as a number...???
-	var/cached_size			= BREASTS_SIZE_DEF //for enlargement SHOULD BE A NUMBER
+	size 					= BREASTS_SIZE_DEF  //SHOULD BE A LETTER, starts as a number...???
+	var/cached_size			= null //for enlargement SHOULD BE A NUMBER
 	var/prev_size			//For flavour texts SHOULD BE A LETTER
 	var/breast_sizes 		= list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "huge", "flat")
 	var/breast_values 		= list ("a" =  1, "b" = 2, "c" = 3, "d" = 4, "e" = 5, "f" = 6, "g" = 7, "h" = 8, "i" = 9, "j" = 10, "k" = 11, "l" = 12, "m" = 13, "n" = 14, "o" = 15, "huge" = 16, "flat" = 0)
@@ -78,15 +78,14 @@
 //Allows breasts to grow and change size, with sprite changes too.
 //maximum wah
 //Comical sizes slow you down in movement and actions.
-//Rediculous sizes makes you more cumberson.
-//Should I turn someone with meter wide... assets into a blob?
+//Rediculous sizes makes you more cumbersome.
 //this is far too lewd wah
 
 /obj/item/organ/genital/breasts/update_size()//wah
 
 	if(!ishuman(owner) || !owner)
 		return
-	if(cached_size < 0)//I don't actually know what round() does to negative numbers, so to be safe!!(Why does this runtime??) - fixed
+	if(cached_size < 0)//I don't actually know what round() does to negative numbers, so to be safe!!fixed
 		to_chat(owner, "<span class='warning'>You feel your breasts shrinking away from your body as your chest flattens out.</b></span>")
 		src.Remove(owner)
 	switch(round(cached_size))

modular_citadel/code/modules/arousal/organs/genitals.dm

@@ -1,6 +1,6 @@
 /obj/item/organ/genital
 	color = "#fcccb3"
-	var/shape = "human"
+	var/shape = "Human" //Changed to be uppercase, let me know if this breaks everything..!!
 	var/sensitivity = 1
 	var/list/genital_flags = list()
 	var/can_masturbate_with = FALSE
@@ -210,13 +210,20 @@
 			else
 				B.color = "#[dna.features["breasts_color"]]"
 			B.size = dna.features["breasts_size"]
-			B.prev_size = B.size
-			message_admins("B.size[B.size]")
-			if (!B.size == "huge")
-				if(isnum(B.size))
-					B.cached_size = B.size
+			if(!isnum(B.size))
+				if(B.size == "flat")
+					B.cached_size = 0
+					B.prev_size = 0
+				else if (B.cached_size == "huge")
+					B.prev_size = "huge"
+					message_admins("I hate genitals, this should not appear. I'm so mad.")
 				else
 					B.cached_size = B.breast_values[B.size]
+					B.prev_size = B.size
+			else
+				B.cached_size = B.size
+				B.prev_size = B.size
+			message_admins("B.size [B.size], Cache [B.cached_size], prev [B.prev_size]")
 			B.shape = dna.features["breasts_shape"]
 			B.fluid_id = dna.features["breasts_fluid"]
 			B.update()
@@ -293,23 +300,21 @@
 		if(istype(O, /obj/item/organ/genital))
 			organCheck = TRUE
 			if(/obj/item/organ/genital/penis)
-				if(!dna.features["has_cock"] == 1)
-					dna.features["has_cock"] = 1//Goddamnit get in there.
+				dna.features["has_cock"] = TRUE
+			if(/obj/item/organ/genital/breasts)
+				dna.features["has_breasts"] = TRUE//Goddamnit get in there.
 	if (organCheck == FALSE)
 		if(ishuman(src) && dna.species.id == "human")
 			dna.features["genitals_use_skintone"] = TRUE
 			dna.species.use_skintones = TRUE
-
-		/* I can't get this to work.
 		if(MUTCOLORS)
 			if(src.dna.species.fixed_mut_color)
-				dna.features["cock_color"] = "#[src.dna.species.fixed_mut_color]"
-				dna.features["breasts_color"] = "#[src.dna.species.fixed_mut_color]"
+				dna.features["cock_color"] = "[src.dna.species.fixed_mut_color]"
+				dna.features["breasts_color"] = "[src.dna.species.fixed_mut_color]"
 				return
 		//So people who haven't set stuff up don't get rainbow surprises.
-		dna.features["cock_color"] = "#[dna.features["mcolor"]]"
-		dna.features["breasts_color"] = "#[dna.features["mcolor"]]"
-		*/
+		dna.features["cock_color"] = "[dna.features["mcolor"]]"
+		dna.features["breasts_color"] = "[dna.features["mcolor"]]"
 	return
 
 /datum/species/proc/handle_genitals(mob/living/carbon/human/H)//more like handle sadness

modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm

@@ -597,7 +597,6 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 	H.genital_override = TRUE
 	var/obj/item/organ/genital/breasts/B = H.getorganslot("breasts")
 	if(!B)
-		H.emergent_genital_call()
 		return
 	if(!B.size == "huge")
 		var/sizeConv =  list("a" =  1, "b" = 2, "c" = 3, "d" = 4, "e" = 5)
@@ -612,6 +611,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 	if(!B) //If they don't have breasts, give them breasts.
 		var/obj/item/organ/genital/breasts/nB = new
 		nB.Insert(M)
+		H.emergent_genital_call()
 		if(nB)
 			if(M.dna.species.use_skintones && M.dna.features["genitals_use_skintone"])
 				nB.color = skintone2hex(H.skin_tone)
@@ -719,7 +719,6 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 	H.genital_override = TRUE
 	var/obj/item/organ/genital/penis/P = M.getorganslot("penis")
 	if(!P)
-		H.emergent_genital_call()
 		return
 	P.prev_size = P.length
 	P.cached_length = P.length
@@ -732,6 +731,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 	if(!P)//They do have a preponderance for escapism, or so I've heard.
 		var/obj/item/organ/genital/penis/nP = new
 		nP.Insert(M)
+		H.emergent_genital_call()
 		if(nP)
 			nP.length = 1
 			to_chat(M, "<span class='warning'>Your groin feels warm, as you feel a newly forming bulge down below.</b></span>")//OwO
@@ -1038,7 +1038,7 @@ Okay, seriously, unless you're an antag, it will be difficult to enthrall people
 If it becomes an issue, I'll make all pets pacifists and apply more weakness effects based on mood and state. I'll probably do this anyways as I want the bond between the two to be imperative.
 As stated earlier the biggest concern is the use as a murder aid, which I have ideas for. (weaken the enthraller during the enthrallment process?)
 
-And as stated earlier, this chem is hard to make, and is punishing on failure. You fall in love with the chem dispencer and have to stay within 8 tiles of it. Additionally, you hug the dispencer instead of using it - thus making you unable to continue chemistry for that round, and likely getting the CMO mad as hecc at you.
+And as stated earlier, this chem is hard to make, and is punishing on failure. You fall in love with someone if it's impure, and then your piorities change.
 (thats not written yet but thats the idea.)
 */