diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 89053916..c7bed07a 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -534,8 +534,12 @@ if(istype(reagent_source, /obj/item/reagent_containers/food/snacks) || istype(reagent_source, /obj/item/reagent_containers/pill)) qdel(reagent_source) - if(S.on_tray(H, split, user) >= 1) + if(myseed) + myseed.on_chem_reaction(S) lastuser = user + for(var/datum/reagent/R in S.reagent_list) + if(R.on_tray(H, R.volume, user) >= 1) + lastuser = user S.clear_reagents() qdel(S) diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 0fc9f58d..bfa2532d 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -36,10 +36,11 @@ for(var/obj/machinery/hydroponics/H in trays) var/datum/reagents/temp_reagents = new /datum/reagents() - temp_reagents.my_atom = H source.reagents.trans_to(temp_reagents, split) - H.applyChemicals(temp_reagents) + for(var/datum/reagent/R in temp_reagents.reagent_list) + if(R.on_tray(H, R.volume, src) >= 1) + tray.lastuser = src temp_reagents.clear_reagents() qdel(temp_reagents) diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index ca0349d8..0a98ade5 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -78,8 +78,8 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) return //Hyperstation Edit: Hydroponics trays reactions, idea stolen from citadel but not directly referenced -/datum/reagent/proc/on_tray(/obj/machinery/hydroponics/T, volume, mob/user, override = FALSE) //See hyperstation's reagent module - if(!tray.myseed) +/datum/reagent/proc/on_tray(obj/machinery/hydroponics/T, volume, mob/user) //See hyperstation's reagent module + if(!T.myseed) return 0 return -1 diff --git a/hyperstation/code/modules/reagents/chemistry/reagents/hydroponics_reactions.dm b/hyperstation/code/modules/reagents/chemistry/reagents/hydroponics_reactions.dm index 5dae50eb..da1d8983 100644 --- a/hyperstation/code/modules/reagents/chemistry/reagents/hydroponics_reactions.dm +++ b/hyperstation/code/modules/reagents/chemistry/reagents/hydroponics_reactions.dm @@ -8,286 +8,287 @@ #define DEFAULT_ACT_MUTAGEN switch(rand(100)){\ if(91 to 100){\ - tray.adjustHealth(-10);\ + T.adjustHealth(-10);\ to_chat(user, "The plant shrivels and burns.");}\ if(81 to 90)\ - tray.mutatespecie();\ + T.mutatespecie();\ if(66 to 80)\ - tray.hardmutate();\ + T.hardmutate();\ if(41 to 65)\ - tray.mutate();\ + T.mutate();\ if(21 to 41)\ to_chat(user, "The plants don't seem to react...");\ if(11 to 20)\ - tray.mutateweed();\ + T.mutateweed();\ if(1 to 10)\ - tray.mutatepest(user);\ + T.mutatepest(user);\ else\ to_chat(user, "Nothing happens...");} //Ammonia -/datum/reagent/ammonia/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustHealth(round(volume * 0.5)) - tray.adjustNutri(round(volume * 1)) +/datum/reagent/ammonia/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustHealth(round(volume * 0.5)) + T.adjustNutri(round(volume * 1)) if(..()) - tray.myseed.adjust_yield(round(volume * 0.01)) + T.myseed.adjust_yield(round(volume * 0.01)) return 1 //Ash -/datum/reagent/ash/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/ash/on_tray(obj/machinery/hydroponics/T, volume, mob/user) // Ash is used IRL in gardening, as a fertilizer enhancer and weed killer - adjustHealth(round(volume * 0.25)) - adjustNutri(round(volume * 0.5)) - adjustWeeds(-round(volume / 10)) + T.adjustHealth(round(volume * 0.25)) + T.adjustNutri(round(volume * 0.5)) + T.adjustWeeds(-round(volume / 10)) return 1 //Beer -/datum/reagent/consumable/ethanol/beer/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/consumable/ethanol/beer/on_tray(obj/machinery/hydroponics/T, volume, mob/user) // Beer is a chemical composition of alcohol and various other things. It's a shitty nutrient but hey, it's still one. Also alcohol is bad, mmmkay? - tray.adjustHealth(-round(volume * 0.05)) - tray.adjustNutri(round(volume * 0.25)) - tray.adjustWater(round(volume * 0.7)) + T.adjustHealth(-round(volume * 0.05)) + T.adjustNutri(round(volume * 0.25)) + T.adjustWater(round(volume * 0.7)) return 1 //Blood -/datum/reagent/blood/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustNutri(round(volume * 0.6)) - tray.adjustHealth(-round(volume)) - tray.adjustPests(rand(2,4)) +/datum/reagent/blood/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustNutri(round(volume * 0.6)) + T.adjustHealth(-round(volume)) + T.adjustPests(rand(2,4)) //they HUNGER return 1 //Charcoal -/datum/reagent/medicine/charcoal/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustToxic(-round(volume * 2)) //Antitoxin binds shit pretty well. So the tox goes significantly down +/datum/reagent/medicine/charcoal/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustToxic(-round(volume * 2)) //Antitoxin binds shit pretty well. So the tox goes significantly down return 1 //Chlorine -/datum/reagent/chlorine/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustHealth(-round(volume * 1)) - tray.adjustToxic(round(volume * 1.5)) - tray.adjustWater(-round(volume * 0.5)) - tray.adjustWeeds(-rand(1,volume * 0.125)) +/datum/reagent/chlorine/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustHealth(-round(volume * 1)) + T.adjustToxic(round(volume * 1.5)) + T.adjustWater(-round(volume * 0.5)) + T.adjustWeeds(-rand(1,volume * 0.125)) return 1 //Diethylamine -/datum/reagent/diethylamine/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/diethylamine/on_tray(obj/machinery/hydroponics/T, volume, mob/user) //Corrosive to pests, but not to plants if(..()) - tray.myseed.adjust_yield(round(volume * 0.02)) - tray.adjustHealth(round(volume)) - tray.adjustNutri(round(volume * 2)) - tray.adjustPests(-rand(1,round(volume / 30))) + T.myseed.adjust_yield(round(volume * 0.02)) + T.adjustHealth(round(volume)) + T.adjustNutri(round(volume * 2)) + T.adjustPests(-rand(1,round(volume / 30))) return 1 //Earthsblood -/datum/reagent/medicine/earthsblood/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.self_sufficiency_progress += volume - if(tray.self_sufficiency_progress >= tray.self_sufficiency_req) - tray.become_self_sufficient() +/datum/reagent/medicine/earthsblood/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.self_sufficiency_progress += volume + if(T.self_sufficiency_progress >= T.self_sufficiency_req) + T.become_self_sufficient() else - to_chat(user, "[tray] warms as it might on a spring day under a genuine Sun.") + to_chat(user, "[T] warms as it might on a spring day under a genuine Sun.") return 1 //Enduro-Grow -/datum/reagent/plantnutriment/endurogrow/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/plantnutriment/endurogrow/on_tray(obj/machinery/hydroponics/T, volume, mob/user) if(!..()) return -1 - tray.myseed.adjust_potency(-round(volume / 10)) - tray.myseed.adjust_yield(-round(volume / 30)) - tray.myseed.adjust_endurance(round(volume / 30)) + T.myseed.adjust_potency(-round(volume / 10)) + T.myseed.adjust_yield(-round(volume / 30)) + T.myseed.adjust_endurance(round(volume / 30)) return 1 //E-Z Nutrient -/datum/reagent/plantnutriment/eznutriment/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.yieldmod = 1 - tray.mutmod = 1 +/datum/reagent/plantnutriment/eznutriment/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.yieldmod = 1 + T.mutmod = 1 return ..() //Flourine -/datum/reagent/fluorine/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/fluorine/on_tray(obj/machinery/hydroponics/T, volume, mob/user) // Fluorine one of the most corrosive and deadly gasses - tray.adjustHealth(-round(volume * 2)) - tray.adjustToxic(round(volume * 2.5)) - tray.adjustWater(-round(volume * 0.5)) - tray.adjustWeeds(-rand(1, volume * 0.25)) + T.adjustHealth(-round(volume * 2)) + T.adjustToxic(round(volume * 2.5)) + T.adjustWater(-round(volume * 0.5)) + T.adjustWeeds(-rand(1, volume * 0.25)) return 1 //Fluorosulfuric acid -/datum/reagent/toxin/acid/fluacid/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustHealth(-round(volume * 2)) - tray.adjustToxic(round(volume * 3)) - trayadjustWeeds(-rand(1,volume * 0.5)) +/datum/reagent/toxin/acid/fluacid/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustHealth(-round(volume * 2)) + T.adjustToxic(round(volume * 3)) + T.adjustWeeds(-rand(1,volume * 0.5)) return 1 //Holy Water -/datum/reagent/water/holywater/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/water/holywater/on_tray(obj/machinery/hydroponics/T, volume, mob/user) //Mostly the same as water, it also heals the plant a little with the power of the spirits~ - tray.adjustWater(round(volume)) - tray.adjustHealth(round(volume * 0.1)) + T.adjustWater(round(volume)) + T.adjustHealth(round(volume * 0.1)) return 1 //Left-4-Zed -/datum/reagent/plantnutriment/left4zednutriment/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.yieldmod = 0 - tray.mutmod = 2 +/datum/reagent/plantnutriment/left4zednutriment/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.yieldmod = 0 + T.mutmod = 2 return ..() //Liquid Earthquake -/datum/reagent/plantnutriment/liquidearthquake/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/plantnutriment/liquidearthquake/on_tray(obj/machinery/hydroponics/T, volume, mob/user) if(!..()) return -1 - tray.myseed.adjust_weed_chance(round(volume / 10)) - tray.myseed.adjust_weed_rate(round(volume / 30)) - tray.myseed.adjust_production(-round(volume / 30)) + T.myseed.adjust_weed_chance(round(volume / 10)) + T.myseed.adjust_weed_rate(round(volume / 30)) + T.myseed.adjust_production(-round(volume / 30)) return 1 //Milk -/datum/reagent/consumable/milk/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustNutri(round(volume * 0.2)) - tray.adjustWater(round(volume * 0.5)) +/datum/reagent/consumable/milk/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustNutri(round(volume * 0.2)) + T.adjustWater(round(volume * 0.5)) if(..()) // Milk is good for humans, but bad for plants. The sugars canot be used by plants, and the milk fat fucks up growth. - if(!tray.myseed.get_gene(/datum/plant_gene/trait/plant_type/fungal_metabolism)) //Not shrooms though - tray.adjustHealth(-round(volume / 2)) + if(!T.myseed.get_gene(/datum/plant_gene/trait/plant_type/fungal_metabolism)) //Not shrooms though + T.adjustHealth(-round(volume / 2)) return 1 //Napalm -/datum/reagent/napalm/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/napalm/on_tray(obj/machinery/hydroponics/T, volume, mob/user) if(..()) - if(tray.myseed.resistance_flags & FIRE_PROOF) + if(T.myseed.resistance_flags & FIRE_PROOF) return 1 - tray.adjustHealth(-round(S.get_reagent_amount(/datum/reagent/napalm) * 6)) - tray.adjustToxic(round(S.get_reagent_amount(/datum/reagent/napalm) * 7)) - tray.adjustWeeds(-rand(5,9)) + T.adjustHealth(-round(volume * 6)) + T.adjustToxic(round(volume * 7)) + T.adjustWeeds(-rand(5,9)) return 1 //Nutriment -/datum/reagent/consumable/nutriment/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/consumable/nutriment/on_tray(obj/machinery/hydroponics/T, volume, mob/user) //Compost, effectively - tray.adjustHealth(round(volume * 0.5)) - tray.adjustNutri(round(volume)) + T.adjustHealth(round(volume * 0.5)) + T.adjustNutri(round(volume)) return 1 //Pest Killer -/datum/reagent/toxin/pestkiller/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustToxic(round(volume * 0.5)) - tray.adjustPests(-rand(1,volume / 5)) +/datum/reagent/toxin/pestkiller/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustToxic(round(volume * 0.5)) + T.adjustPests(-rand(1,volume / 5)) return 1 //Phosphorus -/datum/reagent/phosphorus/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/phosphorus/on_tray(obj/machinery/hydroponics/T, volume, mob/user) // White Phosphorous + water -> phosphoric acid. That's not a good thing really. // Phosphoric salts are beneficial though. And even if the plant suffers, in the long run the tray gets some nutrients. The benefit isn't worth that much. - tray.adjustHealth(-round(volume * 0.75)) - tray.adjustNutri(round(volume * 0.1)) - tray.adjustWater(-round(volume * 0.5)) - tray.adjustWeeds(-rand(1, volume * 0.1)) + T.adjustHealth(-round(volume * 0.75)) + T.adjustNutri(round(volume * 0.1)) + T.adjustWater(-round(volume * 0.5)) + T.adjustWeeds(-rand(1, volume * 0.1)) return 1 //Plant-B-Gone -/datum/reagent/toxin/plantbgone/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustHealth(-round(volume * 5)) - tray.adjustToxic(round(volume * 6)) - tray.adjustWeeds(-rand(4,8)) +/datum/reagent/toxin/plantbgone/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustHealth(-round(volume * 5)) + T.adjustToxic(round(volume * 6)) + T.adjustWeeds(-rand(4,8)) return 1 //Plant Base //For subtypes of /datum/reagent/plantnutriment/ -/datum/reagent/plantnutriment/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustNutri(round(volume)) +/datum/reagent/plantnutriment/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustNutri(round(volume)) return ..() //Radium -/datum/reagent/radium/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/radium/on_tray(obj/machinery/hydroponics/T, volume, mob/user) if(volume >= 10) DEFAULT_ACT_MUTAGEN else if(volume >= 5) - tray.hardmutate() + T.hardmutate() else if(volume >= 2) - tray.mutate() + T.mutate() - tray.adjustHealth(-round(volume)) - tray.adjustToxic(round(volume * 3)) // Radium is harsher (OOC: also easier to produce) + T.adjustHealth(-round(volume)) + T.adjustToxic(round(volume * 3)) // Radium is harsher (OOC: also easier to produce) return 1 //Robust Harvest -/datum/reagent/plantnutriment/robustharvestnutriment/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.yieldmod = 1.3 - tray.mutmod = 0 +/datum/reagent/plantnutriment/robustharvestnutriment/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.yieldmod = 1.3 + T.mutmod = 0 return ..() //Saltpetre -/datum/reagent/saltpetre/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/saltpetre/on_tray(obj/machinery/hydroponics/T, volume, mob/user) // Saltpetre is used for gardening IRL. To simplify highly, it speeds up growth and strengthens plants - adjustHealth(round(salt * 0.25)) + T.adjustHealth(round(volume * 0.25)) if (..()) - tray.myseed.adjust_production(-round(volume/100)-prob(volume%100)) - tray.myseed.adjust_potency(round(volume*0.5)) + T.myseed.adjust_production(-round(volume/100)-prob(volume%100)) + T.myseed.adjust_potency(round(volume*0.5)) return 1 //Soda Water -/datum/reagent/consumable/sodawater/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/consumable/sodawater/on_tray(obj/machinery/hydroponics/T, volume, mob/user) // A variety of nutrients are dissolved in club soda, without sugar. // These nutrients include carbon, oxygen, hydrogen, phosphorous, potassium, sulfur and sodium, all of which are needed for healthy plant growth. - tray.adjustWater(round(volume) * 0.9) - tray.adjustHealth(round(volume * 0.1)) - tray.adjustNutri(round(volume * 0.1)) + T.adjustWater(round(volume) * 0.9) + T.adjustHealth(round(volume * 0.1)) + T.adjustNutri(round(volume * 0.1)) return 1 //Sugar -/datum/reagent/consumable/sugar/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustWeeds(round(rand(1, volume / 5))) - tray.adjustPests(round(rand(1, volume / 5))) +/datum/reagent/consumable/sugar/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustWeeds(round(rand(1, volume / 5))) + T.adjustPests(round(rand(1, volume / 5))) return 1 //Sulphuric Acid -/datum/reagent/toxin/acid/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustHealth(-round(volume * 1)) - tray.adjustToxic(round(volume * 1.5)) - tray.adjustWeeds(-rand(1,volume * 0.25)) +/datum/reagent/toxin/acid/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustHealth(-round(volume * 1)) + T.adjustToxic(round(volume * 1.5)) + T.adjustWeeds(-rand(1,volume * 0.25)) return 1 //Toxin -/datum/reagent/toxin/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - adjustToxic(round(volume * 2)) +/datum/reagent/toxin/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustToxic(round(volume * 2)) return 1 //Unstable Mutagen -/datum/reagent/toxin/mutagen/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/toxin/mutagen/on_tray(obj/machinery/hydroponics/T, volume, mob/user) if(volume >= 5) DEFAULT_ACT_MUTAGEN else if(volume >= 2) - tray.hardmutate() + T.hardmutate() else if(volume >= 1) - tray.mutate() + T.mutate() return 1 //Uranium -/datum/reagent/uranium/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) +/datum/reagent/uranium/on_tray(obj/machinery/hydroponics/T, volume, mob/user) if(volume >= 10) DEFAULT_ACT_MUTAGEN else if(volume >= 5) - tray.hardmutate() + T.hardmutate() else if(volume >= 2) - tray.mutate() + T.mutate() - tray.adjustHealth(-round(volume)) - tray.adjustToxic(round(volume * 2)) + T.adjustHealth(-round(volume)) + T.adjustToxic(round(volume * 2)) return 1 //Virus Food -/datum/reagent/toxin/mutagen/mutagenvirusfood/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustNutri(round(volume * 0.5)) - tray.adjustHealth(-round(volume * 0.5)) +/datum/reagent/toxin/mutagen/mutagenvirusfood/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustNutri(round(volume * 0.5)) + T.adjustHealth(-round(volume * 0.5)) + return 1 //Water -/datum/reagent/water/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - tray.adjustWater(round(volume)) +/datum/reagent/water/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustWater(round(volume)) return 1 //Weed Killer -/datum/reagent/toxin/plantbgone/weedkiller/on_tray(/obj/machinery/hydroponics/tray, volume, mob/user) - adjustToxic(round(volume / 2)) - adjustWeeds(-rand(1,volume / 5)) +/datum/reagent/toxin/plantbgone/weedkiller/on_tray(obj/machinery/hydroponics/T, volume, mob/user) + T.adjustToxic(round(volume / 2)) + T.adjustWeeds(-rand(1,volume / 5)) return 1 #undef DEFAULT_ACT_MUTAGEN