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

Fixes reagent grinder juicing. Again. #12034

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 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
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/apple.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
icon_state = "apple"
bite_consumption_mod = 100 // Always eat apples in one bite
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/applejuice = 0)
juice_results = /datum/reagent/consumable/applejuice
tastes = list("apple" = 1)
distill_reagent = /datum/reagent/consumable/ethanol/hcider

Expand Down
4 changes: 2 additions & 2 deletions code/modules/hydroponics/grown/banana.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
trash_type = /obj/item/grown/bananapeel
bite_consumption_mod = 3
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/banana = 0)
juice_results = /datum/reagent/consumable/banana
distill_reagent = /datum/reagent/consumable/ethanol/bananahonk
dying_key = DYE_REGISTRY_BANANA

Expand All @@ -33,7 +33,7 @@
var/obj/item/grown/bananapeel/peel = .
if(istype(peel))
peel.grind_results = list(/datum/reagent/medicine/coagulant/banana_peel = seed.potency * 0.2)
peel.juice_results = list(/datum/reagent/medicine/coagulant/banana_peel = seed.potency * 0.2)
peel.juice_results = /datum/reagent/medicine/coagulant/banana_peel
*/

/obj/item/food/grown/banana/suicide_act(mob/user)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/hydroponics/grown/berries.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
icon_state = "berrypile"
gender = PLURAL
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/berryjuice = 0)
juice_results = /datum/reagent/consumable/berryjuice
tastes = list("berry" = 1)
distill_reagent = /datum/reagent/consumable/ethanol/gin

Expand All @@ -47,7 +47,7 @@
icon_state = "poisonberrypile"
bite_consumption_mod = 3
foodtypes = FRUIT | TOXIC
juice_results = list(/datum/reagent/consumable/poisonberryjuice = 0)
juice_results = /datum/reagent/consumable/poisonberryjuice
tastes = list("poison-berry" = 1)
distill_reagent = null
wine_power = 35
Expand All @@ -74,7 +74,7 @@
icon_state = "deathberrypile"
bite_consumption_mod = 3
foodtypes = FRUIT | TOXIC
juice_results = list(/datum/reagent/consumable/poisonberryjuice = 0)
juice_results = /datum/reagent/consumable/poisonberryjuice
tastes = list("death-berry" = 1)
distill_reagent = null
wine_power = 50
Expand Down Expand Up @@ -217,7 +217,7 @@
icon_state = "grapes"
bite_consumption_mod = 2
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/grapejuice = 0)
juice_results = /datum/reagent/consumable/grapejuice
tastes = list("grape" = 1)
distill_reagent = /datum/reagent/consumable/ethanol/wine

Expand Down
8 changes: 4 additions & 4 deletions code/modules/hydroponics/grown/citrus.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
name = "lime"
desc = "It's so sour, your face will twist."
icon_state = "lime"
juice_results = list(/datum/reagent/consumable/limejuice = 0)
juice_results = /datum/reagent/consumable/limejuice

// Orange
/obj/item/seeds/orange
Expand All @@ -55,7 +55,7 @@
name = "orange"
desc = "It's a tangy fruit."
icon_state = "orange"
juice_results = list(/datum/reagent/consumable/orangejuice = 0)
juice_results = /datum/reagent/consumable/orangejuice
distill_reagent = /datum/reagent/consumable/ethanol/triple_sec

// Lemon
Expand All @@ -81,7 +81,7 @@
name = "lemon"
desc = "When life gives you lemons, make lemonade."
icon_state = "lemon"
juice_results = list(/datum/reagent/consumable/lemonjuice = 0)
juice_results = /datum/reagent/consumable/lemonjuice

// Combustible lemon
/obj/item/seeds/firelemon //combustible lemon is too long so firelemon
Expand Down Expand Up @@ -175,7 +175,7 @@
desc = "You can hardly wrap your head around this thing."
icon_state = "orang"
bite_consumption_mod = 2
juice_results = list(/datum/reagent/consumable/orangejuice = 0)
juice_results = /datum/reagent/consumable/orangejuice
distill_reagent = /datum/reagent/consumable/ethanol/triple_sec
tastes = list("polygons" = 1, "oranges" = 1)
discovery_points = 300
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/cocoa_vanilla.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
bite_consumption_mod = 2
trash_type = /obj/item/food/grown/bungopit
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/bungojuice = 0)
juice_results = /datum/reagent/consumable/bungojuice
tastes = list("bungo" = 2, "tropical fruitiness" = 1)
distill_reagent = null
discovery_points = 300
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/corn.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
trash_type = /obj/item/grown/corncob
bite_consumption_mod = 2
foodtypes = VEGETABLES
juice_results = list(/datum/reagent/consumable/corn_starch = 0)
juice_results = /datum/reagent/consumable/corn_starch
tastes = list("corn" = 1)
distill_reagent = /datum/reagent/consumable/ethanol/whiskey
discovery_points = 300
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/melon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
bite_consumption_mod = 2
w_class = WEIGHT_CLASS_NORMAL
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/watermelonjuice = 0)
juice_results = /datum/reagent/consumable/watermelonjuice
wine_power = 40

/obj/item/food/grown/watermelon/make_processable()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/pineapple.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
foodtypes = FRUIT | PINEAPPLE
juice_results = list(/datum/reagent/consumable/pineapplejuice = 0)
juice_results = /datum/reagent/consumable/pineapplejuice
tastes = list("pineapple" = 1)
wine_power = 40

Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/potato.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
icon_state = "potato"
bite_consumption_mod = 100
foodtypes = VEGETABLES
juice_results = list(/datum/reagent/consumable/potato_juice = 0)
juice_results = /datum/reagent/consumable/potato_juice
distill_reagent = /datum/reagent/consumable/ethanol/vodka

/obj/item/food/grown/potato/wedges
Expand Down
4 changes: 2 additions & 2 deletions code/modules/hydroponics/grown/pumpkin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
icon_state = "pumpkin"
bite_consumption_mod = 2
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/pumpkinjuice = 0)
juice_results = /datum/reagent/consumable/pumpkinjuice
wine_power = 20

/obj/item/food/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
Expand Down Expand Up @@ -54,6 +54,6 @@
icon_state = "blumpkin"
bite_consumption_mod = 3
foodtypes = FRUIT
juice_results = list(/datum/reagent/consumable/blumpkinjuice = 0)
juice_results = /datum/reagent/consumable/blumpkinjuice
wine_power = 50
discovery_points = 300
4 changes: 2 additions & 2 deletions code/modules/hydroponics/grown/root.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
filling_color = "#FFA500"
bite_consumption_mod = 2
foodtypes = VEGETABLES
juice_results = list(/datum/reagent/consumable/carrotjuice = 0)
juice_results = /datum/reagent/consumable/carrotjuice
wine_power = 30

/obj/item/food/grown/carrot/attackby(obj/item/I, mob/user, params)
Expand Down Expand Up @@ -53,7 +53,7 @@
desc = "Closely related to carrots."
icon_state = "parsnip"
foodtypes = VEGETABLES
juice_results = list(/datum/reagent/consumable/parsnipjuice = 0)
juice_results = /datum/reagent/consumable/parsnipjuice
wine_power = 35
discovery_points = 300

Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/tomato.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
splat_type = /obj/effect/decal/cleanable/food/tomato_smudge
foodtypes = FRUIT
grind_results = list(/datum/reagent/consumable/ketchup = 0)
juice_results = list(/datum/reagent/consumable/tomatojuice = 0)
juice_results = /datum/reagent/consumable/tomatojuice
distill_reagent = /datum/reagent/consumable/enzyme

// Blood Tomato
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@
tool_behaviour = null
fake_seed = null
grind_results = list(/datum/reagent/consumable/chlorophyll = 20)
juice_results = list(/datum/reagent/consumable/chlorophyll = 20)
juice_results = /datum/reagent/consumable/chlorophyll

/obj/item/clothing/head/mob_holder/nymph/Initialize(mapload, mob/living/M, worn_state, head_icon, lh_icon, rh_icon, worn_slot_flags)
if(M.mind)
Expand Down
Loading