Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removes alcoholic root beer (no recipe actually used it) and renames root beer #6120

Closed
wants to merge 1 commit into from
Closed

removes alcoholic root beer (no recipe actually used it) and renames root beer #6120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 4 additions & 17 deletions code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2225,27 +2225,27 @@
glass_special = list(DRINK_FIZZ)

/datum/reagent/drink/soda/sarsaparilla
name = "CC's Homemade Sarsaparilla"
name = "Sarsaparilla"
id = "sarsaparilla"
description = "The Cyan Cowgirl rides again!"
taste_description = "earthy vanilla and harsh bubbles"
color = "#503301"
adj_temp = -2

glass_name = "CC's Homemade Sarsaparilla"
glass_name = "Cyan Cowgirl Sarsaparilla"
glass_desc = "Real girls drink from the bottle."
glass_icon = DRINK_ICON_NOISY
glass_special = list(DRINK_FIZZ)

/datum/reagent/drink/soda/sassafras
name = "CC's Famous Root Beer"
name = "Root Beer"
id = "sassafras"
description = "Feel nostalgia for a range you never rode."
taste_description = "bitter licorice and sweet vanilla"
color = "#312003"
adj_temp = -2

glass_name = "CC's Famous Root Beer"
glass_name = "Cyan Cowgirl Root Beer"
glass_desc = "Wet your whistle!"
glass_icon = DRINK_ICON_NOISY
glass_special = list(DRINK_FIZZ)
Expand Down Expand Up @@ -4043,19 +4043,6 @@

glass_name = "Fire Punch"
glass_desc = "A spicy take on a summer classic."

/datum/reagent/ethanol/alcsassafras
name = "CC's Hard Rootbeer"
id = "alcsassafras"
description = "Doesn't matter if you're drunk when you have a horse to take you home!"
taste_description = "bitter vanilla with a sharp burn"
strength = 20

glass_name = "CC's Hard Rootbeer"
glass_desc = "You'd better carry two guns if you're gonna keep drinking these!"
glass_icon = DRINK_ICON_NOISY
glass_special = list(DRINK_FIZZ)

/datum/reagent/ethanol/newsheriff
name = "New Sheriff"
id = "newsheriff"
Expand Down
1 change: 0 additions & 1 deletion code/modules/reagents/machinery/dispenser/synthesizer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
/datum/reagent/ethanol/cider,
/datum/reagent/ethanol/ale,
/datum/reagent/ethanol/mead,
/datum/reagent/ethanol/alcsassafras
)

/obj/item/reagent_synth/cafe
Expand Down
Loading