cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Plant Refactor 4

Browse Source
This commit is contained in:
c0
2016-03-07 12:46:12 +03:00
parent 9f302e6ed4
commit 08bdcc3024
38 changed files with 485 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown/ambrosia.dm
+4 -5
View File
@@ -1,12 +1,11 @@
// Ambrosia - base type
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia
seed = /obj/item/seeds/ambrosia
name = "ambrosia branch"
desc = "This is a plant."
icon_state = "ambrosiavulgaris"
slot_flags = SLOT_HEAD
filling_color = "#008000"
reagents_add = list("nutriment" = 0)
// It means 1 nutriment no matter how low or high potency is
bitesize_mod = 2
// Ambrosia Vulgaris
@@ -23,12 +22,12 @@
potency = 5
icon_dead = "ambrosia-dead"
mutatelist = list(/obj/item/seeds/ambrosia/deus)
reagents_add = list("space_drugs" = 0.15, "salglu_solution" = 0.25, "vitamin" = 0.04, "nutriment" = 0, "toxin" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris
seed = /obj/item/seeds/ambrosia
name = "ambrosia vulgaris branch"
desc = "This is a plant containing various healing chemicals."
reagents_add = list("space_drugs" = 0.15, "salglu_solution" = 0.25, "vitamin" = 0.04, "nutriment" = 0, "toxin" = 0.1)
// Ambrosia Deus
/obj/item/seeds/ambrosia/deus
@@ -39,6 +38,7 @@
plantname = "Ambrosia Deus"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus
mutatelist = list()
reagents_add = list("omnizine" = 0.15, "synaptizine" = 0.15, "space_drugs" = 0.1, "vitamin" = 0.04, "nutriment" = 0)
rarity = 40
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus
@@ -46,5 +46,4 @@
name = "ambrosia deus branch"
desc = "Eating this makes you feel immortal!"
icon_state = "ambrosiadeus"
filling_color = "#008B8B"
reagents_add = list("omnizine" = 0.15, "synaptizine" = 0.15, "space_drugs" = 0.1, "vitamin" = 0.04, "nutriment" = 0)
filling_color = "#008B8B"
code/modules/hydroponics/grown/apple.dm
+4 -4
View File
@@ -12,6 +12,7 @@
icon_grow = "apple-grow"
icon_dead = "apple-dead"
mutatelist = list(/obj/item/seeds/apple/gold)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/apple
seed = /obj/item/seeds/apple
@@ -19,18 +20,17 @@
desc = "It's a little piece of Eden."
icon_state = "apple"
filling_color = "#FF4500"
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
bitesize = 100 // Always eat the apple in one bite
// Posioned Apple
/obj/item/seeds/apple/poisoned
product = /obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned
mutatelist = list()
reagents_add = list("cyanide" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 50 // Source of cyanide, and hard (almost impossible) to obtain normally.
/obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned
seed = /obj/item/seeds/apple/poisoned
reagents_add = list("cyanide" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
// Gold Apple
/obj/item/seeds/apple/gold
@@ -43,6 +43,7 @@
maturation = 10
production = 10
mutatelist = list()
reagents_add = list("gold" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 40 // Alchemy!
/obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold
@@ -50,5 +51,4 @@
name = "golden apple"
desc = "Emblazoned upon the apple is the word 'Kallisti'."
icon_state = "goldapple"
filling_color = "#FFD700"
reagents_add = list("gold" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
filling_color = "#FFD700"
code/modules/hydroponics/grown/banana.dm
+7 -7
View File
@@ -10,6 +10,7 @@
endurance = 30
icon_dead = "banana-dead"
mutatelist = list(/obj/item/seeds/banana/mime, /obj/item/seeds/banana/bluespace)
reagents_add = list("banana" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
/obj/item/weapon/reagent_containers/food/snacks/grown/banana
seed = /obj/item/seeds/banana
@@ -19,7 +20,6 @@
item_state = "banana"
trash = /obj/item/weapon/grown/bananapeel
filling_color = "#FFFF00"
reagents_add = list("banana" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
@@ -36,7 +36,7 @@
return (OXYLOSS)
// Mimana
// Mimana - invisible sprites are totally a feature!
/obj/item/seeds/banana/mime
name = "pack of mimana seeds"
desc = "They're seeds that grow into mimana trees. When grown, keep away from mime."
@@ -46,6 +46,7 @@
product = /obj/item/weapon/reagent_containers/food/snacks/grown/banana/mime
growthstages = 4
mutatelist = list()
reagents_add = list("nothing" = 0.1, "mutetoxin" = 0.1, "nutriment" = 0.02)
rarity = 15
/obj/item/weapon/reagent_containers/food/snacks/grown/banana/mime
@@ -55,7 +56,6 @@
icon_state = "mimana"
trash = /obj/item/weapon/grown/bananapeel/mimanapeel
filling_color = "#FFFFEE"
reagents_add = list("nothing" = 0.1, "mutetoxin" = 0.1, "nutriment" = 0.02)
// Bluespace Banana
@@ -68,6 +68,7 @@
plantname = "Bluespace Banana Tree"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/banana/bluespace
mutatelist = list()
reagents_add = list("singulo" = 0.2, "banana" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
rarity = 30
/obj/item/weapon/reagent_containers/food/snacks/grown/banana/bluespace
@@ -77,7 +78,6 @@
trash = /obj/item/weapon/grown/bananapeel/bluespace
filling_color = "#0000FF"
origin_tech = "bluespace=3"
reagents_add = list("singulo" = 0.2, "banana" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
@@ -101,8 +101,8 @@
/obj/item/weapon/grown/bananapeel/Crossed(AM as mob|obj)
if (istype(AM, /mob/living/carbon))
var/mob/living/carbon/M = AM
var/stun = Clamp(potency / 10, 1, 10)
var/weaken = Clamp(potency / 20, 0.5, 5)
var/stun = Clamp(seed.potency / 10, 1, 10)
var/weaken = Clamp(seed.potency / 20, 0.5, 5)
M.slip(stun, weaken, src)
return 1
@@ -114,7 +114,7 @@
/obj/item/weapon/grown/bananapeel/bluespace/Crossed(AM)
if(..())
var/teleport_radius = max(round(potency / 10), 1)
var/teleport_radius = max(round(seed.potency / 10), 1)
do_teleport(AM, get_turf(AM), teleport_radius)
AM << "<span class='notice'>You slip through spacetime!</span>"
code/modules/hydroponics/grown/beans.dm
+3 -3
View File
@@ -13,6 +13,7 @@
icon_grow = "soybean-grow"
icon_dead = "soybean-dead"
mutatelist = list(/obj/item/seeds/soya/koi)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
seed = /obj/item/seeds/soya
@@ -21,7 +22,6 @@
gender = PLURAL
icon_state = "soybeans"
filling_color = "#F0E68C"
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
bitesize_mod = 2
// Koibean
@@ -32,8 +32,9 @@
species = "koibean"
plantname = "Koibean Plants"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/koibeans
mutatelist = list()
potency = 10
mutatelist = list()
reagents_add = list("carpotoxin" = 0.05, "vitamin" = 0.04, "nutriment" = 0.05)
rarity = 20
/obj/item/weapon/reagent_containers/food/snacks/grown/koibeans
@@ -42,5 +43,4 @@
desc = "Something about these seems fishy."
icon_state = "koibeans"
filling_color = "#F0E68C"
reagents_add = list("carpotoxin" = 0.05, "vitamin" = 0.04, "nutriment" = 0.05)
bitesize_mod = 2
code/modules/hydroponics/grown/berries.dm
+12 -13
View File
@@ -13,6 +13,7 @@
icon_grow = "berry-grow" // Uses one growth icons set for all the subtypes
icon_dead = "berry-dead" // Same for the dead icon
mutatelist = list(/obj/item/seeds/berry/glow, /obj/item/seeds/berry/poison)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/berries
seed = /obj/item/seeds/berry
@@ -21,7 +22,6 @@
icon_state = "berrypile"
gender = PLURAL
filling_color = "#FF00FF"
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
bitesize_mod = 2
// Poison Berries
@@ -33,6 +33,7 @@
plantname = "Poison-Berry Bush"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison
mutatelist = list(/obj/item/seeds/berry/death)
reagents_add = list("toxin" = 0.25, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 10 // Mildly poisonous berries are common in reality
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison
@@ -41,7 +42,6 @@
desc = "Taste so good, you could die!"
icon_state = "poisonberrypile"
filling_color = "#C71585"
reagents_add = list("toxin" = 0.25, "vitamin" = 0.04, "nutriment" = 0.1)
// Death Berries
/obj/item/seeds/berry/death
@@ -54,6 +54,7 @@
lifespan = 30
potency = 50
mutatelist = list()
reagents_add = list("lexorin" = 0.25, "toxin" = 0.35, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 30
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/death
@@ -62,7 +63,6 @@
desc = "Taste so good, you could die!"
icon_state = "deathberrypile"
filling_color = "#708090"
reagents_add = list("lexorin" = 0.25, "toxin" = 0.35, "vitamin" = 0.04, "nutriment" = 0.1)
// Glow Berries
/obj/item/seeds/berry/glow
@@ -75,6 +75,7 @@
lifespan = 30
endurance = 25
mutatelist = list()
reagents_add = list("uranium" = 0.25, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 20
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow
@@ -85,22 +86,21 @@
var/brightness_on = 2 //luminosity when on
icon_state = "glowberrypile"
filling_color = "#7CFC00"
reagents_add = list("uranium" = 0.25, "vitamin" = 0.04, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/Destroy()
if(istype(loc,/mob))
loc.AddLuminosity(round(-potency / 5))
loc.AddLuminosity(round(-seed.potency / 5))
return ..()
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/pickup(mob/user)
..()
src.SetLuminosity(0)
user.AddLuminosity(round(potency / 5))
user.AddLuminosity(round(seed.potency / 5))
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/dropped(mob/user)
..()
user.AddLuminosity(round(-potency / 5))
src.SetLuminosity(round(potency / 5))
user.AddLuminosity(round(-seed.potency / 5))
src.SetLuminosity(round(seed.potency / 5))
// Cherries
@@ -119,6 +119,7 @@
icon_grow = "cherry-grow"
icon_dead = "cherry-dead"
mutatelist = list(/obj/item/seeds/cherry/blue)
reagents_add = list("nutriment" = 0.07, "sugar" = 0.07)
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries
seed = /obj/item/seeds/cherry
@@ -127,7 +128,6 @@
icon_state = "cherry"
gender = PLURAL
filling_color = "#FF0000"
reagents_add = list("nutriment" = 0.07, "sugar" = 0.07)
bitesize_mod = 2
// Blue Cherries
@@ -147,7 +147,6 @@
desc = "They're cherries that are blue."
icon_state = "bluecherry"
filling_color = "#6495ED"
reagents_add = list("nutriment" = 0.07, "sugar" = 0.07)
bitesize_mod = 2
@@ -168,6 +167,7 @@
icon_grow = "grape-grow"
icon_dead = "grape-dead"
mutatelist = list(/obj/item/seeds/grape/green)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1, "sugar" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/grapes
seed = /obj/item/seeds/grape
@@ -176,7 +176,6 @@
icon_state = "grapes"
dried_type = /obj/item/weapon/reagent_containers/food/snacks/no_raisin
filling_color = "#FF1493"
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1, "sugar" = 0.1)
bitesize_mod = 2
// Green Grapes
@@ -187,6 +186,7 @@
species = "greengrape"
plantname = "Green-Grape Vine"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/grapes/green
reagents_add = list("salglu_solution" = 0.25, "vitamin" = 0.04, "nutriment" = 0.1, "sugar" = 0.1)
// No rarity: technically it's a beneficial mutant, but it's not exactly "new"...
mutatelist = list()
@@ -194,5 +194,4 @@
seed = /obj/item/seeds/grape/green
name = "bunch of green grapes"
icon_state = "greengrapes"
filling_color = "#7FFF00"
reagents_add = list("salglu_solution" = 0.25, "vitamin" = 0.04, "nutriment" = 0.1, "sugar" = 0.1)
filling_color = "#7FFF00"
code/modules/hydroponics/grown/cereals.dm
+2 -4
View File
@@ -12,6 +12,7 @@
oneharvest = 1
icon_dead = "wheat-dead"
mutatelist = list(/obj/item/seeds/wheat/oat)
reagents_add = list("nutriment" = 0.04)
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat
seed = /obj/item/seeds/wheat
@@ -21,7 +22,6 @@
icon_state = "wheat"
filling_color = "#F0E68C"
bitesize_mod = 2
reagents_add = list("nutriment" = 0.04)
// Oat
/obj/item/seeds/wheat/oat
@@ -41,7 +41,6 @@
icon_state = "oat"
filling_color = "#556B2F"
bitesize_mod = 2
reagents_add = list("nutriment" = 0.04)
// Rice
/obj/item/seeds/wheat/rice
@@ -61,5 +60,4 @@
gender = PLURAL
icon_state = "rice"
filling_color = "#FAFAD2"
bitesize_mod = 2
reagents_add = list("nutriment" = 0.04)
bitesize_mod = 2
code/modules/hydroponics/grown/chili.dm
+3 -4
View File
@@ -13,8 +13,8 @@
potency = 20
icon_grow = "chili-grow" // Uses one growth icons set for all the subtypes
icon_dead = "chili-dead" // Same for the dead icon
mutatelist = list(/obj/item/seeds/chili/ice, /obj/item/seeds/chili/ghost)
reagents_add = list("capsaicin" = 0.25, "vitamin" = 0.04, "nutriment" = 0.04)
/obj/item/weapon/reagent_containers/food/snacks/grown/chili
seed = /obj/item/seeds/chili
@@ -22,7 +22,6 @@
desc = "It's spicy! Wait... IT'S BURNING ME!!"
icon_state = "chilipepper"
filling_color = "#FF0000"
reagents_add = list("capsaicin" = 0.25, "vitamin" = 0.04, "nutriment" = 0.04)
bitesize_mod = 2
// Ice Chili
@@ -38,6 +37,7 @@
production = 4
rarity = 20
mutatelist = list()
reagents_add = list("frostoil" = 0.25, "vitamin" = 0.02, "nutriment" = 0.02)
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper
seed = /obj/item/seeds/chili/ice
@@ -45,7 +45,6 @@
desc = "It's a mutant strain of chili"
icon_state = "icepepper"
filling_color = "#0000CD"
reagents_add = list("frostoil" = 0.25, "vitamin" = 0.02, "nutriment" = 0.02)
bitesize_mod = 2
// Ghost Chili
@@ -62,6 +61,7 @@
yield = 3
rarity = 20
mutatelist = list()
reagents_add = list("condensedcapsaicin" = 0.3, "capsaicin" = 0.55, "nutriment" = 0.04)
/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili
seed = /obj/item/seeds/chili/ghost
@@ -70,7 +70,6 @@
icon_state = "ghostchilipepper"
var/mob/held_mob
filling_color = "#F8F8FF"
reagents_add = list("condensedcapsaicin" = 0.3, "capsaicin" = 0.55, "nutriment" = 0.04)
bitesize_mod = 4
/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user)
code/modules/hydroponics/grown/citrus.dm
+5 -3
View File
@@ -4,7 +4,6 @@
name = "citrus"
desc = "It's so sour, your face will twist."
icon_state = "lime"
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
bitesize_mod = 2
// Lime
@@ -20,6 +19,7 @@
yield = 4
potency = 15
mutatelist = list(/obj/item/seeds/orange)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime
seed = /obj/item/seeds/lime
@@ -43,6 +43,7 @@
icon_grow = "lime-grow"
icon_dead = "lime-dead"
mutatelist = list(/obj/item/seeds/lime)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange
seed = /obj/item/seeds/orange
@@ -65,6 +66,7 @@
icon_grow = "lime-grow"
icon_dead = "lime-dead"
mutatelist = list(/obj/item/seeds/cash)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon
seed = /obj/item/seeds/lemon
@@ -86,6 +88,7 @@
lifespan = 55
endurance = 45
yield = 4
reagents_add = list("nutriment" = 0.05)
rarity = 50 // Nanotrasen approves...
/obj/item/weapon/reagent_containers/food/snacks/grown/shell/moneyfruit
@@ -93,12 +96,11 @@
name = "Money Fruit"
desc = "Looks like a lemon with someone buldging from the inside."
icon_state = "moneyfruit"
reagents_add = list("nutriment" = 0.05)
bitesize_mod = 2
/obj/item/weapon/reagent_containers/food/snacks/grown/shell/moneyfruit/add_juice()
..()
switch(potency)
switch(seed.potency)
if(0 to 10)
trash = /obj/item/stack/spacecash
if(11 to 20)
code/modules/hydroponics/grown/cocoa_vanilla.dm
+3 -3
View File
@@ -14,6 +14,7 @@
icon_grow = "cocoapod-grow"
icon_dead = "cocoapod-dead"
mutatelist = list(/obj/item/seeds/cocoapod/vanillapod)
reagents_add = list("cocoa" = 0.25, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod
seed = /obj/item/seeds/cocoapod
@@ -21,7 +22,6 @@
desc = "Fattening... Mmmmm... chucklate."
icon_state = "cocoapod"
filling_color = "#FFD700"
reagents_add = list("cocoa" = 0.25, "nutriment" = 0.1)
bitesize_mod = 2
// Vanilla Pod
@@ -33,11 +33,11 @@
plantname = "Vanilla Tree"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/vanillapod
mutatelist = list()
reagents_add = list("vanilla" = 0.25, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/vanillapod
seed = /obj/item/seeds/cocoapod/vanillapod
name = "vanilla pod"
desc = "Fattening... Mmmmm... vanilla."
icon_state = "vanillapod"
filling_color = "#FFD700"
reagents_add = list("vanilla" = 0.25, "nutriment" = 0.1)
filling_color = "#FFD700"
code/modules/hydroponics/grown/corn.dm
+2 -2
View File
@@ -13,6 +13,7 @@
icon_grow = "corn-grow" // Uses one growth icons set for all the subtypes
icon_dead = "corn-dead" // Same for the dead icon
mutatelist = list(/obj/item/seeds/corn/snapcorn)
reagents_add = list("cornoil" = 0.1, "vitamin" = 0.04, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/corn
seed = /obj/item/seeds/corn
@@ -22,7 +23,6 @@
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/popcorn
filling_color = "#FFFF00"
trash = /obj/item/weapon/grown/corncob
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
bitesize_mod = 2
/obj/item/weapon/grown/corncob
@@ -69,7 +69,7 @@
/obj/item/weapon/grown/snapcorn/add_juice()
..()
snap_pops = max(round(potency/8), 1)
snap_pops = max(round(seed.potency/8), 1)
/obj/item/weapon/grown/snapcorn/attack_self(mob/user)
..()
code/modules/hydroponics/grown/eggplant.dm
+2 -3
View File
@@ -11,6 +11,7 @@
icon_grow = "eggplant-grow"
icon_dead = "eggplant-dead"
mutatelist = list(/obj/item/seeds/eggplant/eggy)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
seed = /obj/item/seeds/eggplant
@@ -18,7 +19,6 @@
desc = "Maybe there's a chicken inside?"
icon_state = "eggplant"
filling_color = "#800080"
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
bitesize_mod = 2
// Egg-Plant
@@ -30,7 +30,7 @@
lifespan = 75
production = 12
mutatelist = list()
// No rarity: Centcom ships these to us in the exotic seeds crate.
reagents_add = list("nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy
seed = /obj/item/seeds/eggplant/eggy
@@ -39,5 +39,4 @@
icon_state = "eggyplant"
trash = /obj/item/weapon/reagent_containers/food/snacks/egg
filling_color = "#F8F8FF"
reagents_add = list("nutriment" = 0.1)
bitesize_mod = 2
code/modules/hydroponics/grown/flowers.dm
+10 -12
View File
@@ -15,6 +15,7 @@
icon_grow = "poppy-grow"
icon_dead = "poppy-dead"
mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/poppy/lily)
reagents_add = list("salglu_solution" = 0.05, "nutriment" = 0.05)
/obj/item/weapon/reagent_containers/food/snacks/grown/poppy
seed = /obj/item/seeds/poppy
@@ -23,7 +24,6 @@
icon_state = "poppy"
slot_flags = SLOT_HEAD
filling_color = "#FF6347"
reagents_add = list("salglu_solution" = 0.05, "nutriment" = 0.05)
bitesize_mod = 3
// Lily
@@ -78,6 +78,7 @@
oneharvest = 1
growthstages = 4
plant_type = PLANT_WEED
reagents_add = list("nutriment" = 0.04)
/obj/item/weapon/reagent_containers/food/snacks/grown/harebell
seed = /obj/item/seeds/harebell
@@ -86,7 +87,6 @@
icon_state = "harebell"
slot_flags = SLOT_HEAD
filling_color = "#E6E6FA"
reagents_add = list("nutriment" = 0.05)
bitesize_mod = 3
@@ -106,6 +106,7 @@
icon_grow = "sunflower-grow"
icon_dead = "sunflower-dead"
mutatelist = list(/obj/item/seeds/sunflower/moonflower, /obj/item/seeds/sunflower/novaflower)
reagents_add = list("cornoil" = 0.08, "nutriment" = 0.04)
/obj/item/weapon/grown/sunflower // FLOWER POWER!
seed = /obj/item/seeds/sunflower
@@ -133,6 +134,7 @@
plantname = "Moonflowers"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/moonflower
mutatelist = list()
reagents_add = list("moonshine" = 0.1, "vitamin" = 0.02, "nutriment" = 0.02)
rarity = 15
/obj/item/weapon/reagent_containers/food/snacks/grown/moonflower
@@ -142,7 +144,6 @@
icon_state = "moonflower"
slot_flags = SLOT_HEAD
filling_color = "#E6E6FA"
reagents_add = list("moonshine" = 0.1, "vitamin" = 0.02, "nutriment" = 0.02)
bitesize_mod = 2
// Novaflower
@@ -154,6 +155,7 @@
plantname = "Novaflowers"
product = /obj/item/weapon/grown/novaflower
mutatelist = list()
reagents_add = list("condensedcapsaicin" = 0.25, "capsaicin" = 0.3, "nutriment" = 0)
rarity = 20
/obj/item/weapon/grown/novaflower
@@ -168,27 +170,23 @@
w_class = 1
throw_speed = 1
throw_range = 3
plant_type = PLANT_NORMAL
attack_verb = list("roasted", "scorched", "burned")
/obj/item/weapon/grown/novaflower/add_juice()
if(..())
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("capsaicin", round((potency / 3.5), 1))
reagents.add_reagent("condensedcapsaicin", round((potency / 4), 1))
force = round((5 + potency / 5), 1)
..()
force = round((5 + seed.potency / 5), 1)
/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M, mob/user)
if(!..()) return
if(istype(M, /mob/living))
M << "<span class='danger'>You are lit on fire from the intense heat of the [name]!</span>"
M.adjust_fire_stacks(potency / 20)
M.adjust_fire_stacks(seed.potency / 20)
M.IgniteMob()
/obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity)
if(!proximity) return
if(endurance > 0)
endurance -= rand(1, (endurance / 3) + 1)
if(force > 0)
force -= rand(1, (force / 3) + 1)
else
usr << "<span class='warning'>All the petals have fallen off the [name] from violent whacking!</span>"
usr.unEquip(src)
code/modules/hydroponics/grown/grass_carpet.dm
+5 -5
View File
@@ -15,6 +15,7 @@
icon_grow = "grass-grow"
icon_dead = "grass-dead"
mutatelist = list(/obj/item/seeds/grass/carpet)
reagents_add = list("nutriment" = 0.02)
/obj/item/weapon/reagent_containers/food/snacks/grown/grass
seed = /obj/item/seeds/grass
@@ -23,13 +24,12 @@
icon_state = "grassclump"
filling_color = "#32CD32"
bitesize_mod = 2
reagents_add = list("nutriment" = 0.02)
/obj/item/weapon/reagent_containers/food/snacks/grown/grass/attack_self(mob/user)
user << "<span class='notice'>You prepare the astroturf.</span>"
var/grassAmt = 1 + round(potency / 50) // The grass we're holding
var/grassAmt = 1 + round(seed.potency / 50) // The grass we're holding
for(var/obj/item/weapon/reagent_containers/food/snacks/grown/grass/G in user.loc) // The grass on the floor
grassAmt += 1 + round(G.potency / 50)
grassAmt += 1 + round(G.seed.potency)
qdel(G)
while(grassAmt > 0)
var/obj/item/stack/tile/GT = new /obj/item/stack/tile/grass(user.loc)
@@ -63,9 +63,9 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/attack_self(mob/user)
user << "<span class='notice'>You roll out the red carpet.</span>"
var/carpetAmt = 1 + round(potency / 50) // The carpet we're holding
var/carpetAmt = 1 + round(seed.potency / 50) // The carpet we're holding
for(var/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/C in user.loc) // The carpet on the floor
carpetAmt += 1 + round(C.potency / 50)
carpetAmt += 1 + round(C.seed.potency / 50)
qdel(C)
while(carpetAmt > 0)
var/obj/item/stack/tile/CT = new /obj/item/stack/tile/carpet(user.loc)
code/modules/hydroponics/grown/kudzu.dm
+9 -16
View File
@@ -14,22 +14,18 @@
plant_type = PLANT_WEED
rarity = 30
var/list/mutations = list()
reagents_add = list("charcoal" = 0.04, "nutriment" = 0.02)
/obj/item/seeds/kudzu/New(loc, obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/parent)
..()
if(parent)
mutations = parent.mutations
/obj/item/seeds/kudzu/Copy()
var/obj/item/seeds/kudzu/S = ..()
S.mutations = mutations.Copy()
return S
/obj/item/seeds/kudzu/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] swallows the pack of kudzu seeds! It looks like \he's trying to commit suicide..</span>")
plant(user)
return (BRUTELOSS)
/obj/item/seeds/kudzu/harvest()
var/list/prod = ..()
for(var/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/K in prod)
K.mutations = mutations
/obj/item/seeds/kudzu/proc/plant(mob/user)
if(istype(user.loc,/turf/space))
return
@@ -44,15 +40,14 @@
user << "<span class='notice'>You plant the kudzu. You monster.</span>"
/obj/item/seeds/kudzu/get_analyzer_text()
var/list/mut_text = list()
var/text = ..()
var/text_string = ""
for(var/datum/spacevine_mutation/SM in mutations)
text_string += "[(text_string == "") ? "" : ", "][SM.name]"
mut_text += "-Plant Mutations: [(text_string == "") ? "None" : text_string]"
return mut_text
text += "\n- Plant Mutations: [(text_string == "") ? "None" : text_string]"
return text
/obj/item/seeds/kudzu/on_chem_reaction(datum/reagents/S)
var/list/temp_mut_list = list()
if(S.has_reagent("sterilizine", 5))
@@ -90,7 +85,5 @@
name = "kudzu pod"
desc = "<I>Pueraria Virallis</I>: An invasive species with vines that rapidly creep and wrap around whatever they contact."
icon_state = "kudzupod"
var/list/mutations = list()
filling_color = "#6B8E23"
bitesize_mod = 2
reagents_add = list("charcoal" = 0.04, "nutriment" = 0.02)
bitesize_mod = 2
code/modules/hydroponics/grown/melon.dm
+3 -3
View File
@@ -10,6 +10,7 @@
endurance = 40
icon_dead = "watermelon-dead"
mutatelist = list(/obj/item/seeds/watermelon/holy)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.2)
/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon
seed = /obj/item/seeds/watermelon
@@ -21,7 +22,6 @@
dried_type = null
w_class = 3
filling_color = "#008000"
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.2, "water" = 0.1)
bitesize_mod = 3
// Holymelon
@@ -33,6 +33,7 @@
plantname = "Holy Melon Vines"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/holymelon
mutatelist = list()
reagents_add = list("holywater" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 20
/obj/item/weapon/reagent_containers/food/snacks/grown/holymelon
@@ -41,5 +42,4 @@
desc = "The water within this melon has been blessed by some deity that's particularly fond of watermelon."
icon_state = "holymelon"
filling_color = "#FFD700"
dried_type = null
reagents_add = list("holywater" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
dried_type = null
code/modules/hydroponics/grown/misc.dm
+4 -4
View File
@@ -31,6 +31,7 @@
yield = 4
growthstages = 1
mutatelist = list(/obj/item/seeds/replicapod)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage
seed = /obj/item/seeds/cabbage
@@ -38,7 +39,6 @@
desc = "Ewwwwwwwwww. Cabbage."
icon_state = "cabbage"
filling_color = "#90EE90"
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
bitesize_mod = 2
@@ -55,6 +55,7 @@
maturation = 3
yield = 4
growthstages = 3
reagents_add = list("sugar" = 0.25)
/obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane
seed = /obj/item/seeds/sugarcane
@@ -62,7 +63,6 @@
desc = "Sickly sweet."
icon_state = "sugarcane"
filling_color = "#FFD700"
reagents_add = list("sugar" = 0.25)
bitesize_mod = 2
@@ -82,6 +82,7 @@
potency = 60
growthstages = 2
rarity = 60 // Obtainable only with xenobio+superluck.
reagents_add = list("sulfur" = 0.1, "carbon" = 0.1, "nitrogen" = 0.07, "potassium" = 0.05)
/obj/item/weapon/reagent_containers/food/snacks/grown/shell/gatfruit
seed = /obj/item/seeds/gatfruit
@@ -90,5 +91,4 @@
icon_state = "gatfruit"
origin_tech = "combat=3"
trash = /obj/item/weapon/gun/projectile/revolver
bitesize_mod = 2
reagents_add = list("sulfur" = 0.1, "carbon" = 0.1, "nitrogen" = 0.07, "potassium" = 0.05)
bitesize_mod = 2
code/modules/hydroponics/grown/mushrooms.dm
+23 -31
View File
@@ -20,6 +20,7 @@
oneharvest = 1
growthstages = 4
plant_type = PLANT_MUSHROOM
reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, "nutriment" = 0)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi
seed = /obj/item/seeds/reishi
@@ -27,7 +28,6 @@
desc = "<I>Ganoderma lucidum</I>: A special fungus known for its medicinal and stress relieving properties."
icon_state = "reishi"
filling_color = "#FF4500"
reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, "nutriment" = 0)
// Fly Amanita
@@ -47,6 +47,7 @@
growthstages = 3
plant_type = PLANT_MUSHROOM
mutatelist = list(/obj/item/seeds/angel)
reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.35, "nutriment" = 0)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita
seed = /obj/item/seeds/amanita
@@ -54,7 +55,6 @@
desc = "<I>Amanita Muscaria</I>: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
icon_state = "amanita"
filling_color = "#FF0000"
reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.35, "nutriment" = 0)
// Destroying Angel
@@ -74,6 +74,7 @@
oneharvest = 1
growthstages = 3
plant_type = PLANT_MUSHROOM
reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.8, "nutriment" = 0)
rarity = 30
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel
@@ -82,7 +83,6 @@
desc = "<I>Amanita Virosa</I>: Deadly poisonous basidiomycete fungus filled with alpha amatoxins."
icon_state = "angel"
filling_color = "#C0C0C0"
reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.8, "nutriment" = 0)
// Liberty Cap
@@ -100,6 +100,7 @@
oneharvest = 1
growthstages = 3
plant_type = PLANT_MUSHROOM
reagents_add = list("mushroomhallucinogen" = 0.25, "nutriment" = 0.02)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap
seed = /obj/item/seeds/liberty
@@ -107,7 +108,6 @@
desc = "<I>Psilocybe Semilanceata</I>: Liberate yourself!"
icon_state = "libertycap"
filling_color = "#DAA520"
reagents_add = list("mushroomhallucinogen" = 0.25, "nutriment" = 0.02)
// Plump Helmet
@@ -126,6 +126,7 @@
growthstages = 3
plant_type = PLANT_MUSHROOM
mutatelist = list(/obj/item/seeds/plump/walkingmushroom)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet
seed = /obj/item/seeds/plump
@@ -133,7 +134,6 @@
desc = "<I>Plumus Hellmus</I>: Plump, soft and s-so inviting~"
icon_state = "plumphelmet"
filling_color = "#9370DB"
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
// Walking Mushroom
@@ -149,6 +149,7 @@
maturation = 5
yield = 1
mutatelist = list()
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.12)
rarity = 30
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom
@@ -157,16 +158,15 @@
desc = "<I>Plumus Locomotus</I>: The beginning of the great walk."
icon_state = "walkingmushroom"
filling_color = "#9370DB"
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.12)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user)
if(istype(user.loc,/turf/space))
return
var/mob/living/simple_animal/hostile/mushroom/M = new /mob/living/simple_animal/hostile/mushroom(user.loc)
M.maxHealth += round(endurance / 4)
M.melee_damage_lower += round(potency / 20)
M.melee_damage_upper += round(potency / 20)
M.move_to_delay -= round(production / 50)
M.maxHealth += round(seed.endurance / 4)
M.melee_damage_lower += round(seed.potency / 20)
M.melee_damage_upper += round(seed.potency / 20)
M.move_to_delay -= round(seed.production / 50)
M.health = M.maxHealth
qdel(src)
user << "<span class='notice'>You plant the walking mushroom.</span>"
@@ -189,6 +189,7 @@
oneharvest = 1
growthstages = 3
plant_type = PLANT_MUSHROOM
reagents_add = list("nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle
seed = /obj/item/seeds/chanter
@@ -196,7 +197,6 @@
desc = "<I>Cantharellus Cibarius</I>: These jolly yellow little shrooms sure look tasty!"
icon_state = "chanterelle"
filling_color = "#FFA500"
reagents_add = list("nutriment" = 0.1)
// Glowshroom
@@ -218,6 +218,7 @@
plant_type = PLANT_MUSHROOM
rarity = 20
mutatelist = list(/obj/item/seeds/glowshroom/glowcap)
reagents_add = list("radium" = 0.05, "nutriment" = 0.04)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom
seed = /obj/item/seeds/glowshroom
@@ -226,48 +227,39 @@
icon_state = "glowshroom"
filling_color = "#00FA9A"
var/effect_path = /obj/effect/glowshroom
reagents_add = list("radium" = 0.05, "nutriment" = 0.04)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/New(var/loc, var/new_potency = 10)
..()
if(lifespan == 0) //basically, if you're spawning these via admin or on the map, then set up some default stats.
lifespan = 120
endurance = 30
maturation = 15
production = 1
yield = 3
potency = 30
plant_type = PLANT_MUSHROOM
if(istype(src.loc,/mob))
pickup(src.loc)//adjusts the lighting on the mob
else
src.SetLuminosity(round(potency / 10,1))
src.SetLuminosity(round(seed.potency / 10,1))
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
if(istype(user.loc,/turf/space))
return
var/obj/effect/glowshroom/planted = new effect_path(user.loc)
planted.delay = planted.delay - production * 100 //So the delay goes DOWN with better stats instead of up. :I
planted.endurance = endurance
planted.yield = yield
planted.potency = potency
planted.delay = planted.delay - seed.production * 100 //So the delay goes DOWN with better stats instead of up. :I
planted.endurance = seed.endurance
planted.yield = seed.yield
planted.potency = seed.potency
user << "<span class='notice'>You plant [src].</span>"
qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/Destroy()
if(istype(loc,/mob))
loc.AddLuminosity(round(-potency / 10,1))
loc.AddLuminosity(round(-seed.potency / 10,1))
return ..()
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/pickup(mob/user)
..()
SetLuminosity(0)
user.AddLuminosity(round(potency / 10,1))
user.AddLuminosity(round(seed.potency / 10,1))
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/dropped(mob/user)
..()
user.AddLuminosity(round(-potency / 10,1))
SetLuminosity(round(potency / 10,1))
user.AddLuminosity(round(-seed.potency / 10,1))
SetLuminosity(round(seed.potency / 10,1))
// Glowcap
@@ -282,6 +274,7 @@
plant_type = PLANT_MUSHROOM
product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
mutatelist = list()
reagents_add = list("teslium" = 0.02, "nutriment" = 0.04)
rarity = 30
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
@@ -291,13 +284,12 @@
icon_state = "glowcap"
filling_color = "#00FA9A"
effect_path = /obj/effect/glowshroom/glowcap
reagents_add = list("teslium" = 0.02, "nutriment" = 0.04)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap/On_Consume()
if(!reagents.total_volume)
var/batteries_recharged = 0
for(var/obj/item/weapon/stock_parts/cell/C in usr.GetAllContents())
var/newcharge = (potency*0.01)*C.maxcharge
var/newcharge = (seed.potency*0.01)*C.maxcharge
if(C.charge < newcharge)
C.charge = newcharge
if(isobj(C.loc))
code/modules/hydroponics/grown/nettle.dm
+5 -6
View File
@@ -11,6 +11,7 @@
growthstages = 5
plant_type = PLANT_WEED
mutatelist = list(/obj/item/seeds/nettle/death)
reagents_add = list("sacid" = 0.5)
/obj/item/seeds/nettle/death
name = "pack of death-nettle seeds"
@@ -23,7 +24,8 @@
maturation = 8
yield = 2
mutatelist = list()
rarity = 10
reagents_add = list("facid" = 0.5, "sacid" = 0.5)
rarity = 20
/obj/item/weapon/grown/nettle //abstract type
@@ -38,7 +40,6 @@
w_class = 1
throw_speed = 1
throw_range = 3
plant_type = PLANT_WEED
origin_tech = "combat=1"
attack_verb = list("stung")
@@ -79,8 +80,7 @@
/obj/item/weapon/grown/nettle/basic/add_juice()
..()
reagents.add_reagent("sacid", round((potency / 2), 1))
force = round((5 + potency / 5), 1)
force = round((5 + seed.potency / 5), 1)
/obj/item/weapon/grown/nettle/death
@@ -94,8 +94,7 @@
/obj/item/weapon/grown/nettle/death/add_juice()
..()
reagents.add_reagent("facid", round((potency / 2), 1))
force = round((5 + potency / 2.5), 1)
force = round((5 + seed.potency / 2.5), 1)
/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/user)
..()
code/modules/hydroponics/grown/potato.dm
+4 -4
View File
@@ -15,6 +15,7 @@
icon_grow = "potato-grow"
icon_dead = "potato-dead"
mutatelist = list(/obj/item/seeds/potato/sweet)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/potato
seed = /obj/item/seeds/potato
@@ -22,7 +23,6 @@
desc = "Boil 'em! Mash 'em! Stick 'em in a stew!"
icon_state = "potato"
filling_color = "#E9967A"
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
bitesize = 100
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W, mob/user, params)
@@ -32,7 +32,7 @@
if (C.use(5))
user << "<span class='notice'>You add some cable to the potato and slide it inside the battery encasing.</span>"
var/obj/item/weapon/stock_parts/cell/potato/pocell = new /obj/item/weapon/stock_parts/cell/potato(user.loc)
pocell.maxcharge = src.potency * 20
pocell.maxcharge = seed.potency * 20
pocell.charge = pocell.maxcharge
qdel(src)
return
@@ -49,10 +49,10 @@
plantname = "Sweet Potato Plants"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet
mutatelist = list()
reagents_add = list("vitamin" = 0.1, "sugar" = 0.1, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet
seed = /obj/item/seeds/potato/sweet
name = "sweet potato"
desc = "It's sweet."
icon_state = "sweetpotato"
reagents_add = list("vitamin" = 0.1, "sugar" = 0.1, "nutriment" = 0.1)
icon_state = "sweetpotato"
code/modules/hydroponics/grown/pumpkin.dm
+2 -2
View File
@@ -12,6 +12,7 @@
icon_grow = "pumpkin-grow"
icon_dead = "pumpkin-dead"
mutatelist = list(/obj/item/seeds/pumpkin/blumpkin)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.2)
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin
seed = /obj/item/seeds/pumpkin
@@ -19,7 +20,6 @@
desc = "It's large and scary."
icon_state = "pumpkin"
filling_color = "#FFA500"
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.2)
bitesize_mod = 2
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
@@ -39,6 +39,7 @@
plantname = "Blumpkin Vines"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin
mutatelist = list()
reagents_add = list("ammonia" = 0.2, "nutriment" = 0.2)
rarity = 20
/obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin
@@ -47,5 +48,4 @@
desc = "The pumpkin's toxic sibling."
icon_state = "blumpkin"
filling_color = "#87CEFA"
reagents_add = list("ammonia" = 0.2, "nutriment" = 0.2)
bitesize_mod = 2
code/modules/hydroponics/grown/replicapod.dm
+63 -1
View File
@@ -42,4 +42,66 @@
user << "<span class='warning'>The seeds reject the sample!</span>"
else
user << "<span class='warning'>The seeds already contain a genetic sample!</span>"
..()
..()
/obj/item/seeds/replicapod/get_analyzer_text()
var/text = ..()
if(contains_sample)
text += "\n It contains a blood sample!"
return text
/obj/item/seeds/replicapod/harvest(mob/user = usr) //now that one is fun -- Urist
var/obj/machinery/hydroponics/parent = loc
var/make_podman = 0
var/ckey_holder = null
if(config.revival_pod_plants)
if(ckey)
for(var/mob/M in player_list)
if(istype(M, /mob/dead/observer))
var/mob/dead/observer/O = M
if(O.ckey == ckey && O.can_reenter_corpse)
make_podman = 1
break
else
if(M.ckey == ckey && M.stat == DEAD && !M.suiciding)
make_podman = 1
break
else //If the player has ghosted from his corpse before blood was drawn, his ckey is no longer attached to the mob, so we need to match up the cloned player through the mind key
for(var/mob/M in player_list)
if(mind && M.mind && ckey(M.mind.key) == ckey(mind.key) && M.ckey && M.client && M.stat == 2 && !M.suiciding)
if(istype(M, /mob/dead/observer))
var/mob/dead/observer/O = M
if(!O.can_reenter_corpse)
break
make_podman = 1
ckey_holder = M.ckey
break
if(make_podman) //all conditions met!
var/mob/living/carbon/human/podman = new /mob/living/carbon/human(parent.loc)
if(realName)
podman.real_name = realName
else
podman.real_name = "Pod Person [rand(0,999)]"
mind.transfer_to(podman)
if(ckey)
podman.ckey = ckey
else
podman.ckey = ckey_holder
podman.gender = blood_gender
podman.faction |= factions
if(!features["mcolor"])
features["mcolor"] = "#59CE00"
podman.hardset_dna(null,null,podman.real_name,blood_type,/datum/species/pod,features)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman
podman.set_cloned_appearance()
else //else, one packet of seeds. maybe two
var/seed_count = 1
if(prob(getYield() * 20))
seed_count++
for(var/i=0,i<seed_count,i++)
var/obj/item/seeds/replicapod/harvestseeds = src.Copy()
harvestseeds.loc = user.loc
parent.update_tray()
code/modules/hydroponics/grown/root.dm
+5 -5
View File
@@ -12,6 +12,7 @@
oneharvest = 1
growthstages = 3
mutatelist = list(/obj/item/seeds/carrot/parsnip)
reagents_add = list("oculine" = 0.25, "vitamin" = 0.04, "nutriment" = 0.05)
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot
seed = /obj/item/seeds/carrot
@@ -20,7 +21,6 @@
icon_state = "carrot"
filling_color = "#FFA500"
bitesize_mod = 2
reagents_add = list("oculine" = 0.25, "vitamin" = 0.04, "nutriment" = 0.05)
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/kitchen/knife) || istype(I, /obj/item/weapon/hatchet))
@@ -43,13 +43,13 @@
product = /obj/item/weapon/reagent_containers/food/snacks/grown/parsnip
icon_dead = "carrot-dead"
mutatelist = list()
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.05)
/obj/item/weapon/reagent_containers/food/snacks/grown/parsnip
seed = /obj/item/seeds/carrot/parsnip
name = "parsnip"
desc = "Closely related to carrots."
icon_state = "parsnip"
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.05)
bitesize_mod = 2
@@ -65,7 +65,9 @@
endurance = 50
yield = 6
oneharvest = 1
icon_dead = "whitebeet-dead"
mutatelist = list(/obj/item/seeds/redbeet)
reagents_add = list("vitamin" = 0.04, "sugar" = 0.2, "nutriment" = 0.05)
/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet
seed = /obj/item/seeds/whitebeet
@@ -73,7 +75,6 @@
desc = "You can't beat white-beet."
icon_state = "whitebeet"
filling_color = "#F4A460"
reagents_add = list("vitamin" = 0.04, "sugar" = 0.2, "nutriment" = 0.05)
bitesize_mod = 2
// Red Beet
@@ -87,13 +88,12 @@
lifespan = 60
endurance = 50
yield = 6
icon_dead = "whitebeet-dead"
oneharvest = 1
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.05)
/obj/item/weapon/reagent_containers/food/snacks/grown/redbeet
seed = /obj/item/seeds/redbeet
name = "red beet"
desc = "You can't beat red beet."
icon_state = "redbeet"
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.05)
bitesize_mod = 2
code/modules/hydroponics/grown/tea_coffee.dm
+5 -5
View File
@@ -13,6 +13,7 @@
growthstages = 5
icon_dead = "tea-dead"
mutatelist = list(/obj/item/seeds/tea/astra)
reagents_add = list("vitamin" = 0.04, "teapowder" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/tea
seed = /obj/item/seeds/tea
@@ -20,7 +21,6 @@
desc = "These aromatic tips of the tea plant can be dried to make tea."
icon_state = "tea_aspera_leaves"
filling_color = "#008000"
reagents_add = list("vitamin" = 0.04, "teapowder" = 0.1)
// Tea Astra
/obj/item/seeds/tea/astra
@@ -30,6 +30,7 @@
plantname = "Tea Astra Plant"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra
mutatelist = list()
reagents_add = list("salglu_solution" = 0.05, "vitamin" = 0.04, "teapowder" = 0.1)
rarity = 20
/obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra
@@ -37,7 +38,6 @@
name = "Tea Astra tips"
icon_state = "tea_astra_leaves"
filling_color = "#4582B4"
reagents_add = list("salglu_solution" = 0.05, "vitamin" = 0.04, "teapowder" = 0.1)
// Coffee
@@ -56,6 +56,7 @@
growthstages = 5
icon_dead = "coffee-dead"
mutatelist = list(/obj/item/seeds/coffee/robusta)
reagents_add = list("vitamin" = 0.04, "coffeepowder" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee
seed = /obj/item/seeds/coffee
@@ -64,7 +65,6 @@
icon_state = "coffee_arabica"
filling_color = "#DC143C"
bitesize_mod = 2
reagents_add = list("vitamin" = 0.04, "coffeepowder" = 0.1)
// Coffee Robusta
/obj/item/seeds/coffee/robusta
@@ -75,10 +75,10 @@
plantname = "Coffee Robusta Bush"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta
mutatelist = list()
reagents_add = list("morphine" = 0.05, "vitamin" = 0.04, "coffeepowder" = 0.1)
rarity = 20
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta
seed = /obj/item/seeds/coffee/robusta
name = "coffee robusta beans"
icon_state = "coffee_robusta"
reagents_add = list("morphine" = 0.05, "vitamin" = 0.04, "coffeepowder" = 0.1)
icon_state = "coffee_robusta"
code/modules/hydroponics/grown/tobacco.dm
+3 -3
View File
@@ -14,6 +14,7 @@
growthstages = 3
icon_dead = "tobacco-dead"
mutatelist = list(/obj/item/seeds/tobacco/space)
reagents_add = list("nicotine" = 0.03, "nutriment" = 0.03)
/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco
seed = /obj/item/seeds/tobacco
@@ -21,7 +22,6 @@
desc = "Dry them out to make some smokes."
icon_state = "tobacco_leaves"
filling_color = "#008000"
reagents_add = list("nicotine" = 0.03, "nutriment" = 0.03)
// Space Tobacco
/obj/item/seeds/tobacco/space
@@ -32,11 +32,11 @@
plantname = "Space Tobacco Plant"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space
mutatelist = list()
reagents_add = list("salbutamol" = 0.05, "nicotine" = 0.08, "nutriment" = 0.03)
rarity = 20
/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space
seed = /obj/item/seeds/tobacco/space
name = "space tobacco leaves"
desc = "Dry them out to make some space-smokes."
icon_state = "stobacco_leaves"
reagents_add = list("salbutamol" = 0.05, "nicotine" = 0.08, "nutriment" = 0.03)
icon_state = "stobacco_leaves"
code/modules/hydroponics/grown/tomato.dm
+12 -12
View File
@@ -10,6 +10,7 @@
icon_grow = "tomato-grow"
icon_dead = "tomato-dead"
mutatelist = list(/obj/item/seeds/tomato/blue, /obj/item/seeds/tomato/blood, /obj/item/seeds/tomato/killer)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato
seed = /obj/item/seeds/tomato
@@ -18,7 +19,6 @@
icon_state = "tomato"
var/splat_type = /obj/effect/decal/cleanable/tomato_smudge
filling_color = "#FF6347"
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
bitesize_mod = 2
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/proc/squish(atom/target)
@@ -44,6 +44,7 @@
plantname = "Blood-Tomato Plants"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood
mutatelist = list()
reagents_add = list("blood" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 20
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood
@@ -53,7 +54,6 @@
icon_state = "bloodtomato"
splat_type = /obj/effect/gibspawner/generic
filling_color = "#FF0000"
reagents_add = list("blood" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
// Blue Tomato
@@ -65,8 +65,9 @@
plantname = "Blue-Tomato Plants"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue
yield = 2
mutatelist = list(/obj/item/seeds/tomato/blue/bluespace)
icon_grow = "bluetomato-grow"
mutatelist = list(/obj/item/seeds/tomato/blue/bluespace)
reagents_add = list("lube" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 20
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue
@@ -76,13 +77,12 @@
icon_state = "bluetomato"
splat_type = /obj/effect/decal/cleanable/oil
filling_color = "#0000FF"
reagents_add = list("lube" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/Crossed(AM as mob|obj)
if (istype(AM, /mob/living/carbon))
var/mob/living/carbon/M = AM
var/stun = Clamp(potency / 10, 1, 10)
var/weaken = Clamp(potency / 20, 0.5, 5)
var/stun = Clamp(seed.potency / 10, 1, 10)
var/weaken = Clamp(seed.potency / 20, 0.5, 5)
M.slip(stun, weaken, src)
@@ -96,6 +96,7 @@
product = /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace
yield = 2
mutatelist = list()
reagents_add = list("lube" = 0.2, "singulo" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 50
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace
@@ -104,7 +105,6 @@
desc = "So lubricated, you might slip through space-time."
icon_state = "bluespacetomato"
origin_tech = "bluespace=3"
reagents_add = list("lube" = 0.2, "singulo" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/attack_self(mob/user)
squish(user)
@@ -114,7 +114,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/squish(atom/squishee)
..()
var/teleport_radius = max(round(potency / 10), 1)
var/teleport_radius = max(round(seed.potency / 10), 1)
if(isliving(squishee))
var/turf/T = get_turf(squishee)
new /obj/effect/decal/cleanable/molten_item(T) //Leave a pile of goo behind for dramatic effect...
@@ -161,10 +161,10 @@
spawn(30)
if(!qdeleted(src))
var/mob/living/simple_animal/hostile/killertomato/K = new /mob/living/simple_animal/hostile/killertomato(get_turf(src.loc))
K.maxHealth += round(endurance / 3)
K.melee_damage_lower += round(potency / 10)
K.melee_damage_upper += round(potency / 10)
K.move_to_delay -= round(production / 50)
K.maxHealth += round(seed.endurance / 3)
K.melee_damage_lower += round(seed.potency / 10)
K.melee_damage_upper += round(seed.potency / 10)
K.move_to_delay -= round(seed.production / 50)
K.health = K.maxHealth
K.visible_message("<span class='notice'>The Killer Tomato growls as it suddenly awakens.</span>")
if(user)
code/modules/hydroponics/grown/towercap.dm
+1 -3
View File
@@ -13,7 +13,6 @@
potency = 50
oneharvest = 1
growthstages = 3
plant_type = PLANT_MUSHROOM
icon_dead = "towercap-dead"
mutatelist = list(/obj/item/seeds/tower/steel)
@@ -40,7 +39,6 @@
w_class = 3
throw_speed = 2
throw_range = 3
plant_type = PLANT_MUSHROOM
origin_tech = "materials=1"
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
var/plank_type = /obj/item/stack/sheet/mineral/wood
@@ -56,7 +54,7 @@
..()
if(W.sharpness)
user.show_message("<span class='notice'>You make [plank_name] out of \the [src]!</span>", 1)
var/obj/item/stack/plank = new plank_type(user.loc, 1 + round(potency / 25))
var/obj/item/stack/plank = new plank_type(user.loc, 1 + round(seed.potency / 25))
var/old_plank_amount = plank.amount
for(var/obj/item/stack/ST in user.loc)
if(ST != plank && istype(ST, plank_type) && ST.amount < ST.max_amount)