Skip to content
This repository has been archived by the owner on Mar 10, 2022. It is now read-only.

Adds ketchup flavored whiskey #19

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 2 additions & 1 deletion code/game/machinery/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
base_type = /obj/machinery/vending/assist
construct_state = /decl/machine_construction/default/panel_closed
uncreated_component_parts = null

machine_name = "vending machine"
machine_desc = "Holds an internal stock of items that can be dispensed on-demand or when a charged ID card is swiped, depending on the brand."

Expand Down Expand Up @@ -610,6 +610,7 @@
/obj/item/reagent_containers/food/drinks/bottle/whiskey = 5,
/obj/item/reagent_containers/food/drinks/bottle/llanbrydewhiskey = 5,
/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey = 5,
/obj/item/reagent_containers/food/drinks/bottle/ketchupwhiskey = 5,
/obj/item/reagent_containers/food/drinks/bottle/wine = 5,
/obj/item/reagent_containers/food/drinks/bottle/small/beer = 15,
/obj/item/reagent_containers/food/drinks/bottle/small/alcoholfreebeer = 15,
Expand Down
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"
super12pl marked this conversation as resolved.
Show resolved Hide resolved
description = "A superb and well-aged single-malt whiskey. Too bad this one is ketchup flavored."
super12pl marked this conversation as resolved.
Show resolved Hide resolved
taste_description = "grossness"
color = "#d6024d"

glass_name = "ketchup flavored whiskey"
super12pl marked this conversation as resolved.
Show resolved Hide resolved
glass_desc = "What the hell?"

/datum/reagent/ethanol/wine
name = "Wine"
description = "An premium alchoholic beverage made from distilled grape juice."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,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."
super12pl marked this conversation as resolved.
Show resolved Hide resolved
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
Binary file not shown.