diff --git a/code/datums/supplypacks/hospitality.dm b/code/datums/supplypacks/hospitality.dm index 2771caa5383..1ca6aee6209 100644 --- a/code/datums/supplypacks/hospitality.dm +++ b/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, diff --git a/code/game/machinery/vending_machines.dm b/code/game/machinery/vending_machines.dm index 098d231ce77..4adaac75723 100644 --- a/code/game/machinery/vending_machines.dm +++ b/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, diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 57ed321edc6..f7a3b499331 100644 --- a/code/game/objects/random/misc.dm +++ b/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, diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index e9c8b1372d6..9e3fb438d82 100644 --- a/code/modules/economy/price_list.dm +++ b/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---// //***************// diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index 9472f8459db..1f9443ca256 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -628,3 +628,16 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/lemonadeschnapps/Initialize() . = ..() reagents.add_reagent("schnapps_lem", 100) +<<<<<<< HEAD +======= + +/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) +>>>>>>> 81ae48b... Merge pull request #7974 from MistakeNot4892/jager diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index f2dbac9f69c..a3a1af83fed 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -4099,6 +4099,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" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 0a112657ea0..68188dd88a8 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ