diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index a593a5cc86..d528f7bda5 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1696,9 +1696,9 @@ glass_name = "Ent's Draught" glass_desc = "You can almost smell the tranquility emanating from this." -/datum/reagent/drink/strawberrylovepotion //ywedit - name = "Strawberry Love Potion" //ywedit - id = "strawberrylovepotion" //ywedit +/datum/reagent/drink/lovepotion + name = "Love Potion" + id = "lovepotion" description = "Creamy strawberries and sugar, simple and sweet." taste_description = "strawberries and cream" color = "#fc8a8a" // rgb(252, 138, 138) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_yw.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_yw.dm new file mode 100644 index 0000000000..13c987a149 --- /dev/null +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_yw.dm @@ -0,0 +1,29 @@ +/datum/reagent/drink/lovepotion_yw + name = "Strawberry Love Potion" + id = "strawberrylovepotion" + description = "Creamy strawberries and sugar, simple and sweet." + taste_description = "strawberries and cream" + color = "#fc8a8a" // rgb(252, 138, 138) + + glass_name = "Love Potion" + glass_desc = "Love me tender, love me sweet." + + +/datum/reagent/ethanol/wormblood + name = "Worm Blood" + id = "wormblood" + description = "Who had the grand idea to bottle THE BLOOD OF A WORM." + taste_description = "Wriggly cave fungus" + color = "#827A00" + strength = 30 + druggy = 10 + + glass_name = "Worm blood" + glass_desc = "Who had the grand idea to bottle THE BLOOD OF A WORM." + glass_icon_state = "wormblood" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_yw.dmi' + + + + diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index f96e757a0d..b2591d992f 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2240,10 +2240,10 @@ catalysts = list("enzyme" = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe result_amount = 5 -/datum/chemical_reaction/drinks/strawberrylovepotion //ywedit start - name = "Strawberry Love Potion" - id = "strawberrylovepotion" - result = "strawberrylovepotion" //ywedit end +/datum/chemical_reaction/drinks/lovepotion + name = "Love Potion" + id = "lovepotion" + result = "lovepotion" required_reagents = list("cream" = 1, "berryjuice" = 1, "sugar" = 1) result_amount = 3 diff --git a/code/modules/reagents/Chemistry-Recipes_yw.dm b/code/modules/reagents/Chemistry-Recipes_yw.dm new file mode 100644 index 0000000000..8cf9a31339 --- /dev/null +++ b/code/modules/reagents/Chemistry-Recipes_yw.dm @@ -0,0 +1,14 @@ +/datum/chemical_reaction/drinks/lovepotion_yw + name = "Strawberry Love Potion" + id = "strawberrylovepotion" + result = "strawberrylovepotion" + required_reagents = list("cream" = 1, "berryjuice" = 1, "sugar" = 1) + result_amount = 3 + +/datum/chemical_reaction/drinks/wormblood + name = "Wormblood" + id = "wormblood" + result = "wormblood" + required_reagents = list("booger" = 1, "psilocybin" = 1) + result_amount = 2 + diff --git a/icons/obj/drinks_yw.dmi b/icons/obj/drinks_yw.dmi new file mode 100644 index 0000000000..9163728bf0 Binary files /dev/null and b/icons/obj/drinks_yw.dmi differ diff --git a/vorestation.dme b/vorestation.dme index d916074e8e..c81e8b2703 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -3306,6 +3306,7 @@ #include "code\modules\reagents\Chemistry-Reagents_vr.dm" #include "code\modules\reagents\Chemistry-Recipes.dm" #include "code\modules\reagents\Chemistry-Recipes_vr.dm" +#include "code\modules\reagents\Chemistry-Recipes_yw.dm" #include "code\modules\reagents\kelshark.dm" #include "code\modules\reagents\reagent_containers.dm" #include "code\modules\reagents\reagent_dispenser.dm" @@ -3313,6 +3314,7 @@ #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Dispenser.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks_vr.dm" +#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks_yw.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Medicine.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Medicine_vr.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Modifiers.dm"