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

Jump to bottom

the hoppening 2: lets hop to it #799

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+55 −0
Open

the hoppening 2: lets hop to it #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 0 deletions code/game/objects/structures/roguetown/rogueflora.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@
max_integrity = 10
layer = 4.1

/obj/structure/flora/roguegrass/water/reeds/hops
debris = list(/obj/item/reagent_containers/food/snacks/grown/roguehops = 1)

/obj/structure/flora/roguegrass/water/update_icon()
dir = pick(GLOB.cardinals)

Expand Down
16 changes: 16 additions & 0 deletions code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2155,18 +2155,29 @@ All effects don't start immediately, but rather get worse over time; the rate is
taste_description = "spicy sweet malty overtones"
color = "#f1b5ff"

/datum/reagent/consumable/ethanol/beer/real
name = "Stout"
nutriment_factor = 0.1
boozepwr = 30
quality = DRINK_VERYGOOD
taste_description = "hopped beer"
glass_name = "glass of beer"
hydration_factor = 15

// Elf Production - LEAF-LOVERS MOTHERFUCKER

/datum/reagent/consumable/ethanol/beer/aurorian
name = "Aurorian"
boozepwr = 5
taste_description = "subtle herbacious undertones"
quality = DRINK_NICE
color = "#5D8A8A"

/datum/reagent/consumable/ethanol/beer/fireleaf // cabbbage
name = "Fireleaf"
boozepwr = 2
taste_description = "bland liquor"
quality = DRINK_NICE
color = "#475e45"

// Dwarven Production - Best in the Realms
Expand All @@ -2175,18 +2186,21 @@ All effects don't start immediately, but rather get worse over time; the rate is
name = "Butterhairs"
boozepwr = 30
taste_description = "buttery richness"
quality = DRINK_NICE
color = "#5D8A8A"

/datum/reagent/consumable/ethanol/beer/stonebeards
name = "Stonebeard Reserve"
boozepwr = 40
taste_description = "potent oatlike liquor"
quality = DRINK_NICE
color = "#5D8A8A"

/datum/reagent/consumable/ethanol/beer/voddena // Not vodka. Trust me.
name = "Voddena"
boozepwr = 55 // holy shit
taste_description = "burning starchy wet dirt"
quality = DRINK_NICE
color = "#4b443c"

// WINE - Fancy.. And yes: all drinks are beer, technically. Cope. Seethe. I didnt code it like this.
Expand Down Expand Up @@ -2224,10 +2238,12 @@ All effects don't start immediately, but rather get worse over time; the rate is
name = "Elven Red"
boozepwr = 15
taste_description = "delectable fruity notes"
quality = DRINK_FANTASTIC
color = "#6C0000"

/datum/reagent/consumable/ethanol/beer/elfblue
name = "Valmora Blue"
boozepwr = 50
taste_description = "saintly sweetness"
quality = DRINK_FANTASTIC
color = "#2C9DAF"
1 change: 1 addition & 0 deletions code/modules/roguetown/mapgen/bog.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
clusterCheckFlags = CLUSTER_CHECK_DIFFERENT_ATOMS
spawnableAtoms = list(/obj/structure/flora/roguegrass/water = 5,
/obj/structure/flora/roguegrass/water/reeds = 80,
/obj/structure/flora/roguegrass/water/reeds = 20,
/obj/structure/glowshroom = 60)
allowed_turfs = list(/turf/open/water/swamp,
/turf/open/water/swamp/deep)
Expand Down
35 changes: 35 additions & 0 deletions modular/Neu_Farming/code/produce.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,41 @@
dropshrink = 0.9
rotprocess = SHELFLIFE_EXTREME

// -------------- HOPS and BEER WORT -----------------

/datum/crafting_recipe/roguetown/cooking/beerstarter
name = "Beer starter"
reqs = list(
/obj/item/reagent_containers/food/snacks/grown/roguehops = 1,
/obj/item/reagent_containers/food/snacks/grown/wheat = 1)
result = /obj/item/reagent_containers/food/snacks/grown/roguewort

/obj/item/reagent_containers/food/snacks/grown/roguehops
name = "bog bitters"
desc = ""
icon_state = "swampweedd" //placeholder
eat_effect = /datum/status_effect/debuff/uncookedfood
tastes = list("exteme bitterness" = 1)
bitesize = 1
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
can_distill = FALSE
rotprocess = null
seed = null

/obj/item/reagent_containers/food/snacks/grown/roguewort
name = "wort"
desc = "disgusting mash of leaves and grain, brew this into a strong stout"
icon_state = "flour"
eat_effect = /datum/status_effect/debuff/uncookedfood
tastes = list("exteme bitterness" = 1)
bitesize = 1
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
can_distill = TRUE
distill_amt = 36 //net increase over ingredients
distill_reagent = /datum/reagent/consumable/ethanol/beer/real
rotprocess = null
seed = null

/*
/obj/item/reagent_containers/food/snacks/produce/garlic
name = "garlic"
Expand Down
Loading