From 1ad92b97586c8f7dd02a68e54c3e4ba2c6629250 Mon Sep 17 00:00:00 2001
From: Fermi <phasondragon@googlemail.com>
Date: Tue, 25 Jun 2019 23:44:04 +0100
Subject: [PATCH] Final round of fixes from testing.

---
 .../code/modules/arousal/organs/breasts.dm    |   2 +-
 .../code/modules/arousal/organs/penis.dm      |   2 +-
 .../chemistry/reagents/enlargement.dm         |   2 +-
 .../chemistry/reagents/fermi_reagents.dm      |   4 ++--
 .../reagents/reagent container/hypovial.dm    |   4 ++--
 modular_citadel/icons/firstaid.dmi            | Bin 3051 -> 3060 bytes
 modular_citadel/icons/obj/vial.dmi            | Bin 2622 -> 2625 bytes
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm
index 6260878735..d7c518d415 100644
--- a/modular_citadel/code/modules/arousal/organs/breasts.dm
+++ b/modular_citadel/code/modules/arousal/organs/breasts.dm
@@ -123,7 +123,7 @@
 			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>")
 			var/mob/living/carbon/human/H = owner
 			H.Force_update_genitals()
-		else if (breast_values[size] < breast_values[prev_size])
+		else if ((breast_values[size] < breast_values[prev_size]) && (breast_values[size] > 0.5))
 			to_chat(owner, "<span class='warning'>Your breasts [pick("shrink down to", "decrease into", "diminish into", "deflate into", "shrivel regretfully into", "contracts into")] a [uppertext(size)]-cup.</b></span>")
 			var/mob/living/carbon/human/H = owner
 			H.Force_update_genitals()
diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm
index 6d5342dbee..43a512acf6 100644
--- a/modular_citadel/code/modules/arousal/organs/penis.dm
+++ b/modular_citadel/code/modules/arousal/organs/penis.dm
@@ -60,7 +60,7 @@
 
 	if (round(length) > round(prev_length))
 		to_chat(o, "<span class='warning'>Your [pick(GLOB.gentlemans_organ_names)] [pick("swells up to", "flourishes into", "expands into", "bursts forth into", "grows eagerly into", "amplifys into")] a [uppertext(round(length))] inch penis.</b></span>")
-	else if (round(length) < round(prev_length))
+	else if ((round(length) < round(prev_length)) && (length > 0.5))
 		to_chat(o, "<span class='warning'>Your [pick(GLOB.gentlemans_organ_names)] [pick("shrinks down to", "decreases into", "diminishes into", "deflates into", "shrivels regretfully into", "contracts into")] a [uppertext(round(length))] inch penis.</b></span>")
 	prev_length = length
 	icon_state = sanitize_text("penis_[shape]_[size]")
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
index 0a4496566f..f4e90f45a9 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
@@ -173,7 +173,7 @@
 	color = "#888888" // This is greyish..?
 	taste_description = "chinese dragon powder"
 	overdose_threshold = 12 //ODing makes you male and removes female genitals
-	metabolization_rate = 0.25
+	metabolization_rate = 0.5
 	ImpureChem 			= "PEsmaller" //If you make an inpure chem, it stalls growth
 	InverseChemVal 		= 0.35
 	InverseChem 		= "PEsmaller" //At really impure vols, it just becomes 100% inverse and shrinks instead.
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
index fa1c2f714b..1cd642e2db 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -143,7 +143,7 @@
 				for(var/victim in seen)
 					if((istype(victim, /mob/living/simple_animal/pet/)) || (victim == M) || (!isliving(victim)))
 						seen = seen - victim
-				if(seen)
+				if(LAZYLEN(seen))
 					to_chat(M, "You notice [pick(seen)]'s bulge [pick("OwO!", "uwu!")]")
 		if(16)
 			T = M.getorganslot(ORGAN_SLOT_TONGUE)
@@ -164,7 +164,7 @@
 				for(var/victim in seen)
 					if((istype(victim, /mob/living/simple_animal/pet/)) || (victim == M) || (!isliving(victim)))
 						seen = seen - victim
-				if(seen)
+				if(LAZYLEN(seen))
 					to_chat(M, "You notice [pick(seen)]'s bulge [pick("OwO!", "uwu!")]")
 	..()
 
diff --git a/modular_citadel/code/modules/reagents/reagent container/hypovial.dm b/modular_citadel/code/modules/reagents/reagent container/hypovial.dm
index 37d5a59f4c..07c2ce861d 100755
--- a/modular_citadel/code/modules/reagents/reagent container/hypovial.dm	
+++ b/modular_citadel/code/modules/reagents/reagent container/hypovial.dm	
@@ -148,12 +148,12 @@
 
 /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction
 	name = "pink hypovial (breast reduction)"
-	icon_state = "hypovial-p"
+	icon_state = "hypovial-pink"
 	comes_with = list("BEsmaller_hypo" = 30)
 
 /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction
 	name = "pink hypovial (penis reduction)"
-	icon_state = "hypovial-p"
+	icon_state = "hypovial-pink"
 	comes_with = list("PEsmaller_hypo" = 30)
 
 /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/CMO
diff --git a/modular_citadel/icons/firstaid.dmi b/modular_citadel/icons/firstaid.dmi
index 1e000e000f9daa2f61d945cf144e39773c0a4235..e7ac37822268e1aeaa5ddb80fca59c8b0697f56e 100644
GIT binary patch
delta 2625
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
IItGLP1zV#mi2wiq

delta 2616
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
G(EkVNOc-JS

diff --git a/modular_citadel/icons/obj/vial.dmi b/modular_citadel/icons/obj/vial.dmi
index 38402d4ad0e6dc7c20d05135d73b6f5fe2568959..8d1fefe47019ccc285597391d56b171c2e1a73c8 100755
GIT binary patch
delta 267
zcmV+m0rdX96u}gbB!BCAR9JLGWpiV4X>fFDZ*Bkpc$}5eu?oU45XSL2d5S|<m9{EQ
zS)?Kz^c_xnroq%o8Wi8&A#N&s*;4rRa*+R&w!3|Er25e4hlJ4$H!`$Z6k0u98#^+z
zthDOH*)FD!F>(|#H0fUV;o;bq#YC&tg^>)ET3rJ7lFnbWT7ScIjZfX+Q_BJ$3&Z&d
zr!7tyr&pZbaT;NI8h_JDt5!U}$WS@^xsAKwyL%2+GHUZ2tYjqTIatZ)&U3Jm5#MM3
z%nS1L{M-+J9^>yXc)rQw4JVI>oP1^x8A&IPckMY?0pp(1?pRZOX!IM0Vw6q}Iw-;b
R00|LEL_t(|oU<PR9|-}$f5-p;

delta 267
zcmV+m0rdXC6uuOYB!B37R9JLGWpiV4X>fFDZ*Bkpc$}ruu@1r@5P;zsp5mgbno>1R
zET+bEu<vl%lM>MyAT@n^2i&yD5jRLa4if%3><`Dff$CJtfqbz212k+_g%mH_#tt;B
zODQ_Cri*D4B1QrYvu=F$gGHx`nG~({0W>Hnt{(4{)?c*TvVZB8KXu2SstW#CHe8<h
zwB=Le(;J^Y`82ZWIsB%j6fHR%L4#WS_Zo-ZP)2GFy`hZW9C||;(K+;nGRphBKl6e-
zy}aD}iJzD}!f!Wue!$7|D^8xDa`Kr4Wkl`J8)B9{heK0Ab*kkX%EOZkMz@5i000RQ
RNkl<Zc%1FsL9-<R90}RCe%Sy3