diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 4e04aa1c855f..91c73bfd8aec 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -789,7 +789,9 @@ /obj/item/reagent_containers/food/drinks/bottle/small/sarsaparilla = 10, /obj/item/reagent_containers/food/drinks/cans/gingerale = 10, /obj/item/reagent_containers/food/drinks/cans/nicola = 10, + /obj/item/reagent_containers/food/drinks/cans/nicola_fire = 10, /obj/item/reagent_containers/food/drinks/cans/nicola_sakura = 10, + /obj/item/reagent_containers/food/drinks/cans/nicola_blue = 10, /obj/item/reagent_containers/food/drinks/cans/crystalgibb = 10, /obj/item/reagent_containers/food/drinks/cans/dr_gibb = 10, /obj/item/reagent_containers/food/drinks/cans/dr_gibb_cherry = 10, @@ -834,7 +836,9 @@ /obj/item/reagent_containers/food/drinks/bludboxlight = 35, /obj/item/reagent_containers/food/drinks/cans/coconutwater = 6, /obj/item/reagent_containers/food/drinks/cans/nicola = 2, + /obj/item/reagent_containers/food/drinks/cans/nicola_fire = 2, /obj/item/reagent_containers/food/drinks/cans/nicola_sakura = 2, + /obj/item/reagent_containers/food/drinks/cans/nicola_blue = 2, /obj/item/reagent_containers/food/drinks/cans/dr_gibb_cherry = 2, /obj/item/reagent_containers/food/drinks/cans/cola_cherry = 2, /obj/item/reagent_containers/food/drinks/cans/cola_coffee = 2, @@ -892,7 +896,9 @@ /obj/item/reagent_containers/food/drinks/cans/ochamidori = 10, /obj/item/reagent_containers/food/drinks/cans/ramune = 10, /obj/item/reagent_containers/food/drinks/cans/nicola = 10, + /obj/item/reagent_containers/food/drinks/cans/nicola_fire = 10, /obj/item/reagent_containers/food/drinks/cans/nicola_sakura = 10, + /obj/item/reagent_containers/food/drinks/cans/nicola_blue = 10, /obj/item/clothing/under/kimono = 5, /obj/item/clothing/under/kimono/yellow = 5, /obj/item/clothing/under/kimono/blue = 5, @@ -915,8 +921,10 @@ /obj/item/reagent_containers/food/snacks/bagged/wpeas = 5, /obj/item/reagent_containers/food/drinks/cans/ochamidori = 8, /obj/item/reagent_containers/food/drinks/cans/ramune = 10, - /obj/item/reagent_containers/food/drinks/cans/nicola = 10, - /obj/item/reagent_containers/food/drinks/cans/nicola_sakura = 10, + /obj/item/reagent_containers/food/drinks/cans/nicola = 2, + /obj/item/reagent_containers/food/drinks/cans/nicola_fire = 2, + /obj/item/reagent_containers/food/drinks/cans/nicola_sakura = 2, + /obj/item/reagent_containers/food/drinks/cans/nicola_blue = 2, /obj/item/clothing/under/kimono = 10, /obj/item/clothing/under/kimono/yellow = 10, /obj/item/clothing/under/kimono/blue = 10, diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 38b726b7213c..2fe71fded7be 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -275,9 +275,19 @@ . = ..() reagents.add_reagent("nicola", 30) +/obj/item/reagent_containers/food/drinks/cans/nicola_fire + name = "\improper NiCola Fire" + desc = "A can of crisp NiCola, spiked with flaming hot spices." + icon_state = "nicolafire" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/reagent_containers/food/drinks/cans/nicola_fire/Initialize(mapload) + . = ..() + reagents.add_reagent("nicolafire", 30) + /obj/item/reagent_containers/food/drinks/cans/nicola_sakura name = "\improper NiCola Sakura" - desc = "A can of crisp NiCola, subtly flavored with cherry." + desc = "A can of crisp NiCola, subtly flavored with cherry blossoms." icon_state = "nicolasakura" center_of_mass = list("x"=16, "y"=10) @@ -285,6 +295,16 @@ . = ..() reagents.add_reagent("nicolacherry", 30) +/obj/item/reagent_containers/food/drinks/cans/nicola_blue + name = "\improper NiCola Blue" + desc = "A limited edition can of crisp NiCola, paired with a mellow violet flavor." + icon_state = "nicolablue" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/reagent_containers/food/drinks/cans/nicola_blue/Initialize(mapload) + . = ..() + reagents.add_reagent("nicolablue", 30) + /obj/item/reagent_containers/food/drinks/cans/robustexpress name = "\improper Robust Express" desc = "Delicious caffeine awaits inside. It's pleasantly warm to the touch." diff --git a/code/modules/reagents/Drink-Recipes.dm b/code/modules/reagents/Drink-Recipes.dm index e653242761ac..ddfd1a745aa5 100644 --- a/code/modules/reagents/Drink-Recipes.dm +++ b/code/modules/reagents/Drink-Recipes.dm @@ -469,6 +469,13 @@ required_reagents = list("grenadine" = 1, "tonic" = 1, "cola" = 1) result_amount = 3 +/datum/chemical_reaction/drinks/nicola/fire + name = "NiCola Fire" + id = "nicolafire" + result = "nicolafire" + required_reagents = list("capsaicin" = 1, "nicola" = 1) + result_amount = 2 + /datum/chemical_reaction/drinks/nicola/cherry name = "NiCola Sakura" id = "nicolacherry" @@ -476,6 +483,13 @@ required_reagents = list("cherryjelly" = 1, "nicola" = 1) result_amount = 2 +/datum/chemical_reaction/drinks/nicola/blue + name = "NiCola Blue" + id = "nicolablue" + result = "nicolablue" + required_reagents = list("berryjuice" = 1, "nicola" = 1) + result_amount = 2 + /datum/chemical_reaction/drinks/cherrycola name = "Space Cola Cherry" id = "dr_gibbcherry" 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 f4669a9cc67b..2002f672f14e 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1796,16 +1796,36 @@ glass_name = "NiCola" glass_desc = "A glass of imported Japanese NiCola." +/datum/reagent/drink/soda/nicola/fire + name = "NiCola Fire" + id = "nicolafire" + description = "Cool imported cola mixed with firey hot spices." + taste_description = "cough syrup, capsaicin, and cola" + color = "#271402" + + glass_name = "NiCola Fire" + glass_desc = "A glass of spicy Japanese NiCola Fire." + /datum/reagent/drink/soda/nicola/cherry name = "NiCola Sakura" id = "nicolacherry" description = "Originally a limited flavor, brought back by popular demand." - taste_description = "cherry cough syrup and cola" + taste_description = "cough syrup, cherry blossoms, and cola" color = "#271402" glass_name = "NiCola Sakura" glass_desc = "A glass of limited edition NiCola Sakura." +/datum/reagent/drink/soda/nicola/blue + name = "NiCola Blue" + id = "nicolablue" + description = "A limited edition NiCola flavor praised for its refreshing taste." + taste_description = "cough syrup, violets, and cola" + color = "#271402" + + glass_name = "NiCola Blue" + glass_desc = "A glass of limited edition NiCola Blue." + /datum/reagent/drink/shirley_temple name = "Shirley Temple" id = "shirley_temple" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 25a51ce6d049..7681cf759ca4 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ