diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 5c73bf0621c7..ba4cdaea4ef1 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -6253,12 +6253,6 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) -"aAK" = ( -/obj/structure/sink{ - pixel_y = 30 - }, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "aAM" = ( /obj/item/assembly/signaler{ pixel_y = 8 @@ -6303,13 +6297,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"aAP" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = 30 - }, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "aAQ" = ( /turf/open/floor/plasteel, /area/hydroponics/garden) @@ -7236,12 +7223,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/security/courtroom) -"aEc" = ( -/mob/living/simple_animal/moonrat{ - name = "Joe" - }, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "aEm" = ( /obj/machinery/door/window{ dir = 8; @@ -7677,18 +7658,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) -"aFH" = ( -/obj/item/radio/off, -/obj/structure/table, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/auxiliary) "aFI" = ( /obj/structure/table, /obj/effect/turf_decal/tile/red, @@ -7925,21 +7894,6 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/main) -"aGz" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/grown/wheat, -/obj/item/reagent_containers/food/snacks/grown/watermelon, -/obj/item/reagent_containers/food/snacks/grown/watermelon, -/obj/item/reagent_containers/food/snacks/grown/watermelon, -/obj/item/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/reagent_containers/food/snacks/grown/grapes, -/obj/item/reagent_containers/food/snacks/grown/cocoapod, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "aGA" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -9352,22 +9306,6 @@ "aLE" = ( /turf/open/floor/plasteel, /area/hallway/primary/port) -"aLF" = ( -/obj/structure/sign/painting{ - persistence_id = "public"; - pixel_y = 32 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "aLJ" = ( /obj/machinery/firealarm{ pixel_y = 26 @@ -17618,20 +17556,6 @@ /obj/machinery/rnd/production/circuit_imprinter/department/netmin, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) -"bxM" = ( -/obj/structure/table/glass, -/obj/item/cultivator, -/obj/item/hatchet, -/obj/item/crowbar, -/obj/item/plant_analyzer, -/obj/item/reagent_containers/glass/bucket, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/item/shovel/spade, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "bxO" = ( /obj/effect/turf_decal/tile/blue{ dir = 0 @@ -18916,19 +18840,6 @@ "bDG" = ( /turf/open/floor/plasteel, /area/janitor) -"bDJ" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/sink{ - pixel_y = 30 - }, -/turf/open/floor/plasteel, -/area/hydroponics/garden) -"bDN" = ( -/obj/machinery/seed_extractor, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "bDR" = ( /turf/open/floor/plasteel/white, /area/medical/sleeper) @@ -19630,19 +19541,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/science) -"bHR" = ( -/obj/item/seeds/apple, -/obj/item/seeds/banana, -/obj/item/seeds/cocoapod, -/obj/item/seeds/grape, -/obj/item/seeds/orange, -/obj/item/seeds/sugarcane, -/obj/item/seeds/wheat, -/obj/item/seeds/watermelon, -/obj/structure/table/glass, -/obj/item/seeds/tower, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "bHT" = ( /obj/structure/filingcabinet, /obj/effect/turf_decal/tile/red, @@ -19669,10 +19567,6 @@ /obj/structure/cable, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) -"bIe" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "bIx" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -20156,6 +20050,22 @@ }, /turf/open/floor/plating, /area/science/mixing) +"bLo" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/glass_large{ + doorOpen = 'sound/machines/defib_success.ogg'; + name = "Garden" + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "bLr" = ( /obj/machinery/firealarm{ pixel_y = 26 @@ -20538,10 +20448,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) -"bNi" = ( -/obj/machinery/biogenerator, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "bNj" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/blue{ @@ -21202,18 +21108,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) -"bRo" = ( -/obj/machinery/door/airlock{ - name = "Garden" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "bRq" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -22007,18 +21901,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) -"caB" = ( -/obj/machinery/camera{ - c_tag = "Garden"; - dir = 8 - }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/hydroponics/soil, -/turf/open/floor/grass, -/area/hydroponics/garden) "caC" = ( /obj/machinery/button/door{ id = "ceprivacy"; @@ -22361,6 +22243,24 @@ /obj/machinery/light/small, /turf/open/floor/plating, /area/maintenance/aft) +"ceJ" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "ceK" = ( /obj/machinery/power/apc{ areastring = "/area/crew_quarters/toilet"; @@ -22547,17 +22447,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"cfM" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "cfY" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating{ @@ -22578,32 +22467,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel, /area/hydroponics/garden) -"cgi" = ( -/obj/item/reagent_containers/spray/plantbgone, -/obj/item/reagent_containers/spray/pestspray{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/rh{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/structure/table/glass, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "cgl" = ( /obj/structure/table, /obj/item/storage/toolbox/electrical{ @@ -22837,6 +22700,11 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"cjg" = ( +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/trimline/green/filled/warning, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "cji" = ( /obj/machinery/door/airlock/public/glass{ name = "Dormitory" @@ -23392,23 +23260,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/hallway/primary/port) -"cnp" = ( -/obj/structure/table/glass, -/obj/item/hatchet, -/obj/item/cultivator, -/obj/item/crowbar, -/obj/item/reagent_containers/glass/bucket, -/obj/item/plant_analyzer, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "cnq" = ( /obj/structure/grille, /obj/machinery/meter{ @@ -23419,26 +23270,6 @@ }, /turf/closed/wall/r_wall, /area/engine/atmos_distro) -"cnr" = ( -/obj/item/storage/bag/plants/portaseeder, -/obj/structure/table/glass, -/obj/item/plant_analyzer, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 29 - }, -/obj/machinery/light_switch{ - pixel_x = -6; - pixel_y = -25 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "cnC" = ( /obj/structure/table, /obj/item/wrench, @@ -24398,14 +24229,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cBM" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "cBO" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -24529,6 +24352,13 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +"cDw" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "cDz" = ( /obj/machinery/light_switch{ pixel_y = -25 @@ -24944,24 +24774,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/grimy, /area/hallway/secondary/entry) -"cKY" = ( -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "cLf" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -25212,6 +25024,21 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"cPC" = ( +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_x = 29 + }, +/obj/machinery/light_switch{ + pixel_x = -6; + pixel_y = -25 + }, +/obj/machinery/vending/hydronutrients, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "cPD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -27692,6 +27519,14 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"ekK" = ( +/obj/effect/turf_decal/pool, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/obj/effect/turf_decal/pool/innercorner, +/turf/open/water/safe, +/area/hydroponics/garden) "ekT" = ( /obj/machinery/atmospherics/pipe/simple/yellow/hidden{ dir = 1 @@ -27802,6 +27637,15 @@ }, /turf/open/floor/plasteel, /area/quartermaster/office) +"enQ" = ( +/obj/structure/sink{ + pixel_y = 30 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "enW" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -27940,6 +27784,13 @@ }, /turf/open/floor/plating, /area/engine/engineering) +"esB" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "esG" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -27995,6 +27846,21 @@ }, /turf/open/space/basic, /area/space) +"esX" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "etv" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ dir = 4 @@ -29003,6 +28869,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) +"eRR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/trimline/green/filled/warning, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "eSM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -29288,6 +29163,12 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"eXK" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "eXN" = ( /turf/closed/wall/r_wall, /area/medical/medbay/lobby) @@ -29805,15 +29686,6 @@ /obj/machinery/vending/cigarette, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"fnS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "fnZ" = ( /obj/machinery/light{ dir = 8 @@ -29850,21 +29722,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"fpZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "fqv" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -29952,6 +29809,17 @@ }, /turf/open/floor/plasteel, /area/security/prison/hallway) +"fsv" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "fsU" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -30677,6 +30545,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/sleeper) +"fLl" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "fLq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -31263,6 +31137,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) +"geO" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "gfg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/do_not_question{ @@ -32038,6 +31918,19 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"gzh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/obj/effect/landmark/blobstart, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "gzz" = ( /obj/item/twohanded/required/pool/rubber_ring, /turf/open/indestructible/sound/pool, @@ -32775,6 +32668,16 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"gTo" = ( +/obj/effect/turf_decal/pool, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/obj/effect/turf_decal/pool/innercorner{ + dir = 4 + }, +/turf/open/water/safe, +/area/hydroponics/garden) "gTO" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/structure/window/reinforced, @@ -35084,18 +34987,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/bridge/meeting_room) -"hVW" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "hWd" = ( /obj/machinery/telecomms/broadcaster/preset_left{ name = "subspace broadcaster A" @@ -39120,6 +39011,12 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/engineering) +"jSF" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "jSR" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -39379,21 +39276,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"jZQ" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Garden" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "kaa" = ( /obj/machinery/camera{ c_tag = "Virology Break Room"; @@ -40454,6 +40336,43 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"kAz" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) +"kAT" = ( +/obj/structure/table, +/obj/effect/turf_decal/trimline/green/filled/end{ + dir = 8 + }, +/obj/item/cultivator{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/cultivator{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/reagent_containers/glass/bucket/wooden{ + pixel_x = -8; + pixel_y = 10 + }, +/obj/item/reagent_containers/glass/bucket/wooden{ + pixel_x = -8; + pixel_y = -2 + }, +/obj/item/shovel/spade{ + pixel_x = 3; + pixel_y = -4 + }, +/obj/item/shovel/spade{ + pixel_x = 5; + pixel_y = -1 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "kBc" = ( /obj/machinery/power/apc{ areastring = "/area/maintenance/disposal/incinerator"; @@ -40476,6 +40395,20 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) +"kBq" = ( +/obj/machinery/camera{ + c_tag = "Garden"; + dir = 8 + }, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "kBu" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -40533,6 +40466,19 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"kBV" = ( +/obj/item/radio/off, +/obj/structure/table, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/table, +/turf/open/floor/plasteel, +/area/security/checkpoint/auxiliary) "kCd" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 2; @@ -42578,6 +42524,21 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel, /area/clerk) +"lBy" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + areastring = "/area/hydroponics/garden"; + name = "Garden APC"; + pixel_y = -23 + }, +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "lBz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -43406,6 +43367,27 @@ }, /turf/open/floor/plasteel/white, /area/medical/storage) +"maj" = ( +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "mao" = ( /obj/machinery/mineral/stacking_unit_console{ machinedir = 8 @@ -43506,6 +43488,18 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"mcz" = ( +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/obj/effect/turf_decal/pool/innercorner{ + dir = 8 + }, +/turf/open/water/safe, +/area/hydroponics/garden) "mcQ" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -48404,6 +48398,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"ork" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "orC" = ( /obj/structure/grille, /obj/structure/lattice, @@ -48754,10 +48755,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"oxE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "oyd" = ( /obj/structure/window/reinforced{ dir = 4 @@ -49785,6 +49782,15 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"oVL" = ( +/mob/living/simple_animal/moonrat{ + name = "Joe" + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "oWE" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/structure/cable{ @@ -49845,6 +49851,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"oZb" = ( +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/water/safe, +/area/hydroponics/garden) "oZY" = ( /obj/effect/turf_decal/stripes/end{ dir = 1 @@ -50483,17 +50495,6 @@ /obj/item/stock_parts/subspace/filter, /turf/open/floor/plasteel/white, /area/storage/tech) -"pvQ" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - areastring = "/area/hydroponics/garden"; - name = "Garden APC"; - pixel_y = -23 - }, -/turf/open/floor/plasteel, -/area/hydroponics/garden) "pvR" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -51722,6 +51723,18 @@ }, /turf/open/floor/plating, /area/science/xenobiology) +"qgJ" = ( +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/obj/effect/turf_decal/pool/innercorner{ + dir = 1 + }, +/turf/open/water/safe, +/area/hydroponics/garden) "qgK" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -52218,6 +52231,17 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"qsk" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -26 + }, +/obj/machinery/seed_extractor, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "qsy" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 1 @@ -53471,6 +53495,12 @@ }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet) +"raJ" = ( +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/water/safe, +/area/hydroponics/garden) "raU" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -55511,6 +55541,16 @@ "rYO" = ( /turf/template_noop, /area/maintenance/starboard) +"rYU" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/vending/hydroseeds/weak, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "rZt" = ( /turf/closed/wall, /area/medical/paramedic) @@ -57520,6 +57560,21 @@ }, /turf/open/floor/plasteel/dark, /area/engine/atmos_distro) +"sXC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "sXS" = ( /obj/structure/noticeboard{ dir = 8; @@ -59700,6 +59755,13 @@ }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) +"tWA" = ( +/obj/machinery/vending/fishing, +/obj/effect/turf_decal/trimline/green/filled/end{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "tWQ" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -61491,6 +61553,12 @@ /obj/machinery/chem_heater, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"uRG" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "uSd" = ( /obj/effect/turf_decal/bot_white/left, /obj/effect/turf_decal/tile/neutral{ @@ -63768,6 +63836,13 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"wga" = ( +/obj/machinery/biogenerator, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hydroponics/garden) "whg" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/red/filled/line, @@ -65349,6 +65424,21 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) +"xcb" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "xcL" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -66781,6 +66871,25 @@ }, /turf/open/floor/plasteel/white, /area/medical/surgery) +"xPb" = ( +/obj/structure/sign/painting{ + persistence_id = "public"; + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "xPm" = ( /obj/machinery/papershredder, /turf/open/floor/plasteel, @@ -83052,7 +83161,7 @@ bCu bHn wHb aEE -aFH +kBV aBI aIM aKk @@ -83562,11 +83671,11 @@ alU alU alU azF -pYO -pYO -pYO -aGz -bxM +tWA +mcz +oZb +gTo +kAT azF cmN aNj @@ -83819,11 +83928,11 @@ amC amC amC azF -bDJ -aAQ -aAQ -aAQ -aAQ +esX +qgJ +raJ +ekK +ork azF cnn fNw @@ -84076,15 +84185,15 @@ alU alU amC bvX -aAQ -cgh -aEc -aAQ -pvQ +uRG +geO +geO +geO +lBy azF azF azF -cKY +maj dpF dpF asE @@ -84333,15 +84442,15 @@ ang alU amC azF -bDN -bHR -bNi +enQ +fLl aAQ -fnS -cfM -cnp +esB +gzh +wga +qsk aNl -hVW +xcb aNg aNg asE @@ -84590,15 +84699,15 @@ lFj alU amC azF -aAP -bIe -oxE -oxE +pYO +eXK +aAQ +jSF aMr miL -miL -jZQ -cBM +eRR +bLo +fsv ijG aLE asE @@ -84847,15 +84956,15 @@ lFj alU amC azF -aAK -aAQ -aAQ -aAQ -aAQ +pYO +oVL +kAz +kAz +fLl cgh -aAQ -aNl -fpZ +cjg +cDw +ceJ dVM fHU eRb @@ -85107,12 +85216,12 @@ azF azF pYO pYO -aAQ -caB -cgi -cnr -azF -aLD +pYO +kBq +rYU +cPC +aNl +sXC aLE jVr aPA @@ -85364,12 +85473,12 @@ bwa azF azF azF -bRo +aNl azF azF azF azF -aLF +xPb fnx aOl aPA diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index 24c00df6b893..81158373ea30 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -64,3 +64,21 @@ /obj/item/vending_refill/hydroseeds machine_name = "MegaSeed Servitor" icon_state = "refill_plant" + +/obj/machinery/vending/hydroseeds/weak + name = "\improper Seed Servitor" + product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station for intrepid gardeners!" + products = list(/obj/item/seeds/apple = 2, + /obj/item/seeds/banana = 2, + /obj/item/seeds/cocoapod = 2, + /obj/item/seeds/grape = 2, + /obj/item/seeds/grass = 2, + /obj/item/seeds/orange = 2, + /obj/item/seeds/watermelon = 2, + /obj/item/seeds/wheat = 2) + contraband = list(/obj/item/seeds/cannabis = 1) + premium = list(/obj/item/seeds/sugarcane = 2, + /obj/item/seeds/tower = 2) + refill_canister = /obj/item/vending_refill/hydroseeds + default_price = 15 + extra_price = 40