Merge pull request #9960 from VOREStation/upstream-merge-7974

[MIRROR] Added Doctress' Jager drink.

code/datums/supplypacks/hospitality.dm

@@ -17,6 +17,7 @@
 			/obj/item/weapon/reagent_containers/food/drinks/bottle/patron,
 			/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager,
 			/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey,
+			/obj/item/weapon/reagent_containers/food/drinks/bottle/jager,
 			/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
 			/obj/item/weapon/lipstick/random,
 			/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 2,

code/game/machinery/vending_machines.dm

@@ -71,6 +71,7 @@
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/jager = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 15,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper = 15,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 15,

code/game/objects/random/misc.dm

@@ -362,6 +362,7 @@
 				/obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps,
 				/obj/item/weapon/reagent_containers/food/drinks/bottle/peachschnapps,
 				/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonadeschnapps,
+				/obj/item/weapon/reagent_containers/food/drinks/bottle/jager,
 				/obj/item/weapon/reagent_containers/food/drinks/bottle/small/cider,
 				/obj/item/weapon/reagent_containers/food/drinks/bottle/small/litebeer,
 				/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,

code/modules/economy/price_list.dm

@@ -504,6 +504,9 @@
 /obj/item/weapon/reagent_containers/food/drinks/bottle/sake
 	price_tag = 25
 
+/obj/item/weapon/reagent_containers/food/drinks/bottle/jager
+	price_tag = 25
+
 //***************//
 //---Foodstuff---//
 //***************//

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

@@ -628,3 +628,13 @@
 /obj/item/weapon/reagent_containers/food/drinks/bottle/lemonadeschnapps/Initialize()
 	. = ..()
 	reagents.add_reagent("schnapps_lem", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/jager
+	name = "Schusskonig"
+	desc = "A complex tasting digestif. Thank god the original's trademark lapsed."
+	icon_state = "jager_bottle"
+	center_of_mass = list("x"=16, "y"=3)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/jager/Initialize()
+	. = ..()
+	reagents.add_reagent("jager", 100)

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

@@ -4140,6 +4140,17 @@
 
 	allergen_type = FRUIT //Made from lemons(fruit)
 
+/datum/reagent/ethanol/jager
+	name = "Schuss Konig"
+	id = "jager"
+	description = "A complex alcohol that leaves you feeling all warm inside."
+	taste_description = "complex, rich alcohol"
+	color = "#7f6906"
+	strength = 25
+
+	glass_name = "schusskonig"
+	glass_desc = "A glass of schusskonig digestif. Good for shooting or mixing."
+
 /datum/reagent/ethanol/fusionnaire
 	name = "Fusionnaire"
 	id = "fusionnaire"