diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 6232ed66147..e3f899152e3 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -239,11 +239,6 @@ ITEMS object = /obj/item/storage/stickersheet/goldstar cost = 600 -/singleton/biorecipe/item/cash - name = "Money Bag" - object = /obj/item/storage/bag/money - cost = 200 - /singleton/biorecipe/item/plantbag name = "Plant Bag" object = /obj/item/storage/bag/plants @@ -271,6 +266,152 @@ ITEMS object = /obj/item/storage/firstaid/empty cost = 200 +/singleton/biorecipe/item/trash + name = "Trash Bag" + object = /obj/item/storage/bag/trash + cost = 200 + +/* +CLOTHING +*/ + +/singleton/biorecipe/clothes + name = "Hazard Vest" + class = BIOGEN_CLOTHES + object = /obj/item/clothing/suit/storage/hazardvest + cost = 200 + +/singleton/biorecipe/clothes/satchel + name = "Leather Satchel" + object = /obj/item/storage/backpack/satchel/leather + cost = 300 + +/singleton/biorecipe/clothes/duffel + name = "Duffel Bag" + object = /obj/item/storage/backpack/duffel + cost = 200 + +/singleton/biorecipe/clothes/backpack + name = "Generic Backpack" + object = /obj/random/biogenerator/backpack + cost = 200 + +/singleton/biorecipe/clothes/botanic_leather + name = "Botanical Gloves" + object = /obj/item/clothing/gloves/botanic_leather + cost = 150 + +/singleton/biorecipe/clothes/gloves + name = "Random Black Gloves" + object = /obj/random/biogenerator/gloves + cost = 125 + +/singleton/biorecipe/clothes/latexgloves + name = "Latex Gloves" + object = /obj/item/clothing/gloves/latex + cost = 200 + +/singleton/biorecipe/clothes/randomgloves + name = "Random Gloves" + object = /obj/random/biogenerator/gloves/random + cost = 125 + +/singleton/biorecipe/clothes/medicalbelt + name = "Medical Belt" + object = /obj/item/storage/belt/medical + cost = 200 + +/singleton/biorecipe/clothes/utility + name = "Utility Belt" + object = /obj/item/storage/belt/utility + cost = 200 + +/singleton/biorecipe/clothes/hydrobelt + name = "Hydroponic Belt" + object = /obj/item/storage/belt/hydro + cost = 200 + +/* +MEDICAL +*/ + +/singleton/biorecipe/cube + name = "Monkey Cube" + class = BIOGEN_SPECIAL + object = /obj/item/reagent_containers/food/snacks/monkeycube/wrapped + +/singleton/biorecipe/cube/stok + name = "Stok Cube" + object = /obj/item/reagent_containers/food/snacks/monkeycube/wrapped/stokcube + +/singleton/biorecipe/cube/farwa + name = "Farwa Cube" + object = /obj/item/reagent_containers/food/snacks/monkeycube/wrapped/farwacube + +/singleton/biorecipe/cube/neaera + name = "Neaera Cube" + object = /obj/item/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube + +/singleton/biorecipe/cube/cazador + name = "V'krexi Cube" + object = /obj/item/reagent_containers/food/snacks/monkeycube/wrapped/vkrexicube + cost = 500 + +/singleton/biorecipe/medical + name = "Bruise Pack" + class = BIOGEN_MEDICAL + object = /obj/item/stack/medical/bruise_pack + cost = 400 + +/singleton/biorecipe/medical/ointment + name = "Burn Ointment" + object = /obj/item/stack/medical/ointment + +/singleton/biorecipe/medical/perconol_pill + name = "Perconol Pill" + object = /obj/item/reagent_containers/pill/perconol + cost = 250 + amount = list(1,2,3,5,7) + +/* +CONSTRUCTION +*/ + +/singleton/biorecipe/construction + name = "Animal Hide" + class = BIOGEN_CONSTRUCTION + object = /obj/item/stack/material/animalhide + cost = 100 + amount = list(1,5,10,25,50) + +/singleton/biorecipe/construction/leather + name = "Leather" + object = /obj/item/stack/material/leather + +/singleton/biorecipe/construction/cloth + name = "Cloth" + object = /obj/item/stack/material/cloth + cost = 50 + +/singleton/biorecipe/construction/cardboard + name = "Cardboard" + object = /obj/item/stack/material/cardboard + cost = 50 + +/singleton/biorecipe/construction/wax + name = "Wax" + object = /obj/item/stack/wax + cost = 10 + +/singleton/biorecipe/construction/plastic + name = "Plastic" + object = /obj/item/stack/material/plastic + cost = 75 + +/singleton/biorecipe/construction/wood + name = "Wood" + object = /obj/item/stack/material/wood + /* FLAGS */ @@ -346,138 +487,6 @@ FLAGS object = /obj/item/flag/orion_express/l cost = 500 -/* -CONSTRUCTION -*/ - -/singleton/biorecipe/construction - name = "Animal Hide" - class = BIOGEN_CONSTRUCTION - object = /obj/item/stack/material/animalhide - cost = 100 - amount = list(1,5,10,25,50) - -/singleton/biorecipe/construction/leather - name = "Leather" - object = /obj/item/stack/material/leather - -/singleton/biorecipe/construction/cloth - name = "Cloth" - object = /obj/item/stack/material/cloth - cost = 50 - -/singleton/biorecipe/construction/cardboard - name = "Cardboard" - object = /obj/item/stack/material/cardboard - cost = 50 - -/singleton/biorecipe/construction/wax - name = "Wax" - object = /obj/item/stack/wax - cost = 10 - -/singleton/biorecipe/construction/plastic - name = "Plastic" - object = /obj/item/stack/material/plastic - cost = 75 - -/singleton/biorecipe/construction/wood - name = "Wood" - object = /obj/item/stack/material/wood - -/* -CLOTHING -*/ - -/singleton/biorecipe/clothes - name = "Suit" - class = BIOGEN_CLOTHES - object = /obj/random/suit - cost = 200 - -/singleton/biorecipe/clothes/satchel - name = "Leather Satchel" - object = /obj/item/storage/backpack/satchel/leather - cost = 300 - -/singleton/biorecipe/clothes/backpack - name = "Generic Backpack" - object = /obj/random/biogenerator/backpack - cost = 200 - -/singleton/biorecipe/clothes/backpack - name = "Corporate Backpack" - object = /obj/random/biogenerator/backpack/corporate - cost = 200 - -/singleton/biorecipe/clothes/botanic_leather - name = "Botanical Gloves" - object = /obj/item/clothing/gloves/botanic_leather - cost = 150 - -/singleton/biorecipe/clothes/gloves - name = "Black Gloves" - object = /obj/random/biogenerator/gloves - cost = 125 - -/singleton/biorecipe/clothes/randomgloves - name = "Random Gloves" - object = /obj/random/biogenerator/gloves/random - cost = 125 - -/singleton/biorecipe/clothes/utility - name = "Utility Belt" - object = /obj/item/storage/belt/utility - cost = 200 - -/singleton/biorecipe/clothes/hydrobelt - name = "Hydroponic Belt" - object = /obj/item/storage/belt/hydro - cost = 200 - - -/* -MEDICAL -*/ - -/singleton/biorecipe/cube - name = "Monkey Cube" - class = BIOGEN_SPECIAL - object = /obj/item/reagent_containers/food/snacks/monkeycube/wrapped - -/singleton/biorecipe/cube/stok - name = "Stok Cube" - object = /obj/item/reagent_containers/food/snacks/monkeycube/wrapped/stokcube - -/singleton/biorecipe/cube/farwa - name = "Farwa Cube" - object = /obj/item/reagent_containers/food/snacks/monkeycube/wrapped/farwacube - -/singleton/biorecipe/cube/neaera - name = "Neaera Cube" - object = /obj/item/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube - -/singleton/biorecipe/cube/cazador - name = "V'krexi Cube" - object = /obj/item/reagent_containers/food/snacks/monkeycube/wrapped/vkrexicube - cost = 500 - -/singleton/biorecipe/medical - name = "Bruise Pack" - class = BIOGEN_MEDICAL - object = /obj/item/stack/medical/bruise_pack - cost = 400 - -/singleton/biorecipe/medical/ointment - name = "Burn Ointment" - object = /obj/item/stack/medical/ointment - -/singleton/biorecipe/medical/perconol_pill - name = "Perconol Pill" - object = /obj/item/reagent_containers/pill/perconol - cost = 250 - amount = list(1,2,3,5,7) - /* EMAG/ILLEGAL */ diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index c5c542ca996..51348921dd9 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -14,8 +14,8 @@ max_w_class = WEIGHT_CLASS_SMALL /obj/item/storage/firstaid/empty - name = "empty first-aid kit" desc = "It's a first-aid kit. Comes with nothing, so feel free to put your own stuff in it." + max_storage_space = 16 // So empty first-aid kits don't start with less space than filled ones. /obj/item/storage/firstaid/regular starts_with = list( diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 6c5244cfb31..bd4dc115313 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -573,14 +573,44 @@ //This exists so the prespawned hydro crates spawn with their contents. /obj/structure/closet/crate/hydroponics/prespawned/fill() - new /obj/item/reagent_containers/spray/plantbgone(src) - new /obj/item/reagent_containers/spray/plantbgone(src) new /obj/item/material/minihoe(src) -// new /obj/item/weedspray(src) -// new /obj/item/weedspray(src) -// new /obj/item/pestspray(src) -// new /obj/item/pestspray(src) -// new /obj/item/pestspray(src) + new /obj/item/material/hatchet(src) + new /obj/item/wirecutters/clippers(src) + new /obj/item/reagent_containers/glass/bucket(src) + new /obj/item/reagent_containers/spray/plantbgone(src) + new /obj/item/reagent_containers/spray/plantbgone(src) + new /obj/item/reagent_containers/glass/fertilizer/ez(src) + new /obj/item/reagent_containers/glass/fertilizer/ez(src) + +// Everything you need for beekeeping, including the bees. Those with allergies need not apply. +/obj/structure/closet/crate/hydroponics/beekeeping + name = "beekeeping crate" + desc = "Live bees included! Several small labels warn of the hazards involved therein." + +/obj/structure/closet/crate/hydroponics/beekeeping/fill() + new /obj/item/bee_pack(src) + new /obj/item/honey_frame(src) + new /obj/item/honey_frame(src) + new /obj/item/beehive_assembly(src) + new /obj/item/bee_net(src) + new /obj/item/bee_smoker(src) + +// Includes everything you need to run your own horticultural medicinal operation. Or something more nefarious, if you prefer. +/obj/structure/closet/crate/hydroponics/herbalism + name = "herbalist crate" + desc = "Contains equipment and storage vessels involved in the processing and packaging of herbal medicine." + +/obj/structure/closet/crate/hydroponics/herbalism/fill() + new /obj/item/storage/box/spraybottles(src) + new /obj/item/storage/box/pillbottles(src) + new /obj/item/storage/box/inhalers_auto(src) + new /obj/item/storage/box/autoinjectors(src) + new /obj/item/reagent_containers/chem_disp_cartridge(src) + new /obj/item/reagent_containers/chem_disp_cartridge(src) + new /obj/item/reagent_containers/chem_disp_cartridge(src) + new /obj/item/reagent_containers/chem_disp_cartridge(src) + new /obj/item/reagent_containers/chem_disp_cartridge(src) + new /obj/item/reagent_containers/chem_disp_cartridge(src) // Spawns with everything you need to make your very own field kitchen! (assuming you have power) // Contains enough to create a stove and oven. Using loops for anything above one for readability. Best paired with a freezer with ingredients. diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index a6ecaf3f1a4..628061bab36 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -1,8 +1,10 @@ /datum/seed_pile var/name var/amount - var/datum/seed/seed_type // Keeps track of what our seed is - var/list/obj/item/seeds/seeds = list() // Tracks actual objects contained in the pile + /// Keeps track of what our seed is + var/datum/seed/seed_type + /// Tracks actual objects contained in the pile + var/list/obj/item/seeds/seeds = list() var/ID /datum/seed_pile/New(obj/item/seeds/O, ID) @@ -35,8 +37,10 @@ var/screen_y = 700 var/list/datum/seed_pile/piles = list() + /// The seeds the machine begins with. var/list/starting_seeds = list() - var/list/scanner = list() // What properties we can view + /// What properties we can view. + var/list/scanner = list() /obj/machinery/seed_storage/Initialize() . = ..() @@ -350,92 +354,38 @@ /obj/item/seeds/whitebeetseed = 3, /obj/item/seeds/wulumunushaseed = 2, /obj/item/seeds/xuiziseed = 3, - /obj/item/seeds/ylpha = 2 + /obj/item/seeds/ylpha = 2, + /obj/item/seeds/cranberryseed = 2, ) -/obj/machinery/seed_storage/xenobotany - name = "Xenobotany seed storage" +/obj/machinery/seed_storage/garden/hydroponics + name = "Hydroponics seed storage" scanner = list("stats", "produce", "soil", "temperature", "light") - starting_seeds = list( - /obj/item/seeds/aghrasshseed = 3, - /obj/item/seeds/ambrosiavulgarisseed = 3, - /obj/item/seeds/appleseed = 3, - /obj/item/seeds/amanitamycelium = 2, - /obj/item/seeds/bananaseed = 3, - /obj/item/seeds/bellpepperseed = 3, - /obj/item/seeds/berryseed = 3, - /obj/item/seeds/blackraspberryseed = 3, - /obj/item/seeds/blizzard = 3, - /obj/item/seeds/blueberryseed = 3, - /obj/item/seeds/blueraspberryseed = 3, - /obj/item/seeds/cabbageseed = 3, - /obj/item/seeds/carrotseed = 3, - /obj/item/seeds/chantermycelium = 3, - /obj/item/seeds/cherryseed = 3, - /obj/item/seeds/chiliseed = 3, - /obj/item/seeds/chickpeas = 3, - /obj/item/seeds/cocaseed = 3, - /obj/item/seeds/cocoapodseed = 3, - /obj/item/seeds/coffeeseed = 3, - /obj/item/seeds/cornseed = 3, - /obj/item/seeds/dirtberries = 2, - /obj/item/seeds/dynseed = 3, - /obj/item/seeds/replicapod = 3, - /obj/item/seeds/earthenroot = 2, - /obj/item/seeds/eggplantseed = 3, - /obj/item/seeds/eki = 3, - /obj/item/seeds/fjylozyn = 3, - /obj/item/seeds/garlicseed = 3, - /obj/item/seeds/glowshroom = 2, - /obj/item/seeds/grapeseed = 3, - /obj/item/seeds/grassseed = 3, - /obj/item/seeds/guamiseed = 2, - /obj/item/seeds/gukheseed = 3, - /obj/item/seeds/koisspore = 3, - /obj/item/seeds/lemonseed = 3, - /obj/item/seeds/libertymycelium = 2, - /obj/item/seeds/limeseed = 3, - /obj/item/seeds/mossseed = 2, - /obj/item/seeds/mtearseed = 2, - /obj/item/seeds/mintseed = 3, - /obj/item/seeds/nettleseed = 2, - /obj/item/seeds/onionseed = 3, - /obj/item/seeds/oracleseed = 3, - /obj/item/seeds/orangeseed = 3, - /obj/item/seeds/peaseed = 3, - /obj/item/seeds/peanutseed = 3, - /obj/item/seeds/peppercornseed = 3, - /obj/item/seeds/plastiseed = 3, - /obj/item/seeds/plumpmycelium = 3, - /obj/item/seeds/poppyseed = 3, - /obj/item/seeds/potatoseed = 3, - /obj/item/seeds/pumpkinseed = 3, - /obj/item/seeds/qlortseed = 2, - /obj/item/seeds/raspberryseed = 3, - /obj/item/seeds/reishimycelium = 2, - /obj/item/seeds/riceseed = 3, - /obj/item/seeds/richcoffeeseed = 3, - /obj/item/seeds/sarezhiseed = 3, - /obj/item/seeds/seaweed = 3, - /obj/item/seeds/serkiflowerseed, - /obj/item/seeds/soyaseed = 3, - /obj/item/seeds/sthberryseed = 3, - /obj/item/seeds/strawberryseed = 3, - /obj/item/seeds/sugarcaneseed = 3, - /obj/item/seeds/sunflowerseed = 3, - /obj/item/seeds/sugartree = 2, - /obj/item/seeds/shandseed = 2, - /obj/item/seeds/teaseed = 3, - /obj/item/seeds/tobaccoseed = 3, - /obj/item/seeds/tomatoseed = 3, - /obj/item/seeds/towermycelium = 3, - /obj/item/seeds/vanilla = 3, - /obj/item/seeds/watermelonseed = 3, - /obj/item/seeds/wheatseed = 3, - /obj/item/seeds/whitebeetseed = 3, - /obj/item/seeds/wulumunushaseed = 3, - /obj/item/seeds/xuiziseed = 3, - /obj/item/seeds/ylpha = 2 - ) screen_x = 1000 screen_y = 700 + +/obj/machinery/seed_storage/garden/hydroponics/Initialize() + starting_seeds = src.starting_seeds.Copy() + list( + /obj/item/seeds/libertymycelium = 2, + /obj/item/seeds/koisspore = 3, + /obj/item/seeds/glowshroom = 2, + /obj/item/seeds/nettleseed = 2 + ) + return ..() + +/obj/machinery/seed_storage/garden/xenobotany + name = "Xenobotany seed storage" + scanner = list("stats", "produce", "soil", "temperature", "light") + screen_x = 1000 + screen_y = 700 + +/obj/machinery/seed_storage/garden/xenobotany/Initialize() + starting_seeds = src.starting_seeds.Copy() + list( + /obj/item/seeds/libertymycelium = 2, + /obj/item/seeds/cocaseed = 3, + /obj/item/seeds/koisspore = 3, + /obj/item/seeds/amanitamycelium = 2, + /obj/item/seeds/glowshroom = 2, + /obj/item/seeds/nettleseed = 2 + ) + return ..() diff --git a/html/changelogs/hazelmouse-hydrobuffs.yml b/html/changelogs/hazelmouse-hydrobuffs.yml new file mode 100644 index 00000000000..e1a955f7b4e --- /dev/null +++ b/html/changelogs/hazelmouse-hydrobuffs.yml @@ -0,0 +1,66 @@ +################################ +# 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: "Hydroponics has been partially remapped, implementing atmospheric equipment for some trays allowing their temperature to be controlled." + - rscadd: "Hydroponics now has access to cranberry seeds, glowshroom spores, nettle seeds, k'ois spores, and liberty cap spores. Of these, only cranberry seeds are accessible in the public garden." + - rscadd: "Hydroponics now contains a secure and sealed chamber for growing hazardous specimens. You probably shouldn't plant your k'ois anywhere but here, and be sure to wear your hazmat suit and face mask! Lethal consequences may lay in malpractice!" + - rscadd: "A few new items have been added to the biogenerator, including trash bags, medical belts, and latex gloves." + - rscadd: "Hydroponics now has access to autoinhalers and autoinjectors." + - refactor: "Prefilled hydroponics-related crates now spawn with all the necessary tools, and the beekeeping and herbalist crates on the Horizon are now filled by code rather than by mapping." + - refactor: "Refactored code of seed dispensers to avoid duplicated lists. This does mean, entirely inadvertantly, that Xenobotany has clams now." + - rscadd: "Slightly expanded hydroponics access to immediately adjacent maintenance." + - bugfix: "Empty first-aid kits are no longer inferior in storage capacity to filled first-aid kits." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 59804c68536..6a4e90ebf46 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -2154,7 +2154,10 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/rust) "anV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/lavendergrass, +/mob/living/simple_animal/chicken, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/grass, @@ -3303,6 +3306,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "awx" = ( @@ -4542,6 +4546,10 @@ /obj/machinery/media/jukebox/audioconsole/wall{ pixel_y = 32 }, +/obj/effect/floor_decal/spline/plain/corner/green, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "aFV" = ( @@ -4913,6 +4921,14 @@ }, /turf/simulated/floor/plating, /area/hangar/intrepid) +"aIN" = ( +/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Livestock Pen"; + req_access = list(35) + }, +/turf/simulated/floor/tiled/full, +/area/horizon/hydroponics/lower) "aIS" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -6893,6 +6909,9 @@ /obj/effect/floor_decal/spline/plain/purple{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "aWd" = ( @@ -8051,8 +8070,8 @@ dir = 8 }, /obj/effect/floor_decal/spline/plain/corner/green, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) @@ -9401,7 +9420,7 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "bmG" = ( -/mob/living/simple_animal/chicken, +/obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/light{ dir = 4 }, @@ -9801,8 +9820,9 @@ /turf/simulated/floor/holofloor/beach/sand, /area/horizon/holodeck/source_picnicarea) "bpl" = ( -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/full, /area/horizon/hydroponics/lower) "bpu" = ( /obj/structure/cable{ @@ -11826,6 +11846,11 @@ /obj/machinery/vending/coffee, /turf/simulated/floor/tiled/white, /area/medical/ward) +"bEr" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/machinery/alarm/west, +/turf/simulated/floor/grass, +/area/horizon/hydroponics/lower) "bEx" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13042,6 +13067,7 @@ /obj/effect/floor_decal/spline/plain/green{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "bMO" = ( @@ -14895,6 +14921,9 @@ icon_state = "1-8" }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "bZp" = ( @@ -16305,6 +16334,7 @@ /obj/effect/floor_decal/industrial/outline_straight/service{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "cjF" = ( @@ -16530,18 +16560,7 @@ /turf/simulated/floor/tiled, /area/operations/break_room) "clG" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/effect/landmark/entry_point/fore{ - name = "fore, d1 garden" - }, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "shutters_deck2_hydroponicswindowssafety"; - name = "Viewing Shutter" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "clH" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -16656,17 +16675,25 @@ /turf/unsimulated/floor, /area/centcom/holding) "cmo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-4" }, /obj/effect/floor_decal/corner/dark_green{ dir = 4 }, -/obj/effect/floor_decal/spline/plain/green{ +/obj/effect/floor_decal/spline/plain/corner/green{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain/corner/blue{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain/corner/red, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "cmp" = ( @@ -26256,9 +26283,13 @@ /area/rnd/xenobiology) "dHe" = ( /obj/structure/table/reinforced/steel, -/obj/item/storage/box/fancy/vials{ +/obj/random/pottedplant_small{ + pixel_x = -9; + pixel_y = 11 + }, +/obj/machinery/reagentgrinder{ pixel_x = 4; - pixel_y = 6 + pixel_y = 11 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) @@ -27574,18 +27605,17 @@ /turf/simulated/floor/tiled/dark/full, /area/crew_quarters/heads/hor) "dSc" = ( -/obj/structure/table/reinforced/steel, -/obj/item/storage/box/gloves{ - pixel_x = 5; - pixel_y = 17 +/obj/effect/floor_decal/spline/plain/green{ + dir = 1 }, -/obj/item/clothing/glasses/safety/goggles{ - pixel_y = 5 +/obj/effect/floor_decal/spline/plain/blue, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/item/clothing/glasses/safety/goggles{ - pixel_y = -1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "dSd" = ( /turf/simulated/floor/wood, @@ -29307,8 +29337,16 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "efs" = ( -/obj/effect/floor_decal/spline/plain/green, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline_straight/service{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/service{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "efy" = ( /obj/effect/floor_decal/corner/dark_blue/full{ @@ -29861,11 +29899,9 @@ /turf/simulated/floor/tiled, /area/horizon/security/equipment) "eiP" = ( -/obj/effect/floor_decal/industrial/outline/service, /obj/machinery/alarm/west, -/obj/machinery/honey_extractor{ - density = 1 - }, +/obj/machinery/seed_extractor, +/obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "eiV" = ( @@ -30427,19 +30463,15 @@ /turf/simulated/floor, /area/maintenance/wing/port/far) "enm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/spline/plain/green{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/spline/plain/blue, +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + name = "Distro to Trays" }, -/obj/effect/floor_decal/spline/plain/corner/blue{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/corner/green{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain/corner/red, +/obj/effect/floor_decal/industrial/hatch_tiny/service, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "enn" = ( @@ -31446,16 +31478,36 @@ /turf/simulated/floor/exoplanet/snow, /area/centcom/shared_dream) "eut" = ( -/obj/machinery/door/window/northleft{ - name = "Animal Pen"; +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow{ + dir = 6 + }, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "hydro_hazard"; + name = "Hazardous Specimens Bolt Control"; + specialfunctions = 4; + pixel_y = -4; + pixel_x = 20; 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 +/obj/machinery/light/colored/blue{ + dir = 4 }, -/turf/simulated/floor/grass, +/obj/machinery/button/remote/airlock{ + id = "hydro_hazard"; + name = "Hazardous Specimens Door Control"; + pixel_y = 8; + req_access = list(35); + dir = 4; + pixel_x = 20 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/hydroponics/lower) "euv" = ( /obj/structure/disposalpipe/sortjunction/flipped{ @@ -32425,6 +32477,20 @@ }, /turf/simulated/floor/tiled, /area/operations/loading) +"eDc" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "shutters_deck2_hydroponicswindowssafety"; + name = "Viewing Shutter" + }, +/obj/effect/landmark/entry_point/fore{ + name = "fore, d1 garden" + }, +/turf/simulated/floor/plating, +/area/horizon/hydroponics/lower) "eDe" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 5 @@ -33241,21 +33307,19 @@ /turf/simulated/floor/greengrid/nitrogen, /area/engineering/drone_fabrication) "eHT" = ( -/obj/effect/floor_decal/industrial/outline_door/medical/dark_green, -/obj/effect/floor_decal/industrial/outline_segment/medical/dark_green{ - dir = 10 +/obj/structure/plasticflaps/airtight, +/obj/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 8 }, -/obj/effect/floor_decal/spline/plain/corner/blue{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/effect/map_effect/door_helper/lock, +/obj/machinery/door/airlock/service{ + id_tag = "hydro_hazard"; + name = "Hazardous Specimens"; + req_access = list(35) }, -/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, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "eHU" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -35297,6 +35361,10 @@ pixel_y = 10 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "eYx" = ( @@ -35643,12 +35711,7 @@ /turf/simulated/floor/tiled, /area/operations/office) "faK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "faM" = ( @@ -36203,14 +36266,6 @@ /turf/simulated/floor/wood, /area/horizon/bar) "fee" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/industrial/outline_door/service{ dir = 4 }, @@ -36223,6 +36278,10 @@ id = "ringer_hydroponics"; name = "hydroponics ringer button" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "fef" = ( @@ -39790,6 +39849,10 @@ /obj/effect/floor_decal/spline/plain/green{ dir = 8 }, +/obj/machinery/disposal/small/west, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "fGm" = ( @@ -40113,15 +40176,10 @@ /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 +/obj/machinery/honey_extractor{ + density = 1 }, +/obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "fIM" = ( @@ -40295,8 +40353,8 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/wing/port/far) "fJY" = ( -/obj/machinery/seed_storage/xenobotany, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/seed_storage/garden/xenobotany, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "fKj" = ( @@ -40332,11 +40390,14 @@ /area/operations/mail_room) "fKB" = ( /obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/window/reinforced{ - dir = 1 +/obj/item/bikehorn/rubberducky{ + pixel_x = -9; + pixel_y = -8 + }, +/obj/machinery/camera/network/service{ + c_tag = "Service - Hydroponics Lower 3"; + dir = 4 }, -/obj/structure/flora/ausbushes/ywflowers, -/mob/living/simple_animal/chicken, /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "fKC" = ( @@ -40687,6 +40748,10 @@ /obj/effect/floor_decal/spline/plain/blue{ dir = 4 }, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "fMY" = ( @@ -40709,6 +40774,18 @@ }, /turf/unsimulated/floor, /area/centcom/legion/hangar5) +"fNa" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/obj/effect/floor_decal/spline/plain/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/horizon/hydroponics/lower) "fNb" = ( /obj/effect/floor_decal/corner/lime/full{ dir = 4 @@ -41258,16 +41335,8 @@ /turf/simulated/floor/tiled, /area/bridge) "fRH" = ( -/obj/structure/closet/crate/hydroponics{ - name = "beekeeping crate" - }, -/obj/item/bee_pack, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/beehive_assembly, -/obj/item/bee_net, -/obj/item/bee_smoker, /obj/effect/floor_decal/industrial/outline/service, +/obj/structure/closet/crate/hydroponics/beekeeping, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "fRJ" = ( @@ -41609,10 +41678,20 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "fUh" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/alarm/south, +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 8 }, -/turf/simulated/floor/grass, +/obj/effect/floor_decal/corner/yellow{ + dir = 6 + }, +/obj/machinery/light/colored/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/hydroponics/lower) "fUm" = ( /obj/effect/floor_decal/industrial/hatch/red, @@ -42578,10 +42657,7 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/engineering) "gas" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/turf/simulated/wall/r_wall, /area/horizon/hydroponics/lower) "gat" = ( /turf/simulated/floor/beach/sand{ @@ -43082,14 +43158,27 @@ /turf/simulated/floor/tiled, /area/medical/emergency_storage) "geB" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/light{ + dir = 4 }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/structure/table/steel, +/obj/random/pottedplant_small{ + pixel_x = -4; + pixel_y = 11 }, -/turf/simulated/floor/grass, +/obj/random/pottedplant_small{ + pixel_x = 6; + pixel_y = 11 + }, +/obj/random/pottedplant_small{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/random/pottedplant_small{ + pixel_x = 6; + pixel_y = 3 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "geE" = ( /obj/vehicle/droppod/legion{ @@ -45623,6 +45712,10 @@ /obj/effect/floor_decal/spline/plain/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "gxx" = ( @@ -46511,13 +46604,15 @@ /area/engineering/storage_hard) "gDx" = ( /obj/structure/table/reinforced/steel, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 13 +/obj/item/storage/box/gloves{ + pixel_x = 2; + pixel_y = 17 }, -/obj/item/pen{ - pixel_x = -3; - pixel_y = 13 +/obj/item/clothing/glasses/safety/goggles{ + pixel_y = 4 + }, +/obj/item/clothing/glasses/safety/goggles{ + pixel_y = -2 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) @@ -50876,7 +50971,7 @@ /area/hangar/auxiliary) "hjN" = ( /obj/effect/floor_decal/industrial/outline/service, -/obj/machinery/seed_storage/garden, +/obj/machinery/seed_storage/garden/hydroponics, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "hjO" = ( @@ -51969,18 +52064,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port/docks) -"hsA" = ( -/obj/effect/floor_decal/corner/dark_green/full{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain/red{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/horizon/hydroponics/lower) "hsK" = ( /obj/effect/floor_decal/corner/dark_blue/full, /turf/simulated/floor/tiled, @@ -54924,9 +55007,17 @@ /area/medical/gen_treatment) "hPi" = ( /obj/structure/table/reinforced/steel, -/obj/item/clothing/head/bandana/hydro{ - pixel_y = 4; - pixel_x = 4 +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = -5; + pixel_y = 14 + }, +/obj/item/reagent_containers/glass/beaker{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/beaker{ + pixel_x = 6; + pixel_y = 3 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) @@ -58312,7 +58403,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ dir = 4; - req_access = list(73) + req_one_access = list(12, 35) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -60586,6 +60677,9 @@ /obj/effect/floor_decal/spline/plain/purple{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "iHq" = ( @@ -63959,6 +64053,7 @@ /obj/effect/floor_decal/spline/plain/green{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "jfG" = ( @@ -67914,7 +68009,6 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "jIW" = ( -/obj/machinery/firealarm/south, /obj/effect/floor_decal/industrial/outline/service, /obj/machinery/seed_extractor, /turf/simulated/floor/tiled/dark/full, @@ -69251,6 +69345,19 @@ }, /turf/simulated/floor/shuttle/black, /area/centcom/specops) +"jUd" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/obj/effect/floor_decal/spline/plain/blue{ + dir = 1 + }, +/obj/item/device/radio/intercom/south, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/horizon/hydroponics/lower) "jUf" = ( /obj/machinery/door/window{ name = "AI Core Door"; @@ -70440,6 +70547,9 @@ /obj/structure/railing/mapped{ dir = 4 }, +/obj/structure/disposalpipe/up{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "kcG" = ( @@ -74668,7 +74778,7 @@ /obj/machinery/door/airlock/maintenance{ dir = 4; name = "Public Garden Maintenance"; - req_access = list(12) + req_one_access = list(12, 35) }, /turf/simulated/floor/tiled/full, /area/horizon/hydroponics/garden) @@ -77437,6 +77547,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/port) "ldo" = ( @@ -80013,7 +80127,6 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/full, /area/horizon/hydroponics) "lxs" = ( @@ -80900,6 +81013,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"lEd" = ( +/obj/effect/floor_decal/spline/plain/blue{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain/red{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/horizon/hydroponics/lower) "lEi" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -82607,6 +82731,9 @@ dir = 6 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/disposalpipe/segment{ + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "lPG" = ( @@ -86287,6 +86414,10 @@ icon_state = "1-4" }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "mqH" = ( @@ -86831,11 +86962,13 @@ "muS" = ( /obj/effect/floor_decal/corner/dark_green/diagonal, /obj/structure/table/reinforced, +/obj/random/horticulture_magazine, /obj/random/horticulture_magazine{ - pixel_x = -2 + pixel_x = 5 }, -/obj/random/horticulture_magazine{ - pixel_x = 3 +/obj/random/pottedplant_small{ + pixel_x = -8; + pixel_y = 10 }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) @@ -87167,6 +87300,7 @@ /obj/structure/engineer_maintenance/electric{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "mxR" = ( @@ -87766,7 +87900,6 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/dark_green{ dir = 1 }, @@ -87776,6 +87909,10 @@ /obj/effect/floor_decal/industrial/outline_segment/service{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "mCb" = ( @@ -87951,6 +88088,9 @@ /obj/effect/floor_decal/spline/plain/purple{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "mDM" = ( @@ -88908,6 +89048,7 @@ name = "Hydroponics Maintenance"; req_access = list(35) }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/full, /area/horizon/hydroponics/lower) "mMK" = ( @@ -93939,6 +94080,9 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "nyp" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/brflowers, +/mob/living/simple_animal/cow, /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "nyu" = ( @@ -94220,8 +94364,11 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "nAx" = ( +/obj/machinery/smartfridge/drying_rack, /obj/effect/floor_decal/industrial/outline/service, -/obj/machinery/seed_extractor, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "nAz" = ( @@ -96664,6 +96811,9 @@ id = "shutters_deck2_hydroponicsdesk"; name = "Hydroponics Desk Shutter" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "nTl" = ( @@ -97177,13 +97327,18 @@ /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/dark_green/diagonal, /obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 6 + pixel_x = -8; + pixel_y = 4 }, /obj/item/pen{ - pixel_x = -3; - pixel_y = 7 + pixel_x = -6; + pixel_y = 4 }, +/obj/item/clothing/ears/earmuffs/earphones/headphones{ + pixel_x = 3; + pixel_y = 12 + }, +/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "nWZ" = ( @@ -97268,6 +97423,9 @@ dir = 4 }, /obj/structure/lattice, +/obj/structure/disposalpipe/down{ + dir = 8 + }, /turf/simulated/open, /area/horizon/maintenance/deck_two/fore/port) "nXn" = ( @@ -97700,15 +97858,14 @@ /obj/effect/floor_decal/corner/dark_green/full{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/effect/floor_decal/spline/plain/corner/green{ dir = 8 }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "obL" = ( @@ -97893,7 +98050,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ dir = 4; - req_access = list(12) + req_one_access = list(12, 35) }, /obj/machinery/door/blast/regular/open{ id = "hangarlockdown"; @@ -99608,9 +99765,13 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/wing/port/far) "oqB" = ( +/obj/effect/floor_decal/spline/plain/green, /obj/effect/floor_decal/corner/dark_green{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "oqC" = ( @@ -101669,6 +101830,7 @@ req_access = list(35) }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/full, /area/horizon/hydroponics) "oFW" = ( @@ -102485,16 +102647,8 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/hapt) "oMZ" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/reagent_containers/chem_disp_cartridge, -/obj/item/reagent_containers/chem_disp_cartridge, -/obj/item/reagent_containers/chem_disp_cartridge, -/obj/item/reagent_containers/chem_disp_cartridge, -/obj/item/reagent_containers/chem_disp_cartridge, -/obj/item/reagent_containers/chem_disp_cartridge, -/obj/item/storage/box/spraybottles, -/obj/item/storage/box/pillbottles, /obj/effect/floor_decal/industrial/outline/service, +/obj/structure/closet/crate/hydroponics/herbalism, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "oNd" = ( @@ -105243,6 +105397,19 @@ }, /turf/simulated/floor/plating, /area/horizon/kitchen) +"phG" = ( +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow{ + dir = 6 + }, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/hydroponics/lower) "phI" = ( /obj/effect/decal/fake_object{ color = "#545c68"; @@ -110461,6 +110628,20 @@ /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, /area/horizon/cafeteria) +"pTY" = ( +/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/manifold/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/horizon/hydroponics/lower) "pTZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/emergency{ @@ -114024,20 +114205,10 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "qvZ" = ( -/obj/structure/table/standard, -/obj/item/paper_bin{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = 1; - pixel_y = 3 +/obj/machinery/atmospherics/unary/heater{ + dir = 4 }, /obj/structure/extinguisher_cabinet/west, -/obj/item/folder/blue{ - pixel_x = -5; - pixel_y = -8 - }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "qwe" = ( @@ -116909,6 +117080,7 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 1 }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "qPL" = ( @@ -117578,8 +117750,11 @@ /turf/simulated/floor/tiled, /area/operations/loading) "qUN" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/industrial/outline/service, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "qUQ" = ( @@ -118803,8 +118978,19 @@ /turf/unsimulated/floor/dark_monotile, /area/antag/actor) "rcg" = ( -/obj/effect/floor_decal/industrial/outline/service, -/obj/machinery/seed_storage/garden, +/obj/structure/table/steel, +/obj/item/device/hand_labeler{ + pixel_y = -2; + pixel_x = -4 + }, +/obj/item/toy/plushie/nymph{ + pixel_y = 17; + pixel_x = -5 + }, +/obj/random/lavalamp{ + pixel_y = 11; + pixel_x = 9 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "rck" = ( @@ -121021,12 +121207,16 @@ }, /area/centcom/holding) "rtk" = ( -/obj/structure/table/standard, -/obj/random/horticulture_magazine{ - pixel_x = -2 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/biohazard{ + pixel_x = -32 }, -/obj/random/horticulture_magazine{ - pixel_x = 4 +/obj/machinery/light/colored/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) @@ -121116,11 +121306,20 @@ /turf/simulated/floor/tiled, /area/horizon/security/investigations_hallway) "rtZ" = ( +/obj/effect/floor_decal/spline/plain/green{ + dir = 6 + }, +/obj/structure/bed/stool/chair/office/light{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Gardener" + }, /obj/effect/floor_decal/corner/dark_green{ dir = 1 }, -/obj/effect/floor_decal/spline/plain/green{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) @@ -122755,7 +122954,7 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/trunk{ - dir = 8 + dir = 4 }, /obj/machinery/disposal/small/north, /obj/machinery/light_switch{ @@ -123867,8 +124066,18 @@ /turf/space/transit/east, /area/template_noop) "rRi" = ( -/mob/living/simple_animal/cow, -/turf/simulated/floor/grass, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/securearea{ + pixel_x = -32 + }, +/obj/machinery/light/colored/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "rRj" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -125612,10 +125821,6 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - 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{ @@ -126669,6 +126874,12 @@ }, /turf/simulated/floor/reinforced, /area/shuttle/hapt) +"smO" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/industrial/outline/service, +/obj/machinery/firealarm/south, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/hydroponics) "smY" = ( /obj/effect/floor_decal/corner/brown{ dir = 10 @@ -126796,6 +127007,10 @@ /obj/effect/floor_decal/spline/plain/purple{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "snX" = ( @@ -127724,9 +127939,6 @@ /area/maintenance/engineering) "svK" = ( /obj/machinery/firealarm/east, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "svL" = ( @@ -129836,19 +130048,11 @@ /turf/simulated/floor/tiled, /area/engineering/lobby) "sMG" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, -/obj/effect/floor_decal/spline/plain/blue{ - dir = 1 - }, +/obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "sML" = ( /obj/item/reagent_containers/blood/OMinus, @@ -132237,7 +132441,9 @@ /turf/simulated/floor/carpet/rubber, /area/shuttle/intrepid/main_compartment) "tfB" = ( -/turf/simulated/floor/exoplanet/water/shallow, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "tfC" = ( /turf/simulated/floor/wood, @@ -132317,7 +132523,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/office) "tgv" = ( -/obj/structure/flora/ausbushes/brflowers, +/mob/living/simple_animal/chicken, /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "tgx" = ( @@ -132948,6 +133154,9 @@ req_one_access = list(35); id = "ringer_hydroponics" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "tlB" = ( @@ -134024,14 +134233,12 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "ttx" = ( -/obj/effect/floor_decal/spline/plain/blue, -/obj/effect/floor_decal/spline/plain/green{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/industrial/outline/service, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "tty" = ( /obj/structure/table/standard, @@ -135630,20 +135837,17 @@ /turf/simulated/floor/plating, /area/chapel/office) "tFb" = ( -/obj/structure/table/standard, -/obj/item/toy/plushie/nymph{ - pixel_y = 16; - pixel_x = -4 +/obj/effect/floor_decal/corner/dark_green{ + dir = 9 }, -/obj/item/device/hand_labeler{ - pixel_y = -1; - pixel_x = -4 +/obj/effect/floor_decal/spline/plain/corner/green{ + dir = 1 }, -/obj/random/lavalamp{ - pixel_y = 11; - pixel_x = 9 +/obj/effect/floor_decal/spline/plain/corner/blue, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "tFp" = ( /obj/effect/floor_decal/corner/grey{ @@ -136839,13 +137043,12 @@ /turf/simulated/open/airless, /area/template_noop) "tOs" = ( -/obj/structure/window/reinforced{ - dir = 1 +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, -/area/horizon/hydroponics/lower) +/turf/simulated/floor/tiled, +/area/horizon/hydroponics) "tOw" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -138555,7 +138758,7 @@ dir = 5 }, /obj/effect/floor_decal/spline/plain/green, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /turf/simulated/floor/tiled, @@ -139154,7 +139357,13 @@ /obj/effect/floor_decal/corner/dark_green/full{ dir = 1 }, +/obj/effect/floor_decal/spline/plain/red, /obj/random/pottedplant, +/obj/structure/sink/kitchen{ + dir = 8; + name = "sink"; + pixel_x = 19 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "uff" = ( @@ -140068,11 +140277,14 @@ /turf/simulated/floor/tiled/full, /area/storage/secure) "ult" = ( -/obj/effect/floor_decal/industrial/outline/service, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/camera/network/service{ + c_tag = "Service - Hydroponics Lower 1"; + dir = 4 + }, +/obj/machinery/atmospherics/unary/freezer{ + dir = 4; + icon_state = "freezer" }, -/obj/machinery/smartfridge/drying_rack, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "ulu" = ( @@ -140724,16 +140936,18 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "upE" = ( -/obj/effect/floor_decal/spline/plain/green{ - dir = 6 +/obj/effect/floor_decal/industrial/outline_straight/service{ + dir = 8 }, -/obj/structure/bed/stool/chair/office/light{ +/obj/effect/floor_decal/industrial/outline_straight/service{ dir = 4 }, +/obj/machinery/meter, /obj/effect/landmark/start{ name = "Gardener" }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "upG" = ( /obj/effect/floor_decal/industrial/warning{ @@ -142280,8 +142494,12 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "uAV" = ( -/obj/machinery/alarm/west, -/turf/simulated/floor/exoplanet/water/shallow, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "uBc" = ( /obj/structure/bed/stool/chair/office/bridge{ @@ -143450,6 +143668,7 @@ /obj/structure/engineer_maintenance/electric{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "uJE" = ( @@ -145770,26 +145989,21 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/rust) "vbN" = ( -/obj/machinery/camera/network/service{ - c_tag = "Service - Hydroponics Lower 1"; - dir = 4 +/obj/structure/sign/biohazard{ + pixel_x = -1; + pixel_y = -30 }, -/obj/structure/table/standard, -/obj/random/pottedplant_small{ - pixel_x = -4; - pixel_y = 12 +/obj/structure/sink{ + dir = 8; + pixel_x = -12 }, -/obj/random/pottedplant_small{ - pixel_x = 7; - pixel_y = 12 - }, -/obj/random/pottedplant_small{ - pixel_x = 7; +/obj/machinery/shower{ + dir = 4; pixel_y = 1 }, -/obj/random/pottedplant_small{ - pixel_x = -4; - pixel_y = 1 +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) @@ -146487,13 +146701,10 @@ /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{ +/obj/effect/floor_decal/spline/plain/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "vgM" = ( @@ -147642,28 +147853,12 @@ /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "vpq" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/sink/kitchen{ - dir = 8; - name = "sink"; - pixel_x = 21 - }, /obj/machinery/light{ 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, +/obj/effect/floor_decal/industrial/outline/service, +/obj/machinery/seed_storage/garden/hydroponics, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "vpr" = ( /obj/structure/table/standard, @@ -147749,6 +147944,9 @@ dir = 1 }, /obj/effect/floor_decal/spline/plain/red, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "vpX" = ( @@ -148117,6 +148315,33 @@ }, /turf/simulated/floor/tiled, /area/operations/lobby) +"vsO" = ( +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "hydro_hazard"; + name = "Hazardous Specimens Bolt Control"; + specialfunctions = 4; + pixel_x = 20; + pixel_y = -5; + req_access = list(35) + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/button/remote/airlock{ + id = "hydro_hazard"; + name = "Hazardous Specimens Door Control"; + pixel_y = 8; + req_access = list(35); + dir = 4; + pixel_x = 20 + }, +/obj/machinery/atmospherics/valve/open{ + name = "Tray Cutoff Valve" + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/hydroponics/lower) "vsW" = ( /obj/effect/floor_decal/corner/dark_green/full, /obj/item/device/radio/intercom/west, @@ -148166,6 +148391,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) +"vtl" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/spline/plain/purple{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/horizon/hydroponics) "vtn" = ( /obj/structure/railing/mapped, /obj/structure/railing/mapped{ @@ -148707,6 +148953,10 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/horizon/hydroponics) "vxB" = ( @@ -149793,7 +150043,14 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 9 }, -/obj/effect/floor_decal/spline/plain/corner/green, +/obj/effect/floor_decal/spline/plain/green{ + dir = 4 + }, +/obj/machinery/atmospherics/binary/pump{ + dir = 1; + name = "Trays to Scrubbers" + }, +/obj/effect/floor_decal/industrial/hatch_tiny/service, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "vFd" = ( @@ -150637,15 +150894,9 @@ /turf/simulated/floor/tiled/white, /area/horizon/security/brig) "vNz" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/mob/living/simple_animal/chicken, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/light{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 1 - }, /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "vNF" = ( @@ -153214,6 +153465,19 @@ "whu" = ( /turf/unsimulated/wall/fakepdoor, /area/centcom/legion/hangar5) +"whB" = ( +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/sink/kitchen{ + dir = 4; + name = "sink"; + pixel_x = -20 + }, +/turf/simulated/floor/tiled, +/area/horizon/hydroponics) "whH" = ( /obj/structure/lattice/catwalk/indoor/grate/damaged, /obj/item/stack/rods, @@ -153755,15 +154019,14 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "wlf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/effect/floor_decal/spline/plain/green{ + dir = 1 }, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/machinery/door/window/northright{ - name = "Animal Pen"; - req_access = list(35) +/obj/effect/floor_decal/spline/plain/blue, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "wlg" = ( /obj/structure/disposaloutlet{ @@ -155737,6 +156000,18 @@ icon_state = "14,1" }, /area/shuttle/legion) +"wyK" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 9 + }, +/obj/effect/floor_decal/spline/plain/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/horizon/hydroponics/lower) "wyN" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 10 @@ -158313,11 +158588,16 @@ /turf/simulated/floor/tiled, /area/operations/loading) "wQA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/spline/plain/blue{ - dir = 8 +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 }, +/obj/effect/floor_decal/spline/plain/corner/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/spline/plain/red{ dir = 4 }, @@ -158812,22 +159092,11 @@ /turf/space/dynamic, /area/horizon/exterior) "wUq" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/effect/floor_decal/spline/plain/corner/blue{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain/corner/red{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "wUr" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -160709,23 +160978,11 @@ /turf/simulated/floor/tiled/dark/full/airless, /area/horizon/exterior) "xgL" = ( -/obj/effect/floor_decal/industrial/outline_door/medical/dark_green, -/obj/effect/floor_decal/industrial/outline_segment/medical/dark_green{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain/blue{ +/mob/living/simple_animal/chicken, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ 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, +/turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "xgP" = ( /obj/machinery/light/small{ @@ -165740,12 +165997,13 @@ /turf/unsimulated/floor/plating, /area/shuttle/specops) "xRa" = ( -/obj/structure/table/standard, -/obj/item/device/radio/intercom/west, -/obj/random/lavalamp{ - pixel_y = 10; - pixel_x = 7 +/obj/machinery/light{ + dir = 8 }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/hazmat/general, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) "xRe" = ( @@ -167180,14 +167438,22 @@ /turf/simulated/floor/tiled/dark, /area/horizon/custodial/disposals) "ybm" = ( -/obj/item/bikehorn/rubberducky{ - pixel_x = -9; - pixel_y = -8 +/obj/effect/floor_decal/industrial/outline_door/medical/dark_green, +/obj/effect/floor_decal/industrial/outline_segment/medical/dark_green{ + dir = 4 }, -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/spline/plain/blue{ + dir = 1 }, -/turf/simulated/floor/exoplanet/water/shallow, +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/obj/machinery/atmospherics/valve/open{ + dir = 8; + name = "Tray Cutoff Valve" + }, +/obj/effect/floor_decal/industrial/hatch_tiny/service, +/turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) "ybp" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -204209,10 +204475,10 @@ nRy nRy nRy nRy -nRy -nRy -nRy -nRy +gas +gas +gas +gas mdL mdL eSV @@ -204467,9 +204733,9 @@ qvZ xRa vbN gas -tOs +rtk uAV -ybm +rRi mdL xiV eSV @@ -204717,16 +204983,16 @@ nRy nRy aFQ vFc -bMz +tFb vgI fMQ -fMQ -fMQ -fMQ +wyK +pTY +vsO eHT eut +phG fUh -tfB mdL kVe eSV @@ -204973,18 +205239,18 @@ nRy fRH oMZ oqB -efs jZc -ttx +enm qUN qUN qUN -qUN -xgL -vNz -rRi -bpl -sWx +ybm +nRy +gas +gas +gas +gas +mdL kVe eSV eSV @@ -205230,18 +205496,18 @@ kGn bdC bMz rtZ -upE qQm -ttx +wlf +efs +upE cjE -cjE -cjE -cjE -sMG +jUd +nRy faK -gTU -dtb -sWx +bEr +vNz +fKB +eDc kVe eSV eSV @@ -205490,15 +205756,15 @@ dHe gDx dSc ttx -qUN -qUN -qUN -qUN +ttx +ttx +fNa +aIN sMG -geB -gTU +xgL nyp clG +sWx kVe eSV eSV @@ -205746,15 +206012,15 @@ jfr jfr fGi cmo -enm -kiV -kiV kiV +lEd +lEd wQA +bpl wUq -wlf anV tgv +tfB sWx kVe eSV @@ -206004,15 +206270,15 @@ acw nRy ufd vpq -rtk -tFb -rcg cnH -hsA -fKB -bpl +rcg +geB +nRy +gTU +gTU bmG -mdL +dtb +sWx kVe eSV eSV @@ -206264,11 +206530,11 @@ mdL drU drU drU -drU mdL drU drU -mdL +drU +drU mdL kVe eSV @@ -268966,7 +269232,7 @@ cpI pSh aWa bEY -not +tOs not cRn jta @@ -269223,7 +269489,7 @@ nKI lZa iHp bEY -not +tOs muS nWS cpI @@ -269478,9 +269744,9 @@ fAA wNc nKI lZa -iHp -not -not +vtl +whB +tOs eLd bse owo @@ -270253,7 +270519,7 @@ gxw lZa lZa spf -lZa +smO wav vOR sdF