Adds Cider Bottles (#6201)

* Adds Cider

How has SS13 alcohol gone on so long without cider? Let's fix that.

* Update cartridge_presets.dm

* Update dispenser2_energy.dm

* Update dispenser_presets.dm

* Adds cider bottle sprite + adds to borgs

* Update Chemistry-Reagents-Food-Drinks.dm

* Removes additional cider entry

code/game/machinery/vending.dm

@@ -706,6 +706,7 @@
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 15,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 15,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/small/cider = 15,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 5,

code/modules/food/drinkingglass/metaglass.dm

@@ -546,3 +546,7 @@ Drinks Data
 /datum/reagent/drink/eggnog
 	glass_icon_state = "eggnog"
 	glass_center_of_mass = list("x"=16, "y"=8)
+
+/datum/reagent/drink/cider
+	glass_icon_state = "ciderglass"
+	glass_center_of_mass = list("x"=16, "y"=8)

code/modules/food/food/drinks/bottle.dm

@@ -520,6 +520,17 @@
 	. = ..()
 	reagents.add_reagent("beer", 30)
 
+/obj/item/weapon/reagent_containers/food/drinks/bottle/small/cider
+	name = "Crisp's Cider"
+	desc = "Fermented apples never tasted this good."
+	icon_state = "cider"
+	center_of_mass = list("x"=16, "y"=12)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/small/cider/Initialize()
+	. = ..()
+	reagents.add_reagent("cider", 30)
+
+
 /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale
 	name = "\improper Magm-Ale"
 	desc = "A true dorf's drink of choice."

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

@@ -1854,6 +1854,7 @@
 
 	glass_name = "cider"
 	glass_desc = "The second most Irish drink."
+	glass_special = list(DRINK_FIZZ)
 
 // Cocktails
 
@@ -3207,4 +3208,4 @@
 	strength = 9
 
 	glass_name = "fusionnaire"
-	glass_desc = "A relatively new cocktail, mostly served in the bars of NanoTrasen owned stations."
+	glass_desc = "A relatively new cocktail, mostly served in the bars of NanoTrasen owned stations."

code/modules/reagents/dispenser/cartridge_presets.dm

@@ -45,6 +45,7 @@
 	ale			spawn_reagent = "ale"
 	mead		spawn_reagent = "mead"
 	bitters		spawn_reagent = "bitters"
+	cider		spawn_reagent = "cider"
 
 	// Bar, soft
 	ice			spawn_reagent = "ice"

code/modules/reagents/dispenser/dispenser2_energy.dm

@@ -52,11 +52,11 @@
 /obj/machinery/chemical_dispenser/bar_alc
 	dispense_reagents = list(
 		"lemon_lime", "sugar", "orangejuice", "limejuice", "sodawater", "tonic", "beer", "kahlua",
-		"whiskey", "wine", "vodka", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters"
+		"whiskey", "wine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters"
 		)
 
 /obj/machinery/chemical_dispenser/bar_coffee
 	dispense_reagents = list(
 		"coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice",
 		"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint"
-		)
+		)

code/modules/reagents/dispenser/dispenser_presets.dm

@@ -111,6 +111,7 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/cider,			
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/ale,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/mead
 		)
@@ -139,4 +140,4 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/berry,
 
 
-		)
+		)

code/modules/reagents/reagent_containers/borghydro.dm

@@ -132,7 +132,7 @@
 	recharge_time = 3
 	volume = 60
 	possible_transfer_amounts = list(5, 10, 20, 30)
-	reagent_ids = list("ale", "beer", "berryjuice", "bitters", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "gingerale", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sake", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine")
+	reagent_ids = list("ale", "cider", "beer", "berryjuice", "bitters", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "gingerale", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sake", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine")
 
 /obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user)
 	return