diff --git a/code/modules/hydroponics/grafts.dm b/code/modules/hydroponics/grafts.dm index 951936ec2e1..105cd40ec29 100644 --- a/code/modules/hydroponics/grafts.dm +++ b/code/modules/hydroponics/grafts.dm @@ -18,8 +18,8 @@ A new subsystem for hydroponics, as a way to share specific traits into plants, /obj/item/graft/Initialize() . = ..() stored_trait = new /datum/plant_gene/trait/repeated_harvest //Default gene is repeated harvest. - icon_state = pick( \ - 10 ; "graft_types" , \ + icon_state = pick( + 10 ; "graft_plant" , \ 5 ; "graft_flower" , \ 4 ; "graft_mushroom" , \ 1 ; "graft_doom" ) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 7e8e7a861ac..d50fcc6d38d 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -252,17 +252,17 @@ //This is where stability mutations exist now. switch(myseed.instability) - if(100 to 80) + if(80 to 100) if(prob(20)) mutate(0, 0, 0, 0, 0, 0, 0, 10, 0) //Exceedingly low odds of gaining a trait. - if(79 to 60) + if(60 to 79) if(prob((myseed.instability)/2) && !self_sustaining) mutatespecie() myseed.instability = myseed.instability/2 - if(59 to 40) + if(40 to 59) if(prob(40)) hardmutate() - if(39 to 20) + if(20 to 39) if(prob(40)) mutate() @@ -508,6 +508,7 @@ var/datum/plant_gene/reagent/reagent_gene = new /datum/plant_gene/reagent(picked_reagent, 0.05) //I cannot figure out how to copy over the keyed value from the reagents_add list so for now this works, skog you'll want to fix this before merge if(reagent_gene.can_add(myseed)) myseed.genes += reagent_gene + myseed.reagents_from_genes() return diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 51c49729cf8..719eb15a36e 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -968,8 +968,9 @@ GG.reagents.add_reagent(type, reac_volume) //Mutagenic chem side-effects. -/datum/reagent/uranium/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray) +/datum/reagent/uranium/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user) . = ..() + mytray.mutation_roll(user) if(chems.has_reagent(src.type, 1)) mytray.adjustHealth(-round(chems.get_reagent_amount(src.type) * 1)) mytray.adjustToxic(round(chems.get_reagent_amount(src.type) * 2)) @@ -983,11 +984,11 @@ irradiation_level = 2*REM material = null -/datum/reagent/uranium/radium/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray) +/datum/reagent/uranium/radium/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user) . = ..() if(chems.has_reagent(src.type, 1)) mytray.adjustHealth(-round(chems.get_reagent_amount(src.type) * 1)) - mytray.adjustToxic(round(chems.get_reagent_amount(src.type) * 3)) + mytray.adjustToxic(round(chems.get_reagent_amount(src.type) * 1)) /datum/reagent/bluespace name = "Bluespace Dust" @@ -1489,7 +1490,7 @@ . = ..() if(myseed && chems.has_reagent(src.type, 1)) myseed.adjust_instability(0.2) - myseed.adjust_potency(round(chems.get_reagent_amount(src.type) * 0.1)) + myseed.adjust_potency(round(chems.get_reagent_amount(src.type) * 0.3)) myseed.adjust_yield(round(chems.get_reagent_amount(src.type) * 0.1)) /datum/reagent/plantnutriment/left4zednutriment @@ -1501,12 +1502,12 @@ /datum/reagent/plantnutriment/left4zednutriment/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray) . = ..() if(myseed && chems.has_reagent(src.type, 1)) - mytray.adjustHealth(round(chems.get_reagent_amount(src.type) * 0.01)) + mytray.adjustHealth(round(chems.get_reagent_amount(src.type) * 0.1)) myseed.adjust_instability(round(chems.get_reagent_amount(src.type) * 0.2)) /datum/reagent/plantnutriment/robustharvestnutriment name = "Robust Harvest" - description = "Very potent nutriment that prevents plants from mutating." + description = "Very potent nutriment that slows plants from mutating." color = "#9D9D00" // RBG: 157, 157, 0 tox_prob = 15 @@ -1514,8 +1515,8 @@ . = ..() if(myseed && chems.has_reagent(src.type, 1)) myseed.adjust_instability(-0.25) - myseed.adjust_potency(round(chems.get_reagent_amount(src.type) * 0.5)) - myseed.adjust_yield(round(chems.get_reagent_amount(src.type) * 0.1)) + myseed.adjust_potency(round(chems.get_reagent_amount(src.type) * 0.1)) + myseed.adjust_yield(round(chems.get_reagent_amount(src.type) * 0.2))