Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -1277,8 +1277,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	if(!M.has_trait(TRAIT_ALCOHOL_TOLERANCE))
 		M.confused = max(M.confused+2,0)
 		M.Dizzy(10)
-	if (!M.slurring)
-		M.slurring = 1
+	M.slurring = max(M.slurring,50)
 	M.slurring += 3
 	switch(current_cycle)
 		if(51 to 200)
@@ -1306,8 +1305,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	M.dizziness +=1.5
 	switch(current_cycle)
 		if(15 to 45)
-			if(!M.slurring)
-				M.slurring = 1
+			M.slurring = max(M.slurring,50)
 			M.slurring += 3
 		if(45 to 55)
 			if(prob(50))
@@ -1336,8 +1334,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	M.dizziness +=2
 	switch(current_cycle)
 		if(15 to 45)
-			if(!M.slurring)
-				M.slurring = 1
+			M.slurring = max(M.slurring,50)
 			M.slurring += 3
 		if(45 to 55)
 			if(prob(50))
@@ -1364,8 +1361,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_desc = "A drink enjoyed by people during the 1960's."
 
 /datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/carbon/M)
-	if (!M.slurring)
-		M.slurring = 1
+	M.slurring = max(M.slurring,50)
 	switch(current_cycle)
 		if(1 to 5)
 			M.Dizzy(10)

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -402,8 +402,7 @@
 	taste_description = "mushroom"
 
 /datum/reagent/mushroomhallucinogen/on_mob_life(mob/living/carbon/M)
-	if(!M.slurring)
-		M.slurring = 1
+	M.slurring = max(M.slurring,50)
 	switch(current_cycle)
 		if(1 to 5)
 			M.Dizzy(5)

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -1912,3 +1912,20 @@
 	description = "The primary precursor for an ancient feline delicacy known as skooma. While it has no notable effects on it's own, mixing it with morphine in a chilled container may yield interesting results."
 	color = "#FAEAFF"
 	taste_description = "synthetic catnip"
+
+/datum/reagent/penis_enlargement
+	name = "Penis Enlargement"
+	id = "penis_enlargement"
+	description = "A patented chemical forumula by Doctor Ronald Hyatt that is guaranteed to bring maximum GROWTH and LENGTH to your penis, today!"
+	color = "#888888"
+	taste_description = "chinese dragon powder"
+	metabolization_rate = INFINITY //So it instantly removes all of itself. Don't want to put strain on the system.
+
+/datum/reagent/penis_enlargement/on_mob_life(mob/living/carbon/C)
+	var/obj/item/organ/genital/penis/P = C.getorganslot(ORGAN_SLOT_PENIS)
+	if(P)
+		var/added_length = round(volume/30,0.01) //Every 30u gives an extra inch. Rounded to the nearest 0.01 so float fuckery doesn't occur with the division by 30.
+		if(added_length >= 0.20) //Only add the length if it's greater than or equal to 0.2. This is to prevent people from smoking the reagents and causing the penis to update constantly.
+			P.length += added_length
+			P.update()
+	..()

code/modules/reagents/reagent_containers/pill.dm

@@ -233,3 +233,7 @@
 
 /obj/item/reagent_containers/pill/get_belt_overlay()
 	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "pouch")
+
+/obj/item/reagent_containers/pill/penis_enlargement
+	name = "penis enlargement pill"
+	list_reagents = list("penis_enlargement" = 30)