From 50cd75df7d8518d6fca3d1b3403c650e8a3c39e6 Mon Sep 17 00:00:00 2001
From: Poojawa <Poojawa@users.noreply.github.com>
Date: Fri, 8 Sep 2017 06:55:19 -0500
Subject: [PATCH] Actually makes Citadel reagents process (#2653)

---
 code/citadel/cit_reagents.dm | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/code/citadel/cit_reagents.dm b/code/citadel/cit_reagents.dm
index 4a0e91479b..30b4da7ccf 100644
--- a/code/citadel/cit_reagents.dm
+++ b/code/citadel/cit_reagents.dm
@@ -46,7 +46,7 @@
 	name = "Female Ejaculate"
 	id = "femcum"
 	description = "Vaginal lubricant found in most mammals and other animals of similar nature. Where you found this is your own business."
-	taste_description = "female arousal"
+	taste_description = "something with a tang" // wew coders who haven't eaten out a girl.
 	taste_mult = 2
 	data = list("donor"=null,"viruses"=null,"donor_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null)
 	reagent_state = LIQUID
@@ -90,7 +90,7 @@
 
 //aphrodisiac & anaphrodisiac
 
-/datum/reagent/aphrodisiac
+/datum/reagent/drug/aphrodisiac
 	name = "Crocin"
 	id = "aphro"
 	description = "Naturally found in the crocus and gardenia flowers, this drug acts as a natural and safe aphrodisiac."
@@ -98,7 +98,7 @@
 	taste_mult = 2 //Hide the roofies in stronger flavors
 	color = "#FFADFF"//PINK, rgb(255, 173, 255)
 
-/datum/reagent/aphrodisiac/on_mob_life(mob/living/M)
+/datum/reagent/drug/aphrodisiac/on_mob_life(mob/living/M)
 	if(prob(33))
 		M.adjustArousalLoss(2)
 	if(prob(5))
@@ -108,7 +108,7 @@
 		to_chat(M, "<span class='love'>[aroused_message]</span>")
 	..()
 
-/datum/reagent/aphrodisiacplus
+/datum/reagent/drug/aphrodisiacplus
 	name = "Hexacrocin"
 	id = "aphro+"
 	description = "Chemically condensed form of basic crocin. This aphrodisiac is extremely powerful and addictive in most animals.\
@@ -119,7 +119,7 @@
 	addiction_threshold = 20
 	overdose_threshold = 20
 
-/datum/reagent/aphrodisiacplus/on_mob_life(mob/living/M)
+/datum/reagent/drug/aphrodisiacplus/on_mob_life(mob/living/M)
 	if(prob(33))
 		M.adjustArousalLoss(6)//not quite six times as powerful, but still considerably more powerful.
 	if(prob(5))
@@ -135,21 +135,21 @@
 			aroused_message = pick("You feel a bit hot.", "You feel strong sexual urges.", "You feel in the mood.", "You're ready to go down on someone.")
 		to_chat(M, "<span class='love'>[aroused_message]</span>")
 
-/datum/reagent/aphrodisiacplus/addiction_act_stage2(mob/living/M)
+/datum/reagent/drug/aphrodisiacplus/addiction_act_stage2(mob/living/M)
 	if(prob(30))
 		M.adjustBrainLoss(2)
 	..()
-/datum/reagent/aphrodisiacplus/addiction_act_stage3(mob/living/M)
+/datum/reagent/drug/aphrodisiacplus/addiction_act_stage3(mob/living/M)
 	if(prob(30))
 		M.adjustBrainLoss(3)
 
 		..()
-/datum/reagent/aphrodisiacplus/addiction_act_stage4(mob/living/M)
+/datum/reagent/drug/aphrodisiacplus/addiction_act_stage4(mob/living/M)
 	if(prob(30))
 		M.adjustBrainLoss(4)
 	..()
 
-/datum/reagent/aphrodisiacplus/overdose_process(mob/living/M)
+/datum/reagent/drug/aphrodisiacplus/overdose_process(mob/living/M)
 	if(prob(33))
 		if(M.getArousalLoss() >= 100 && ishuman(M) && M.has_dna())
 			var/mob/living/carbon/human/H = M
@@ -163,7 +163,7 @@
 		M.adjustArousalLoss(2)
 	..()
 
-/datum/reagent/anaphrodisiac
+/datum/reagent/drug/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\
@@ -173,12 +173,12 @@
 	color = "#D9D9D9"//rgb(217, 217, 217)
 	reagent_state = SOLID
 
-/datum/reagent/anaphrodisiac/on_mob_life(mob/living/M)
+/datum/reagent/drug/anaphrodisiac/on_mob_life(mob/living/M)
 	if(prob(33))
 		M.adjustArousalLoss(-2)
 	..()
 
-/datum/reagent/anaphrodisiacplus
+/datum/reagent/drug/anaphrodisiacplus
 	name = "Hexacamphor"
 	id = "anaphro+"
 	description = "Chemically condensed camphor. Causes an extreme reduction in libido and a permanent one if overdosed. Non-addictive."
@@ -187,12 +187,12 @@
 	reagent_state = SOLID
 	overdose_threshold = 20
 
-/datum/reagent/anaphrodisiacplus/on_mob_life(mob/living/M)
+/datum/reagent/drug/anaphrodisiacplus/on_mob_life(mob/living/M)
 	if(prob(33))
 		M.adjustArousalLoss(-4)
 	..()
 
-/datum/reagent/anaphrodisiacplus/overdose_process(mob/living/M)
+/datum/reagent/drug/anaphrodisiacplus/overdose_process(mob/living/M)
 	if(prob(33))
 		if(M.min_arousal > 0)
 			M.min_arousal -= 1