diff --git a/code/game/objects/structures/flora/flora.dm b/code/game/objects/structures/flora/flora.dm index 6f7963509e..96795f446d 100644 --- a/code/game/objects/structures/flora/flora.dm +++ b/code/game/objects/structures/flora/flora.dm @@ -112,9 +112,33 @@ destroy_on_harvest = TRUE harvest_tool = /obj/item/weapon/material/knife - randomize_harvest_count = FALSE + randomize_harvest_count = TRUE harvest_loot = list(/obj/item/stack/material/fiber = 1) - max_harvests = 1 + min_harvests = 1 + max_harvests = 3 + +/obj/structure/flora/ausbushes/spawn_harvest(var/path = null, var/mob/user = null) + . = ..() + if(. && prob(15)) + var/static/list/possibleseeds = list( + /obj/item/seeds/ambrosiavulgarisseed = 1, + /obj/item/seeds/carrotseed = 5, + /obj/item/seeds/chiliseed = 5, + /obj/item/seeds/cornseed = 10, + /obj/item/seeds/grapeseed = 5, + /obj/item/seeds/grassseed = 1, + /obj/item/seeds/lavenderseed = 5, + /obj/item/seeds/onionseed = 5, + /obj/item/seeds/random = 1, + /obj/item/seeds/reishimycelium = 5, + /obj/item/seeds/sugarcaneseed = 5, + /obj/item/seeds/tomatoseed = 5, + /obj/item/seeds/towermycelium = 5, + /obj/item/seeds/watermelonseed = 10, + /obj/item/seeds/wheatseed = 25, + /obj/item/seeds/whitebeetseed = 5) + var/choice = pickweight(possibleseeds) + new choice(get_turf(user)) /obj/structure/flora/ausbushes/New() ..() diff --git a/code/modules/materials/materials/organic/cloth.dm b/code/modules/materials/materials/organic/cloth.dm index 1908597d32..294e046670 100644 --- a/code/modules/materials/materials/organic/cloth.dm +++ b/code/modules/materials/materials/organic/cloth.dm @@ -10,6 +10,8 @@ integrity = 40 pass_stack_colors = TRUE supply_conversion_value = 2 + hardness = 5 + /datum/material/cloth/generate_recipes() recipes = list( @@ -45,6 +47,7 @@ protectiveness = 15 // 4% pass_stack_colors = TRUE supply_conversion_value = 3 + hardness = 5 /datum/material/cloth/teal name = "teal" @@ -107,23 +110,27 @@ display_name = "comfy" use_name = "red upholstery" icon_colour = "#DA020A" - flags = MATERIAL_PADDING + flags = MATERIAL_PADDING|MATERIAL_BRITTLE ignition_point = T0C+232 melting_point = T0C+300 sheet_singular_name = "tile" sheet_plural_name = "tiles" protectiveness = 1 // 4% conductive = 0 + hardness = 5 + integrity = 40 /datum/material/cotton name = "cotton" display_name ="cotton" icon_colour = "#FFFFFF" - flags = MATERIAL_PADDING + flags = MATERIAL_PADDING|MATERIAL_BRITTLE ignition_point = T0C+232 melting_point = T0C+300 protectiveness = 1 // 4% conductive = 0 + hardness = 5 + integrity = 10 /datum/material/fibers name = MAT_FIBERS @@ -131,9 +138,11 @@ sheet_singular_name = "fiber" sheet_singular_name = "fibers" icon_colour = "#006b0e" - flags = MATERIAL_PADDING + flags = MATERIAL_PADDING|MATERIAL_BRITTLE ignition_point = T0C+232 melting_point = T0C+300 protectiveness = 1 // 4% conductive = 0 pass_stack_colors = TRUE + hardness = 5 + integrity = 5 \ No newline at end of file