diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index 723df1ad9a2..29d2f7c135d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -20,6 +20,7 @@ new /obj/item/wirecutters/clippers(src) new /obj/item/reagent_containers/spray/plantbgone(src) new /obj/item/storage/belt/hydro(src) + new /obj/item/watertank(src) /obj/structure/closet/secure_closet/xenobotany name = "xenobotanist's locker" diff --git a/html/changelogs/hazelmouse-hydrotweaks.yml b/html/changelogs/hazelmouse-hydrotweaks.yml new file mode 100644 index 00000000000..34ee7b89a20 --- /dev/null +++ b/html/changelogs/hazelmouse-hydrotweaks.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Implements several tweaks and minor fixes to hydroponics, particularly affecting the component on the first deck. This includes some rearranged machines, layout tweaks, filling in some missing decals, and correcting some erroneous space turfs." + - rscadd: "Hydroponics lockers now naturally spawn with a water tank inside them." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index a1fec43fc44..a0f0e06facf 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -2159,15 +2159,10 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/rust) "anV" = ( -/obj/structure/table/stone/marble, -/obj/item/device/radio/intercom/west, -/obj/item/device/hand_labeler{ - pixel_y = 13 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/item/device/destTagger, -/obj/item/stack/wrapping_paper, -/obj/item/stack/packageWrap, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "aob" = ( /obj/structure/lattice/catwalk/indoor, @@ -4549,12 +4544,8 @@ /obj/effect/floor_decal/corner/dark_green/full{ dir = 8 }, -/obj/effect/landmark/start{ - name = "Gardener" - }, /obj/machinery/media/jukebox/audioconsole/wall{ - pixel_y = 32; - pixel_x = -4 + pixel_y = 32 }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) @@ -6909,10 +6900,6 @@ /obj/effect/floor_decal/spline/plain/purple{ dir = 1 }, -/obj/structure/engineer_maintenance/electric, -/obj/structure/engineer_maintenance/pipe{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "aWd" = ( @@ -8070,6 +8057,9 @@ dir = 8 }, /obj/effect/floor_decal/spline/plain/corner/green, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "bdE" = ( @@ -16301,8 +16291,12 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/wing/starboard/far) "cjE" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/industrial/hatch/service, +/obj/effect/floor_decal/industrial/outline_straight/service{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/service{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "cjF" = ( @@ -16960,16 +16954,8 @@ /turf/simulated/floor/carpet/rubber, /area/horizon/crew_quarters/fitness/gym) "cnH" = ( -/obj/structure/table/standard, /obj/effect/floor_decal/industrial/outline/service, -/obj/random/seed{ - pixel_y = 4; - pixel_x = 9 - }, -/obj/random/seed{ - pixel_y = 4; - pixel_x = -5 - }, +/obj/machinery/vending/hydronutrients/hydroponics, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "cnN" = ( @@ -17482,6 +17468,9 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, +/obj/structure/bed/stool/chair/office/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "crs" = ( @@ -18658,7 +18647,7 @@ }, /obj/structure/extinguisher_cabinet/west, /obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/industrial/hatch/service, +/obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "cCb" = ( @@ -20563,17 +20552,15 @@ /obj/effect/floor_decal/spline/plain, /obj/structure/table/reinforced, /obj/machinery/button/remote/blast_door{ - dir = 6; id = "shutters_deck2_hydroponicsdesk"; - name = "Desk Shutter"; - pixel_y = -1; + name = "Desk Shutters"; + pixel_y = 8; pixel_x = 6 }, /obj/machinery/button/remote/blast_door{ - dir = 6; id = "shutters_deck2_hydroponicswindows"; name = "Window Shutters"; - pixel_y = -1; + pixel_y = 8; pixel_x = -7 }, /turf/simulated/floor/tiled, @@ -22575,21 +22562,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/port) -"dfR" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/spline/plain/blue{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/horizon/hydroponics/lower) "dfU" = ( /turf/simulated/wall/r_wall, /area/storage/shields) @@ -26263,14 +26235,13 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "dHe" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/door/window/northleft{ - dir = 8; - name = "Hydroponics"; - req_access = list(35) +/obj/structure/table/reinforced/steel, +/obj/item/storage/box/fancy/vials{ + pixel_x = 4; + pixel_y = 6 }, -/turf/simulated/open, -/area/horizon/hydroponics) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/hydroponics/lower) "dHi" = ( /turf/space, /area/template_noop) @@ -27583,8 +27554,17 @@ /turf/simulated/floor/tiled/dark/full, /area/crew_quarters/heads/hor) "dSc" = ( -/obj/effect/floor_decal/industrial/outline/service, -/obj/machinery/smartfridge/drying_rack, +/obj/structure/table/reinforced/steel, +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = 17 + }, +/obj/item/clothing/glasses/safety/goggles{ + pixel_y = 5 + }, +/obj/item/clothing/glasses/safety/goggles{ + pixel_y = -1 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "dSd" = ( @@ -29307,7 +29287,7 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "efs" = ( -/obj/effect/floor_decal/spline/plain/corner/green, +/obj/effect/floor_decal/spline/plain/green, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "efy" = ( @@ -29858,8 +29838,10 @@ /area/horizon/security/equipment) "eiP" = ( /obj/effect/floor_decal/industrial/outline/service, -/obj/machinery/chem_master/condimaster, /obj/machinery/alarm/west, +/obj/machinery/honey_extractor{ + density = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "eiV" = ( @@ -31439,7 +31421,12 @@ "eut" = ( /obj/machinery/door/window/northleft{ name = "Animal Pen"; - req_one_access = list(35,28) + req_access = list(35) + }, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) @@ -33227,13 +33214,20 @@ /turf/simulated/floor/greengrid/nitrogen, /area/engineering/drone_fabrication) "eHT" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 1 - }, /obj/effect/floor_decal/industrial/outline_door/medical/dark_green, /obj/effect/floor_decal/industrial/outline_segment/medical/dark_green{ dir = 10 }, +/obj/effect/floor_decal/spline/plain/corner/blue{ + dir = 1 + }, +/obj/effect/floor_decal/corner/dark_green/full, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "eHU" = ( @@ -33659,10 +33653,10 @@ /turf/simulated/floor/tiled, /area/operations/loading) "eLd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/effect/floor_decal/corner/dark_green/diagonal, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "eLg" = ( @@ -33741,10 +33735,13 @@ /turf/simulated/floor/lino, /area/horizon/cafeteria) "eMc" = ( -/obj/structure/lattice/catwalk, -/obj/item/hullbeacon/red, -/turf/space, -/area/template_noop) +/obj/effect/floor_decal/industrial/outline/service, +/obj/structure/table/rack, +/obj/item/storage/toolbox/mechanical, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/hydroponics) "eMd" = ( /turf/simulated/wall, /area/medical/smoking) @@ -35622,12 +35619,12 @@ /turf/simulated/floor/tiled, /area/operations/office) "faK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "faM" = ( @@ -40082,12 +40079,18 @@ /turf/simulated/wall, /area/horizon/commissary) "fII" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/item/watertank, -/obj/effect/floor_decal/industrial/outline/service, /obj/machinery/light{ dir = 8 }, +/obj/structure/table/reinforced/steel, +/obj/machinery/reagentgrinder{ + pixel_x = 4; + pixel_y = 16 + }, +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = -5; + pixel_y = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "fIM" = ( @@ -40648,11 +40651,8 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 9 }, -/obj/structure/bed/stool/chair/office/light{ - dir = 8 - }, -/obj/effect/landmark/start{ - name = "Gardener" +/obj/effect/floor_decal/spline/plain/blue{ + dir = 4 }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) @@ -41576,12 +41576,11 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "fUh" = ( -/obj/effect/floor_decal/industrial/outline_straight/service{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/floor_decal/corner/dark_green, -/turf/simulated/floor/tiled, -/area/horizon/hydroponics) +/turf/simulated/floor/grass, +/area/horizon/hydroponics/lower) "fUm" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning{ @@ -42546,16 +42545,10 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/engineering) "gas" = ( -/obj/random/soap{ - pixel_y = 8; - pixel_x = -4 - }, -/obj/structure/table/standard, -/obj/effect/floor_decal/industrial/outline/service, /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "gat" = ( /turf/simulated/floor/beach/sand{ @@ -43057,11 +43050,8 @@ /area/medical/emergency_storage) "geB" = ( /obj/structure/flora/ausbushes/ppflowers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 8 }, /obj/structure/window/reinforced{ dir = 1 @@ -44909,8 +44899,8 @@ /obj/structure/table/reinforced, /obj/item/device/quikpay{ destinationact = "Operations"; - pixel_y = 10; - pixel_x = -8 + pixel_y = 4; + pixel_x = 4 }, /obj/item/holomenu{ pixel_y = 6; @@ -44925,6 +44915,10 @@ pixel_x = -12 }, /obj/item/device/radio/intercom/south, +/obj/item/material/ashtray/glass{ + pixel_x = -8; + pixel_y = 9 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "grU" = ( @@ -46484,9 +46478,14 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/storage_hard) "gDx" = ( -/obj/effect/floor_decal/industrial/outline/service, -/obj/machinery/honey_extractor{ - density = 1 +/obj/structure/table/reinforced/steel, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 13 + }, +/obj/item/pen{ + pixel_x = -3; + pixel_y = 13 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) @@ -54906,9 +54905,11 @@ /turf/simulated/floor/tiled, /area/medical/gen_treatment) "hPi" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/item/watertank, -/obj/effect/floor_decal/industrial/outline/service, +/obj/structure/table/reinforced/steel, +/obj/item/clothing/head/bandana/hydro{ + pixel_y = 4; + pixel_x = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "hPj" = ( @@ -58585,10 +58586,8 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos) "irN" = ( -/obj/structure/table/rack, -/obj/item/storage/toolbox/mechanical, -/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/industrial/outline/service, +/obj/machinery/chem_master/condimaster, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "irQ" = ( @@ -67920,9 +67919,9 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "jIW" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/industrial/hatch/service, /obj/machinery/firealarm/south, +/obj/effect/floor_decal/industrial/outline/service, +/obj/machinery/seed_extractor, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "jIX" = ( @@ -69919,10 +69918,9 @@ /turf/simulated/floor/tiled, /area/bridge/supply) "jZc" = ( -/obj/effect/floor_decal/spline/plain/green{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/service, +/obj/machinery/chem_master, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "jZe" = ( /obj/structure/railing/mapped{ @@ -74634,7 +74632,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/vending/hydronutrients/hydroponics, +/obj/structure/closet/secure_closet/hydroponics, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "kGp" = ( @@ -83900,7 +83898,7 @@ /area/engineering/atmos/propulsion/starboard) "lZa" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/industrial/hatch/service, +/obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "lZu" = ( @@ -86863,10 +86861,14 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_boxingcourt) "muS" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/structure/table/reinforced, +/obj/random/horticulture_magazine{ + pixel_x = -2 + }, +/obj/random/horticulture_magazine{ + pixel_x = 3 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "muX" = ( @@ -87185,7 +87187,16 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/outline_door/red{ +/obj/effect/floor_decal/spline/plain/purple{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/structure/engineer_maintenance/electric{ dir = 1 }, /turf/simulated/floor/tiled, @@ -97196,9 +97207,17 @@ c_tag = "Service- Hydroponics 2"; dir = 1 }, -/obj/machinery/seed_extractor, -/obj/effect/floor_decal/industrial/outline/service, -/turf/simulated/floor/tiled/dark/full, +/obj/structure/table/reinforced, +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = -3; + pixel_y = 7 + }, +/turf/simulated/floor/tiled, /area/horizon/hydroponics) "nWZ" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -104565,18 +104584,19 @@ /turf/simulated/floor/tiled/white, /area/horizon/security/forensic_laboratory) "pdp" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /obj/structure/sink/kitchen{ dir = 4; name = "sink"; pixel_x = -20 }, +/obj/effect/floor_decal/corner/dark_green/diagonal, /obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/spline/plain/purple{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "pdt" = ( @@ -110219,10 +110239,9 @@ icon_state = "0-2" }, /obj/machinery/power/apc/north, -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, -/obj/effect/floor_decal/industrial/outline/security, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/service, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "pSk" = ( /obj/machinery/atmospherics/unary/vent_pump/on, @@ -111069,15 +111088,10 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "pYH" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain/blue, -/obj/effect/floor_decal/spline/plain/green{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/horizon/hydroponics/lower) +/obj/effect/floor_decal/industrial/outline/service, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/hydroponics) "pYP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -114041,19 +114055,18 @@ "qvZ" = ( /obj/structure/table/standard, /obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 2 + pixel_x = 1; + pixel_y = 3 }, /obj/item/pen{ - pixel_x = -6; - pixel_y = 2 + pixel_x = 1; + pixel_y = 3 }, /obj/structure/extinguisher_cabinet/west, -/obj/random/pottedplant_small{ - pixel_x = 9; - pixel_y = 1 +/obj/item/folder/blue{ + pixel_x = -5; + pixel_y = -8 }, -/obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "qwe" = ( @@ -117607,10 +117620,9 @@ /turf/simulated/floor/tiled, /area/operations/loading) "qUN" = ( -/obj/effect/floor_decal/spline/plain/blue{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/industrial/outline/service, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "qUQ" = ( /obj/structure/bed/stool/chair{ @@ -118833,20 +118845,8 @@ /turf/unsimulated/floor/dark_monotile, /area/antag/actor) "rcg" = ( -/obj/structure/table/standard, /obj/effect/floor_decal/industrial/outline/service, -/obj/random/seed{ - pixel_y = -11; - pixel_x = -5 - }, -/obj/random/seed{ - pixel_y = -11; - pixel_x = 9 - }, -/obj/item/storage/box/snack{ - pixel_y = 7; - pixel_x = 6 - }, +/obj/machinery/seed_storage/garden, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "rck" = ( @@ -121068,10 +121068,11 @@ /area/centcom/holding) "rtk" = ( /obj/structure/table/standard, -/obj/effect/floor_decal/industrial/outline/service, -/obj/random/lavalamp{ - pixel_y = 5; - pixel_x = 7 +/obj/random/horticulture_magazine{ + pixel_x = -2 + }, +/obj/random/horticulture_magazine{ + pixel_x = 4 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) @@ -121164,7 +121165,7 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 1 }, -/obj/machinery/light/floor{ +/obj/effect/floor_decal/spline/plain/green{ dir = 4 }, /turf/simulated/floor/tiled, @@ -122820,9 +122821,10 @@ /obj/machinery/disposal/small/north, /obj/machinery/light_switch{ dir = 1; - pixel_x = -9; + pixel_x = -6; pixel_y = -24 }, +/obj/effect/floor_decal/corner/dark_green/diagonal, /obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/spline/plain/purple{ dir = 1 @@ -125677,6 +125679,8 @@ dir = 4; icon_state = "pipe-c" }, +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/spline/plain/purple{ dir = 1 }, @@ -126945,11 +126949,12 @@ /turf/simulated/floor/carpet/rubber, /area/tcommsat/chamber) "spa" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/industrial/hatch/service, /obj/machinery/alarm/north{ req_one_access = list(24,11,55) }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, +/obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "spf" = ( @@ -127791,10 +127796,6 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "svK" = ( -/obj/effect/floor_decal/industrial/outline_straight/medical/dark_green, -/obj/effect/floor_decal/industrial/outline_straight/medical/dark_green{ - dir = 1 - }, /obj/machinery/firealarm/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -129914,6 +129915,12 @@ /obj/effect/floor_decal/spline/plain/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "sML" = ( @@ -133008,9 +133015,6 @@ /obj/structure/bed/stool/chair/office/light{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline_segment/service{ - dir = 1 - }, /obj/machinery/ringer/west{ pixel_y = 32; department = "Service"; @@ -134110,6 +134114,9 @@ /obj/effect/floor_decal/spline/plain/green{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "tty" = ( @@ -135734,14 +135741,17 @@ /area/chapel/office) "tFb" = ( /obj/structure/table/standard, -/obj/effect/floor_decal/industrial/outline/service, /obj/item/toy/plushie/nymph{ - pixel_y = 20; - pixel_x = 4 + pixel_y = 16; + pixel_x = -4 }, -/obj/random/horticulture_magazine{ - pixel_y = -4; - pixel_x = 3 +/obj/item/device/hand_labeler{ + pixel_y = -1; + pixel_x = -4 + }, +/obj/random/lavalamp{ + pixel_y = 11; + pixel_x = 9 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) @@ -138655,10 +138665,10 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 5 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /obj/effect/floor_decal/spline/plain/green, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "uaL" = ( @@ -140173,7 +140183,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/chem_master, +/obj/machinery/smartfridge/drying_rack, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "ulu" = ( @@ -140828,6 +140838,12 @@ /obj/effect/floor_decal/spline/plain/green{ dir = 6 }, +/obj/structure/bed/stool/chair/office/light{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Gardener" + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "upG" = ( @@ -143544,18 +143560,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/outline_door/red{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline_segment/engineering{ +/obj/structure/engineer_maintenance/pipe{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline_segment/engineering{ - dir = 5 - }, -/obj/structure/engineer_maintenance/pipe, /obj/structure/engineer_maintenance/electric{ - dir = 4 + dir = 1 }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) @@ -145788,7 +145797,7 @@ /obj/machinery/door/airlock/glass_service{ dir = 1; name = "Hydroponics"; - req_one_access = list(35,28) + req_access = list(35) }, /obj/machinery/door/firedoor, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -145863,32 +145872,23 @@ c_tag = "Service - Hydroponics Lower 1"; dir = 4 }, -/obj/random/pottedplant_small{ - pixel_x = 7; - pixel_y = 12 - }, -/obj/random/pottedplant_small{ - pixel_x = 7; - pixel_y = 2 - }, -/obj/random/pottedplant_small{ - pixel_x = 7; - pixel_y = -8 - }, -/obj/random/pottedplant_small{ - pixel_x = -4; - pixel_y = 12 - }, -/obj/random/pottedplant_small{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/random/pottedplant_small{ - pixel_x = -4; - pixel_y = -8 - }, /obj/structure/table/standard, -/obj/effect/floor_decal/industrial/outline/service, +/obj/random/pottedplant_small{ + pixel_x = -4; + pixel_y = 12 + }, +/obj/random/pottedplant_small{ + pixel_x = 7; + pixel_y = 12 + }, +/obj/random/pottedplant_small{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/random/pottedplant_small{ + pixel_x = -4; + pixel_y = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "vbW" = ( @@ -146582,10 +146582,16 @@ /turf/simulated/floor/tiled, /area/rnd/hallway/secondary) "vgI" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 9 + }, /obj/effect/floor_decal/spline/plain/corner/blue, /obj/effect/floor_decal/spline/plain/corner/green{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "vgM" = ( @@ -147732,6 +147738,12 @@ dir = 4 }, /obj/effect/floor_decal/spline/plain/red, +/obj/structure/bed/stool/chair/office/light{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Gardener" + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "vpr" = ( @@ -149855,6 +149867,7 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 9 }, +/obj/effect/floor_decal/spline/plain/corner/green, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "vFd" = ( @@ -150701,9 +150714,11 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, /mob/living/simple_animal/chicken, -/obj/machinery/door/window/northright{ - req_one_access = list(35,28); - name = "Animal Pen" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 }, /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) @@ -153813,12 +153828,13 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "wlf" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/flora/ausbushes/lavendergrass, +/obj/machinery/door/window/northright{ + name = "Animal Pen"; + req_access = list(35) }, /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) @@ -158881,9 +158897,6 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -158893,6 +158906,9 @@ /obj/effect/floor_decal/spline/plain/corner/red{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "wUr" = ( @@ -160703,11 +160719,11 @@ /turf/unsimulated/floor/wood, /area/centcom/bar) "xgi" = ( -/obj/machinery/seed_storage/garden, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/service{ c_tag = "Service - Hydroponics Lower 2" }, +/obj/structure/closet/secure_closet/hydroponics, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "xgm" = ( @@ -160777,9 +160793,18 @@ /obj/effect/floor_decal/industrial/outline_segment/medical/dark_green{ dir = 4 }, -/obj/effect/floor_decal/spline/plain/corner/blue{ +/obj/effect/floor_decal/spline/plain/blue{ dir = 1 }, +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "xgP" = ( @@ -165830,20 +165855,11 @@ /turf/unsimulated/floor/plating, /area/shuttle/specops) "xRa" = ( -/obj/machinery/reagentgrinder{ - pixel_y = 8; - pixel_x = -8 - }, -/obj/item/clothing/head/bandana/hydro{ - pixel_y = -4; - pixel_x = 10 - }, /obj/structure/table/standard, -/obj/effect/floor_decal/industrial/outline/service, /obj/item/device/radio/intercom/west, /obj/random/lavalamp{ - pixel_y = 16; - pixel_x = 5 + pixel_y = 10; + pixel_x = 7 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) @@ -204532,7 +204548,7 @@ nRy hPi fII eiP -qQm +nAx ult qvZ xRa @@ -204788,15 +204804,15 @@ nRy nRy aFQ vFc -vFc -vFc +bMz +vgI +fMQ +fMQ +fMQ fMQ -vFc -vFc -vFc eHT eut -gTU +fUh tfB mdL kVe @@ -205041,12 +205057,12 @@ wcz kcE nRy nRy -anV fRH +oMZ oqB efs jZc -vgI +ttx qUN qUN qUN @@ -205302,7 +205318,7 @@ bdC bMz rtZ upE -nAx +qQm ttx cjE cjE @@ -205310,7 +205326,7 @@ cjE cjE sMG faK -nyp +gTU dtb sWx kVe @@ -205557,20 +205573,20 @@ nRy xgi uaK irN -oMZ +dHe gDx dSc -pYH -cjE -cjE -cjE -cjE -dfR +ttx +qUN +qUN +qUN +qUN +sMG geB gTU nyp clG -ctz +kVe eSV eSV eSV @@ -205824,10 +205840,10 @@ kiV wQA wUq wlf -nyp +anV tgv sWx -ctz +kVe eSV eSV eSV @@ -206084,7 +206100,7 @@ fKB bpl bmG mdL -ctz +kVe eSV eSV eSV @@ -206341,7 +206357,7 @@ drU drU mdL mdL -ctz +kVe eSV eSV eSV @@ -206592,13 +206608,13 @@ kVe kVe kVe kVe -eMc +xiV kVe kVe kVe kVe kVe -eMc +xiV eSV eSV eSV @@ -269037,7 +269053,7 @@ cpI pSh aWa bEY -fUh +not not cRn jta @@ -269294,7 +269310,7 @@ nKI lZa iHp bEY -fUh +not muS nWS cpI @@ -269805,7 +269821,7 @@ vOy cdC fJo nKI -lZa +eMc snV qPK vxy @@ -270064,8 +270080,8 @@ bSl cpI aAS vpV -lZa -lZa +hjN +tye spf jIW wav @@ -270576,7 +270592,7 @@ wlM pSr nXl cpI -tye +pYH fpa lZa lZa @@ -270833,7 +270849,7 @@ aZM pSr sFf cpI -hjN +pYH lQk lZa lZa @@ -271091,10 +271107,10 @@ pSr ksS cpI dds -dHe +hNk krn dwg -dHe +hNk nou vzy qEc