Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit f944c94

Browse files
authored
Adds root beer to the game (I FUCKING LOVE MUG!!!!!!!!) (#14439)
* GIVE ME MY ROOT BEER!!!!! * fix
1 parent 4baeb6e commit f944c94

5 files changed

Lines changed: 28 additions & 0 deletions

File tree

code/modules/food_and_drinks/drinks/drinks.dm

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,18 @@
469469
list_reagents = list(/datum/reagent/consumable/space_cola = 30)
470470
foodtype = SUGAR
471471

472+
/obj/item/reagent_containers/food/drinks/soda_cans/rootbeer
473+
name = "Root Beer"
474+
desc = "A soft drink made from roots. Non-Alcoholic."
475+
custom_price = 10
476+
icon_state = "Rootbeer_Mug"
477+
list_reagents = list(/datum/reagent/consumable/rootbeer = 30)
478+
foodtype = SUGAR
479+
480+
/obj/item/reagent_containers/food/drinks/soda_cans/rootbeer/Initialize()
481+
icon_state = pick("Rootbeer_Mug","Rootbeer_AW","Rootbeer_Barq")
482+
. = ..()
483+
472484
/obj/item/reagent_containers/food/drinks/soda_cans/tonic
473485
name = "T-Borg's tonic water"
474486
desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@
469469
/datum/reagent/consumable/tea,
470470
/datum/reagent/consumable/icetea,
471471
/datum/reagent/consumable/space_cola,
472+
/datum/reagent/consumable/rootbeer,
472473
/datum/reagent/consumable/spacemountainwind,
473474
/datum/reagent/consumable/dr_gibb,
474475
/datum/reagent/consumable/space_up,

code/modules/reagents/chemistry/reagents/drink_reagents.dm

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,20 @@
479479
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
480480
..()
481481

482+
/datum/reagent/consumable/rootbeer
483+
name = "Root Beer"
484+
description = "Beer, but not."
485+
color = "#251505" // rgb: 16, 8, 0
486+
taste_description = "root and beer"
487+
glass_icon_state = "glass_brown"
488+
glass_name = "glass of root beer"
489+
glass_desc = "A glass of refreshing fizzing root beer."
490+
491+
/datum/reagent/consumable/rootbeer/on_mob_life(mob/living/carbon/M)
492+
M.drowsyness = max(0,M.drowsyness-5)
493+
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
494+
..()
495+
482496
/datum/reagent/consumable/nuka_cola
483497
name = "Nuka Cola"
484498
description = "Cola, cola never changes."

code/modules/vending/cola.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
1414
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
1515
/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10,
16+
/obj/item/reagent_containers/food/drinks/soda_cans/rootbeer=10,
1617
/obj/item/reagent_containers/glass/beaker/waterbottle = 10)
1718
contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,
1819
/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6,

icons/obj/drinks.dmi

237 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)