diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index bb88165ef42..f7621057ecc 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -173,6 +173,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/cola = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 10, + /obj/item/weapon/reagent_containers/food/drinks/cans/root_beer = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 10, @@ -188,6 +189,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/cola = 15, /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 11, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 16, + /obj/item/weapon/reagent_containers/food/drinks/cans/root_beer = 13, /obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 15, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 12, /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 15, 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 bb5ef293f8b..a4513cec053 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1330,6 +1330,19 @@ glass_name = "glass of Dr. Gibb" glass_desc = "Dr. Gibb. Not as dangerous as the name might imply." +/datum/reagent/drink/root_beer + name = "R&D Root Beer" + id = "root_beer" + description = "A classic Earth drink from the United Americas province." + color = "#211100" + adj_drowsy = -6 + adj_temp = -5 + taste_description = "sassafras and anise soda" + + glass_icon_state = "root_beer_glass" + glass_name = "glass of R&D Root Beer" + glass_desc = "A glass of bubbly R&D Root Beer." + /datum/reagent/drink/space_up name = "Space-Up" id = "space_up" diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index e9f54ab786b..720c6471d39 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -135,3 +135,13 @@ . = ..() reagents.add_reagent("koispasteclean", 10) reagents.add_reagent("phoron", 5) + +/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer + name = "\improper R&D Root Beer" + desc = "A classic Earth drink from the United Americas province." + icon_state = "root_beer" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer/Initialize() + . = ..() + reagents.add_reagent("root_beer", 30) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 5ad9746fb44..5cc83daa5b7 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ