DaedalusDock · Kapu1178 · Dec 10, 2024 · Dec 11, 2024 · Dec 13, 2024 · Dec 19, 2024
diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
@@ -1113,7 +1113,6 @@
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "zq" = (
 /obj/structure/table/reinforced/rglass,
-/obj/item/food/grown/tomato/blue/bluespace,
 /turf/open/floor/glass,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "zu" = (
@@ -2105,11 +2104,6 @@
 /obj/item/grown/bananapeel/bluespace,
 /turf/open/floor/glass,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
-"Uc" = (
-/obj/structure/table/reinforced/rglass,
-/obj/item/food/grown/banana/bluespace,
-/turf/open/floor/glass,
-/area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "Ui" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/grimy,
@@ -2673,7 +2667,7 @@ Rj
 CO
 Rj
 Zc
-Uc
+yi
 Bo
 ch
 Ut

diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -1093,8 +1093,6 @@
 /obj/item/food/grown/tomato,
 /obj/item/food/grown/rice,
 /obj/item/food/grown/rice,
-/obj/item/food/grown/icepepper,
-/obj/item/food/grown/icepepper,
 /obj/item/food/grown/citrus/lemon,
 /obj/item/food/grown/citrus/lime,
 /obj/item/food/grown/citrus/orange,

diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
@@ -73,6 +73,11 @@
 "aw" = (
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
+"ax" = (
+/obj/effect/landmark/start,
+/obj/machinery/light/floor/has_bulb,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "aA" = (
 /turf/open/floor/iron,
 /area/station/engineering/main)
@@ -1961,6 +1966,10 @@
 /obj/structure/cable/smart_cable/color/yellow,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
+"zX" = (
+/obj/machinery/hydroponics/constructable,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "Ao" = (
 /obj/effect/turf_decal/plaque{
 	icon_state = "L9"
@@ -2367,6 +2376,10 @@
 /obj/machinery/chem_recipe_debug,
 /turf/open/floor/iron,
 /area/station/medical/chemistry)
+"Nd" = (
+/obj/machinery/vending/hydroseeds,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "NN" = (
 /obj/structure/fans/tiny,
 /obj/structure/cable/smart_cable/color/yellow,
@@ -2575,6 +2588,10 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
+"TR" = (
+/obj/machinery/vending/hydronutrients,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "UI" = (
 /obj/machinery/door/airlock,
 /obj/structure/cable/smart_cable/color/yellow,
@@ -7581,7 +7598,7 @@ cS
 hf
 dr
 dJ
-dJ
+TR
 dJ
 dI
 dJ
@@ -7673,7 +7690,7 @@ Tg
 xN
 ds
 dJ
-dJ
+Nd
 dJ
 dI
 dJ
@@ -7766,8 +7783,8 @@ jm
 dt
 dJ
 dD
-dJ
-dI
+zX
+ax
 dJ
 XZ
 dJ

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -5152,8 +5152,6 @@
 /obj/item/food/grown/tomato,
 /obj/item/food/grown/rice,
 /obj/item/food/grown/rice,
-/obj/item/food/grown/icepepper,
-/obj/item/food/grown/icepepper,
 /obj/item/food/grown/citrus/lemon,
 /obj/item/food/grown/citrus/lime,
 /obj/item/food/grown/citrus/orange,
@@ -17730,7 +17728,7 @@
 /obj/item/food/grown/chili,
 /obj/item/food/grown/carrot,
 /obj/item/food/grown/apple,
-/obj/item/food/grown/ambrosia/vulgaris,
+/obj/item/food/grown/ambrosia,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/machinery/status_display/evac/directional/north,
 /turf/open/floor/iron/dark,

diff --git a/code/__DEFINES/maths.dm → code/__DEFINES/_maths.dm b/code/__DEFINES/maths.dm → code/__DEFINES/_maths.dm
diff --git a/code/__DEFINES/botany.dm b/code/__DEFINES/botany.dm
@@ -36,12 +36,10 @@
 #define FLORA_GUN_MIN_ENDURANCE 20
 
 /// -- Flags for genes --
-/// Plant genes that can be removed via gene shears.
-#define PLANT_GENE_REMOVABLE (1<<0)
-/// Plant genes that can be mutated randomly in strange seeds / due to high instability.
+/// Gene is not passed on via splicing.
+#define PLANT_GENE_UNSPLICABLE (1<<0)
+/// Gene can be obtained via random seed.
 #define PLANT_GENE_MUTATABLE (1<<1)
-/// Plant genes that can be graftable. Used in formatting text, as they need to be set to be graftable anyways.
-#define PLANT_GENE_GRAFTABLE (1<<2)
 
 /// -- Flags for seeds. --
 /// Allows a plant to wild mutate (mutate on haravest) at a certain instability.

diff --git a/code/__DEFINES/dcs/signals/signals_hydroponic.dm b/code/__DEFINES/dcs/signals/signals_hydroponic.dm
@@ -11,25 +11,5 @@
 ///called when a seed is planted in a tray (obj/machinery/hydroponics)
 #define COMSIG_SEED_ON_PLANTED "plant_on_plant"
 
-//Hydro tray
-///from base of /obj/machinery/hydroponics/set_seed() : (obj/item/new_seed)
-#define COMSIG_HYDROTRAY_SET_SEED "hydrotray_set_seed"
-///from base of /obj/machinery/hydroponics/set_self_sustaining() : (new_value)
-#define COMSIG_HYDROTRAY_SET_SELFSUSTAINING "hydrotray_set_selfsustaining"
-///from base of /obj/machinery/hydroponics/set_weedlevel() : (new_value)
-#define COMSIG_HYDROTRAY_SET_WEEDLEVEL "hydrotray_set_weedlevel"
-///from base of /obj/machinery/hydroponics/set_pestlevel() : (new_value)
-#define COMSIG_HYDROTRAY_SET_PESTLEVEL "hydrotray_set_pestlevel"
-///from base of /obj/machinery/hydroponics/set_waterlevel() : (new_value)
-#define COMSIG_HYDROTRAY_SET_WATERLEVEL "hydrotray_set_waterlevel"
-///from base of /obj/machinery/hydroponics/set_plant_health() : (new_value)
-#define COMSIG_HYDROTRAY_SET_PLANT_HEALTH "hydrotray_set_plant_health"
-///from base of /obj/machinery/hydroponics/set_toxic() : (new_value)
-#define COMSIG_HYDROTRAY_SET_TOXIC "hydrotray_set_toxic"
-///from base of /obj/machinery/hydroponics/set_plant_status() : (new_value)
-#define COMSIG_HYDROTRAY_SET_PLANT_STATUS "hydrotray_set_plant_status"
-///from base of /obj/machinery/hydroponics/update_tray() : (mob/user, product_count)
-#define COMSIG_HYDROTRAY_ON_HARVEST "hydrotray_on_harvest"
-///from base of /obj/machinery/hydroponics/plantdies()
-#define COMSIG_HYDROTRAY_PLANT_DEATH "hydrotray_plant_death"
-///from base of obj/item/attack(): (/mob/living/target, /mob/living/user)
+/// Called by plant gene holders when getting a stat's value. (stat, base_val)
+#define COMSIG_PLANT_GENE_HOLDER_GET_STAT "pgh_get_stat"
diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm
@@ -107,10 +107,10 @@
 	#define COMPONENT_ITEM_BLOCK_UNEQUIP (1<<0)
 ///called on [/obj/item] AFTER unequip from base of [mob/proc/tryUnequipItem]: (force, atom/newloc, no_move, invdrop, silent)
 #define COMSIG_ITEM_POST_UNEQUIP "item_post_unequip"
-///from base of obj/item/on_grind(): ())
-#define COMSIG_ITEM_ON_GRIND "on_grind"
-///from base of obj/item/on_juice(): ()
-#define COMSIG_ITEM_ON_JUICE "on_juice"
+///from base of obj/item/grind(): ())
+#define COMSIG_ITEM_PRE_GRIND "pre_grind"
+///from base of obj/item/juice(): ()
+#define COMSIG_ITEM_PRE_JUICE "pre_juice"
 ///from /obj/machinery/hydroponics/attackby(obj/item/O, mob/user, params) when an object is used as compost: (mob/user)
 #define COMSIG_ITEM_ON_COMPOSTED "on_composted"
 ///Called when an item is dried by a drying rack:

diff --git a/code/__DEFINES/hydroponics.dm b/code/__DEFINES/hydroponics.dm
@@ -0,0 +1,40 @@
+// Plant states
+#define PLANT_DEAD "dead"
+#define PLANT_PLANTED "planted"
+#define PLANT_GROWING "growing"
+#define PLANT_MATURE "mature"
+#define PLANT_HARVESTABLE "harvestable"
+
+// Plant stats
+#define PLANT_STAT_MATURATION "maturation"
+#define PLANT_STAT_PRODUCTION "production"
+#define PLANT_STAT_YIELD "yield"
+#define PLANT_STAT_HARVEST_AMT "harvest_amt"
+#define PLANT_STAT_ENDURANCE "endurance"
+#define PLANT_STAT_POTENCY "potency"
+
+#define PLANT_STAT_PROB_ROUND(num) (trunc(num) + prob(fract(num) * 100) * SIGN(num))
+#warn undo this
+/proc/psbr(num)
+	return PLANT_STAT_PROB_ROUND(num)
+
+/// The functional maximum value from SCALE_PLANT_POTENCY
+#define POTENCY_SCALE_FUNCTIONAL_MAXIMUM 200
+/// The value returned by SCALE_PLANT_POTENCY when given 100 potency
+#define POTENCY_SCALE_AT_100 100
+
+#define POTENCY_SCALE_FACTOR (((100 * POTENCY_SCALE_FUNCTIONAL_MAXIMUM) / POTENCY_SCALE_AT_100) - 100)
+/// Scales a potency value according to the above values.
+#define SCALE_PLANT_POTENCY(given_potency) round((POTENCY_SCALE_FUNCTIONAL_MAXIMUM / (given_potency + POTENCY_SCALE_FACTOR)) * given_potency)
+
+/// Water level above this is considered drowning the plant.
+#define HYDRO_WATER_DROWNING_LIMIT 50
+
+/// Growth per process tick (1 second) base
+#define HYDRO_BASE_GROWTH_RATE 1
+/// Damage per process tick (1 second) if the plant has no water.
+#define HYDRO_NO_WATER_DAMAGE 1
+
+// Plant damage types
+/// Lack of water during process tick
+#define PLANT_DAMAGE_NO_WATER "no_water"
diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm
@@ -104,6 +104,14 @@
 ////Used to force an equlibrium to end a reaction in reaction_step() (i.e. in a reaction_step() proc return END_REACTION to end it)
 #define END_REACTION "end_reaction"
 
+//flags used by holder.dm to locate an reagent
+///Direct type
+#define REAGENT_STRICT_TYPE 1
+///Parent type but not sub types for e.g. if param is obj/item it will look for obj/item/stack but not obj/item/stack/sheet
+#define REAGENT_PARENT_TYPE 2
+///same as istype() check
+#define REAGENT_SUB_TYPE 3
+
 /// Helper for converting realtime seconds into reagent cycles.
 #define SECONDS_TO_REAGENT_CYCLES(seconds) round(seconds / (/datum/controller/subsystem/mobs::wait / 10))
 

diff --git a/code/__DEFINES/traits_hydroponics.dm b/code/__DEFINES/traits_hydroponics.dm
@@ -0,0 +1,5 @@
+/// get_effective_stat returns half for Yield.
+#define TRAIT_HALF_YIELD "half_yield"
+
+/// Sourced from a plant gene.
+#define PLANT_GENE_SOURCE "plant_gene"
diff --git a/code/__HELPERS/randoms.dm b/code/__HELPERS/randoms.dm
@@ -19,7 +19,6 @@
 		/obj/item/food/clothing,
 		/obj/item/food/meat/slab/human/mutant,
 		/obj/item/food/grown/nettle,
-		/obj/item/food/grown/shell
 		)
 
 	return pick(subtypesof(/obj/item/food) - blocked)

diff --git a/code/_compile_options.dm b/code/_compile_options.dm
@@ -165,7 +165,7 @@
 /////////////////////// MISC PERFORMANCE
 
 //uncomment this to load centcom and runtime station and thats it.
-// #define LOWMEMORYMODE
+#define LOWMEMORYMODE
 
 //uncomment to enable the spatial grid debug proc.
 // #define SPATIAL_GRID_ZLEVEL_STATS
@@ -269,7 +269,7 @@
 #endif

 #ifdef LOWMEMORYMODE
 #warn LOWMEMORYMODE is enabled!
 #endif

 #ifdef DEBUG_AI

diff --git a/code/controllers/subsystem/processing/hydroponics.dm b/code/controllers/subsystem/processing/hydroponics.dm
@@ -0,0 +1,44 @@
+PROCESSING_SUBSYSTEM_DEF(hydroponics)
+	name = "Hydroponics"
+	flags = SS_HIBERNATE
+
+
+	var/list/gene_list = list()
+
+	var/list/mutation_list = list()
+
+	var/list/non_abstract_plant_types = list()
+
+/datum/controller/subsystem/processing/hydroponics/Initialize(start_timeofday)
+	. = ..()
+	for(var/datum/plant_gene/path as anything in subtypesof(/datum/plant_gene))
+		if(isabstract(path))
+			continue
+
+		gene_list[path] = new path
+
+	for(var/datum/plant_mutation/path as anything in subtypesof(/datum/plant_mutation))
+		if(isabstract(path))
+			continue
+
+		mutation_list[path] = new path
+
+	for(var/datum/plant/path as anything in subtypesof(/datum/plant))
+		if(isabstract(path))
+			continue
+		non_abstract_plant_types += path
+
+/datum/controller/subsystem/processing/hydroponics/proc/splice_alleles(allele_one, allele_two, value_one, value_two)
+	if(allele_one == allele_two)
+		// Both were dominant or recessive, average them
+		return round((allele_one + allele_two) / 2)
+
+	var/dominance = allele_one - allele_two
+
+	// Allele 1 was dominant. (1 - 0 == 1)
+	if(dominance > 0)
+		return value_one
+
+	// Allele 1 was recessive. (0 - 1 == -1)
+	else
+		return value_two
diff --git a/code/datums/elements/food/food_trash.dm b/code/datums/elements/food/food_trash.dm
@@ -22,8 +22,8 @@
 		RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, PROC_REF(open_trash))
 	if(flags & FOOD_TRASH_POPABLE)
 		RegisterSignal(target, COMSIG_FOOD_CROSSED, PROC_REF(food_crossed))
-	RegisterSignal(target, COMSIG_ITEM_ON_GRIND, PROC_REF(generate_trash))
-	RegisterSignal(target, COMSIG_ITEM_ON_JUICE, PROC_REF(generate_trash))
+	RegisterSignal(target, COMSIG_ITEM_PRE_GRIND, PROC_REF(generate_trash))
+	RegisterSignal(target, COMSIG_ITEM_PRE_JUICE, PROC_REF(generate_trash))
 	RegisterSignal(target, COMSIG_ITEM_ON_COMPOSTED, PROC_REF(generate_trash))
 	RegisterSignal(target, COMSIG_ITEM_SOLD_TO_CUSTOMER, PROC_REF(generate_trash))
 

diff --git a/code/datums/elements/plant_backfire.dm b/code/datums/elements/plant_backfire.dm
@@ -101,7 +101,7 @@
  *
  * returns FALSE if none of the checks are successful.
  */
-/datum/element/plant_backfire/proc/plant_safety_check(obj/item/plant, mob/living/carbon/user)
+/datum/element/plant_backfire/proc/plant_safety_check(obj/item/product, mob/living/carbon/user)
 	if(!istype(user))
 		return TRUE
 
@@ -112,10 +112,10 @@
 		if(HAS_TRAIT(user, checked_trait))
 			return TRUE
 
-	var/obj/item/seeds/our_seed = plant.get_plant_seed()
-	if(our_seed)
+	var/datum/plant/our_plant = product.get_plant_datum()
+	if(our_plant)
 		for(var/checked_gene in extra_genes)
-			if(!our_seed.get_gene(checked_gene))
+			if(!our_plant.gene_holder.has_active_gene_of_type(checked_gene))
 				return TRUE
 
 	for(var/obj/item/clothing/worn_item in user.get_equipped_items())

diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
@@ -441,7 +441,6 @@
 		/datum/design/plant_analyzer,
 		/datum/design/shovel,
 		/datum/design/spade,
-		/datum/design/secateurs,
 		/datum/design/blood_filter,
 		/datum/design/scalpel,
 		/datum/design/circular_saw,

diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
@@ -172,16 +172,18 @@
 	var/obj/item/grown/log/L = I
 	if(istype(L))
 		var/seed_modifier = 0
-		if(L.seed)
-			seed_modifier = round(L.seed.potency / 25)
+		if(L.plant_datum)
+			seed_modifier = round(L.cached_potency / 25)
 		new L.plank_type(loc, 1 + seed_modifier)
+
 	else
 		var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
 		var/material_amount = materials.get_item_material_amount(I, BREAKDOWN_FLAGS_RECYCLER)
 		if(!material_amount)
 			return
 		materials.insert_item(I, material_amount, multiplier = (amount_produced / 100), breakdown_flags=BREAKDOWN_FLAGS_RECYCLER)
 		materials.retrieve_all()
+
 	qdel(I)