Hydroponics Overhaul (#1181)

* minor cleanup * progress * progress * progress * cherries and chilli * citrus * corn * abstract plant datum handling * Flowers * another batch * MORE * whoops * cleanup * untick * finish more * gorwn item code * cabbage/replicapod * fixes and hedges * plant gene pt1 * trait -> product_trait * plant gene pt2 * proggers * proggers 2 * random shit * grass * work * grind/juice refactor sidequest * whoops * almost * Lily and Spacemans Trumpet * potency scalar * horrrryyy fuck it compiles * updatepaths * unused var * fixes * more fixes * rename vars * var renames * i dont even know what to title this * unit test fixes * small tweaks * fixes / temp stuff * fixes * harddel fix * plant icon fixes * fuck * fixes * fix * fix * qdel gene holder * fuck you * fix mutations * ambrosia/vulgaris -> ambrosia * restore novaflower properties * maybe fix this runtime * reagent genes are unsplicable * i change my mind * fix seed extractor, jsx -> tsx * fix not passing plant_datum * fix test * FRICK * FRICK. AGAIN. * AM I DUMB? * fix + improve test accuracy * i need t osleep * fix these * fix all icons hopefuly * unit test name fix * tweak seed extractor ui * flex conv * good enough for now * unused gene flags * add some goon genes * tincture base * bananrries * probably need this * analyzer * should be unit tested but i need a break * fix seeds * parsnip fix * infusion UI * remove unneeded folder * delete * delete * move * remove seed_damage todo * delta time growth * a TON of new toys * fixes * seedextractor is now sortable * fix unit test * fuck me im dumb * cleanup * FUCK * remove a couple todos * infusion tweaks * codex stuffs * remove the cultivator and references to weeds * impl honey * somatoray * stub quality for now * spit out seed * rename + pass linters * fixes * fixes, impl reagent potency * mushroom stats * codex fixes/additions * fix juicing * fix killer tomatos * tinctures * hook up infusion * FUCK --------- Co-authored-by: Francinum <[email protected]>
DaedalusDock · Jan 28, 2025 · f4c4003 · f4c4003
1 parent e86c6a3
commit f4c4003
Show file tree

Hide file tree

Showing 222 changed files with 8,989 additions and 7,902 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -2827,7 +2827,6 @@
 /obj/structure/closet/wardrobe/orange,
 /obj/effect/spawner/random/maintenance/two,
 /obj/item/shovel/spade,
-/obj/item/cultivator,
 /turf/open/floor/iron/airless,
 /area/ruin/space/derelict/hallway/primary/port)
 "zN" = (

diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -135,7 +135,6 @@
 /area/ruin/space/has_grav/abandonedzoo)
 "aZ" = (
 /obj/structure/table/reinforced,
-/obj/item/cultivator,
 /obj/item/shovel,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)

diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -316,7 +316,6 @@
 /obj/structure/closet/cardboard,
 /obj/item/knife/kitchen,
 /obj/item/knife/kitchen,
-/obj/item/cultivator,
 /obj/item/hatchet,
 /obj/item/kitchen/rollingpin,
 /obj/effect/turf_decal/delivery,
@@ -559,7 +558,6 @@
 /area/ruin/space/has_grav/deepstorage/hydroponics)
 "bB" = (
 /obj/structure/table,
-/obj/item/cultivator,
 /obj/item/hatchet,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/deepstorage/hydroponics)

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" = (
@@ -2083,9 +2082,7 @@
 "TE" = (
 /obj/structure/table/reinforced/rglass,
 /obj/item/hatchet,
-/obj/item/cultivator,
 /obj/item/shovel/spade,
-/obj/item/secateurs,
 /turf/open/floor/glass,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "TO" = (
@@ -2100,16 +2097,6 @@
 /obj/structure/hedge/opaque,
 /turf/open/floor/iron/grimy,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
-"TV" = (
-/obj/structure/table/reinforced/rglass,
-/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,
@@ -2595,7 +2582,7 @@ Rj
 CO
 Rj
 Ti
-TV
+zq
 Bo
 Ut
 Ut
@@ -2673,7 +2660,7 @@ Rj
 CO
 Rj
 Zc
-Uc
+yi
 Bo
 ch
 Ut

diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -1525,11 +1525,6 @@
 "ep" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
-/obj/item/cultivator{
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/obj/item/cultivator,
 /obj/item/shovel/spade,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
@@ -2202,8 +2197,6 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/obj/item/reagent_containers/spray/weedspray,
-/obj/item/reagent_containers/spray/pestspray,
 /obj/structure/closet/crate/hydroponics,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/ancientstation/charlie/hydro)

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/Theseus/Theseus.dmm b/_maps/map_files/Theseus/Theseus.dmm
@@ -317,7 +317,6 @@
 /area/station/ai_monitored/security/armory)
 "adQ" = (
 /obj/structure/table,
-/obj/item/cultivator,
 /obj/item/hatchet,
 /obj/structure/extinguisher_cabinet/directional/west,
 /obj/item/paper/guides/jobs/hydroponics,
@@ -7860,7 +7859,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/item/cultivator,
 /obj/item/clothing/head/chefhat,
 /obj/machinery/camera/directional/west{
 	c_tag = "Service - Starboard"
@@ -17700,9 +17698,6 @@
 	pixel_x = -4;
 	pixel_y = -2
 	},
-/obj/item/cultivator{
-	pixel_y = 3
-	},
 /obj/item/reagent_containers/glass/bucket{
 	pixel_x = 6;
 	pixel_y = 7
@@ -18026,10 +18021,6 @@
 /area/station/commons/dorms)
 "gGE" = (
 /obj/item/reagent_containers/spray/plantbgone,
-/obj/item/reagent_containers/spray/pestspray{
-	pixel_x = 3;
-	pixel_y = 4
-	},
 /obj/item/reagent_containers/glass/bottle/nutrient/ez,
 /obj/item/reagent_containers/glass/bottle/nutrient/rh{
 	pixel_x = 2;
@@ -43990,7 +43981,6 @@
 	},
 /area/station/ai_monitored/command/nuke_storage)
 "qri" = (
-/obj/item/cultivator,
 /obj/item/crowbar,
 /obj/item/plant_analyzer,
 /obj/item/reagent_containers/glass/bucket,
@@ -49866,7 +49856,6 @@
 /obj/item/shovel/spade,
 /obj/item/wrench,
 /obj/item/reagent_containers/glass/bucket,
-/obj/item/cultivator,
 /obj/item/wirecutters,
 /obj/machinery/airalarm/directional/south,
 /obj/effect/turf_decal/stripes/line{
@@ -51606,7 +51595,6 @@
 "tiF" = (
 /obj/structure/table,
 /obj/item/hatchet,
-/obj/item/cultivator,
 /obj/item/crowbar,
 /obj/item/reagent_containers/glass/bucket,
 /obj/item/plant_analyzer,
@@ -55547,7 +55535,6 @@
 /area/station/ai_monitored/aisat/exterior)
 "uKl" = (
 /obj/structure/table,
-/obj/item/cultivator,
 /obj/item/hatchet,
 /obj/item/crowbar,
 /obj/machinery/light/directional/north,
@@ -56822,10 +56809,6 @@
 /obj/item/plant_analyzer{
 	pixel_x = -3
 	},
-/obj/item/cultivator{
-	pixel_x = 4;
-	pixel_y = 9
-	},
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "vjG" = (

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)
@@ -7767,7 +7772,7 @@ dt
 dJ
 dD
 dJ
-dI
+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,
@@ -10598,10 +10596,6 @@
 /obj/item/seeds/cannabis{
 	pixel_y = 8
 	},
-/obj/item/cultivator{
-	pixel_x = -6;
-	pixel_y = 11
-	},
 /turf/open/floor/mineral/titanium/tiled,
 /area/centcom/syndicate_mothership/expansion_bioterrorism)
 "EB" = (
@@ -13757,7 +13751,6 @@
 /obj/item/shovel/spade{
 	pixel_y = -14
 	},
-/obj/item/cultivator,
 /turf/open/floor/wood,
 /area/centcom/central_command_areas/holding)
 "Ox" = (
@@ -17730,7 +17723,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/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm
@@ -3008,10 +3008,6 @@
 /obj/effect/station_crash/devastating,
 /turf/open/floor/iron/dark,
 /area/shuttle/escape)
-"OM" = (
-/obj/item/cultivator,
-/turf/open/floor/grass,
-/area/shuttle/escape)
 "OW" = (
 /obj/item/seeds/banana,
 /obj/item/seeds/grass,
@@ -6107,7 +6103,7 @@ nr
 mQ
 EL
 Py
-OM
+Vi
 Vi
 GU
 eu

diff --git a/_maps/shuttles/emergency_nature.dmm b/_maps/shuttles/emergency_nature.dmm
@@ -835,7 +835,6 @@
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
 "Fo" = (
-/obj/item/cultivator,
 /mob/living/simple_animal/hostile/lizard,
 /turf/open/floor/grass,
 /area/shuttle/escape)

diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
@@ -1487,7 +1487,6 @@
 /obj/structure/table,
 /obj/item/storage/bag/plants/portaseeder,
 /obj/item/shovel/spade,
-/obj/item/cultivator,
 /obj/item/plant_analyzer,
 /obj/item/reagent_containers/glass/bucket,
 /obj/effect/decal/cleanable/dirt/dust,

diff --git a/_maps/templates/holodeck_petpark.dmm b/_maps/templates/holodeck_petpark.dmm
@@ -105,11 +105,6 @@
 	},
 /turf/open/floor/holofloor,
 /area/template_noop)
-"U" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/cultivator,
-/turf/open/floor/holofloor/grass,
-/area/template_noop)
 "V" = (
 /obj/item/shovel/spade{
 	pixel_x = 2;
@@ -190,7 +185,7 @@ I
 I
 G
 R
-U
+c
 q
 I
 "}

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,16 +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.
-#define MUTATE_EARLY (1<<0)
 
 /// -- Flags for traits. --
 /// Caps the plant's yield at 5 instead of 10.

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: