diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 381259e1207..82086d69e49 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -281,6 +281,8 @@ /obj/item/reagent_containers/food/snacks/spacetwinkie = 6, /obj/item/reagent_containers/food/snacks/cheesiehonkers = 6, /obj/item/reagent_containers/food/snacks/tastybread = 6, + /obj/item/storage/box/pineapple = 4, + /obj/item/reagent_containers/food/snacks/chocolatebar = 6, /obj/item/storage/box/fancy/cookiesnack = 6, /obj/item/storage/box/fancy/gum = 4, /obj/item/clothing/mask/chewable/candy/lolli = 8, @@ -312,6 +314,8 @@ /obj/item/reagent_containers/food/snacks/spacetwinkie = 15, /obj/item/reagent_containers/food/snacks/cheesiehonkers = 15, /obj/item/reagent_containers/food/snacks/tastybread = 18, + /obj/item/storage/box/pineapple = 20, + /obj/item/reagent_containers/food/snacks/chocolatebar = 12, /obj/item/storage/box/fancy/gum = 15, /obj/item/clothing/mask/chewable/candy/lolli = 2, /obj/item/storage/box/fancy/admints = 12, diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm index 19cdc352370..4e601a0e993 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm @@ -262,6 +262,7 @@ overdose = 10 strength = 1.5 // makes up for it with slight suffocation damage + glass_icon_state = "lean" glass_name = "glass of purple drank" glass_desc = "Bottoms up." 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 4f0a96c7ada..38a976d14f9 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1793,7 +1793,7 @@ taste_description = "cola" carbonated = TRUE - glass_icon_state = "glass_brown" + glass_icon_state = "spacecola" glass_name = "glass of Space Cola" glass_desc = "A glass of refreshing Space Cola" glass_center_of_mass = list("x"=17, "y"=6) @@ -1801,7 +1801,7 @@ /decl/reagent/drink/spacemountainwind name = "Mountain Wind" description = "Blows right through you like a space wind." - color = "#102000" + color = "#93230b" adj_drowsy = -7 adj_sleepy = -1 taste_description = "sweet citrus soda" @@ -1814,7 +1814,7 @@ /decl/reagent/drink/dr_gibb name = "Dr. Gibb" description = "A delicious blend of 42 different flavours" - color = "#102000" + color = "#93230b" adj_drowsy = -6 taste_description = "cherry soda" carbonated = TRUE @@ -3494,7 +3494,7 @@ /decl/reagent/drink/dr_gibb_diet name = "Diet Dr. Gibb" description = "A delicious blend of 42 different flavours, one of which is water." - color = "#102000" + color = "#93230b" taste_description = "watered down liquid sunshine" carbonated = TRUE @@ -4743,4 +4743,51 @@ glass_icon_state = "caprician_coffee" glass_name = "glass of caprician coffee" - glass_desc = "A Vaurcesian take on liqueur coffee, quickly becoming a favorite of the Zo'ra hive." \ No newline at end of file + glass_desc = "A Vaurcesian take on liqueur coffee, quickly becoming a favorite of the Zo'ra hive." + +/decl/reagent/alcohol/mojito + name = "Mojito" + description = "Originated from Sol, now popular all around the Spur." + strength = 30 + color = "#b6ecaa" + taste_description = "refreshing mint" + + glass_icon_state = "mojito" + glass_name = "glass of mojito" + glass_desc = "Originated from Sol, now popular all around the Spur." + +/decl/reagent/alcohol/zavdoskoi_mule + name = "Zavodskoi Mule" + description = "It is said to be Lyudmila Zavodskoi's favorite." + strength = 40 + color = "#EEF1AA" + taste_description = "refreshing spiciness" + + glass_icon_state = "zavodskoi_mule" + glass_name = "glass of zavodskoi mule" + glass_desc = "It is said to be Lyudmila Zavodskoi's favorite." + +/decl/reagent/alcohol/pina_colada + name = "Pina Colada" + description = "Prepared just like in Silversun." + strength = 30 + color = "#FFF1B2" + taste_description = "pineapple, coconut, and a hint of the ocean" + + glass_icon_state = "pina_colada" + glass_name = "glass of pina colada" + glass_desc = "Prepared just like in Silversun." + +/decl/reagent/drink/gibbfloats + name = "Gibb Floats" + description = "A floating soda of icecream and Dr. Gibb." + color = "#93230b" + taste_description = "cherry soda and icecream" + carbonated = TRUE + + glass_icon_state = "gibbfloats" + glass_name = "glass of gibb floats" + glass_desc = "A floating soda of icecream and Dr. Gibb." + + + diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 48f7f18c0fb..a54b7a4e407 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3518,4 +3518,32 @@ id = "caprician_coffee" result = /decl/reagent/drink/toothpaste/caprician_coffee required_reagents = list(/decl/reagent/drink/toothpaste = 1, /decl/reagent/drink/coffee = 2) + result_amount = 3 + +/datum/chemical_reaction/drink/mojito + name = "Mojito" + id = "mojito" + result = /decl/reagent/alcohol/mojito + required_reagents = list(/decl/reagent/drink/mintsyrup = 1, /decl/reagent/drink/limejuice = 1, /decl/reagent/alcohol/rum = 1) + result_amount = 3 + +/datum/chemical_reaction/drink/zavodskoi_mule + name = "Zavodskoi Mule" + id = "zavodskoi_mule" + result = /decl/reagent/alcohol/zavdoskoi_mule + required_reagents = list(/decl/reagent/alcohol/vodka = 2, /decl/reagent/drink/lemonjuice = 1) + result_amount = 3 + +/datum/chemical_reaction/drink/pina_colada + name = "Pina Colada" + id = "pina_colada" + result = /decl/reagent/alcohol/pina_colada + required_reagents = list(/decl/reagent/drink/pineapplejuice = 1, /decl/reagent/alcohol/rum = 2) + result_amount = 3 + +/datum/chemical_reaction/drink/gibbfloats + name = "Gibb Floats" + id = "gibbfloats" + result = /decl/reagent/drink/gibbfloats + required_reagents = list(/decl/reagent/drink/dr_gibb = 1, /decl/reagent/drink/ice = 1, /decl/reagent/drink/milk/cream = 1) result_amount = 3 \ No newline at end of file diff --git a/html/changelogs/desven-drinks.yml b/html/changelogs/desven-drinks.yml new file mode 100644 index 00000000000..2dd07e2152f --- /dev/null +++ b/html/changelogs/desven-drinks.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Desven + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added four new cocktails. Three alcoholic, one non-alcoholic. They are mojito, pina colada, Zavodskoi mule and Gibb Floats." + - rscadd: "Added a fancy new sprite for the Space Cola and for Lean." + - rscadd: "To account for the lack of pineapples, added the pineapple box to the Getmore vendor. Also, added a chocolate bar because it's really weird Getmore doesn't actually sell chocolates." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 400fabadcae..bb7a5e15ad6 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ