From cfd82179472f501ebcdd78b7184eeb872573c8c0 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 17 Aug 2019 22:10:23 -0400 Subject: [PATCH 1/8] Update flowers.dm --- code/modules/hydroponics/grown/flowers.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 4e1718f853..b1fad0cfaa 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -25,6 +25,7 @@ slot_flags = ITEM_SLOT_HEAD filling_color = "#FF6347" bitesize_mod = 3 + tastes = list("sesame seeds" = 1) foodtype = VEGETABLES | GROSS distill_reagent = "vermouth" @@ -43,6 +44,7 @@ name = "lily" desc = "A beautiful orange flower." icon_state = "lily" + tastes = list("pelts " = 1) filling_color = "#FFA500" // Geranium @@ -61,6 +63,7 @@ desc = "A beautiful blue flower." icon_state = "geranium" filling_color = "#008B8B" + tastes = list("pelts " = 1) // Harebell /obj/item/seeds/harebell @@ -86,6 +89,7 @@ name = "harebell" desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten'd not thy breath.\"" icon_state = "harebell" + tastes = list("salt" = 1) slot_flags = ITEM_SLOT_HEAD filling_color = "#E6E6FA" bitesize_mod = 3 @@ -123,6 +127,7 @@ w_class = WEIGHT_CLASS_TINY throw_speed = 1 throw_range = 3 + tastes = list("seeds" = 1) /obj/item/grown/sunflower/attack(mob/M, mob/user) to_chat(M, " [user] smacks you with a sunflower!FLOWER POWER") @@ -153,6 +158,7 @@ filling_color = "#E6E6FA" bitesize_mod = 2 distill_reagent = "absinthe" //It's made from flowers. + tastes = list("glowbugs" = 1) // Novaflower /obj/item/seeds/sunflower/novaflower @@ -175,6 +181,7 @@ icon_state = "novaflower" lefthand_file = 'icons/mob/inhands/weapons/plants_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/plants_righthand.dmi' + tastes = list("nova" = 1) damtype = "fire" force = 0 slot_flags = ITEM_SLOT_HEAD From bb9aa4f039e7de1d737b0538a068a992f8482846 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 17 Aug 2019 22:49:06 -0400 Subject: [PATCH 2/8] I woulder how much this will fuck everthing up --- code/modules/hydroponics/grown/flowers.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index b1fad0cfaa..60f0b6a3be 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -113,7 +113,7 @@ mutatelist = list(/obj/item/seeds/sunflower/moonflower, /obj/item/seeds/sunflower/novaflower) reagents_add = list("cornoil" = 0.08, "nutriment" = 0.04) -/obj/item/grown/sunflower // FLOWER POWER! +/obj/item/reagent_containers/food/snacks/grown/sunflower // FLOWER POWER! seed = /obj/item/seeds/sunflower name = "sunflower" desc = "It's beautiful! A certain person might beat you to death if you trample these." @@ -129,7 +129,7 @@ throw_range = 3 tastes = list("seeds" = 1) -/obj/item/grown/sunflower/attack(mob/M, mob/user) +/obj/item/reagent_containers/food/snacks/grown/sunflower/attack(mob/M, mob/user) to_chat(M, " [user] smacks you with a sunflower!FLOWER POWER") to_chat(user, "Your sunflower's FLOWER POWERstrikes [M]") @@ -174,14 +174,13 @@ reagents_add = list("condensedcapsaicin" = 0.25, "capsaicin" = 0.3, "nutriment" = 0) rarity = 20 -/obj/item/grown/novaflower +/obj/item/reagent_containers/food/snacks/grown/novaflower seed = /obj/item/seeds/sunflower/novaflower name = "novaflower" desc = "These beautiful flowers have a crisp smokey scent, like a summer bonfire." icon_state = "novaflower" lefthand_file = 'icons/mob/inhands/weapons/plants_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/plants_righthand.dmi' - tastes = list("nova" = 1) damtype = "fire" force = 0 slot_flags = ITEM_SLOT_HEAD @@ -191,12 +190,13 @@ throw_range = 3 attack_verb = list("roasted", "scorched", "burned") grind_results = list("capsaicin" = 0, "condensedcapsaicin" = 0) + tastes = list("cooked sunflower" = 1) -/obj/item/grown/novaflower/add_juice() +/obj/item/reagent_containers/food/snacks/grown/novaflower/add_juice() ..() force = round((5 + seed.potency / 5), 1) -/obj/item/grown/novaflower/attack(mob/living/carbon/M, mob/user) +/obj/item/reagent_containers/food/snacks/grown/novaflower/attack(mob/living/carbon/M, mob/user) if(!..()) return if(isliving(M)) @@ -206,7 +206,7 @@ message_admins("[ADMIN_LOOKUPFLW(user)] set [ADMIN_LOOKUPFLW(M)] on fire with [src] at [AREACOORD(user)]") log_game("[key_name(user)] set [key_name(M)] on fire with [src] at [AREACOORD(user)]") -/obj/item/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity) +/obj/item/reagent_containers/food/snacks/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity) . = ..() if(!proximity) return @@ -216,7 +216,7 @@ to_chat(usr, "All the petals have fallen off the [name] from violent whacking!") qdel(src) -/obj/item/grown/novaflower/pickup(mob/living/carbon/human/user) +/obj/item/reagent_containers/food/snacks/grown/novaflower/pickup(mob/living/carbon/human/user) ..() if(!user.gloves) to_chat(user, "The [name] burns your bare hand!") From 43b1d0405e91d954f0f7b8eb8a346b6ae5b34d65 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 17 Aug 2019 23:25:38 -0400 Subject: [PATCH 3/8] Update flowers.dm --- code/modules/hydroponics/grown/flowers.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 60f0b6a3be..bcd1047270 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -102,7 +102,7 @@ icon_state = "seed-sunflower" species = "sunflower" plantname = "Sunflowers" - product = /obj/item/grown/sunflower + product = /obj/item/reagent_containers/food/snacks/grown/sunflower endurance = 20 production = 2 yield = 2 @@ -169,7 +169,7 @@ plantname = "Novaflowers" icon_grow = "novaflower-grow" icon_dead = "sunflower-dead" - product = /obj/item/grown/novaflower + product = /obj/item/reagent_containers/food/snacks/grown/novaflower mutatelist = list() reagents_add = list("condensedcapsaicin" = 0.25, "capsaicin" = 0.3, "nutriment" = 0) rarity = 20 From 4dae36869ca137bf53b8ff01c767ce47e507ed50 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sun, 18 Aug 2019 01:01:00 -0400 Subject: [PATCH 4/8] tada --- code/modules/hydroponics/grown/berries.dm | 10 +++++----- code/modules/hydroponics/grown/flowers.dm | 18 +++++++++--------- code/modules/hydroponics/growninedible.dm | 1 + 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index d24160ad6f..c8f6e986e9 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -217,9 +217,9 @@ distill_reagent = "cognac" // Strawberry -/obj/item/seeds/strawberries - name = "pack of strawberrie seeds" - desc = "These seeds grow into strawberries vines." +/obj/item/seeds/strawberry + name = "pack of strawberry seeds" + desc = "These seeds grow into strawberry vines." icon_state = "seed-strawberry" species = "strawberry" plantname = "Strawberry Vine" @@ -227,10 +227,10 @@ reagents_add = list("vitamin" = 0.07, "nutriment" = 0.1, "sugar" = 0.2) mutatelist = list() -/obj/item/reagent_containers/food/snacks/grown/strawberries +/obj/item/reagent_containers/food/snacks/grown/strawberry seed = /obj/item/seeds/strawberries name = "strawberry" - icon_state = "strawberries" + icon_state = "strawberry" filling_color = "#7FFF00" tastes = list("strawberries" = 1) wine_power = 20 diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index bcd1047270..fddfaa65c9 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -102,7 +102,7 @@ icon_state = "seed-sunflower" species = "sunflower" plantname = "Sunflowers" - product = /obj/item/reagent_containers/food/snacks/grown/sunflower + product = /obj/item/grown/sunflower endurance = 20 production = 2 yield = 2 @@ -113,7 +113,7 @@ mutatelist = list(/obj/item/seeds/sunflower/moonflower, /obj/item/seeds/sunflower/novaflower) reagents_add = list("cornoil" = 0.08, "nutriment" = 0.04) -/obj/item/reagent_containers/food/snacks/grown/sunflower // FLOWER POWER! +/obj/item/grown/sunflower // FLOWER POWER! seed = /obj/item/seeds/sunflower name = "sunflower" desc = "It's beautiful! A certain person might beat you to death if you trample these." @@ -129,7 +129,7 @@ throw_range = 3 tastes = list("seeds" = 1) -/obj/item/reagent_containers/food/snacks/grown/sunflower/attack(mob/M, mob/user) +/obj/item/grown/sunflower/attack(mob/M, mob/user) to_chat(M, " [user] smacks you with a sunflower!FLOWER POWER") to_chat(user, "Your sunflower's FLOWER POWERstrikes [M]") @@ -169,12 +169,12 @@ plantname = "Novaflowers" icon_grow = "novaflower-grow" icon_dead = "sunflower-dead" - product = /obj/item/reagent_containers/food/snacks/grown/novaflower + product = /obj/item/grown/novaflower mutatelist = list() reagents_add = list("condensedcapsaicin" = 0.25, "capsaicin" = 0.3, "nutriment" = 0) rarity = 20 -/obj/item/reagent_containers/food/snacks/grown/novaflower +/obj/item/grown/grown/novaflower seed = /obj/item/seeds/sunflower/novaflower name = "novaflower" desc = "These beautiful flowers have a crisp smokey scent, like a summer bonfire." @@ -192,11 +192,11 @@ grind_results = list("capsaicin" = 0, "condensedcapsaicin" = 0) tastes = list("cooked sunflower" = 1) -/obj/item/reagent_containers/food/snacks/grown/novaflower/add_juice() +/obj/item/grown/novaflower/add_juice() ..() force = round((5 + seed.potency / 5), 1) -/obj/item/reagent_containers/food/snacks/grown/novaflower/attack(mob/living/carbon/M, mob/user) +/obj/item/grown/novaflower/attack(mob/living/carbon/M, mob/user) if(!..()) return if(isliving(M)) @@ -206,7 +206,7 @@ message_admins("[ADMIN_LOOKUPFLW(user)] set [ADMIN_LOOKUPFLW(M)] on fire with [src] at [AREACOORD(user)]") log_game("[key_name(user)] set [key_name(M)] on fire with [src] at [AREACOORD(user)]") -/obj/item/reagent_containers/food/snacks/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity) +/obj/item/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity) . = ..() if(!proximity) return @@ -216,7 +216,7 @@ to_chat(usr, "All the petals have fallen off the [name] from violent whacking!") qdel(src) -/obj/item/reagent_containers/food/snacks/grown/novaflower/pickup(mob/living/carbon/human/user) +/obj/item/grown/novaflower/pickup(mob/living/carbon/human/user) ..() if(!user.gloves) to_chat(user, "The [name] burns your bare hand!") diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 5aeef19b1a..c0e3beaf79 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -7,6 +7,7 @@ icon = 'icons/obj/hydroponics/harvest.dmi' resistance_flags = FLAMMABLE var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item. + var/tastes = list("indescribable" = 1) //Stops runtimes. Grown are un-eatable anyways so if you do then its a bug /obj/item/grown/Initialize(newloc, obj/item/seeds/new_seed) . = ..() From fc6633071a5f6128fdc1cc24cc6d2f2afe032a1e Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 18 Aug 2019 01:07:38 -0400 Subject: [PATCH 5/8] rwar! --- code/modules/hydroponics/grown/flowers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index fddfaa65c9..f1aea5706a 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -174,7 +174,7 @@ reagents_add = list("condensedcapsaicin" = 0.25, "capsaicin" = 0.3, "nutriment" = 0) rarity = 20 -/obj/item/grown/grown/novaflower +/obj/item/grown/novaflower seed = /obj/item/seeds/sunflower/novaflower name = "novaflower" desc = "These beautiful flowers have a crisp smokey scent, like a summer bonfire." From 8214a7012fc8150ba1d87701dfc3c130b26a5cbe Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 18 Aug 2019 01:17:34 -0400 Subject: [PATCH 6/8] I Didnt save the two corrections --- code/modules/hydroponics/grown/berries.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index c8f6e986e9..e9ad49eedd 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -223,12 +223,12 @@ icon_state = "seed-strawberry" species = "strawberry" plantname = "Strawberry Vine" - product = /obj/item/reagent_containers/food/snacks/grown/strawberries + product = /obj/item/reagent_containers/food/snacks/grown/strawberry reagents_add = list("vitamin" = 0.07, "nutriment" = 0.1, "sugar" = 0.2) mutatelist = list() /obj/item/reagent_containers/food/snacks/grown/strawberry - seed = /obj/item/seeds/strawberries + seed = /obj/item/seeds/strawberry name = "strawberry" icon_state = "strawberry" filling_color = "#7FFF00" From 566a4e65a12c647cde3564fd334fcacd12cdd157 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sun, 18 Aug 2019 01:31:38 -0400 Subject: [PATCH 7/8] right crafting --- code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm | 2 +- .../food_and_drinks/recipes/tablecraft/recipes_pastry.dm | 2 +- code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 71ba5dfe41..9cf5ea31a0 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -337,7 +337,7 @@ name = "Chocolate Strawberry" reqs = list( /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberries = 1 + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 ) result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry subcategory = CAT_MISCFOOD \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index f3675ccb0d..931a78212f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -329,7 +329,7 @@ datum/crafting_recipe/food/donut/meat name = "Strawberry cherry cupcake" reqs = list( /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberries = 1 + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 ) result = /obj/item/reagent_containers/food/snacks/strawberrycupcake subcategory = CAT_PASTRY diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm index a0a225c44f..81824dc4b8 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm @@ -164,7 +164,7 @@ name = "Strawberry pie" reqs = list( /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberries = 1 + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 ) result = /obj/item/reagent_containers/food/snacks/pie/strawberrypie subcategory = CAT_PIE From e1cee157208e3aba859d31f3f64a9d2369486125 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sun, 18 Aug 2019 01:40:36 -0400 Subject: [PATCH 8/8] seed --- code/modules/vending/megaseed.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index bdf53d3953..52bbbcb904 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -33,7 +33,7 @@ /obj/item/seeds/soya = 3, /obj/item/seeds/sugarcane = 3, /obj/item/seeds/sunflower = 3, - /obj/item/seeds/strawberries = 3, + /obj/item/seeds/strawberry = 3, /obj/item/seeds/tea = 3, /obj/item/seeds/tobacco = 3, /obj/item/seeds/tomato = 3,