diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 161dd7311b..bd250cb1a1 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -645,7 +645,7 @@ C.eye_blurry += poison_temp - C.make_dizzy(10*poison_temp) + C.make_dizzy(5*poison_temp) spawn() for(poison_temp, poison_temp>0, 1) // Poison does 10 damage per tick sleep(100) // Every 10 seconds @@ -787,7 +787,7 @@ return //////////////////////////////////////////////////////////////////////////////// -/// Snacks. END +/// FOOD END //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 2c9d016b5b..994fb8ccfa 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -384,6 +384,7 @@ var/plant_type = 0 /obj/item/weapon/reagent_containers/food/snacks/grown/berries + seed = "/obj/item/seeds/berryseed" name = "Berries" desc = "Nutritious!" icon_state = "berrypile" @@ -391,6 +392,7 @@ heal_amt = 3 /obj/item/weapon/reagent_containers/food/snacks/grown/chili + seed = "/obj/item/seeds/chiliseed" name = "Chili" desc = "Spicy!" icon_state = "chilipepper" @@ -400,6 +402,7 @@ potency = 20 /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant + seed = "/obj/item/seeds/eggplantseed" name = "Eggplant" desc = "Yum!" icon_state = "eggplant" @@ -407,6 +410,7 @@ heal_amt = 5 /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans + seed = "/obj/item/seeds/soyaseed" name = "Soybeans" desc = "Pretty bland, but the possibilities..." icon_state = "soybeans" @@ -414,6 +418,7 @@ heal_amt = 2 /obj/item/weapon/reagent_containers/food/snacks/grown/tomato + seed = "/obj/item/seeds/tomatoseed" name = "Tomato" desc = "Tom-mae-to or to-mah-to? You decide." icon_state = "tomato" @@ -421,6 +426,7 @@ heal_amt = 5 /obj/item/weapon/reagent_containers/food/snacks/grown/wheat + seed = "/obj/item/seeds/wheatseed" name = "Wheat" desc = "I wouldn't eat this, unless you're one of those health freaks.." icon_state = "wheat" @@ -428,6 +434,7 @@ heal_amt = 2 /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper + seed = "/obj/item/seeds/icepepperseed" name = "Icepepper" desc = "A mutant strain of chile" icon_state = "icepepper" @@ -437,6 +444,7 @@ potency = 20 /obj/item/weapon/reagent_containers/food/snacks/grown/carrot + seed = "/obj/item/seeds/carrotseed" name = "Carrot" desc = "Good for the eyes!" icon_state = "carrot" @@ -444,6 +452,7 @@ heal_amt = 1 /obj/item/weapon/reagent_containers/food/snacks/grown/amanita + seed = "/obj/item/seeds/amanitamycelium" name = "Fly amanita" desc = "Amanita Muscaria: Learn poisonous mushrooms by heart. Only pick mushrooms you know." icon_state = "amanita" @@ -453,6 +462,7 @@ potency = 10 /obj/item/weapon/reagent_containers/food/snacks/grown/angel + seed = "/obj/item/seeds/angelmycelium" name = "Destroying angel" desc = "Amanita Virosa: Deadly poisonous basidiomycete fungus filled with alpha amatoxins." icon_state = "angel" @@ -462,6 +472,7 @@ potency = 35 /obj/item/weapon/reagent_containers/food/snacks/grown/libertycap + seed = "/obj/item/seeds/libertymycelium" name = "Liberty cap" desc = "Psilocybe Semilanceata: Liberate yourself!" icon_state = "libertycap" @@ -471,6 +482,7 @@ potency = 15 /obj/item/weapon/reagent_containers/food/snacks/grown/plumphelmet + seed = "/obj/item/seeds/plumpmycelium" name = "Plump Helmet" desc = "Plumus Hellmus: Plump, soft and s-so inviting~" icon_state = "plumphelmet" @@ -478,6 +490,7 @@ heal_amt = 5 /obj/item/weapon/reagent_containers/food/snacks/grown/chanterelle + seed = "/obj/item/seeds/chantermycelium" name = "Chanterelle" desc = "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty! There's a lot!" icon_state = "chanterelle" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index f9cbaedd1f..a509538d5c 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1410,6 +1410,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov throw_speed = 1 throw_range = 3 plant_type = 1 + seed = "/obj/item/seeds/nettleseed" /obj/item/weapon/grown/deathnettle // -- Skie desc = "The \red glowing \black nettle incites \redrage\black in you just from looking at it!" @@ -1424,6 +1425,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov throw_speed = 1 throw_range = 3 plant_type = 1 + seed = "/obj/item/seeds/deathnettleseed" /obj/item/weapon/plantbgone // -- Skie desc = "Plant-B-Gone! Kill those pesky weeds!" diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index 52b9c7d630..52686e1836 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -95,6 +95,8 @@ obj/machinery/hydroponics/process() while(m_count < src.mutmod) if(prob(90)) src.mutate() + else if(prob(30)) + src.hardmutate() else src.mutatespecie() // Just testing this here until mutagens are in place m_count++; diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm index 08ac68e9df..1dfef9194d 100644 --- a/code/game/machinery/seed_extractor.dm +++ b/code/game/machinery/seed_extractor.dm @@ -26,4 +26,23 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob t_prod.potency = F.potency t_amount++ del(O) + + else if (istype(O, /obj/item/weapon/grown/)) + var/obj/item/weapon/grown/F = O + user << "\blue You extract some seeds from the [F.name]" + var/seed = text2path(F.seed) + var/t_amount = 0 + var/t_max = rand(1,4) + while ( t_amount < t_max) + var/obj/item/seeds/t_prod = new seed(src.loc) + t_prod.species = F.species + t_prod.lifespan = F.lifespan + t_prod.endurance = F.endurance + t_prod.maturation = F.maturation + t_prod.production = F.production + t_prod.yield = F.yield + t_prod.potency = F.potency + t_amount++ + del(O) + return \ No newline at end of file