Adds Skrell Drinks (#5963)

Adds Grape juice to the boozeomat and 5 new mixable Skrell drinks.

code/game/machinery/vending_types.dm

@@ -69,6 +69,7 @@
 		/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4,
 		/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4,
 		/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice = 4,
+		/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 6,
 		/obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,
 		/obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 8,
 		/obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 5,

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -3477,6 +3477,72 @@
 	glass_name = "glass of Winter Offensive"
 	glass_desc = "Proven to be more successful than the campaign."
 
+// Skrellian drinks
+//====================
+// Some are alocholic, some are not
+
+/datum/reagent/alcohol/ethanol/thirdincident
+	name = "The Third Incident"
+	id = "thirdincident"
+	color = "#1936a0"
+	strength = 10
+	description = "A controversial drink popular with the punk youth of the Jargon Federation. Represents blood, eggs, and tears."
+	taste_description = "genophage sadness"
+
+	glass_icon_state = "thirdincident"
+	glass_name = "glass of the Third Incident"
+	glass_desc = "A controversial drink popular with the punk youth of the Jargon Federation. Represents blood, eggs, and tears."
+
+/datum/reagent/drink/upsidedowncup
+	name = "Upside-Down Cup"
+	id = "upsidedowncup"
+	color = "#B2110A"
+	description = "An age-old part of Skrell culture. Even children know of the humor."
+	taste_description = "esoteric humor"
+
+	glass_icon_state = "upsidedowncup"
+	glass_name = "glass of Upside-Down Cup"
+	glass_desc = "An age-old part of Skrell culture. Even children know of the humor. It's not actually upside down."
+
+/datum/reagent/drink/smokinglizard
+	name = "Cigarette Lizard"
+	id = "cigarettelizard"
+	color = "#80C274"
+	description = "The amusement of Cigarette Lizard, now in a cup!"
+	taste_description = "minty sass"
+
+	glass_icon_state = "cigarettelizard"
+	glass_name = "glass of Cigarette Lizard"
+	glass_desc = "The amusement of Cigarette Lizard, now in a cup!"
+
+/datum/reagent/drink/coffee/sromshine
+	name = "Sromshine"
+	id = "sromshine"
+	color = "#A14702"
+	description = "The best part of waking up."
+	taste_description = "bitter citrus"
+
+	glass_icon_state = "sromshine"
+	glass_name = "cup of Sromshine"
+	glass_desc = "The best part of waking up."
+
+/datum/reagent/alcohol/ethanol/cbsc
+	name = "Complex Bluespace Calculation"
+	id = "cbsc"
+	color = "#000000"
+	strength = 25
+	description = "A loud bang. No, really, that's the joke. Skrell get a kick out of it."
+	taste_description = "fizzling spatiotemporal instability"
+
+	glass_icon_state = "cbsc"
+	glass_name = "glass of Complex Bluespace Calculation"
+	glass_desc = "A loud bang. No, really, that's the joke. Skrell get a kick out of it."
+
+/datum/reagent/alcohol/ethanol/cbsc/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+	..()
+	if(alien != IS_DIONA)
+		M.make_jittery(10)
+
 
 // Butanol-based alcoholic drinks
 //=====================================

code/modules/reagents/Chemistry-Recipes.dm

@@ -2899,6 +2899,44 @@
 	required_reagents = list("coffee" = 6, "pumpkinspice" = 2, "cream" = 2)
 	result_amount = 10
 
+//Skrell drinks. Bring forth the culture.
+//===========================================
+
+/datum/chemical_reaction/thirdincident
+	name = "The Third Incident"
+	id = "thirdincident"
+	result = "thirdincident"
+	required_reagents = list("egg" = 3, "bluecuracao" = 10, "grapejuice" = 10)
+	result_amount = 20
+
+/datum/chemical_reaction/upsidedowncup
+	name = "Upside-Down Cup"
+	id = "upsidedowncup"
+	result = "upsidedowncup"
+	required_reagents = list("dr_gibb" = 3, "ice" = 1, "lemonjuice" = 1)
+	result_amount = 5
+
+/datum/chemical_reaction/cigarettelizard
+	name = "Cigarette Lizard"
+	id = "cigarettelizard"
+	result = "cigarettelizard"
+	required_reagents = list("limejuice" = 2, "sodawater" = 2, "mintsyrup" = 1, "ice" = 1)
+	result_amount = 6
+
+/datum/chemical_reaction/sromshine
+	name = "Sromshine"
+	id = "sromshine"
+	result = "sromshine"
+	required_reagents = list("coffee" = 2, "orangejuice" = 1)
+	result_amount = 3
+
+/datum/chemical_reaction/cbsc
+	name = "Complex Bluespace Calculation"
+	id = "cbsc"
+	result = "cbsc"
+	required_reagents = list("wine" = 4, "vodka" = 2, "sodawater" = 3, "radium" = 1 )
+	result_amount = 10
+
 //transmutation
 
 /datum/chemical_reaction/transmutation_silver

html/changelogs/skrelldrinks.yml

@@ -0,0 +1,42 @@
+################################
+# 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: Conspiir
+
+# 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: "Adds five new mixable drinks based on Skrell culture and taste."
+  - rscadd: "Adds grape juice to the boozeomat."