From c20c7f06986b409f20d36afe594c53d1aee254de Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 9 May 2020 05:34:30 -0700 Subject: [PATCH] Removes crocin, hexacrocin from emagged booze dispenser; makes crocin no longer "roofies" (??) (#12177) * Removes crocin, hexacrocin from emagged booze dispenser * what. what. what. what. what. --- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 4 +--- .../code/modules/reagents/reagents/cit_reagents.dm | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 7f57dd1723..942786fd43 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -575,9 +575,7 @@ /datum/reagent/consumable/ethanol/alexander, /datum/reagent/consumable/clownstears, /datum/reagent/toxin/minttoxin, - /datum/reagent/consumable/ethanol/atomicbomb, - /datum/reagent/drug/aphrodisiac, - /datum/reagent/drug/aphrodisiacplus + /datum/reagent/consumable/ethanol/atomicbomb ) /obj/machinery/chem_dispenser/drinks/beer/fullupgrade //fully ugpraded stock parts, emagged diff --git a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm index 280a5eebfa..17de8c806d 100644 --- a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm +++ b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm @@ -92,8 +92,7 @@ /datum/reagent/drug/aphrodisiac name = "Crocin" 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 + taste_description = "strawberries" color = "#FFADFF"//PINK, rgb(255, 173, 255) can_synth = FALSE