Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions code/modules/food_and_drinks/drinks/drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
14 changes: 14 additions & 0 deletions code/modules/reagents/chemistry/reagents/drink_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
1 change: 1 addition & 0 deletions code/modules/vending/cola.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Binary file modified icons/obj/drinks.dmi
Binary file not shown.