Componented Growing Tray, Plus Goon Sprited Plants (#1689)

* start of compoents * most things * replaces hydrotrays with growing trays * changes * changes and additions * fixes * whoops * Update lavaland_surface_gaia.dmm * Update fruits.dm * more changes * more stuff * more changes * whoops * Update plant_growth_holder.dm * Update plant_growth_holder.dm * fixes * Update plant_growing.dm * more changes * Update plant_growing.dm * whoops * Update plant_growth_holder.dm * craig knows nothing but killing people and watering plants * Update potty.dm * Update potty.dm * some math tweaks * Update seedling.dm * blocks age from affecting plants during bio_boost * fixes weeds racking up while bioboosted * runtime fix * finishes the mutli-seed helper * makes harvest bag work * replaces towercaps with tree seeds, adds paper and money trees. * updates the cash tree sprite * re-adds the animation for pouring nutrients * Update item_attack.dm * whoops * more fixes * Update hydrotray.dm * more fixes * Update composter.dm * gye * Update plant_growing.dm * Update plant_growing.dm * Update stack.dm * fixes * this was too much * Update plant_growth_holder.dm * Update plant_growth_holder.dm * fixes * Update other_reagents.dm * Update plant_growing.dm * Update other_reagents.dm * Update pollution.dm * fixes * drain trays * stuff * apid tweaks * more changes * Update holder.dm * Update plant_growing.dm * Update species.dm * whoops * fixes infusions * new apid ability * hydro * should fix the issue * Update vac_tagged.dm * converts types to names for blackbox foods * saves ran events as name * adds roundid and severity to logs which slightly increases storage for the cost of aggregation and alerting * womp womp * Update species.dm * adds toggle for hard delete if server ooms re-enable them but for now nah. * names instead of types all the feedback tables so we can graph em pretty * adds emote_used to tracker * removes dead songs and some rule breaking ones * hard deletes clients again * hard deletes clients again * ffs * adds power tracking * Update garbage.dm
Monkestation · May 3, 2024 · 9cba046 · 9cba046
1 parent 9aeedda
commit 9cba046
Show file tree

Hide file tree

Showing 196 changed files with 3,886 additions and 2,083 deletions.
diff --git a/SQL/feedback_conversion_2017-11-12.py b/SQL/feedback_conversion_2017-11-12.py
@@ -456,7 +456,7 @@ def pick_parsing(var_name, var_value, details, multirows_completed):
     raise Exception("Python must be at least version 3 for this script.")
 text_keys = ["religion_book", "religion_deity", "religion_name", "shuttle_fasttravel", "shuttle_manipulator", "shuttle_purchase", "shuttle_reason", "station_renames"]
 amount_keys = ["admin_cookies_spawned", "cyborg_ais_created", "cyborg_frames_built", "cyborg_mmis_filled", "newscaster_newspapers_printed", "newscaster_stories", "nuclear_challenge_mode"]
-simple_tallies = ["admin_secrets_fun_used", "admin_verb", "assembly_made", "brother_success", "cell_used", "changeling_power_purchase", "changeling_success", "chaplain_weapon", "chemical_reaction", "circuit_printed", "clockcult_scripture_recited", "contamination", "cult_runes_scribed", "engine_started", "event_admin_cancelled", "event_ran", "food_harvested", "food_made", "gun_fired", "handcuffs", "item_deconstructed", "item_printed", "jaunter", "lazarus_injector", "megafauna_kills", "mining_voucher_redeemed", "mobs_killed_mining", "object_crafted", "ore_mined", "pick_used_mining", "slime_cores_used", "surgeries_completed", "time_dilation_current", "traitor_random_uplink_items_gotten", "traitor_success", "voice_of_god", "warp_cube", "wisp_lantern", "wizard_spell_learned", "wizard_success", "zone_targeted"]
+simple_tallies = ["admin_secrets_fun_used", "admin_verb", "assembly_made", "brother_success", "cell_used", "changeling_power_purchase", "changeling_success", "chaplain_weapon", "chemical_reaction", "circuit_printed", "clockcult_scripture_recited", "contamination", "cult_runes_scribed", "engine_started", "event_admin_cancelled", "event_ran", "food_harvested", "food_made", "gun_fired", "handcuffs", "item_deconstructed", "item_printed", "jaunter", "lazarus_injector", "megafauna_kills", "mining_voucher_redeemed", "mobs_killed_mining", "object_crafted", "ore_mined", "pick_used_mining", "slime_cores_used", "surgeries_completed", "time_dilation_current", "traitor_random_uplink_items_gotten", "traitor_success", "voice_of_god", "warp_cube", "wisp_lantern", "wizard_spell_learned", "wizard_success", "zone_targeted", "emote_used"]
 nested_tallies = ["admin_toggle", "cargo_imports", "changeling_objective", "changeling_powers", "cult_objective", "export_sold_cost", "hivelord_core", "item_used_for_combat", "job_preferences", "mining_equipment_bought", "played_url", "preferences_verb", "testmerged_prs", "traitor_objective", "traitor_uplink_items_bought", "vending_machine_usage", "wizard_objective", "wizard_spell_improved"]
 associatives = ["colonies_dropped", "commendation", "high_research_level"]
 special_cases = ["immortality_talisman", "newscaster_channels", "radio_usage", "shuttle_gib", "slime_babies_born", "slime_core_harvested"]

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm
@@ -289,7 +289,7 @@
 /turf/open/floor/carpet/neon/simple/lime,
 /area/ruin/bughabitat)
 "IX" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)
 "Jr" = (

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm
@@ -116,7 +116,7 @@
 /turf/open/floor/wood,
 /area/ruin/smoking_room/house)
 "w" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "x" = (

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm
@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "bf" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "cP" = (
@@ -44,7 +44,7 @@
 	color = "#8a7453";
 	dir = 8
 	},
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "ng" = (
@@ -120,7 +120,7 @@
 	color = "#8a7453";
 	dir = 10
 	},
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "vI" = (
@@ -209,7 +209,7 @@
 /obj/structure/railing{
 	color = "#8a7453"
 	},
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "Fg" = (
@@ -328,18 +328,18 @@
 	color = "#8a7453";
 	dir = 8
 	},
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "Tf" = (
 /obj/structure/railing{
 	color = "#8a7453"
 	},
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "TP" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "Vf" = (

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
@@ -78,7 +78,7 @@
 /turf/open/floor/plating,
 /area/ruin/powered/hermit)
 "sj" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /obj/machinery/light/directional/north,
 /turf/open/floor/grass/fairy,
 /area/ruin/powered/hermit)
@@ -87,7 +87,7 @@
 /turf/open/floor/wood,
 /area/ruin/powered/hermit)
 "uw" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/floor/grass/fairy,
 /area/ruin/powered/hermit)
 "wf" = (
@@ -157,7 +157,7 @@
 "Yi" = (
 /obj/item/seeds/plump,
 /obj/item/seeds/plump,
-/obj/item/seeds/tower,
+/obj/item/seeds/tree,
 /obj/item/seeds/reishi,
 /obj/structure/table/wood,
 /obj/item/food/grown/mushroom/glowshroom,

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -582,7 +582,7 @@
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
 "sV" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /turf/open/floor/iron/grimy,
 /area/ruin/powered/beach)
 "ta" = (
@@ -853,14 +853,14 @@
 /turf/closed/wall/mineral/sandstone,
 /area/ruin/powered/beach)
 "CZ" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
 	dir = 4
 	},
 /turf/open/floor/iron/grimy,
 /area/ruin/powered/beach)
 "Dg" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
@@ -711,7 +711,7 @@
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "ie" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /obj/structure/stone_tile/block/cracked{
 	dir = 1
 	},
@@ -1112,8 +1112,8 @@
 /obj/item/seeds/glowshroom,
 /obj/item/seeds/lavaland/porcini,
 /obj/item/seeds/lavaland/porcini,
-/obj/item/seeds/tower,
-/obj/item/seeds/tower,
+/obj/item/seeds/tree,
+/obj/item/seeds/tree,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
 "GW" = (
@@ -1131,7 +1131,7 @@
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "Ic" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /obj/structure/stone_tile/surrounding_tile/cracked{
 	dir = 1
 	},
@@ -1301,7 +1301,7 @@
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "Tr" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /obj/structure/stone_tile/block{
 	dir = 8
 	},

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gaia.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gaia.dmm
@@ -30,9 +30,7 @@
 /turf/open/misc/grass/lavaland,
 /area/ruin/unpowered/gaia)
 "i" = (
-/obj/machinery/hydroponics/soil{
-	self_sustaining = 1
-	},
+/obj/machinery/growing/soil,
 /turf/open/misc/grass/lavaland,
 /area/ruin/unpowered/gaia)
 "j" = (

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -56,11 +56,11 @@
 /obj/item/seeds/plump,
 /obj/item/seeds/plump,
 /obj/item/food/grown/mushroom/glowshroom,
-/obj/item/seeds/tower,
+/obj/item/seeds/tree,
 /turf/open/misc/asteroid/basalt,
 /area/ruin/powered)
 "n" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/floor/plating,
 /area/ruin/powered)
 "o" = (
@@ -168,7 +168,7 @@
 	},
 /area/ruin/powered)
 "L" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /obj/item/cultivator,
 /turf/open/floor/plating,
 /area/ruin/powered)

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
@@ -385,7 +385,7 @@
 /area/ruin/powered/seedvault)
 "bc" = (
 /obj/machinery/light/directional/west,
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/trimline/green/line{
 	dir = 8
@@ -423,7 +423,7 @@
 /area/ruin/powered/seedvault)
 "bg" = (
 /obj/machinery/light/directional/east,
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/effect/turf_decal/trimline/green/line{
@@ -435,7 +435,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/powered/seedvault)
 "bh" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/effect/turf_decal/trimline/green/line{
 	dir = 6
 	},
@@ -456,7 +456,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/powered/seedvault)
 "bj" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/effect/turf_decal/trimline/green/line{
 	dir = 10
 	},
@@ -474,7 +474,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/trimline/green/line{
 	dir = 8
@@ -522,7 +522,7 @@
 /area/ruin/powered/seedvault)
 "bq" = (
 /obj/machinery/light/directional/east,
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/trimline/green/line{
 	dir = 8
@@ -559,7 +559,7 @@
 /area/ruin/powered/seedvault)
 "bv" = (
 /obj/machinery/light/directional/south,
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/trimline/green/line{
 	dir = 1
@@ -569,7 +569,7 @@
 /area/ruin/powered/seedvault)
 "bw" = (
 /obj/machinery/light/directional/south,
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/trimline/green/line{
@@ -601,14 +601,14 @@
 /turf/closed/wall/r_wall,
 /area/ruin/powered/seedvault)
 "bB" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/effect/turf_decal/trimline/green/line{
 	dir = 5
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/powered/seedvault)
 "bC" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/effect/turf_decal/trimline/green/line{
 	dir = 9
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/botanical_haven.dmm b/_maps/RandomRuins/SpaceRuins/botanical_haven.dmm
@@ -17,11 +17,11 @@
 "f" = (
 /obj/structure/flora/bush/flowers_br/style_random,
 /obj/machinery/light/warm/directional/east,
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/misc/grass,
 /area/ruin/space/has_grav/powered/botanical_haven)
 "g" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/misc/grass,
 /area/ruin/space/has_grav/powered/botanical_haven)
 "h" = (

diff --git a/_maps/RandomRuins/SpaceRuins/clownplanet.dmm b/_maps/RandomRuins/SpaceRuins/clownplanet.dmm
@@ -63,7 +63,7 @@
 	},
 /area/ruin/space/has_grav/powered/clownplanet)
 "ao" = (
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /obj/item/seeds/banana,
 /turf/open/floor/grass{
 	color = "#1eff00"

diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -447,14 +447,14 @@
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/deepstorage/hydroponics)
 "bk" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
 	},
 /turf/open/floor/light,
 /area/ruin/space/has_grav/deepstorage/hydroponics)
 "bl" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 10
 	},
@@ -664,7 +664,7 @@
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/deepstorage/hydroponics)
 "bS" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /turf/open/floor/light,
 /area/ruin/space/has_grav/deepstorage/hydroponics)
 "bT" = (
@@ -924,14 +924,14 @@
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/deepstorage/hydroponics)
 "cz" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 4
 	},
 /turf/open/floor/light,
 /area/ruin/space/has_grav/deepstorage/hydroponics)
 "cA" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 9
 	},
@@ -2532,7 +2532,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/deepstorage/crusher)
 "hf" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/growing/tray,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
@@ -1893,7 +1893,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "Rj" = (
-/obj/machinery/hydroponics,
+/obj/machinery/growing,
 /turf/open/floor/mineral/titanium/white,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "Rk" = (

diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -209,7 +209,7 @@
 /area/ruin/space)
 "hK" = (
 /obj/structure/extinguisher_cabinet/directional/south,
-/obj/machinery/hydroponics/soil,
+/obj/machinery/growing/soil,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/listeningstation)
 "iU" = (