diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 8f16252455..76c421c551 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 made into a fine drank." + color = "#421C52" // rgb: 98, 57, 53 + adj_drowsy = -3 drink/poisonberryjuice name = "Poison Berry Juice" 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///// diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm index 2aec56dc0a..2c08c1ce60 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm @@ -1,5 +1,5 @@ - - + + /obj/item/weapon/reagent_containers/food/drinks/drinkingglass name = "glass" desc = "Your standard drinking glass." @@ -434,6 +434,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 +503,4 @@ New() ..() reagents.add_reagent("cola", 50) - on_reagent_change() \ No newline at end of file + on_reagent_change() diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 8bbcfbe54e..0ea105e7e3 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ