From 67fcd2e6e460da39939872bc276f63ad890e2334 Mon Sep 17 00:00:00 2001 From: MDReckless Date: Mon, 28 Oct 2013 11:24:45 -0400 Subject: [PATCH 01/11] Grape Soda Adds grape soda as a recipe --- code/modules/reagents/Chemistry-Recipes.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 07c1c77869..f9451472ce 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1790,6 +1790,14 @@ datum result = "barefoot" required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1) result_amount = 3 + + grapesoda //Allows Grape Soda to be made + name = "Grape Soda" + id = "grapesoda" + result = "grapesoda" + required_reagents = list("grapejuice" = 2, "cola" = 1) + result_amount = 3 + ////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri///// From 3946e8c30b3f8439fe4ccf9b88d9f786da976a4a Mon Sep 17 00:00:00 2001 From: MDReckless Date: Mon, 28 Oct 2013 11:33:35 -0400 Subject: [PATCH 02/11] Create drinks2.dmi --- icons/obj/drinks2.dmi | 1 + 1 file changed, 1 insertion(+) create mode 100644 icons/obj/drinks2.dmi diff --git a/icons/obj/drinks2.dmi b/icons/obj/drinks2.dmi new file mode 100644 index 0000000000..9daeafb986 --- /dev/null +++ b/icons/obj/drinks2.dmi @@ -0,0 +1 @@ +test From 994339acb60858d8228071db1985c863ce11373d Mon Sep 17 00:00:00 2001 From: MDReckless Date: Mon, 28 Oct 2013 11:34:35 -0400 Subject: [PATCH 03/11] Delete drinks2.dmi --- icons/obj/drinks2.dmi | 1 - 1 file changed, 1 deletion(-) delete mode 100644 icons/obj/drinks2.dmi diff --git a/icons/obj/drinks2.dmi b/icons/obj/drinks2.dmi deleted file mode 100644 index 9daeafb986..0000000000 --- a/icons/obj/drinks2.dmi +++ /dev/null @@ -1 +0,0 @@ -test From 809a7faf58df2a8abc8e5b9b13a80c4dca9e50e9 Mon Sep 17 00:00:00 2001 From: MDReckless Date: Mon, 28 Oct 2013 14:45:36 -0400 Subject: [PATCH 04/11] Adding Grapes to the Juicer allow list Grapes grown from hydroponics can now be juiced --- code/modules/reagents/Chemistry-Machinery.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index ce4fef22d8..50770700d1 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -870,6 +870,8 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/lime = list("limejuice" = 0), /obj/item/weapon/reagent_containers/food/snacks/watermelonslice = list("watermelonjuice" = 0), /obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries = list("poisonberryjuice" = 0), + /obj/item/weapon/reagent_containers/food/snacks/grown/grapes = "grapejuice" + ) From 811a4b1aa9e6ec35f5729152e114a428be7e6095 Mon Sep 17 00:00:00 2001 From: MDReckless Date: Mon, 28 Oct 2013 14:57:08 -0400 Subject: [PATCH 05/11] Adds Grape Soda as a reagent Allows grape soda in a beaker and gives it color --- code/modules/reagents/Chemistry-Reagents.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 8f16252455..1929b5c402 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -2347,6 +2347,13 @@ datum id = "grapejuice" description = "It's grrrrrape!" color = "#863333" // rgb: 134, 51, 51 + + drink/grapesoda + name = "Grape Soda" + id = "grapesoda" + description = "Grapes turned into soda!" + color = "#421C52" // rgb: 98, 57, 53 + adj_drowsy = -3 drink/poisonberryjuice name = "Poison Berry Juice" From 39d312e69dacbafd9c29c19145039664f795ea16 Mon Sep 17 00:00:00 2001 From: MDReckless Date: Mon, 28 Oct 2013 15:00:21 -0400 Subject: [PATCH 06/11] Removed grape juice from unneeded area --- code/modules/reagents/Chemistry-Machinery.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 50770700d1..ce4fef22d8 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -870,8 +870,6 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/lime = list("limejuice" = 0), /obj/item/weapon/reagent_containers/food/snacks/watermelonslice = list("watermelonjuice" = 0), /obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries = list("poisonberryjuice" = 0), - /obj/item/weapon/reagent_containers/food/snacks/grown/grapes = "grapejuice" - ) From 152d83d47cbce560dc0b602274fa2bb764be0a71 Mon Sep 17 00:00:00 2001 From: MDReckless Date: Mon, 28 Oct 2013 15:02:14 -0400 Subject: [PATCH 07/11] Update drinkingglass.dm --- .../reagent_containers/food/drinks/drinkingglass.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm index 2aec56dc0a..a8ebbe1e82 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm @@ -1,5 +1,4 @@ - /obj/item/weapon/reagent_containers/food/drinks/drinkingglass name = "glass" desc = "Your standard drinking glass." @@ -434,6 +433,10 @@ icon_state = "grapejuice" name = "Glass of grape juice" desc = "It's grrrrrape!" + if("grapesoda") + icon_state = "grapesoda" + name = "Can of Grape Soda" + desc = "Looks like a delicious drank!" if("icetea") icon_state = "icedteaglass" name = "Iced Tea" @@ -499,4 +502,4 @@ New() ..() reagents.add_reagent("cola", 50) - on_reagent_change() \ No newline at end of file + on_reagent_change() From e6d42432ff0c857cd7640f4e77e9d36485ea600e Mon Sep 17 00:00:00 2001 From: MDReckless Date: Mon, 28 Oct 2013 15:03:30 -0400 Subject: [PATCH 08/11] Changed grape soda description --- code/modules/reagents/Chemistry-Reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 1929b5c402..76c421c551 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -2351,7 +2351,7 @@ datum drink/grapesoda name = "Grape Soda" id = "grapesoda" - description = "Grapes turned into soda!" + description = "Grapes made into a fine drank." color = "#421C52" // rgb: 98, 57, 53 adj_drowsy = -3 From 98359a52dbfd5507c9d81ce739fa06b23d2224e5 Mon Sep 17 00:00:00 2001 From: MDReckless Date: Mon, 28 Oct 2013 15:47:17 -0400 Subject: [PATCH 09/11] Added grape soda and juice sprites. Due to someone else making the sprite before me I included mine with (mdr) in the front in case it's chosen instead. --- icons/obj/drinks.dmi | Bin 65274 -> 66215 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 8bbcfbe54e7147e94b45634a1f74014043a550d4..0ea105e7e3c361699801b740e4239c956c4a7b34 100644 GIT binary patch delta 10585 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 KsTv8R!2bcm+p(4a delta 9636 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 Date: Mon, 28 Oct 2013 15:55:54 -0400 Subject: [PATCH 11/11] Update drinkingglass.dm --- .../reagents/reagent_containers/food/drinks/drinkingglass.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm index a8ebbe1e82..2c08c1ce60 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm @@ -1,4 +1,5 @@ - + + /obj/item/weapon/reagent_containers/food/drinks/drinkingglass name = "glass" desc = "Your standard drinking glass."