diff --git a/code/citadel/cit_reagents.dm b/code/citadel/cit_reagents.dm index 79ccfea936..df4af10faa 100644 --- a/code/citadel/cit_reagents.dm +++ b/code/citadel/cit_reagents.dm @@ -235,3 +235,40 @@ required_reagents = list("anaphro" = 5, "acetone" = 1) required_temp = 300 mix_message = "The mixture thickens and heats up slighty..." + +//=========Drinks and Stuff!============// + +/datum/reagent/consumable/ethanol/sake + name = "Sake" + id = "sake" + description = "A sweet rice wine of questionable legality and extreme potency." + color = "#DDDDDD" + boozepwr = 70 + taste_description = "sweet rice wine" + glass_icon_state = "sakecup" + glass_name = "glass of sake" + glass_desc = "A traditional cup of sake." + +/datum/chemical_reaction/sake + name = "sake" + id = "sake" + results = list("sake" = 20) + required_reagents = list("rice" = 15, "sugar" = 5) + required_temp = 400 + mix_message = "The rice grains ferment with the sugar into a clear, sweet-smelling liquid." + +/obj/item/reagent_containers/food/drinks/bottle/sake + name = "Traditional Sake" + desc = "Sweet as can be, and burns like foxfire going down." + icon = 'code/citadel/icons/drinks.dmi' + icon_state = "sakebottle" + list_reagents = list("sake" = 100) + +/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize() + . = ..() + if(prob(30)) + name = "Tetravulpine Sake" + desc += " On the bottle is a picture of a kitsune with four tails." + else if(prob(30)) + name = "Inubashiri's Home Brew" + desc += " Awoo." \ No newline at end of file diff --git a/code/citadel/icons/drinks.dmi b/code/citadel/icons/drinks.dmi new file mode 100644 index 0000000000..0000af8b56 Binary files /dev/null and b/code/citadel/icons/drinks.dmi differ diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 69bac9b906..203abeabb7 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -640,7 +640,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/reagent_containers/food/drinks/soda_cans/cola = 8, /obj/item/reagent_containers/food/drinks/soda_cans/sodawater = 15, /obj/item/reagent_containers/food/drinks/drinkingglass = 30, /obj/item/reagent_containers/food/drinks/ice = 10, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12, /obj/item/reagent_containers/food/drinks/flask = 3, - /obj/item/reagent_containers/food/drinks/beer = 6) + /obj/item/reagent_containers/food/drinks/beer = 6, /obj/item/reagent_containers/food/drinks/bottle/sake = 5) //CIT CHANGE - Adds Sake to Booze-o-Mat. contraband = list(/obj/item/reagent_containers/food/drinks/mug/tea = 12) product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?" product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!" diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index bbe20e7e09..4209d22c90 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -394,7 +394,7 @@ container_type = NONE spillable = FALSE isGlass = FALSE - + /obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/user) user.visible_message("[user] is trying to eat \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 2053ca5b8e..d14be3cbd4 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ