Merge remote-tracking branch 'upstream/master' into more-reagents

code/modules/reagents/Chemistry-Holder.dm

@@ -334,7 +334,7 @@ datum
 
 								var/list/seen = viewers(4, get_turf(my_atom))
 								for(var/mob/M in seen)
-									M << "\blue \icon[my_atom] [C.mix_message]."
+									M << "\blue \icon[my_atom] [C.mix_message]"
 
 							/*	if(istype(my_atom, /obj/item/slime_core))
 									var/obj/item/slime_core/ME = my_atom

code/modules/reagents/Chemistry-Reagents.dm

@@ -2479,6 +2479,12 @@ datum
 					M:jitteriness = max(M:jitteriness-3,0)
 					return
 
+			cider
+				name = "Cider"
+				id = "cider"
+				description = "An alcoholic beverage derived from apples."
+				color = "#174116"
+
 			whiskey
 				name = "Whiskey"
 				id = "whiskey"
@@ -2576,15 +2582,18 @@ datum
 				dizzy_adj = 4
 				confused_start = 115	//amount absorbed after which mob starts confusing directions
 
-			hooch
-				name = "Hooch"
-				id = "hooch"
-				description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?"
-				color = "#664300" // rgb: 102, 67, 0
-				dizzy_adj = 6
-				slurr_adj = 5
-				slur_start = 35			//amount absorbed after which mob starts slurring
-				confused_start = 90	//amount absorbed after which mob starts confusing directions
+			suicider //otherwise known as "I want to get so smashed my liver gives out and I die from alcohol poisoning".
+				name = "Suicider"
+				id = "suicider"
+				description = "An unbelievably strong and potent variety of Cider."
+				color = "#CF3811"
+				dizzy_adj = 20
+				slurr_adj = 20
+				confused_adj = 3
+				slur_start = 15
+				confused_start = 40
+				blur_start = 60
+				pass_out = 80
 
 			ale
 				name = "Ale"

code/modules/reagents/Chemistry-Recipes.dm

@@ -1250,12 +1250,13 @@ datum
 			required_reagents = list ("beer" = 1, "ale" = 2)
 			result_amount = 3
 
-		hooch
-			name = "Hooch"
-			id = "hooch"
-			result = "hooch"
-			required_reagents = list ("sugar" = 1, "ethanol" = 2, "fuel" = 1)
-			result_amount = 3
+		suicider
+			name = "Suicider"
+			id = "suicider"
+			result = "suicider"
+			required_reagents = list ("vodka" = 1, "cider" = 1, "fuel" = 1, "epinephrine" = 1)
+			result_amount = 4
+			mix_message = "The drinks and chemicals mix together, emitting a potent smell."
 
 		irish_coffee
 			name = "Irish Coffee"

code/modules/reagents/newchem/toxins.dm

@@ -328,7 +328,6 @@ datum/reagent/initropidril/on_mob_life(var/mob/living/M as mob)
 			if(3)
 				var/mob/living/carbon/human/H = M
 				if(!H.heart_attack)
-					H.visible_message("<span class = 'userdanger'>[H] clutches at their chest!</span>")
 					H.heart_attack = 1 // rip in pepperoni
 	..()
 	return
@@ -346,7 +345,6 @@ datum/reagent/concentrated_initro/on_mob_life(var/mob/living/M as mob)
 	if(volume >=5)
 		var/mob/living/carbon/human/H = M
 		if(!H.heart_attack)
-			H.visible_message("<span class = 'userdanger'>[H] clutches at their chest!</span>")
 			H.heart_attack = 1 // rip in pepperoni
 
 datum/reagent/pancuronium

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

@@ -96,6 +96,10 @@
 					icon_state = "beerglass"
 					name = "Beer glass"
 					desc = "A freezing pint of beer"
+				if("cider")
+					icon_state = "rewriter"
+					name = "Cider"
+					desc = "a refreshing glass of traditional cider"
 				if("beer2")
 					icon_state = "beerglass"
 					name = "Beer glass"
@@ -312,9 +316,9 @@
 					icon_state = "irishcoffeeglass"
 					name = "Irish Coffee"
 					desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
-				if("hooch")
-					icon_state = "glass_brown2"
-					name = "Hooch"
+				if("suicider")
+					icon_state = "suicider"
+					name = "Suicider"
 					desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
 				if("whiskeysoda")
 					icon_state = "whiskeysodaglass2"

code/modules/reagents/reagent_containers/glass.dm

@@ -247,6 +247,8 @@
 ␍	volume = 50
 ␍	amount_per_transfer_from_this = 10
 ␍	flags = OPENCONTAINER | NOREACT
+	
+	origin_tech = "materials=2"
 
 ␍/obj/item/weapon/reagent_containers/glass/beaker/bluespace
 ␍	name = "bluespace beaker"
@@ -257,6 +259,8 @@
 ␍	amount_per_transfer_from_this = 10
 ␍	possible_transfer_amounts = list(5,10,15,25,30,50,100,300)
 ␍	flags = OPENCONTAINER
+	
+	origin_tech = "bluespace=2;materials=6"
 
 ␍/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
 ␍	New()

code/modules/reagents/reagent_containers/glass/bottle.dm

@@ -250,4 +250,16 @@
 	icon_state = "rbottle"
 	New()
 		..()
-		reagents.add_reagent("formaldehyde", 50)
+		reagents.add_reagent("formaldehyde", 50)
+
+
+////////////////////Traitor Poison Bottle//////////////////////////////
+
+/obj/item/weapon/reagent_containers/glass/bottle/traitor
+	desc = "It has a small skull and crossbones on it. Uh-oh!"
+	possible_transfer_amounts = list(5,10,15,25,30,40)
+	volume = 40
+
+	New()
+		..()
+		reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","sarin","histamine","venom","cyanide"), 40)

code/modules/reagents/syringe_gun.dm

@@ -64,4 +64,5 @@
 	name = "rapid syringe gun"
 	desc = "A modification of the syringe gun design, using a rotating cylinder to store up to six syringes."
 	icon_state = "rapidsyringegun"
-	max_syringes = 6
+	max_syringes = 6
+	origin_tech="combat=3;materials=3;engineering=3;biotech=2"