Holy water glass looks like water, IPC booze makes organics puke, more synth drinks

code/modules/reagents/newchem/drinks.dm

@@ -12,7 +12,6 @@
 	required_reagents = list("gintonic" = 1, "methamphetamine" = 1)
 	result_amount = 2
 	mix_message = "The drink turns electric blue and starts quivering violently."
-	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
 
 /datum/reagent/ginsonic/on_mob_life(var/mob/living/M as mob)
 	if(!M) M = holder.my_atom
@@ -63,7 +62,6 @@
 	result = "jackrose"
 	required_reagents = list("applejack" = 4, "lemonjuice" = 1)
 	result_amount = 5
-	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
 
 
 // ROBOT ALCOHOL PAST THIS POINT
@@ -76,13 +74,14 @@
 	description = "A runny liquid with conductive capacities. Its effects on synthetics are similar to those of alcohol on organics."
 	reagent_state = LIQUID
 	color = "#1BB1FF"
-	process_flags = SYNTHETIC
+	process_flags = ORGANIC | SYNTHETIC
 	metabolization_rate = 0.4
 	vomit_start = INFINITY		//
 	blur_start = INFINITY		//
 	pass_out = INFINITY			//INFINITY, so that IPCs don't puke and stuff
-	var/collapse_start = 200	//amount absorbed after wich mob starts collapsing
-	var/braindamage_start = 300 //amount absorbed after which mob starts taking small amount of brain damage
+	var/spark_start = 50	//amount absorbed after which mob starts sparking
+	var/collapse_start = 150	//amount absorbed after wich mob starts sparking and collapsing (DOUBLE THE SPARKS, DOUBLE THE FUN)
+	var/braindamage_start = 250 //amount absorbed after which mob starts taking a small amount of brain damage
 
 
 /datum/chemical_reaction/synthanol
@@ -96,16 +95,34 @@
 /datum/reagent/ethanol/synthanol/on_mob_life(var/mob/living/M as mob, var/alien)
 
 	var/d = data
+	if(M.isSynthetic()) //works normally on synthetics
+		if(d >= spark_start && prob(25))
+			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+			s.set_up(3, 1, M)
+			s.start()
+		if(d >= collapse_start && prob(10))
+			M.emote("collapse")
+			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+			s.set_up(3, 1, M)
+			s.start()
+		if(d >= braindamage_start && prob(33))
+			M.adjustBrainLoss(1)
 
-	if(d >= collapse_start && prob(10))
-		M.emote("collapse")
-		var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
-		s.set_up(3, 1, M)
-		s.start()
-	if(d >= braindamage_start && prob(33))
-		M.adjustBrainLoss(1)
+	else
+		holder.remove_reagent(id, 3.6) //gets removed from organics very fast
+		if(prob(25))
+			holder.remove_reagent(id, 15)
+			M.fakevomit()
 	..()
 
+datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+	if(!istype(M, /mob/living))
+		return
+	if(M.get_species() == "Machine")
+		return
+	if(method == INGEST)
+		M << pick("<span class = 'danger'>That was awful!</span>", "<span class = 'danger'>Yuck!</span>")
+
 /datum/reagent/ethanol/synthanol/robottears
 	name = "Robot Tears"
 	id = "robottears"
@@ -120,7 +137,6 @@
 	required_reagents = list("synthanol" = 1, "oil" = 1, "sodawater" = 1)
 	result_amount = 3
 	mix_message = "The ingredients combine into a stiff, dark goo."
-	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
 
 /datum/reagent/ethanol/synthanol/trinary
 	name = "Trinary"
@@ -136,7 +152,6 @@
 	required_reagents = list("synthanol" = 1, "limejuice" = 1, "orangejuice" = 1)
 	result_amount = 3
 	mix_message = "The ingredients mix into a colorful substance."
-	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
 
 /datum/reagent/ethanol/synthanol/servo
 	name = "Servo"
@@ -152,6 +167,46 @@
 	required_reagents = list("synthanol" = 2, "cream" = 1, "hot_coco" = 1)
 	result_amount = 4
 	mix_message = "The ingredients mix into a dark brown substance."
-	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
 
+/datum/reagent/ethanol/synthanol/uplink
+	name = "Uplink"
+	id = "uplink"
+	description = "A potent mix of alcohol and synthanol. Will only work on synthetics."
+	reagent_state = LIQUID
+	color = "#e7ae04"
+
+/datum/chemical_reaction/synthanol/uplink
+	name = "Uplink"
+	id = "uplink"
+	result = "uplink"
+	required_reagents = list("rum" = 1, "vodka" = 1, "tequilla" = 1, "whiskey" = 1, "synthanol" = 1)
+	result_amount = 5
+
+/datum/reagent/ethanol/synthanol/synthnsoda
+	name = "Synth 'n Soda"
+	id = "synthnsoda"
+	description = "The classic drink adjusted for a robot's tastes."
+	reagent_state = LIQUID
+	color = "#7204e7"
+
+/datum/chemical_reaction/synthanol/synthnsoda
+	name = "Synth 'n Soda"
+	id = "synthnsoda"
+	result = "synthnsoda"
+	required_reagents = list("synthanol" = 1, "cola" = 1)
+	result_amount = 2
+
+/datum/reagent/ethanol/synthanol/synthignon
+	name = "Synthignon"
+	id = "synthignon"
+	description = "Someone mixed wine and alcohol for robots. Hope you're proud of yourself."
+	reagent_state = LIQUID
+	color = "#d004e7"
+
+/datum/chemical_reaction/synthanol/synthignon
+	name = "Synthignon"
+	id = "synthignon"
+	result = "synthignon"
+	required_reagents = list("synthanol" = 1, "wine" = 1)
+	result_amount = 2
 // ROBOT ALCOHOL ENDS

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -580,6 +580,22 @@
 					icon_state = "servoglass"
 					name = "Glass of Servo"
 					desc = "Chocolate - based drink made for IPCs. Not sure if anyone's actually tried out the recipe."
+				if("synthnsoda")
+					icon_state = "synthnsodaglass"
+					name = "Glass of Synth 'n Soda"
+					desc = "Classic drink altered to fit the tastes of a robot. Bad idea to drink if you're made of carbon."
+				if("synthignon")
+					icon_state = "synthignonglass"
+					name = "Glass of Synthignon"
+					desc = "Someone mixed good wine and robot booze. Romantic, but atrocious."
+				if("uplink")
+					icon_state = "uplinkglass"
+					name = "Glass of Uplink"
+					desc = "An exquisite mix of the finest liquoirs and synthanol. Meant only for synthetics."
+				if("holywater")
+					icon_state = "glass_clear"
+					name = "Glass of Holy Water"
+					desc = "The contents of this glass seem to be filled with an energy of some kind."
 
 
 				else