From 5736094ff57362b0d4b93b0c0145f78e1f020c0d Mon Sep 17 00:00:00 2001 From: SplinterGP Date: Fri, 12 Jun 2020 11:39:38 -0300 Subject: [PATCH 1/3] quick fix for bulldog drink --- code/modules/reagents/Chemistry-Recipes_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm index 195f926c25..61ecfb4a3a 100644 --- a/code/modules/reagents/Chemistry-Recipes_vr.dm +++ b/code/modules/reagents/Chemistry-Recipes_vr.dm @@ -161,7 +161,7 @@ name = "Space Bulldog" id = "bulldog" result = "bulldog" - required_reagents = list("blackrussian" = 3, "cola" =1, "cream" =1) + required_reagents = list("blackrussian" = 3, "cola" =1) // YW edit, cream makes it turn into white russian, when they change on vorestation and we update, can change this result_amount = 5 /datum/chemical_reaction/drinks/sbagliato From c99ca9a04bf276d57f6e4fcb760394f194cf37d8 Mon Sep 17 00:00:00 2001 From: SplinterGP Date: Fri, 12 Jun 2020 17:11:00 -0300 Subject: [PATCH 2/3] puts strawberry love potion back --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 6 +++--- code/modules/reagents/Chemistry-Recipes.dm | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) 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 d528f7bda5..a593a5cc86 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/lovepotion - name = "Love Potion" - id = "lovepotion" +/datum/reagent/drink/strawberrylovepotion //ywedit + name = "Strawberry Love Potion" //ywedit + id = "strawberrylovepotion" //ywedit 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-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index b2591d992f..f96e757a0d 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/lovepotion - name = "Love Potion" - id = "lovepotion" - result = "lovepotion" +/datum/chemical_reaction/drinks/strawberrylovepotion //ywedit start + name = "Strawberry Love Potion" + id = "strawberrylovepotion" + result = "strawberrylovepotion" //ywedit end required_reagents = list("cream" = 1, "berryjuice" = 1, "sugar" = 1) result_amount = 3 From c8b4b944ec58f94b39b7019a6834147c5f269705 Mon Sep 17 00:00:00 2001 From: SplinterGP Date: Fri, 12 Jun 2020 20:05:09 -0300 Subject: [PATCH 3/3] adds drinks from yw --- .../Chemistry-Reagents-Food-Drinks.dm | 6 ++-- .../Chemistry-Reagents-Food-Drinks_yw.dm | 29 ++++++++++++++++++ code/modules/reagents/Chemistry-Recipes.dm | 8 ++--- code/modules/reagents/Chemistry-Recipes_yw.dm | 14 +++++++++ icons/obj/drinks_yw.dmi | Bin 0 -> 315 bytes vorestation.dme | 2 ++ 6 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_yw.dm create mode 100644 code/modules/reagents/Chemistry-Recipes_yw.dm create mode 100644 icons/obj/drinks_yw.dmi 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 0000000000000000000000000000000000000000..9163728bf0c857b57e45a68c569c05e8a6c25021 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*8>L*q^73U*Vivww#>$Y z!QY!9IhLWRiedE$c2A%h#*!evU5|`BC)e_1!5cyiE*d|0q;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTT7 zrOkc~b4_)7d)LlxW7W+oBs9`a9Gw|9WyWl-L~ZRIzjikCvN0SKmVOZa^kfRq;s{R{ z#}JK)$q5VO1w=xO%*>9dA9x@nC3UJHT)||mP45B+OUA|`CMG=xS&e0jxOX(1aS?MA zFKFaC;JSgU!S|>#gAij=KnzpD#DFIXhXfcp85o)67;6|97HqW${PBCwGN2s{p00i_ I>zopr0MVarcmMzZ literal 0 HcmV?d00001 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"