diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm
index d2656e29..88f152fc 100644
--- a/code/modules/cargo/packs/service.dm
+++ b/code/modules/cargo/packs/service.dm
@@ -314,9 +314,9 @@
crate_name = "games supply crate"
crate_type = /obj/structure/closet/crate
-/datum/supply_pack/vending/hydro
+/datum/supply_pack/service/vending/hydrovendors
name = "Hydroponics Supply Crate"
- desc = "Arnt you glad you dont have to do it the natural way? Contains a megaseed and nutrimax vending machine refill."
+ desc = "Arn't you glad you dont have to do it the natural way? Contains a megaseed and nutrimax vending machine refill."
cost = 5000
contains = list(/obj/item/vending_refill/hydroseeds,
/obj/item/vending_refill/hydronutrients)
diff --git a/code/modules/hydroponics/hydro_chemreact.dm b/code/modules/hydroponics/hydro_chemreact.dm
index d7b51194..b0821ae3 100644
--- a/code/modules/hydroponics/hydro_chemreact.dm
+++ b/code/modules/hydroponics/hydro_chemreact.dm
@@ -1,5 +1,4 @@
-/obj/machinery/hydroponics/proc/applyChemicals(datum/reagents/S, mob/user)
-
+/obj/machinery/hydroponics/proc/applyFertilizer(datum/reagents/S, mob/user)
// Ambrosia Gaia produces earthsblood.
if(S.has_reagent(/datum/reagent/medicine/earthsblood))
self_sufficiency_progress += S.get_reagent_amount(/datum/reagent/medicine/earthsblood)
@@ -8,10 +7,6 @@
else if(!self_sustaining)
to_chat(user, "[src] warms as it might on a spring day under a genuine Sun.")
- if(!myseed)
- return
- myseed.on_chem_reaction(S) //In case seeds have some special interactions with special chems, currently only used by vines
-
// Requires 5 mutagen to possibly change species.// Poor man's mutagen.
if(S.has_reagent(/datum/reagent/toxin/mutagen, 5) || S.has_reagent(/datum/reagent/radium, 10) || S.has_reagent(/datum/reagent/uranium, 10))
switch(rand(100))
@@ -39,16 +34,6 @@
else if(S.has_reagent(/datum/reagent/toxin/mutagen, 1) || S.has_reagent(/datum/reagent/radium, 2) || S.has_reagent(/datum/reagent/uranium, 2))
mutate()
-
- // After handling the mutating, we now handle the damage from adding crude radioactives...
- if(S.has_reagent(/datum/reagent/uranium, 1))
- adjustHealth(-round(S.get_reagent_amount(/datum/reagent/uranium) * 1))
- adjustToxic(round(S.get_reagent_amount(/datum/reagent/uranium) * 2))
- if(S.has_reagent(/datum/reagent/radium, 1))
- adjustHealth(-round(S.get_reagent_amount(/datum/reagent/radium) * 1))
- adjustToxic(round(S.get_reagent_amount(/datum/reagent/radium) * 3)) // Radium is harsher (OOC: also easier to produce)
-
-
// Nutriments
if(S.has_reagent(/datum/reagent/plantnutriment/eznutriment, 1))
yieldmod = 1
@@ -63,12 +48,28 @@
mutmod = 0
adjustNutri(round(S.get_reagent_amount(/datum/reagent/plantnutriment/robustharvestnutriment) * 1))
+
+
+
+/obj/machinery/hydroponics/proc/applyChemicals(datum/reagents/S, mob/user)
+ if(!myseed)
+ return
+ myseed.on_chem_reaction(S) //In case seeds have some special interactions with special chems, currently only used by vines
+
+ // After handling the mutating, we now handle the damage from adding crude radioactives...
+ if(S.has_reagent(/datum/reagent/uranium, 1))
+ adjustHealth(-round(S.get_reagent_amount(/datum/reagent/uranium) * 1))
+ adjustToxic(round(S.get_reagent_amount(/datum/reagent/uranium) * 2))
+ if(S.has_reagent(/datum/reagent/radium, 1))
+ adjustHealth(-round(S.get_reagent_amount(/datum/reagent/radium) * 1))
+ adjustToxic(round(S.get_reagent_amount(/datum/reagent/radium) * 3)) // Radium is harsher (OOC: also easier to produce)
+
if(S.has_reagent(/datum/reagent/plantnutriment/endurogrow, 1))
var/total_transferred = S.get_reagent_amount(/datum/reagent/plantnutriment/endurogrow)
if(total_transferred >= 20)
myseed.adjust_potency(-round(total_transferred / 10))
myseed.adjust_yield(-round(total_transferred / 20))
- myseed.adjust_endurance(round(total_transferred / 30))
+ myseed.adjust_endurance(round(total_transferred / 60))
else
to_chat(user, "The plants don't seem to react...")
@@ -76,8 +77,8 @@
var/total_transferred = S.get_reagent_amount(/datum/reagent/plantnutriment/liquidearthquake)
if(total_transferred >= 20)
myseed.adjust_weed_chance(round(total_transferred / 10))
- myseed.adjust_weed_rate(round(total_transferred / 20))
- myseed.adjust_production(-round(total_transferred / 30))
+ myseed.adjust_weed_rate(round(total_transferred / 60))
+ myseed.adjust_production(round(total_transferred / 60))
else
to_chat(user, "The plants don't seem to react...")
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 70e1280e..d2cc76d9 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -533,8 +533,9 @@
reagent_source.reagents.trans_to(S,split)
if(istype(reagent_source, /obj/item/reagent_containers/food/snacks) || istype(reagent_source, /obj/item/reagent_containers/pill))
qdel(reagent_source)
- lastuser = user
+ lastuser = user
+ H.applyFertilizer(S, user)
H.applyChemicals(S, user)
S.clear_reagents()
@@ -631,6 +632,7 @@
user.visible_message("[user] digs out the plants in [src]!", "You dig out all of [src]'s plants!")
if(myseed) //Could be that they're just using it as a de-weeder
age = 0
+ lastproduce = 0
plant_health = 0
if(harvest)
harvest = FALSE //To make sure they can't just put in another seed and insta-harvest it