diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 7729e7073e6..2daf7c40508 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -33,6 +33,8 @@ // Stronger reagents must always come first to avoid being displaced by weaker ones. // Total amount of any reagent in plant is calculated by formula: 1 + round(potency * multiplier) + var/innate_yieldmod = 1 //modifier for yield, seperate to the one in Hydro trays, as that one is SPECIFICALLY for nutriment/chems (which means it's constantly reset) + //This is added onto the yield mod of the hydro tray, yield *= (parent.yieldmod+innate_yieldmod) /obj/item/seeds/New(loc, nogenes = 0) ..() @@ -122,7 +124,7 @@ if(parent.yieldmod == 0) return_yield = min(return_yield, 1)//1 if above zero, 0 otherwise else - return_yield *= parent.yieldmod + return_yield *= (parent.yieldmod+innate_yieldmod) return return_yield diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index d07bb4d49be..51262083000 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -6,6 +6,9 @@ #define BEE_TRAY_RECENT_VISIT 200 //How long in deciseconds until a tray can be visited by a bee again #define BEE_DEFAULT_COLOUR "#e5e500" //the colour we make the stripes of the bee if our reagent has no colour (or we have no reagent) +#define BEE_POLLINATE_YIELD_CHANCE 10 +#define BEE_POLLINATE_PEST_CHANCE 33 +#define BEE_POLLINATE_POTENTCY_CHANCE 50 /mob/living/simple_animal/hostile/poison/bees name = "bee" @@ -160,9 +163,13 @@ var/growth = health //Health also means how many bees are in the swarm, roughly. //better healthier plants! - Hydro.health += growth - Hydro.pestlevel = max(0, --Hydro.pestlevel) - Hydro.yieldmod++ + Hydro.health += round(growth*0.5) + if(prob(BEE_POLLINATE_PEST_CHANCE)) + Hydro.pestlevel = max(0, --Hydro.pestlevel) + if(prob(BEE_POLLINATE_YIELD_CHANCE)) //Yield mod is HELLA powerful, but quite rare + Hydro.myseed.innate_yieldmod++ + if(prob(BEE_POLLINATE_POTENTCY_CHANCE)) + Hydro.myseed.potency++ if(beehome) beehome.bee_resources = min(beehome.bee_resources + growth, 100)