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

Ketchup flavored whiskey (sins against god) #8

Merged
merged 4 commits into from
Feb 18, 2022
Merged

Ketchup flavored whiskey (sins against god) #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6404e2
ketchup whiskey
Jul 18, 2021
7be48da
Better sprite
Jul 18, 2021
2c6b1f4
Merge branch 'Project-Wildflower:master' into ketchup
super12pl Jul 24, 2021
eaa1249
Adds Ketchup whiskey to drink crate
Aug 3, 2021
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
3 changes: 2 additions & 1 deletion code/datums/supplypacks/galley.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@
/decl/hierarchy/supply_pack/galley/premiumalcohol
name = "Bar - Premium drinks"
contains = list(/obj/item/reagent_containers/food/drinks/bottle/premiumwine = 1,
/obj/item/reagent_containers/food/drinks/bottle/premiumvodka = 1)
/obj/item/reagent_containers/food/drinks/bottle/premiumvodka = 1,
/obj/item/reagent_containers/food/drinks/bottle/ketchupwhiskey = 1)
cost = 60
containertype = /obj/structure/closet/crate/freezer
containername = "premium drinks crate"
Expand Down
9 changes: 9 additions & 0 deletions code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Ethanol.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,15 @@
glass_name = "whiskey"
glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."

/datum/reagent/ethanol/ketchupwhiskey
name = "Ketchup Flavored Whiskey"
description = "A superb and well-aged single-malt whiskey. Too bad this one is ketchup flavored."
taste_description = "grossness"
color = "#d6024d"

glass_name = "ketchup flavored whiskey"
glass_desc = "What the hell?"

/datum/reagent/ethanol/wine
name = "Wine"
description = "An premium alchoholic beverage made from distilled grape juice."
Expand Down
8 changes: 8 additions & 0 deletions code/modules/reagents/reagent_containers/food/drinks/bottle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,14 @@
reagents.add_reagent(/datum/reagent/ethanol/whiskey, 100)


/obj/item/reagent_containers/food/drinks/bottle/ketchupwhiskey
name = "Crown Royal's Ketchup Flavored Whiskey"
desc = "A premium single-malt whiskey, gently matured then industralily ruined with artificial ketchup flavor."
icon_state = "ketchupwhiskeybottle"
New()
..()
reagents.add_reagent(/datum/reagent/ethanol/ketchupwhiskey, 100)

/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey
name = "Special Blend Whiskey"
desc = "Just when you thought regular whiskey was good... This silky, amber goodness has to come along and ruin everything."
Expand Down
Binary file modified icons/obj/drinks.dmi
View file
Open in desktop
Binary file not shown.