diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 0fea05dee27f..d355c8e00a57 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -469,6 +469,18 @@ list_reagents = list(/datum/reagent/consumable/space_cola = 30) foodtype = SUGAR +/obj/item/reagent_containers/food/drinks/soda_cans/rootbeer + name = "Root Beer" + desc = "A soft drink made from roots. Non-Alcoholic." + custom_price = 10 + icon_state = "Rootbeer_Mug" + list_reagents = list(/datum/reagent/consumable/rootbeer = 30) + foodtype = SUGAR + +/obj/item/reagent_containers/food/drinks/soda_cans/rootbeer/Initialize() + icon_state = pick("Rootbeer_Mug","Rootbeer_AW","Rootbeer_Barq") + . = ..() + /obj/item/reagent_containers/food/drinks/soda_cans/tonic name = "T-Borg's tonic water" desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 1102ebcd142b..80cc308cf2d3 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -469,6 +469,7 @@ /datum/reagent/consumable/tea, /datum/reagent/consumable/icetea, /datum/reagent/consumable/space_cola, + /datum/reagent/consumable/rootbeer, /datum/reagent/consumable/spacemountainwind, /datum/reagent/consumable/dr_gibb, /datum/reagent/consumable/space_up, diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index c555556bbb9c..86bdbf870cdb 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -479,6 +479,20 @@ M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL) ..() +/datum/reagent/consumable/rootbeer + name = "Root Beer" + description = "Beer, but not." + color = "#251505" // rgb: 16, 8, 0 + taste_description = "root and beer" + glass_icon_state = "glass_brown" + glass_name = "glass of root beer" + glass_desc = "A glass of refreshing fizzing root beer." + +/datum/reagent/consumable/rootbeer/on_mob_life(mob/living/carbon/M) + M.drowsyness = max(0,M.drowsyness-5) + M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL) + ..() + /datum/reagent/consumable/nuka_cola name = "Nuka Cola" description = "Cola, cola never changes." diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index b8410e719044..4e430624691a 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -13,6 +13,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/rootbeer=10, /obj/item/reagent_containers/glass/beaker/waterbottle = 10) contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6, diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index dcd91f7bf928..d5071fefda9f 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ