Skip to content

Commit

Permalink
removes france
Browse files Browse the repository at this point in the history
  • Loading branch information
MistakeNot4892 authored and comma committed Oct 22, 2024
1 parent 47155f3 commit 46695b6
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 17 deletions.
22 changes: 6 additions & 16 deletions code/modules/reagents/chems/chems_ethanol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -509,16 +509,17 @@

/decl/material/liquid/ethanol/champagne
name = "champagne"
lore_text = "Smooth sparkling wine, produced in the same region of France as it has for centuries."
taste_description = "a superior taste of sparkling wine"
color = "#e8dfc1"
strength = 25
lore_text = "Smooth sparkling wine, produced in the same region of France as it has been for centuries."
taste_description = "bitterness and fizz"
color = "#a89410"
strength = 18
exoplanet_rarity_plant = MAT_RARITY_NOWHERE
exoplanet_rarity_gas = MAT_RARITY_NOWHERE
uid = "chem_ethanol_champagne"

glass_name = "champagne"
glass_desc = "Smooth sparkling wine, produced in the same region of France as it has for centuries."
glass_desc = "Sparkling white wine, produced in the same region of France as it has been for centuries."
glass_special = list(DRINK_FIZZ)

/decl/material/liquid/ethanol/jagermeister
name = "Jagermeister"
Expand All @@ -545,14 +546,3 @@

glass_name = "kvass"
glass_desc = "An alcoholic drink commonly made from bread."

/decl/material/liquid/ethanol/champagne
name = "champagne"
lore_text = "Sparkling wine made from exquisite grape."
taste_description = "bitter taste"
color = "#a89410"
strength = 18

glass_name = "champagne"
glass_desc = "Wow, it's bubbling!"
glass_special = list(DRINK_FIZZ)
9 changes: 8 additions & 1 deletion mods/content/fantasy/items/material_overrides.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,11 @@

/obj/item/gravemarker
material = /decl/material/solid/organic/wood/walnut
color = /decl/material/solid/organic/wood/walnut::color
color = /decl/material/solid/organic/wood/walnut::color

// FRANCE ISN'T REAL
/decl/material/liquid/ethanol/champagne
name = "sparkling wine"
glass_name = "sparkling wine"
glass_desc = "Sparkling white wine, a favourite at noble and merchant parties."
lore_text = "Sparkling white wine, a favourite at noble and merchant parties."

0 comments on commit 46695b6

Please sign in to comment.