Kills grown/misc.dm (#7074)

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-07-26 15:43:57 +01:00
committed by GitHub
co-authored by tralezab
parent 97da6f3071
commit 247afa352b
13 changed files with 401 additions and 145 deletions
-28
View File
@@ -262,34 +262,6 @@
desc = "A pile of scrap metal. It seems damaged beyond repair."
icon_state = "clockgolem_dead"
/obj/structure/fluff/hedge
name = "hedge"
desc = "A large bushy hedge."
icon = 'icons/obj/smooth_structures/hedge.dmi'
icon_state = "hedge-0"
base_icon_state = "hedge"
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_HEDGE_FLUFF)
canSmoothWith = list(SMOOTH_GROUP_HEDGE_FLUFF)
density = TRUE
anchored = TRUE
deconstructible = FALSE
max_integrity = 80
/obj/structure/fluff/hedge/attacked_by(obj/item/I, mob/living/user)
if(opacity && HAS_TRAIT(user, TRAIT_BONSAI) && I.get_sharpness())
to_chat(user,span_notice("You start trimming \the [src]."))
if(do_after(user, 3 SECONDS,target=src))
to_chat(user,span_notice("You finish trimming \the [src]."))
opacity = FALSE
else
return ..()
/**
* useful for mazes and such
*/
/obj/structure/fluff/hedge/opaque
opacity = TRUE
/obj/structure/fluff/tram_rail
name = "tram rail"
desc = "Great for trams, not so great for skating."
+31
View File
@@ -0,0 +1,31 @@
// aloe
/obj/item/seeds/aloe
name = "pack of aloe seeds"
desc = "These seeds grow into aloe."
icon_state = "seed-aloe"
species = "aloe"
plantname = "Aloe"
product = /obj/item/food/grown/aloe
lifespan = 60
endurance = 25
maturation = 4
production = 4
yield = 6
growthstages = 5
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.05)
/obj/item/food/grown/aloe
seed = /obj/item/seeds/aloe
name = "aloe"
desc = "Cut leaves from the aloe plant."
icon_state = "aloe"
bite_consumption_mod = 3
foodtypes = VEGETABLES
juice_results = list(/datum/reagent/consumable/aloejuice = 0)
distill_reagent = /datum/reagent/consumable/ethanol/tequila
/obj/item/food/grown/aloe/microwave_act(obj/machinery/microwave/M)
new /obj/item/stack/medical/aloe(drop_location(), 2)
qdel(src)
-82
View File
@@ -105,88 +105,6 @@
distill_reagent = null
wine_power = 60
// Cherries
/obj/item/seeds/cherry
name = "pack of cherry pits"
desc = "Careful not to crack a tooth on one... That'd be the pits."
icon_state = "seed-cherry"
species = "cherry"
plantname = "Cherry Tree"
product = /obj/item/food/grown/cherries
lifespan = 35
endurance = 35
maturation = 5
production = 5
growthstages = 5
instability = 15
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "cherry-grow"
icon_dead = "cherry-dead"
icon_harvest = "cherry-harvest"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/cherry/blue, /obj/item/seeds/cherry/bulb)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07)
/obj/item/food/grown/cherries
seed = /obj/item/seeds/cherry
name = "cherries"
desc = "Great for toppings!"
icon_state = "cherry"
gender = PLURAL
bite_consumption_mod = 2
foodtypes = FRUIT
grind_results = list(/datum/reagent/consumable/cherryjelly = 0)
tastes = list("cherry" = 1)
wine_power = 30
// Blue Cherries
/obj/item/seeds/cherry/blue
name = "pack of blue cherry pits"
desc = "The blue kind of cherries."
icon_state = "seed-bluecherry"
species = "bluecherry"
plantname = "Blue Cherry Tree"
product = /obj/item/food/grown/bluecherries
mutatelist = list()
reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07, /datum/reagent/oxygen = 0.07)
rarity = 10
/obj/item/food/grown/bluecherries
seed = /obj/item/seeds/cherry/blue
name = "blue cherries"
desc = "They're cherries that are blue."
icon_state = "bluecherry"
bite_consumption_mod = 2
foodtypes = FRUIT
grind_results = list(/datum/reagent/consumable/bluecherryjelly = 0)
tastes = list("blue cherry" = 1)
wine_power = 50
//Cherry Bulbs
/obj/item/seeds/cherry/bulb
name = "pack of cherry bulb pits"
desc = "The glowy kind of cherries."
icon_state = "seed-cherrybulb"
species = "cherrybulb"
plantname = "Cherry Bulb Tree"
product = /obj/item/food/grown/cherrybulbs
genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/pink)
mutatelist = list()
reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07)
rarity = 10
graft_gene = /datum/plant_gene/trait/glow/pink
/obj/item/food/grown/cherrybulbs
seed = /obj/item/seeds/cherry/bulb
name = "cherry bulbs"
desc = "They're like little Space Christmas lights!"
icon_state = "cherry_bulb"
bite_consumption_mod = 2
foodtypes = FRUIT
grind_results = list(/datum/reagent/consumable/cherryjelly = 0)
tastes = list("cherry" = 1)
wine_power = 50
// Grapes
/obj/item/seeds/grape
name = "pack of grape seeds"
+103
View File
@@ -0,0 +1,103 @@
// Cherries
/obj/item/seeds/cherry
name = "pack of cherry pits"
desc = "Careful not to crack a tooth on one... That'd be the pits."
icon_state = "seed-cherry"
species = "cherry"
plantname = "Cherry Tree"
product = /obj/item/food/grown/cherries
lifespan = 35
endurance = 35
maturation = 5
production = 5
growthstages = 5
instability = 15
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "cherry-grow"
icon_dead = "cherry-dead"
icon_harvest = "cherry-harvest"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/cherry/blue, /obj/item/seeds/cherry/bulb)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07)
/obj/item/food/grown/cherries
seed = /obj/item/seeds/cherry
name = "cherries"
desc = "Great for toppings!"
icon_state = "cherry"
gender = PLURAL
bite_consumption_mod = 2
foodtypes = FRUIT
grind_results = list(/datum/reagent/consumable/cherryjelly = 0)
tastes = list("cherry" = 1)
wine_power = 30
// Blue Cherries
/obj/item/seeds/cherry/blue
name = "pack of blue cherry pits"
desc = "The blue kind of cherries."
icon_state = "seed-bluecherry"
species = "bluecherry"
plantname = "Blue Cherry Tree"
product = /obj/item/food/grown/bluecherries
mutatelist = list()
reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07, /datum/reagent/oxygen = 0.07)
rarity = 10
/obj/item/food/grown/bluecherries
seed = /obj/item/seeds/cherry/blue
name = "blue cherries"
desc = "They're cherries that are blue."
icon_state = "bluecherry"
bite_consumption_mod = 2
foodtypes = FRUIT
grind_results = list(/datum/reagent/consumable/bluecherryjelly = 0)
tastes = list("blue cherry" = 1)
wine_power = 50
//Cherry Bulbs
/obj/item/seeds/cherry/bulb
name = "pack of cherry bulb pits"
desc = "The glowy kind of cherries."
icon_state = "seed-cherrybulb"
species = "cherrybulb"
plantname = "Cherry Bulb Tree"
product = /obj/item/food/grown/cherrybulbs
genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/pink)
mutatelist = list()
reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07)
rarity = 10
graft_gene = /datum/plant_gene/trait/glow/pink
/obj/item/food/grown/cherrybulbs
seed = /obj/item/seeds/cherry/bulb
name = "cherry bulbs"
desc = "They're like little Space Christmas lights!"
icon_state = "cherry_bulb"
bite_consumption_mod = 2
foodtypes = FRUIT
grind_results = list(/datum/reagent/consumable/cherryjelly = 0)
tastes = list("cherry" = 1)
wine_power = 50
//Cherry Bombs
/obj/item/seeds/cherry/bomb
name = "pack of cherry bomb pits"
desc = "They give you vibes of dread and frustration."
icon_state = "seed-cherry_bomb"
species = "cherry_bomb"
plantname = "Cherry Bomb Tree"
product = /obj/item/food/grown/cherry_bomb
mutatelist = list()
genes = list(/datum/plant_gene/trait/bomb_plant, /datum/plant_gene/trait/modified_volume/cherry_bomb)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.1, /datum/reagent/gunpowder = 0.7)
rarity = 60 //See above
/obj/item/food/grown/cherry_bomb
name = "cherry bombs"
desc = "You think you can hear the hissing of a tiny fuse."
icon_state = "cherry_bomb"
alt_icon = "cherry_bomb_lit"
seed = /obj/item/seeds/cherry/bomb
bite_consumption_mod = 3
wine_power = 80
@@ -0,0 +1,31 @@
// Gatfruit
/obj/item/seeds/gatfruit
name = "pack of gatfruit seeds"
desc = "These seeds grow into .357 revolvers."
icon_state = "seed-gatfruit"
species = "gatfruit"
plantname = "Gatfruit Tree"
product = /obj/item/food/grown/shell/gatfruit
genes = list(/datum/plant_gene/trait/repeated_harvest)
lifespan = 20
endurance = 20
maturation = 40
production = 10
yield = 2
potency = 60
growthstages = 2
rarity = 60 // Obtainable only with xenobio+superluck.
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
reagents_add = list(/datum/reagent/sulfur = 0.1, /datum/reagent/carbon = 0.1, /datum/reagent/nitrogen = 0.07, /datum/reagent/potassium = 0.05)
/obj/item/food/grown/shell/gatfruit
seed = /obj/item/seeds/gatfruit
name = "gatfruit"
desc = "It smells like burning."
icon_state = "gatfruit"
trash_type = /obj/item/gun/ballistic/revolver
bite_consumption_mod = 2
foodtypes = FRUIT
tastes = list("gunpowder" = 1)
wine_power = 90 //It burns going down, too.
+60
View File
@@ -0,0 +1,60 @@
/obj/item/seeds/shrub
name = "pack of shrub seeds"
desc = "These seeds grow into hedge shrubs."
icon_state = "seed-shrub"
species = "shrub"
plantname = "Shrubbery"
product = /obj/item/grown/shrub
lifespan = 40
endurance = 30
maturation = 4
production = 6
yield = 2
instability = 10
growthstages = 3
reagents_add = list()
/obj/item/grown/shrub
seed = /obj/item/seeds/shrub
name = "shrub"
desc = "A shrubbery, it looks nice and it was only a few credits too. Plant it on the ground to grow a hedge, shrubbing skills not required."
icon_state = "shrub"
/obj/item/grown/shrub/attack_self(mob/user)
var/turf/player_turf = get_turf(user)
if(player_turf?.is_blocked_turf(TRUE))
return FALSE
user.visible_message(span_danger("[user] begins to plant \the [src]..."))
if(do_after(user, 8 SECONDS, target = user.drop_location(), progress = TRUE))
new /obj/structure/fluff/hedge/opaque(user.drop_location())
to_chat(user, span_notice("You plant \the [src]."))
qdel(src)
///the structure placed by the shrubs
/obj/structure/fluff/hedge
name = "hedge"
desc = "A large bushy hedge."
icon = 'icons/obj/smooth_structures/hedge.dmi'
icon_state = "hedge-0"
base_icon_state = "hedge"
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_HEDGE_FLUFF)
canSmoothWith = list(SMOOTH_GROUP_HEDGE_FLUFF)
density = TRUE
anchored = TRUE
deconstructible = FALSE
max_integrity = 80
/obj/structure/fluff/hedge/attacked_by(obj/item/I, mob/living/user)
if(opacity && HAS_TRAIT(user, TRAIT_BONSAI) && I.get_sharpness())
to_chat(user,span_notice("You start trimming \the [src]."))
if(do_after(user, 3 SECONDS,target=src))
to_chat(user,span_notice("You finish trimming \the [src]."))
opacity = FALSE
else
return ..()
/**
* useful for mazes and such
*/
/obj/structure/fluff/hedge/opaque
opacity = TRUE
@@ -1,5 +1,35 @@
// A very special plant, deserving it's own file.
// Yes, i'm talking about cabbage, baby! No, just kidding, but cabbages are the precursor to replica pods, so they are here as well.
/obj/item/seeds/cabbage
name = "pack of cabbage seeds"
desc = "These seeds grow into cabbages."
icon_state = "seed-cabbage"
species = "cabbage"
plantname = "Cabbages"
product = /obj/item/food/grown/cabbage
lifespan = 50
endurance = 25
maturation = 3
production = 5
yield = 4
instability = 10
growthstages = 1
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list(/obj/item/seeds/replicapod)
reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
seed_flags = null
/obj/item/food/grown/cabbage
seed = /obj/item/seeds/cabbage
name = "cabbage"
desc = "Ewwwwwwwwww. Cabbage."
icon_state = "cabbage"
foodtypes = VEGETABLES
wine_power = 20
///The actual replica pods themselves!
/obj/item/seeds/replicapod
name = "pack of replica pod seeds"
desc = "These seeds grow into replica pods. They say these are used to harvest humans."
@@ -0,0 +1,57 @@
// Sugarcane
/obj/item/seeds/sugarcane
name = "pack of sugarcane seeds"
desc = "These seeds grow into sugarcane."
icon_state = "seed-sugarcane"
species = "sugarcane"
plantname = "Sugarcane"
product = /obj/item/food/grown/sugarcane
genes = list(/datum/plant_gene/trait/repeated_harvest)
lifespan = 60
endurance = 50
maturation = 3
yield = 4
instability = 15
growthstages = 2
reagents_add = list(/datum/reagent/consumable/sugar = 0.25)
mutatelist = list(/obj/item/seeds/bamboo)
/obj/item/food/grown/sugarcane
seed = /obj/item/seeds/sugarcane
name = "sugarcane"
desc = "Sickly sweet."
icon_state = "sugarcane"
bite_consumption_mod = 2
foodtypes = VEGETABLES | SUGAR
distill_reagent = /datum/reagent/consumable/ethanol/rum
///and bamboo!
/obj/item/seeds/bamboo
name = "pack of bamboo seeds"
desc = "A plant known for its flexible and resistant logs."
icon_state = "seed-bamboo"
species = "bamboo"
plantname = "Bamboo"
product = /obj/item/grown/log/bamboo
lifespan = 80
endurance = 70
maturation = 15
production = 2
yield = 5
potency = 50
growthstages = 2
growing_icon = 'icons/obj/hydroponics/growing.dmi'
icon_dead = "bamboo-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
/obj/item/grown/log/bamboo
seed = /obj/item/seeds/bamboo
name = "bamboo log"
desc = "A long and resistant bamboo log."
icon_state = "bamboo"
plank_type = /obj/item/stack/sheet/mineral/bamboo
plank_name = "bamboo sticks"
/obj/item/grown/log/bamboo/CheckAccepted(obj/item/I)
return FALSE
@@ -30,9 +30,6 @@
reagents_add = list(/datum/reagent/cellulose = 0.05, /datum/reagent/iron = 0.05)
rarity = 20
/obj/item/grown/log
seed = /obj/item/seeds/tower
name = "tower-cap log"
@@ -103,35 +100,6 @@
/obj/item/grown/log/steel/CheckAccepted(obj/item/I)
return FALSE
/obj/item/seeds/bamboo
name = "pack of bamboo seeds"
desc = "A plant known for its flexible and resistant logs."
icon_state = "seed-bamboo"
species = "bamboo"
plantname = "Bamboo"
product = /obj/item/grown/log/bamboo
lifespan = 80
endurance = 70
maturation = 15
production = 2
yield = 5
potency = 50
growthstages = 2
growing_icon = 'icons/obj/hydroponics/growing.dmi'
icon_dead = "bamboo-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
/obj/item/grown/log/bamboo
seed = /obj/item/seeds/bamboo
name = "bamboo log"
desc = "A long and resistant bamboo log."
icon_state = "bamboo"
plank_type = /obj/item/stack/sheet/mineral/bamboo
plank_name = "bamboo sticks"
/obj/item/grown/log/bamboo/CheckAccepted(obj/item/I)
return FALSE
/obj/structure/punji_sticks
name = "punji sticks"
desc = "Don't step on this."
@@ -0,0 +1,81 @@
// Starthistle
/obj/item/seeds/starthistle
name = "pack of starthistle seeds"
desc = "A robust species of weed that often springs up in-between the cracks of spaceship parking lots."
icon_state = "seed-starthistle"
species = "starthistle"
plantname = "Starthistle"
lifespan = 70
endurance = 50 // damm pesky weeds
maturation = 5
production = 1
yield = 2
potency = 10
instability = 35
growthstages = 3
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
genes = list(/datum/plant_gene/trait/plant_type/weed_hardy)
mutatelist = list(/obj/item/seeds/starthistle/corpse_flower, /obj/item/seeds/galaxythistle)
graft_gene = /datum/plant_gene/trait/plant_type/weed_hardy
/obj/item/seeds/starthistle/harvest(mob/user)
var/obj/machinery/hydroponics/parent = loc
var/seed_count = yield
if(prob(getYield() * 20))
seed_count++
var/output_loc = parent.Adjacent(user) ? user.loc : parent.loc
for(var/i in 1 to seed_count)
var/obj/item/seeds/starthistle/harvestseeds = Copy()
harvestseeds.forceMove(output_loc)
parent.update_tray()
// Corpse flower
/obj/item/seeds/starthistle/corpse_flower
name = "pack of corpse flower seeds"
desc = "A species of plant that emits a horrible odor. The odor stops being produced in difficult atmospheric conditions."
icon_state = "seed-corpse-flower"
species = "corpse-flower"
plantname = "Corpse flower"
production = 2
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
genes = list(/datum/plant_gene/trait/gas_production)
mutatelist = list()
reagents_add = list(/datum/reagent/toxin/formaldehyde = 0.1)
//Galaxy Thistle
/obj/item/seeds/galaxythistle
name = "pack of galaxythistle seeds"
desc = "An impressive species of weed that is thought to have evolved from the simple milk thistle. Contains flavolignans that can help repair a damaged liver."
icon_state = "seed-galaxythistle"
species = "galaxythistle"
plantname = "Galaxythistle"
product = /obj/item/food/grown/galaxythistle
lifespan = 70
endurance = 40
maturation = 3
production = 2
yield = 2
potency = 25
instability = 35
growthstages = 3
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
genes = list(/datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/invasive)
mutatelist = list()
reagents_add = list(/datum/reagent/consumable/nutriment = 0.05, /datum/reagent/medicine/silibinin = 0.1)
graft_gene = /datum/plant_gene/trait/invasive
/obj/item/seeds/galaxythistle/Initialize(mapload,nogenes)
. = ..()
if(!nogenes)
unset_mutability(/datum/plant_gene/trait/invasive, PLANT_GENE_REMOVABLE)
/obj/item/food/grown/galaxythistle
seed = /obj/item/seeds/galaxythistle
name = "galaxythistle flower head"
desc = "This spiny cluster of florets reminds you of the highlands."
icon_state = "galaxythistle"
bite_consumption_mod = 2
foodtypes = VEGETABLES
wine_power = 35
tastes = list("thistle" = 2, "artichoke" = 1)
+8 -3
View File
@@ -2332,6 +2332,7 @@
#include "code\modules\hydroponics\beekeeping\beekeeper_suit.dm"
#include "code\modules\hydroponics\beekeeping\honey_frame.dm"
#include "code\modules\hydroponics\beekeeping\honeycomb.dm"
#include "code\modules\hydroponics\grown\aloe.dm"
#include "code\modules\hydroponics\grown\ambrosia.dm"
#include "code\modules\hydroponics\grown\apple.dm"
#include "code\modules\hydroponics\grown\banana.dm"
@@ -2339,6 +2340,7 @@
#include "code\modules\hydroponics\grown\berries.dm"
#include "code\modules\hydroponics\grown\cannabis.dm"
#include "code\modules\hydroponics\grown\cereals.dm"
#include "code\modules\hydroponics\grown\cherries.dm"
#include "code\modules\hydroponics\grown\chili.dm"
#include "code\modules\hydroponics\grown\citrus.dm"
#include "code\modules\hydroponics\grown\cocoa_vanilla.dm"
@@ -2347,13 +2349,12 @@
#include "code\modules\hydroponics\grown\eggplant.dm"
#include "code\modules\hydroponics\grown\flowers.dm"
#include "code\modules\hydroponics\grown\garlic.dm"
#include "code\modules\hydroponics\grown\gatfruit.dm"
#include "code\modules\hydroponics\grown\grass_carpet.dm"
#include "code\modules\hydroponics\grown\hedges.dm"
#include "code\modules\hydroponics\grown\korta_nut.dm"
#include "code\modules\hydroponics\grown\kudzu.dm"
#include "code\modules\hydroponics\grown\melon.dm"
#include "code\modules\hydroponics\grown\misc.dm"
#include "code\modules\hydroponics\grown\mushrooms.dm"
#include "code\modules\hydroponics\grown\nettle.dm"
#include "code\modules\hydroponics\grown\onion.dm"
#include "code\modules\hydroponics\grown\peas.dm"
#include "code\modules\hydroponics\grown\pineapple.dm"
@@ -2363,10 +2364,14 @@
#include "code\modules\hydroponics\grown\random.dm"
#include "code\modules\hydroponics\grown\replicapod.dm"
#include "code\modules\hydroponics\grown\root.dm"
#include "code\modules\hydroponics\grown\sugarcane.dm"
#include "code\modules\hydroponics\grown\tea_coffee.dm"
#include "code\modules\hydroponics\grown\tobacco.dm"
#include "code\modules\hydroponics\grown\tomato.dm"
#include "code\modules\hydroponics\grown\towercap.dm"
#include "code\modules\hydroponics\grown\weeds\kudzu.dm"
#include "code\modules\hydroponics\grown\weeds\nettle.dm"
#include "code\modules\hydroponics\grown\weeds\starthistle.dm"
#include "code\modules\instruments\items.dm"
#include "code\modules\instruments\stationary.dm"
#include "code\modules\instruments\instrument_data\_instrument_data.dm"