Raunchy branch

code/modules/hydroponics/grown/feverblossom.dm

@@ -16,7 +16,7 @@
 	icon_dead = "feverblossom-dead"
 	mutatelist = list()
 	reagents_add = list(
-		/datum/reagent/drug/aphrodisiac = 0.2,
+		/datum/reagent/consumable/aphrodisiac = 0.2,
 		/datum/reagent/consumable/nutriment = 0.05
 	)
 

code/modules/reagents/chemistry/reagents/drug_reagents.dm

@@ -684,15 +684,15 @@
 		if(!C.undergoing_cardiac_arrest())
 			C.set_heartattack(TRUE)
 
-/datum/reagent/drug/aphrodisiac
+/datum/reagent/consumable/aphrodisiac
 	name = "Crocin"
 	description = "Naturally found in the crocus and gardenia flowers, this drug acts as a natural and safe aphrodisiac."
 	taste_description = "strawberries"
 	color = "#FFADFF"//PINK, rgb(255, 173, 255)
 	can_synth = FALSE
 	synth_metabolism_use_human = TRUE // robots can honry too
 
-/datum/reagent/drug/aphrodisiac/on_mob_life(mob/living/M)
+/datum/reagent/consumable/aphrodisiac/on_mob_life(mob/living/M)
 	if(dont_do_drugs(M))
 		. = TRUE
 		..()
@@ -711,7 +711,7 @@
 				to_chat(M, span_userlove("[G.arousal_verb]!"))
 	..()
 
-/datum/reagent/drug/aphrodisiacplus
+/datum/reagent/consumable/aphrodisiacplus
 	name = "Hexacrocin"
 	description = "Chemically condensed form of basic crocin. This aphrodisiac is extremely powerful and addictive in most animals.\
 					Addiction withdrawals can cause brain damage and shortness of breath. Overdosage can lead to brain damage and a \
@@ -723,7 +723,7 @@
 	can_synth = FALSE
 	synth_metabolism_use_human = TRUE
 
-/datum/reagent/drug/aphrodisiacplus/on_mob_life(mob/living/M)
+/datum/reagent/consumable/aphrodisiacplus/on_mob_life(mob/living/M)
 	if(dont_do_drugs(M))
 		. = TRUE
 		..()
@@ -750,21 +750,21 @@
 				to_chat(M, span_userlove("[G.arousal_verb]!"))
 	..()
 
-/datum/reagent/drug/aphrodisiacplus/addiction_act_stage2(mob/living/M)
+/datum/reagent/consumable/aphrodisiacplus/addiction_act_stage2(mob/living/M)
 	if(prob(30))
 		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2)
 	..()
-/datum/reagent/drug/aphrodisiacplus/addiction_act_stage3(mob/living/M)
+/datum/reagent/consumable/aphrodisiacplus/addiction_act_stage3(mob/living/M)
 	if(prob(30))
 		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3)
 
 		..()
-/datum/reagent/drug/aphrodisiacplus/addiction_act_stage4(mob/living/M)
+/datum/reagent/consumable/aphrodisiacplus/addiction_act_stage4(mob/living/M)
 	if(prob(30))
 		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 4)
 	..()
 
-/datum/reagent/drug/aphrodisiacplus/overdose_process(mob/living/M)
+/datum/reagent/consumable/aphrodisiacplus/overdose_process(mob/living/M)
 	if(M && M.client?.prefs.arousable && !(M.client?.prefs.cit_toggles & NO_APHRO) && prob(33))
 		if(prob(5) && ishuman(M) && M.has_dna() && (M.client?.prefs.cit_toggles & BIMBOFICATION))
 			if(!HAS_TRAIT(M,TRAIT_PERMABONER))
@@ -773,7 +773,7 @@
 				ADD_TRAIT(M,TRAIT_PERMABONER,APHRO_TRAIT)
 	..()
 
-/datum/reagent/drug/anaphrodisiac
+/datum/reagent/consumable/anaphrodisiac
 	name = "Camphor"
 	description = "Naturally found in some species of evergreen trees, camphor is a waxy substance. When injested by most animals, it acts as an anaphrodisiac\
 					, reducing libido and calming them. Non-habit forming and not addictive."
@@ -784,7 +784,7 @@
 	can_synth = FALSE
 	synth_metabolism_use_human = TRUE // robots can horno too
 
-/datum/reagent/drug/anaphrodisiac/on_mob_life(mob/living/M)
+/datum/reagent/consumable/anaphrodisiac/on_mob_life(mob/living/M)
 	if(dont_do_drugs(M))
 		. = TRUE
 		..()
@@ -797,7 +797,7 @@
 				to_chat(M, "<span class='notice'>You no longer feel aroused.")
 	..()
 
-/datum/reagent/drug/anaphrodisiacplus
+/datum/reagent/consumable/anaphrodisiacplus
 	name = "Hexacamphor"
 	description = "Chemically condensed camphor. Causes an extreme reduction in libido and a permanent one if overdosed. Non-addictive."
 	taste_description = "tranquil celibacy"
@@ -807,7 +807,7 @@
 	can_synth = FALSE
 	synth_metabolism_use_human = TRUE
 
-/datum/reagent/drug/anaphrodisiacplus/on_mob_life(mob/living/M)
+/datum/reagent/consumable/anaphrodisiacplus/on_mob_life(mob/living/M)
 	if(dont_do_drugs(M))
 		. = TRUE
 		..()
@@ -822,7 +822,7 @@
 
 	..()
 
-/datum/reagent/drug/anaphrodisiacplus/overdose_process(mob/living/M)
+/datum/reagent/consumable/anaphrodisiacplus/overdose_process(mob/living/M)
 	if(M && M.client?.prefs.arousable && prob(5))
 		to_chat(M, span_userlove("You feel like you'll never feel aroused again..."))
 		ADD_TRAIT(M,TRAIT_NEVERBONER,APHRO_TRAIT)

code/modules/reagents/chemistry/recipes/drugs.dm

@@ -72,33 +72,33 @@
 
 /datum/chemical_reaction/aphro
 	name = "crocin"
-	id = /datum/reagent/drug/aphrodisiac
-	results = list(/datum/reagent/drug/aphrodisiac = 6)
+	id = /datum/reagent/consumable/aphrodisiac
+	results = list(/datum/reagent/consumable/aphrodisiac = 6)
 	required_reagents = list(/datum/reagent/carbon = 2, /datum/reagent/hydrogen = 2, /datum/reagent/oxygen = 2, /datum/reagent/water = 1)
 	required_temp = 400
 	mix_message = "The mixture boils off a pink vapor..."//The water boils off, leaving the crocin
 
 /datum/chemical_reaction/aphroplus
 	name = "hexacrocin"
-	id = /datum/reagent/drug/aphrodisiacplus
-	results = list(/datum/reagent/drug/aphrodisiacplus = 1)
-	required_reagents = list(/datum/reagent/drug/aphrodisiac = 6, /datum/reagent/phenol = 1)
+	id = /datum/reagent/consumable/aphrodisiacplus
+	results = list(/datum/reagent/consumable/aphrodisiacplus = 1)
+	required_reagents = list(/datum/reagent/consumable/aphrodisiac = 6, /datum/reagent/phenol = 1)
 	required_temp = 400
 	mix_message = "The mixture rapidly condenses and darkens in color..."
 
 /datum/chemical_reaction/anaphro
 	name = "camphor"
-	id = /datum/reagent/drug/anaphrodisiac
-	results = list(/datum/reagent/drug/anaphrodisiac = 6)
+	id = /datum/reagent/consumable/anaphrodisiac
+	results = list(/datum/reagent/consumable/anaphrodisiac = 6)
 	required_reagents = list(/datum/reagent/carbon = 2, /datum/reagent/hydrogen = 2, /datum/reagent/oxygen = 2, /datum/reagent/sulfur = 1)
 	required_temp = 400
 	mix_message = "The mixture boils off a yellow, smelly vapor..."//Sulfur burns off, leaving the camphor
 
 /datum/chemical_reaction/anaphroplus
 	name = "hexacamphor"
-	id = /datum/reagent/drug/anaphrodisiacplus
-	results = list(/datum/reagent/drug/anaphrodisiacplus = 1)
-	required_reagents = list(/datum/reagent/drug/anaphrodisiac = 6, /datum/reagent/acetone = 1)
+	id = /datum/reagent/consumable/anaphrodisiacplus
+	results = list(/datum/reagent/consumable/anaphrodisiacplus = 1)
+	required_reagents = list(/datum/reagent/consumable/anaphrodisiac = 6, /datum/reagent/acetone = 1)
 	required_temp = 400
 	mix_message = "The mixture thickens and heats up slighty..."
 

code/modules/reagents/chemistry/recipes/others.dm

@@ -901,55 +901,55 @@
 	name = "Succubus Milk"
 	id = "/datum/reagent/breast_enlarger"
 	results = list(/datum/reagent/breast_enlarger = 6)
-	required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/consumable/milk = 1, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/silicon = 3, /datum/reagent/drug/aphrodisiac = 3)
+	required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/consumable/milk = 1, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/silicon = 3, /datum/reagent/consumable/aphrodisiac = 3)
 	required_temp = 200
 
 /datum/chemical_reaction/BEsmaller
 	name = "Modesty Milk"
 	id = "/datum/reagent/BEsmaller"
 	results = list(/datum/reagent/BEsmaller = 6)
-	required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/consumable/milk = 1, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/silicon = 3, /datum/reagent/drug/anaphrodisiac = 3)
+	required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/consumable/milk = 1, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/silicon = 3, /datum/reagent/consumable/anaphrodisiac = 3)
 	required_temp = 200
 
 /datum/chemical_reaction/penis_enlarger
 	name = "Incubus Draft"
 	id = "/datum/reagent/penis_enlarger"
 	results = list(/datum/reagent/penis_enlarger = 6)
-	required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/blood = 5, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/carbon = 2, /datum/reagent/drug/aphrodisiac = 2)
+	required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/blood = 5, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/carbon = 2, /datum/reagent/consumable/aphrodisiac = 2)
 	required_temp = 200
 
 /datum/chemical_reaction/PEsmaller
 	name = "Chastity Draft"
 	id = "/datum/reagent/PEsmaller"
 	results = list(/datum/reagent/PEsmaller = 6)
-	required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/blood = 5, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/carbon = 2, /datum/reagent/drug/anaphrodisiac = 2)
+	required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/blood = 5, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/carbon = 2, /datum/reagent/consumable/anaphrodisiac = 2)
 	required_temp = 200
 
 /datum/chemical_reaction/butt_enlarger
 	name = "Callipygian Cream"
 	id = "/datum/reagent/butt_enlarger"
 	results = list(/datum/reagent/butt_enlarger = 6)
-	required_reagents = list (/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/diethylamine = 2, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/copper = 2, /datum/reagent/drug/aphrodisiac = 2)
+	required_reagents = list (/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/diethylamine = 2, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/copper = 2, /datum/reagent/consumable/aphrodisiac = 2)
 	required_temp = 200
 
 /datum/chemical_reaction/butt_shrinker
 	name = "Callipygian Skim"
 	id = "/datum/reagent/butt_shrinker"
 	results = list(/datum/reagent/butt_shrinker = 6)
-	required_reagents = list (/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/diethylamine = 2, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/copper = 2, /datum/reagent/drug/anaphrodisiac = 2)
+	required_reagents = list (/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/diethylamine = 2, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/copper = 2, /datum/reagent/consumable/anaphrodisiac = 2)
 	required_temp = 200
 
 /datum/chemical_reaction/belly_enlarger
 	name = "Fortified butter"
 	id = "/datum/reagent/belly_enlarger"
 	results = list(/datum/reagent/belly_enlarger = 6)
-	required_reagents = list (/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/diethylamine = 2, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/consumable/milk = 2, /datum/reagent/drug/aphrodisiac = 2)
+	required_reagents = list (/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/diethylamine = 2, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/consumable/milk = 2, /datum/reagent/consumable/aphrodisiac = 2)
 	required_temp = 200
 
 /datum/chemical_reaction/belly_shrinker
 	name = "weight-loss shake"
 	id = "/datum/reagent/belly_shrinker"
 	results = list(/datum/reagent/belly_shrinker = 6)
-	required_reagents = list (/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/diethylamine = 2, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/consumable/milk = 2, /datum/reagent/drug/anaphrodisiac = 2)
+	required_reagents = list (/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/diethylamine = 2, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/consumable/milk = 2, /datum/reagent/consumable/anaphrodisiac = 2)
 	required_temp = 200
 

modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm

@@ -422,7 +422,7 @@ datum/chemical_reaction/fermi/eigenstate
 	name = "Furranium"
 	id = /datum/reagent/fermi/furranium
 	results = list(/datum/reagent/fermi/furranium = 5)
-	required_reagents = list(/datum/reagent/drug/aphrodisiac = 1, /datum/reagent/moonsugar = 1, /datum/reagent/silver = 2, /datum/reagent/medicine/salglu_solution = 1)
+	required_reagents = list(/datum/reagent/consumable/aphrodisiac = 1, /datum/reagent/moonsugar = 1, /datum/reagent/silver = 2, /datum/reagent/medicine/salglu_solution = 1)
 	mix_message = "You think you can hear a howl come from the beaker."
 	//FermiChem vars:
 	OptimalTempMin 	= 350

modular_citadel/code/modules/reagents/reagents/cit_reagents.dm

@@ -121,15 +121,15 @@
 
 //aphrodisiac & anaphrodisiac
 
-/datum/reagent/drug/aphrodisiac
+/datum/reagent/consumable/aphrodisiac
 	name = "Crocin"
 	id = "aphro"
 	description = "Naturally found in the crocus and gardenia flowers, this drug acts as a natural and safe aphrodisiac."
 	taste_description = "strawberry roofies"
 	taste_mult = 2 //Hide the roofies in stronger flavors
 	color = "#FFADFF"//PINK, rgb(255, 173, 255)
 
-/datum/reagent/drug/aphrodisiac/on_mob_life(mob/living/M)
+/datum/reagent/consumable/aphrodisiac/on_mob_life(mob/living/M)
 	if(M && M.canbearoused && !HAS_TRAIT(M, TRAIT_CROCRIN_IMMUNE))
 		if(prob(33))
 			M.adjustArousalLoss(2)
@@ -140,7 +140,7 @@
 			to_chat(M, span_userlove("[aroused_message]"))
 	..()
 
-/datum/reagent/drug/aphrodisiacplus
+/datum/reagent/consumable/aphrodisiacplus
 	name = "Hexacrocin"
 	id = "aphro+"
 	description = "Chemically condensed form of basic crocin. This aphrodisiac is extremely powerful and addictive in most animals.\
@@ -151,7 +151,7 @@
 	addiction_threshold = 20
 	overdose_threshold = 20
 
-/datum/reagent/drug/aphrodisiacplus/on_mob_life(mob/living/M)
+/datum/reagent/consumable/aphrodisiacplus/on_mob_life(mob/living/M)
 	if(M && M.canbearoused && !HAS_TRAIT(M, TRAIT_CROCRIN_IMMUNE))
 		if(prob(33))
 			M.adjustArousalLoss(6)//not quite six times as powerful, but still considerably more powerful.
@@ -169,21 +169,21 @@
 			to_chat(M, span_userlove("[aroused_message]"))
 	..()
 
-/datum/reagent/drug/aphrodisiacplus/addiction_act_stage2(mob/living/M)
+/datum/reagent/consumable/aphrodisiacplus/addiction_act_stage2(mob/living/M)
 	if(prob(30))
 		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2)
 	..()
-/datum/reagent/drug/aphrodisiacplus/addiction_act_stage3(mob/living/M)
+/datum/reagent/consumable/aphrodisiacplus/addiction_act_stage3(mob/living/M)
 	if(prob(30))
 		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3)
 
 		..()
-/datum/reagent/drug/aphrodisiacplus/addiction_act_stage4(mob/living/M)
+/datum/reagent/consumable/aphrodisiacplus/addiction_act_stage4(mob/living/M)
 	if(prob(30))
 		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 4)
 	..()
 
-/datum/reagent/drug/aphrodisiacplus/overdose_process(mob/living/M)
+/datum/reagent/consumable/aphrodisiacplus/overdose_process(mob/living/M)
 	if(M && M.canbearoused && !HAS_TRAIT(M, TRAIT_CROCRIN_IMMUNE) && prob(33))
 		if(prob(5) && M.getArousalLoss() >= 100 && ishuman(M) && M.has_dna())
 			if(prob(5)) //Less spam
@@ -195,7 +195,7 @@
 		M.adjustArousalLoss(2)
 	..()
 
-/datum/reagent/drug/anaphrodisiac
+/datum/reagent/consumable/anaphrodisiac
 	name = "Camphor"
 	id = "anaphro"
 	description = "Naturally found in some species of evergreen trees, camphor is a waxy substance. When injested by most animals, it acts as an anaphrodisiac\
@@ -205,12 +205,12 @@
 	color = "#D9D9D9"//rgb(217, 217, 217)
 	reagent_state = SOLID
 
-/datum/reagent/drug/anaphrodisiac/on_mob_life(mob/living/M)
+/datum/reagent/consumable/anaphrodisiac/on_mob_life(mob/living/M)
 	if(M && M.canbearoused && prob(33))
 		M.adjustArousalLoss(-2)
 	..()
 
-/datum/reagent/drug/anaphrodisiacplus
+/datum/reagent/consumable/anaphrodisiacplus
 	name = "Hexacamphor"
 	id = "anaphro+"
 	description = "Chemically condensed camphor. Causes an extreme reduction in libido and a permanent one if overdosed. Non-addictive."
@@ -219,12 +219,12 @@
 	reagent_state = SOLID
 	overdose_threshold = 20
 
-/datum/reagent/drug/anaphrodisiacplus/on_mob_life(mob/living/M)
+/datum/reagent/consumable/anaphrodisiacplus/on_mob_life(mob/living/M)
 	if(M && M.canbearoused && prob(33))
 		M.adjustArousalLoss(-4)
 	..()
 
-/datum/reagent/drug/anaphrodisiacplus/overdose_process(mob/living/M)
+/datum/reagent/consumable/anaphrodisiacplus/overdose_process(mob/living/M)
 	if(M && M.canbearoused && prob(33))
 		if(M.min_arousal > 0)
 			M.min_arousal -= 1