PElarger BElarger finalise 0.1

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

@@ -76,9 +76,9 @@
 //Should I turn someone with meter wide... assets into a blob?
 //this is far too lewd wah
 /obj/item/organ/genital/breasts/update_size()//wah
+	var/obj/item/organ/genital/breasts/B = owner.getorganslot("breasts")
 	message_admins("Breast size at start: [size], [cached_size], [owner]")
 	if(cached_size < 0)//I don't actually know what round() does to negative numbers, so to be safe!!
-		var/obj/item/organ/genital/breasts/B = owner.getorganslot("breasts")
 		to_chat(owner, "<span class='warning'>You feel your breasts shrinking away from your body as your chest flattens out.</b></span>")
 		B.Remove(owner)
 	switch(round(cached_size))
@@ -105,10 +105,10 @@
 			size = cached_size
 	message_admins("Breast size: [size], [cached_size], [owner]")
 	if(round(cached_size) < 16)//Because byond doesn't count from 0, I have to do this.
-		if (!isnum(prev_size))
-			breast_values[prev_size]
-		if(!isnum(prev_size)//Bloody byond with it's counting from 1
-			breast_values[prev_size]
+		if (isnum(prev_size))
+			prev_size = breast_values[prev_size]//make numbers letters
+		if(isnum(size))//Bloody byond with it's counting from 1
+			size = breast_values[size] //make numbers letters
 		message_admins("2. [breast_values[size]] vs [breast_values[prev_size]]")
 		if (breast_values[size] > breast_values[prev_size])
 			to_chat(owner, "<span class='warning'>Your breasts [pick("swell up to", "flourish into", "expand into", "burst forth into", "grow eagerly into", "amplify into")] a [uppertext(size)]-cup.</b></span>")
@@ -117,7 +117,7 @@
 		prev_size = size
 		icon_state = sanitize_text("breasts_[shape]_[size]")
 
-	else (cached_size == 16.2)
-			to_chat(owner, "<span class='warning'>Your breasts [pick("swell up to", "flourish into", "expand into", "burst forth into", "grow eagerly into", "amplify into")] a hefty [uppertext(size)]cm diameter bosom, taking both of your hands to hold!.</b></span>")
+	else if (cached_size == 16.2)
+		to_chat(owner, "<span class='warning'>Your breasts [pick("swell up to", "flourish into", "expand into", "burst forth into", "grow eagerly into", "amplify into")] a hefty [uppertext(size)]cm diameter bosom, taking both of your hands to hold!.</b></span>")
 	owner.update_body()
 	B.update_icon()

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

@@ -18,13 +18,12 @@
 	var/knot_girth_ratio 	= KNOT_GIRTH_RATIO_DEF
 	var/list/dickflags 		= list()
 	var/list/knotted_types 	= list("knotted", "barbed, knotted")
-	var/mob/living/carbon/human/o = owner
 	var/statuscheck			= FALSE
 	var/prev_size			= 6
 
 
 /obj/item/organ/genital/penis/update_size()
-
+	var/mob/living/carbon/human/o = owner
 	if(cached_length < 0)//I don't actually know what round() does to negative numbers, so to be safe!!
 		var/obj/item/organ/genital/penis/P = o.getorganslot("breasts")
 		to_chat(o, "<span class='warning'>You feel your tallywacker shrinking away from your body as your groin flattens out!</b></span>")
@@ -60,10 +59,11 @@
 	prev_size = length
 	icon_state = sanitize_text("penis_[shape]_[size]")
 	o.update_body()
-	P.update_icon()
+	//P.update_icon()
 	girth = (length * girth_ratio)
 
 /obj/item/organ/genital/penis/update_appearance()
+	var/mob/living/carbon/human/o = owner
 	var/string = "penis_[GLOB.cock_shapes_icons[shape]]_[size]"
 	icon_state = sanitize_text(string)
 	var/lowershape = lowertext(shape)
@@ -75,7 +75,7 @@
 				color = "#[skintone2hex(H.skin_tone)]"
 		else
 			color = "#[owner.dna.features["cock_color"]]"
-	H.update_body()
+	o.update_body()
 
 /obj/item/organ/genital/penis/update_link()
 	if(owner)

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

@@ -484,7 +484,7 @@
 
 	if(P)
 		P.length = P.length - 0.1
-		message_admins("Breast size: [P.size], [P.cached_size], [holder]")
+		message_admins("Breast size: [P.size], [P.cached_length], [holder]")
 		P.update()
 	if(T)
 		T.Remove(M)
@@ -518,30 +518,6 @@
 	var/mob/living/carbon/human/H
 
 /datum/reagent/fermi/PElarger/on_mob_life(mob/living/carbon/M) //Increases penis size
-
-	var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts")
-	if(!B) //If they don't have breasts, give them breasts.
-		message_admins("No breasts found!")
-		var/obj/item/organ/genital/breasts/nB = new
-		nB.Insert(M)
-		if(nB)
-			if(M.dna.species.use_skintones && M.dna.features["genitals_use_skintone"])
-				nB.color = skintone2hex(H.skin_tone)
-			else if(M.dna.features["breasts_color"])
-				nB.color = "#[M.dna.features["breasts_color"]]"
-			else
-				nB.color = skintone2hex(H.skin_tone)
-			nB.size = "flat"
-
-			to_chat(M, "<span class='warning'>Your chest feels warm, tingling with newfound sensitivity.</b></span>")
-
-			B = nB
-	//If they have them, increase size. If size is comically big, limit movement and rip clothes.
-	message_admins("Breast size: [B.size], [B.cached_size], [holder]")
-	B.cached_size = B.cached_size + 0.1
-
-	B.update()
-
 	var/obj/item/organ/genital/penis/P = M.getorganslot("penis")
 	if(!P)
 		message_admins("No penis found!")//They do have a preponderance for escapism, or so I've heard.
@@ -556,14 +532,12 @@
 			P = nP
 	else
 		P.length = P.length + 0.1
-		if (P.cached_size >= 10.5 && P.cached_length < 11) //too low?
-			M.apply_damage(2, BRUTE, target)
+		if (P.cached_length >= 10.5 && P.cached_length < 11) //too low?
 			var/target = M.get_bodypart(BODY_ZONE_CHEST)
 			to_chat(M, "<span class='warning'>Your cock begin to strain against your clothes tightly!</b></span>")
 			M.apply_damage(5, BRUTE, target)
 
 	P.update_appearance()
-	message_admins("P size: [P.length]")
 	..()
 
 /datum/reagent/fermi/PElarger/overdose_process(mob/living/carbon/M) //Turns you into a male if female and ODing, doesn't touch nonbinary and object genders.