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.

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

Adds Eridani drinks (burukutu, ogogoro, zobo) #19640

Merged
merged 6 commits into from
Jul 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
9 changes: 7 additions & 2 deletions code/game/machinery/vending_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@
/obj/item/reagent_containers/food/drinks/bottle/saintjacques = 1,
/obj/item/reagent_containers/food/drinks/bottle/hooch = 1,
/obj/item/reagent_containers/food/drinks/bottle/nemiik = 2,
/obj/item/reagent_containers/food/drinks/bottle/ogogoro = 3,
/obj/item/reagent_containers/food/drinks/bottle/small/burukutu = 15,
/obj/item/reagent_containers/food/drinks/cans/grape_juice = 6,
/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 2,
/obj/item/reagent_containers/food/drinks/cans/sodawater = 15,
Expand Down Expand Up @@ -207,6 +209,7 @@
/obj/item/reagent_containers/food/drinks/bottle/rum = 1,
/obj/item/reagent_containers/food/drinks/bottle/wine = 1,
/obj/item/reagent_containers/food/drinks/bottle/victorygin = 1,
/obj/item/reagent_containers/food/drinks/bottle/ogogoro = 1,
/obj/item/reagent_containers/food/drinks/bottle/small/beer = 2,
/obj/item/reagent_containers/food/drinks/bottle = 6,
/obj/random/junk = 7,
Expand Down Expand Up @@ -453,7 +456,8 @@
/obj/item/reagent_containers/food/drinks/carton/small/milk = 10,
/obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 10,
/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 10,
/obj/item/reagent_containers/food/drinks/cans/melon_soda = 10
/obj/item/reagent_containers/food/drinks/cans/melon_soda = 10,
/obj/item/reagent_containers/food/drinks/zobo = 10
)
contraband = list(
/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 5,
Expand Down Expand Up @@ -483,7 +487,8 @@
/obj/item/reagent_containers/food/drinks/carton/small/milk = 18,
/obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 18,
/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 18,
/obj/item/reagent_containers/food/drinks/cans/melon_soda = 16
/obj/item/reagent_containers/food/drinks/cans/melon_soda = 16,
/obj/item/reagent_containers/food/drinks/zobo = 16
)
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
vending_sound = 'sound/machines/vending/vending_cans.ogg'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6361,6 +6361,28 @@
glass_name = "glass of forbidden apple"
glass_desc = "A champagne cocktail spiked with applejack and orange liqueur."

/singleton/reagent/alcohol/ogogoro
name = "Ogogoro"
description = "A common Eridani dreg palm wine, it seems like it'll have a kick to it."
color = "#FFFFFF"
strength = 60
taste_description = "strong moonshine"

glass_icon_state = "ogogoro_glass"
glass_name = "glass of Ogogoro"
glass_desc = "A common Eridani dreg palm wine, it seems like it'll have a kick to it."

/singleton/reagent/alcohol/burukutu
name = "Burukutu"
description = "A refined millet beer for the esteemed colleagues of the Spur."
color = "#6B391C"
strength = 6
taste_description = "millet beer"

glass_icon_state = "burukutu_glass"
glass_name = "gourd of Burukutu"
glass_desc = "Burukutu is traditionally served in a gourd; this is a mass-produced plastic alternative."

/singleton/reagent/drink/gibbfloats
name = "Root-Cola Floats"
description = "A floating soda of icecream and Getmore Root-Cola."
Expand Down Expand Up @@ -6619,3 +6641,13 @@
glass_name = "lovebug boba"
glass_desc = "Ancient boba-tea marketing teams believed this cherry-strawberry flavored drink holds magical powers of love! What does that mean? Nobody knows!"
glass_center_of_mass = list("x"=15, "y"=10)

/singleton/reagent/drink/zobo
name = "Zobo"
description = "A roselle juice popular across Eridani, often drunk cold."
color = "#71192F"
taste_description = "hibiscus tea"

glass_icon_state = "zobo_glass"
glass_name = "glass of zobo"
glass_desc = "A roselle juice popular across Eridani, often drunk cold."
9 changes: 9 additions & 0 deletions code/modules/reagents/reagent_containers/food/drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,15 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
center_of_mass = list("x"=15, "y"=13)
reagents_to_add = list(/singleton/reagent/drink/hot_coco = 30)

/obj/item/reagent_containers/food/drinks/zobo
name = "zobo bottle"
desc = "A common, mass-produced Eridani drink. Now available on most* Getmore-affiliated installations."
icon_state = "zobo"
empty_icon_state = "zobo_empty"
drop_sound = 'sound/items/drop/disk.ogg'
pickup_sound = 'sound/items/pickup/disk.ogg'
reagents_to_add = list(/singleton/reagent/drink/zobo = 30)

/obj/item/reagent_containers/food/drinks/dry_ramen
name = "cup ramen"
desc = "Just add 10ml water, self heats! A taste that reminds you of your school years."
Expand Down
20 changes: 20 additions & 0 deletions code/modules/reagents/reagent_containers/food/drinks/bottle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,26 @@
center_of_mass = list("x"=16, "y"=8)
reagents_to_add = list(/singleton/reagent/alcohol/hooch = 100)


/obj/item/reagent_containers/food/drinks/bottle/ogogoro
name = "ogogoro jar"
desc = "A traditional Eridani palm wine drink, stored in a mason jar."
desc_extended = "Ogogoro is a traditional West African drink which the colonists of Eridani originally took with them. The nature of it as a high-alcohol moonshine, however, meant that it would eventually be sidelined by the suits of Eridani as \
a vestige of the poor man's culture. As such, whilst it remains extremely common amongst dregs, a suit drinking ogogoro would often be looked down upon by their peers. It remains popular in opaque flasks, however. Appropriately, this jar was not brewed \
on Eridani itself, but instead by the dreg diaspora found in Burzsia."
icon_state = "ogogoro"
empty_icon_state = "ogogoro_empty"
reagents_to_add = list(/singleton/reagent/alcohol/ogogoro = 100)

/obj/item/reagent_containers/food/drinks/bottle/small/burukutu
name = "burukutu bottle"
desc = "A traditional Eridani millet beer, distributed by Idris."
desc_extended = "Burukutu is a millet beer common throughout West Africa and colonies with West African influence. As such, it can be found commonly on the colony of Eridani. This bottle in particular is a Silverport product, extremely popular \
with the suits of the Eridani federation. In spite of their preference for stronger drinks, dregs can often be found with burukutu 'retrieved' from the aboveground cities of Eridani I. According to the label on the back, this was bottled in Tokura, \
Eridani I."
icon_state = "burukutu"
reagents_to_add = list(/singleton/reagent/alcohol/burukutu = 30)

// Butanol-based alcoholic drinks
//=====================================
//These are mainly for unathi, and have very little (but still some) effect on other species
Expand Down
6 changes: 6 additions & 0 deletions html/changelogs/Pirouette-EridaniDrinks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
author: Pirouette, Tomixcomics

delete-after: True

changes:
- rscadd: "Added three Eridani drinks. The alcoholic burukutu and ogogoro, and non-alcoholic zobo."
Binary file modified icons/obj/drinks.dmi
Binary file not shown.
Binary file modified icons/obj/item/reagent_containers/food/drinks/bottle.dmi
Binary file not shown.
Loading