diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index b4bc29c6567..ec0138a6d67 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -1374,7 +1374,12 @@ /obj/item/reagent_containers/food/drinks/cans/zorasoda/cthur = 5, /obj/item/reagent_containers/food/drinks/cans/zorasoda/venomgrass = 5, /obj/item/reagent_containers/food/drinks/cans/zorasoda/kois = 5, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/drone = 5 + /obj/item/reagent_containers/food/drinks/cans/zorasoda/drone = 5, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/mixedberry = 5, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/lemonlime = 5, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/xuizi = 5, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/dyn = 5, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/buzz = 5 ) contraband = list( /obj/item/reagent_containers/food/drinks/cans/zorasoda/hozm = 5 @@ -1389,7 +1394,12 @@ /obj/item/reagent_containers/food/drinks/cans/zorasoda/cthur = 29, /obj/item/reagent_containers/food/drinks/cans/zorasoda/venomgrass = 29, /obj/item/reagent_containers/food/drinks/cans/zorasoda/kois = 29, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/drone = 29 + /obj/item/reagent_containers/food/drinks/cans/zorasoda/drone = 29, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/mixedberry = 29, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/lemonlime = 29, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/xuizi = 29, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/dyn = 29, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/buzz = 29 ) idle_power_usage = 211 temperature_setting = -1 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 d72894aa7d6..395d8b017ed 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -5815,17 +5815,32 @@ taste_description = "fruity grape" /singleton/reagent/drink/zorasoda/klax - name = "K'laxan Energy Crush" + name = "K'lax Energy Crush" description = "An orange zest cream soda with a delicious smooth taste." color = "#E78108" taste_description = "fizzy and creamy orange zest" +/singleton/reagent/drink/zorasoda/xuizi + name = "K'lax Xuizi Xplosion" + description = "A fizzy soda, made with genuine xuizi juice." + color = "#91de47" + taste_description = "sparkling cactus water" + species_taste_description = list( + SPECIES_UNATHI = "an electric kick of strawberry and watermelon" + ) + /singleton/reagent/drink/zorasoda/cthur name = "C'thur Rockin' Raspberry" description = "A raspberry concoction you're pretty sure is already on recall." color = "#0000CD" taste_description = "sweet flowery raspberry" +/singleton/reagent/drink/zorasoda/dyn + name = "C'thur Dyn-A-Mite" + description = "Tastes like dyn, if it punched you in the mouth." + color = "#00e0e0" + taste_description = "an explosion of menthol" + /singleton/reagent/drink/zorasoda/venomgrass name = "Zo'ra Sour Venom Grass" description = "The milder version of High Energy Zorane Might. Still tastes like a cloud of angry stinging acidic bees, though." @@ -5851,6 +5866,24 @@ color = "#DCD9CD" taste_description = "sugary cabbage" +/singleton/reagent/drink/zorasoda/mixedberry + name = "Zo'ra Caprician Craze" + description = "A mixed berry soda. Which berries are those? You can't tell!" + color = "#F9190F" + taste_description = "energizing berries" + +/singleton/reagent/drink/zorasoda/lemonlime + name = "Zo'ra Seismic Slammer" + description = "A potently effervescent lemon-lime energy drink." + color = "#E3E3E3" + taste_description = "electric zestiness" + +/singleton/reagent/drink/zorasoda/buzz + name = "Buzzin' Cola" + description = "A remarkably bubbly cola flavoured energy drink." + color = "#3C090B" + taste_description = "a fizzing swarm of cola" + /singleton/reagent/drink/zorasoda/drone name = "Vaurca Drone Fuel" description = "It's as thick as syrup and smells of gasoline. Why." diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 427b6995c39..af49e4ef3f2 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -376,12 +376,19 @@ reagents_to_add = list(/singleton/reagent/drink/zorasoda/phoron = 30) /obj/item/reagent_containers/food/drinks/cans/zorasoda/klax - name = "\improper K'laxan Energy Crush" + name = "\improper K'lax Energy Crush" desc = "A can of nitrogen-infused creamy orange zest flavoured Zo'ra Soda energy drink, with V'krexi additives. The smooth taste is engineered to near perfection." - icon_state = "klaxancrush" - item_state = "klaxancrush" + icon_state = "klaxcrush" + item_state = "klaxcrush" reagents_to_add = list(/singleton/reagent/drink/zorasoda/klax = 30) +/obj/item/reagent_containers/food/drinks/cans/zorasoda/xuizi + name = "\improper K'lax Xuizi Xplosion" + desc = "A can of xuizi flavoured Zo'ra Soda energy drink, with V'krexi additives. A refreshing taste for more than just unathi." + icon_state = "klaxxuizi" + item_state = "klaxxuizi" + reagents_to_add = list(/singleton/reagent/drink/zorasoda/xuizi = 30) + /obj/item/reagent_containers/food/drinks/cans/zorasoda/cthur name = "\improper C'thur Rockin' Raspberry" desc = "A can of \"blue raspberry\" flavoured Zo'ra Soda energy drink, with V'krexi additives. Tastes like a more flowery and aromatic raspberry." @@ -389,6 +396,13 @@ item_state = "cthurberry" reagents_to_add = list(/singleton/reagent/drink/zorasoda/cthur = 30) +/obj/item/reagent_containers/food/drinks/cans/zorasoda/dyn + name = "\improper C'thur Dyn-A-Mite" + desc = "A can of dyn flavoured Zo'ra Soda energy drink, with V'krexi additives. A blast of flavour, straight from Qerrbalak!" + icon_state = "cthurdyn" + item_state = "cthurdyn" + reagents_to_add = list(/singleton/reagent/drink/zorasoda/dyn = 30) + /obj/item/reagent_containers/food/drinks/cans/zorasoda/venomgrass name = "\improper Zo'ra Sour Venom Grass" desc = "A can of sour \"venom grass\" flavoured Zo'ra Soda energy drink, with V'krexi additives. Tastes like a cloud of angry stinging acidic bees." @@ -410,6 +424,27 @@ item_state = "koistwist" reagents_to_add = list(/singleton/reagent/drink/zorasoda/kois = 30) +/obj/item/reagent_containers/food/drinks/cans/zorasoda/mixedberry + name = "\improper Zo'ra Soda Caprician Craze" + desc = "A can of \"mixed berry\" flavoured Zo'ra Soda energy drink, with V'krexi additives. The number one drink in New Sedantis!" + icon_state = "capriciancraze" + item_state = "capriciancraze" + reagents_to_add = list(/singleton/reagent/drink/zorasoda/mixedberry = 30) + +/obj/item/reagent_containers/food/drinks/cans/zorasoda/lemonlime + name = "\improper Zo'ra Soda Seismic Slammer" + desc = "A can of \"lemon-lime\" flavoured Zo'ra Soda energy drink, with V'krexi additives. It'll knock you off your feet!" + icon_state = "seismicslammer" + item_state = "seismicslammer" + reagents_to_add = list(/singleton/reagent/drink/zorasoda/lemonlime = 30) + +/obj/item/reagent_containers/food/drinks/cans/zorasoda/buzz + name = "\improper Buzzin' Cola" + desc = "A can of cola flavoured energy drink, with V'krexi additives. Guaranteed to overwhelm your taste buds." + icon_state = "buzzinsoda" + item_state = "buzzinsoda" + reagents_to_add = list(/singleton/reagent/drink/zorasoda/buzz = 30) + /obj/item/reagent_containers/food/drinks/cans/zorasoda/drone name = "\improper Vaurca Drone Fuel" desc = "A can of industrial fluid flavoured Zo'ra Soda energy drink, with V'krexi additives, meant for Vaurca.
" + SPAN_DANGER(" WARNING: Known to induce vomiting in all species except vaurcae and dionae!") diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index adfd4e8ee60..12638b34723 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -96,6 +96,11 @@ var/list/lunchables_drinks_ = list( /obj/item/reagent_containers/food/drinks/cans/zorasoda/cthur, /obj/item/reagent_containers/food/drinks/cans/zorasoda/venomgrass, /obj/item/reagent_containers/food/drinks/cans/zorasoda/kois, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/mixedberry, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/lemonlime, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/xuizi, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/dyn, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/buzz ) var/list/lunchables_vaurca_ = list( diff --git a/html/changelogs/SimpleMaroon-zorasoda.yml b/html/changelogs/SimpleMaroon-zorasoda.yml new file mode 100644 index 00000000000..167d8ad3e32 --- /dev/null +++ b/html/changelogs/SimpleMaroon-zorasoda.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added five new flavors of soda to the Zo'ra soda machines: Zo'ra Caprician Craze, Zo'ra Seismic Slammer, Zo'ra Buzzin' Cola, K'lax Xuizi Xplosion, and C'thur Dyn-A-Mite!" + - spellcheck: "Changes 'K'laxan Energy Crush' to 'K'lax Energy Crush' in all code instances." diff --git a/icons/obj/item/reagent_containers/food/drinks/soda.dmi b/icons/obj/item/reagent_containers/food/drinks/soda.dmi index b6e359340f8..98cc3b635b5 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