Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Componented Growing Tray, Plus Goon Sprited Plants #1689

Merged
merged 82 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
f7cb474
start of compoents
dwasint Apr 17, 2024
58a44c5
most things
dwasint Apr 18, 2024
2d3a84b
replaces hydrotrays with growing trays
dwasint Apr 18, 2024
ae5f4b1
changes
dwasint Apr 19, 2024
151404f
changes and additions
dwasint Apr 19, 2024
bd7814b
fixes
dwasint Apr 19, 2024
365c7a0
whoops
dwasint Apr 19, 2024
bce97ca
Update lavaland_surface_gaia.dmm
dwasint Apr 19, 2024
411bfcb
Update fruits.dm
dwasint Apr 19, 2024
163f442
more changes
dwasint Apr 19, 2024
2996068
more stuff
dwasint Apr 19, 2024
1f65550
more changes
dwasint Apr 19, 2024
a153b42
whoops
dwasint Apr 19, 2024
439580c
Update plant_growth_holder.dm
dwasint Apr 19, 2024
7cdb925
Update plant_growth_holder.dm
dwasint Apr 19, 2024
3ebfa33
fixes
dwasint Apr 19, 2024
83d8a4e
Update plant_growing.dm
dwasint Apr 19, 2024
13d8b4f
more changes
dwasint Apr 19, 2024
4041516
Update plant_growing.dm
dwasint Apr 19, 2024
f00776c
whoops
dwasint Apr 19, 2024
3ddc39b
Update plant_growth_holder.dm
dwasint Apr 19, 2024
def6ac6
craig knows nothing but killing people and watering plants
dwasint Apr 19, 2024
be9e585
Update potty.dm
dwasint Apr 19, 2024
fc1e4a7
Update potty.dm
dwasint Apr 19, 2024
96abac2
some math tweaks
dwasint Apr 19, 2024
fbf30ac
Update seedling.dm
dwasint Apr 19, 2024
d1f9ca6
blocks age from affecting plants during bio_boost
dwasint Apr 20, 2024
7e88909
fixes weeds racking up while bioboosted
dwasint Apr 20, 2024
0779011
runtime fix
dwasint Apr 20, 2024
5aaec86
finishes the mutli-seed helper
dwasint Apr 20, 2024
79af00b
makes harvest bag work
dwasint Apr 20, 2024
1cf0464
replaces towercaps with tree seeds, adds paper and money trees.
dwasint Apr 20, 2024
d87bbbf
updates the cash tree sprite
dwasint Apr 20, 2024
5825034
re-adds the animation for pouring nutrients
dwasint Apr 20, 2024
612e01a
Update item_attack.dm
dwasint Apr 20, 2024
61d7017
whoops
dwasint Apr 20, 2024
fc0ea0f
more fixes
dwasint Apr 21, 2024
7ed67d6
Update hydrotray.dm
dwasint Apr 21, 2024
614a150
more fixes
dwasint Apr 21, 2024
81c4ccb
Update composter.dm
dwasint Apr 21, 2024
1a733e1
gye
dwasint Apr 21, 2024
55a7402
Update plant_growing.dm
dwasint Apr 21, 2024
29dbd8f
Update plant_growing.dm
dwasint Apr 21, 2024
b9eb384
Update stack.dm
dwasint Apr 21, 2024
a60b33a
fixes
dwasint Apr 21, 2024
c185e72
this was too much
dwasint Apr 21, 2024
5c8222e
Update plant_growth_holder.dm
dwasint Apr 21, 2024
1658d69
Update plant_growth_holder.dm
dwasint Apr 21, 2024
af7f011
fixes
dwasint Apr 21, 2024
d5d0f04
Update other_reagents.dm
dwasint Apr 21, 2024
a7f0fbb
Update plant_growing.dm
dwasint Apr 21, 2024
8db4957
Update other_reagents.dm
dwasint Apr 21, 2024
95b8c3c
Update pollution.dm
dwasint Apr 22, 2024
7b48d3e
fixes
dwasint Apr 22, 2024
96ab3e4
drain trays
dwasint Apr 22, 2024
8dc8d15
stuff
dwasint Apr 26, 2024
36ef96a
apid tweaks
dwasint Apr 26, 2024
7515a24
more changes
dwasint Apr 27, 2024
42eb589
Update holder.dm
dwasint Apr 27, 2024
a63ce74
Update plant_growing.dm
dwasint Apr 27, 2024
3f28b48
Update species.dm
dwasint Apr 27, 2024
d589f2c
whoops
dwasint Apr 27, 2024
9521cc7
fixes infusions
dwasint Apr 27, 2024
037ef6c
new apid ability
dwasint Apr 28, 2024
f09fba7
hydro
dwasint Apr 28, 2024
021f7af
Merge branch 'master' into botany
dwasint Apr 28, 2024
b08f2bd
should fix the issue
dwasint Apr 28, 2024
e3dd366
Update vac_tagged.dm
dwasint Apr 28, 2024
b09c59e
converts types to names for blackbox foods
dwasint Apr 29, 2024
a293fa9
saves ran events as name
dwasint Apr 29, 2024
f628faf
adds roundid and severity to logs which slightly increases storage fo…
dwasint Apr 29, 2024
20ffa2f
womp womp
dwasint Apr 30, 2024
257ea11
Update species.dm
dwasint Apr 30, 2024
2911b17
adds toggle for hard delete if server ooms re-enable them but for now…
dwasint May 1, 2024
7d631cd
names instead of types all the feedback tables so we can graph em pretty
dwasint May 1, 2024
4585a0a
adds emote_used to tracker
dwasint May 1, 2024
f64bab8
removes dead songs and some rule breaking ones
dwasint May 1, 2024
e656295
hard deletes clients again
dwasint May 1, 2024
d14af5f
hard deletes clients again
dwasint May 1, 2024
becfc59
ffs
dwasint May 1, 2024
f34b3d3
adds power tracking
dwasint May 1, 2024
295f928
Update garbage.dm
dwasint May 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SQL/feedback_conversion_2017-11-12.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
Original file line number Diff line number Diff line change
@@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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
},
Expand Down
10 changes: 5 additions & 5 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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" = (
Expand All @@ -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
},
Expand Down Expand Up @@ -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
},
Expand Down
4 changes: 1 addition & 3 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_gaia.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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)
Expand Down
20 changes: 10 additions & 10 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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{
Expand All @@ -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
},
Expand All @@ -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
},
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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{
Expand Down Expand Up @@ -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
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/botanical_haven.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/clownplanet.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/SpaceRuins/deepstorage.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/listeningstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
Loading
Loading