Ashe Higgs
d447acdc6e
I had some time free, and noticed how awful the reagent grinder code was - it used huge static lists containing types and their associated reagents from grinding. This is now split into two new vars on /obj/item - var/list/grind_results and var/list/juice_results, as well as two new helper procs, on_grind() and on_juice() to allow those to change based on conditions like plant potency. Such checks and the like have been moved to that. If any of these procs return -1, the operation is canceled. I also fixed some of the recipes that didn't work. The reagent IDs for them didn't exist, leading me to believe that they weren't tested. I corrected that! (I've tested every single recipe in this PR, with the exception of a few juicing-related ones.)
59 lines
1.8 KiB
Plaintext
59 lines
1.8 KiB
Plaintext
// Pumpkin
|
|
/obj/item/seeds/pumpkin
|
|
name = "pack of pumpkin seeds"
|
|
desc = "These seeds grow into pumpkin vines."
|
|
icon_state = "seed-pumpkin"
|
|
species = "pumpkin"
|
|
plantname = "Pumpkin Vines"
|
|
product = /obj/item/reagent_containers/food/snacks/grown/pumpkin
|
|
lifespan = 50
|
|
endurance = 40
|
|
growthstages = 3
|
|
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
|
|
icon_grow = "pumpkin-grow"
|
|
icon_dead = "pumpkin-dead"
|
|
genes = list(/datum/plant_gene/trait/repeated_harvest)
|
|
mutatelist = list(/obj/item/seeds/pumpkin/blumpkin)
|
|
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.2)
|
|
|
|
/obj/item/reagent_containers/food/snacks/grown/pumpkin
|
|
seed = /obj/item/seeds/pumpkin
|
|
name = "pumpkin"
|
|
desc = "It's large and scary."
|
|
icon_state = "pumpkin"
|
|
filling_color = "#FFA500"
|
|
bitesize_mod = 2
|
|
foodtype = VEGETABLES
|
|
juice_results = list("pumpkinjuice" = 0)
|
|
|
|
/obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
|
|
if(W.is_sharp())
|
|
user.show_message("<span class='notice'>You carve a face into [src]!</span>", 1)
|
|
new /obj/item/clothing/head/hardhat/pumpkinhead(user.loc)
|
|
qdel(src)
|
|
return
|
|
else
|
|
return ..()
|
|
|
|
// Blumpkin
|
|
/obj/item/seeds/pumpkin/blumpkin
|
|
name = "pack of blumpkin seeds"
|
|
desc = "These seeds grow into blumpkin vines."
|
|
icon_state = "seed-blumpkin"
|
|
species = "blumpkin"
|
|
plantname = "Blumpkin Vines"
|
|
product = /obj/item/reagent_containers/food/snacks/grown/blumpkin
|
|
mutatelist = list()
|
|
reagents_add = list("ammonia" = 0.2, "chlorine" = 0.1, "nutriment" = 0.2)
|
|
rarity = 20
|
|
|
|
/obj/item/reagent_containers/food/snacks/grown/blumpkin
|
|
seed = /obj/item/seeds/pumpkin/blumpkin
|
|
name = "blumpkin"
|
|
desc = "The pumpkin's toxic sibling."
|
|
icon_state = "blumpkin"
|
|
filling_color = "#87CEFA"
|
|
bitesize_mod = 2
|
|
foodtype = VEGETABLES
|
|
juice_results = list("blumpkinjuice" = 0)
|