diff --git a/code/modules/cooking/machinery/commissary.dm b/code/modules/cooking/machinery/commissary.dm index bb89d7ca255..d2d0143c214 100644 --- a/code/modules/cooking/machinery/commissary.dm +++ b/code/modules/cooking/machinery/commissary.dm @@ -436,6 +436,7 @@ /obj/item/reagent_containers/food/drinks/cans/root_beer = 5, /obj/item/reagent_containers/food/drinks/cans/iced_tea = 5, /obj/item/reagent_containers/food/drinks/cans/grape_juice = 5, + /obj/item/reagent_containers/food/drinks/cans/cherry_juice = 5, /obj/item/reagent_containers/food/drinks/zobo = 5, // Skrell /obj/item/reagent_containers/food/drinks/cans/dyn = 5, diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_coalition.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_coalition.dm index 94dd9fd9c24..9bb18633741 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_coalition.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_coalition.dm @@ -92,6 +92,17 @@ glass_name = "glass of Xanu Rush!" glass_desc = "Made from the NEW Xanu Prime peaches." +/singleton/reagent/drink/cherrysoda + name = "Drosiá Cherry" + description = "Assunzione's number two drink!" + color = "#FF0000" + taste_description = "sparkly sweet cherries" + carbonated = TRUE + + glass_icon_state = "glass_red" + glass_name = "glass of Drosiá Cherry" + glass_desc = "Assunzione's number two drink!" + // // Milk // diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_drinks.dm index 2270fe38555..70a974a9c51 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_drinks.dm @@ -1411,16 +1411,16 @@ glass_desc = "A tangy substance made of 0.5% natural citrus!" /singleton/reagent/drink/grapesoda - name = "Grape Soda" - description = "Grapes made into a fine drank." + name = "Drosiá Grape" + description = "Only the second best thing made of grapes to come out of Assunzione." color = "#421C52" adj_drowsy = -3 taste_description = "grape soda" carbonated = TRUE glass_icon_state = "gsodaglass" - glass_name = "glass of grape soda" - glass_desc = "Looks like a delicious drink!" + glass_name = "glass of Drosiá Grape" + glass_desc = "Only the second best thing made of grapes to come out of Assunzione." /singleton/reagent/drink/brownstar name = "Orange Starshine" diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 18aeb200c12..9578a591541 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -314,14 +314,23 @@ reagents_to_add = list(/singleton/reagent/drink/icetea = 30) /obj/item/reagent_containers/food/drinks/cans/grape_juice - name = "\improper Grapel juice" - desc = "500 pages of rules of how to appropriately enter into a combat with this juice!" + name = "\improper Drosiá Grape soda" + desc = "Wine's cheaper, bubblier none alcoholic cousin. Drosiá is popular on Assunzione, but makes only a fraction compared to wine on the export market." icon_state = "grapesoda" item_state = "grapesoda" center_of_mass = list("x"=16, "y"=10) reagents_to_add = list(/singleton/reagent/drink/grapejuice = 30) +/obj/item/reagent_containers/food/drinks/cans/cherry_juice + name = "\improper Drosiá Cherry soda" + desc = "Fruity and overbearingly sweet. Drosiá is popular on Assunzione, but makes only a fraction compared to wine on the export market." + icon_state = "cherrysoda" + item_state = "cherrysoda" + center_of_mass = list("x"=16, "y"=10) + + reagents_to_add = list(/singleton/reagent/drink/cherrysoda = 30) + /obj/item/reagent_containers/food/drinks/cans/tonic name = "\improper T-Borg's tonic water" desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." diff --git a/code/modules/reagents/reagent_containers/food/drinks/yoke.dm b/code/modules/reagents/reagent_containers/food/drinks/yoke.dm index 7aa96d8bcdb..dcfde8b4d41 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/yoke.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/yoke.dm @@ -103,6 +103,7 @@ /obj/item/reagent_containers/food/drinks/cans/lemon_lime, /obj/item/reagent_containers/food/drinks/cans/iced_tea, /obj/item/reagent_containers/food/drinks/cans/grape_juice, + /obj/item/reagent_containers/food/drinks/cans/cherry_juice, /obj/item/reagent_containers/food/drinks/cans/tonic, /obj/item/reagent_containers/food/drinks/cans/sodawater, /obj/item/reagent_containers/food/drinks/cans/root_beer, @@ -172,6 +173,9 @@ /obj/item/storage/box/fancy/yoke/grape_juice starts_with = list(/obj/item/reagent_containers/food/drinks/cans/grape_juice = 6) +/obj/item/storage/box/fancy/yoke/cherry_juice + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/cherry_juice = 6) + /obj/item/storage/box/fancy/yoke/tonic starts_with = list(/obj/item/reagent_containers/food/drinks/cans/tonic = 6) diff --git a/html/changelogs/fyni-drosia-soda.yml b/html/changelogs/fyni-drosia-soda.yml new file mode 100644 index 00000000000..e3fe70ef577 --- /dev/null +++ b/html/changelogs/fyni-drosia-soda.yml @@ -0,0 +1,4 @@ +author: fyni +delete-after: True +changes: + - rscadd: "Adds Drosiá Cherry soda, and rejigs the grape soda to be Drosiá Grape soda. Assunzione's favourite soft drink!" \ No newline at end of file diff --git a/icons/obj/item/reagent_containers/food/drinks/soda.dmi b/icons/obj/item/reagent_containers/food/drinks/soda.dmi index 503d0a59868..7600129da5b 100644 Binary files a/icons/obj/item/reagent_containers/food/drinks/soda.dmi and b/icons/obj/item/reagent_containers/food/drinks/soda.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 7a3fea72f97..8aa593f8c3c 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ