From ba31ea2d2117f3f00c8bf71a7e2ba911c5bc4745 Mon Sep 17 00:00:00 2001 From: Doc Date: Fri, 29 Jul 2022 06:32:08 -0500 Subject: [PATCH] Adds new cafe garden (take two) (#14430) --- code/game/objects/structures/flora.dm | 18 +- .../doc - new cafe garden+stargazer move.yml | 42 ++ icons/obj/flora/jungletreesmall.dmi | Bin 32322 -> 32383 bytes maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 99 ++- maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 564 ++++++++++++------ 5 files changed, 496 insertions(+), 227 deletions(-) create mode 100644 html/changelogs/doc - new cafe garden+stargazer move.yml diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 7e1e20614e8..37f41c2eeab 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -2,7 +2,7 @@ /obj/structure/flora/tree name = "tree" anchored = 1 - density = 1 + density = TRUE pixel_x = -16 layer = 9 @@ -45,6 +45,22 @@ pixel_x = -32 icon = 'icons/obj/flora/jungletreesmall.dmi' +/obj/structure/flora/tree/jungle/small/patience + layer = 3 + density = FALSE + icon_state = "patiencebottom" + +/obj/structure/flora/tree/jungle/small/patience_top + pixel_y = -32 + density = TRUE + icon_state = "patiencetop" + +/obj/structure/flora/tree/jungle/small/patience/Initialize() + . = ..() + var/turf/T = get_step(src, NORTH) + if(T) + new /obj/structure/flora/tree/jungle/small/patience_top(T) + //Jungle grass /obj/structure/flora/grass/jungle name = "jungle grass" diff --git a/html/changelogs/doc - new cafe garden+stargazer move.yml b/html/changelogs/doc - new cafe garden+stargazer move.yml new file mode 100644 index 00000000000..398a34429d4 --- /dev/null +++ b/html/changelogs/doc - new cafe garden+stargazer move.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Doc + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Added a new garden area attached to the third deck cafe, featuring Patience." + - maptweak: "Moved Stargazer to the central ring." diff --git a/icons/obj/flora/jungletreesmall.dmi b/icons/obj/flora/jungletreesmall.dmi index c56148b5dc5f45f924a2db30beeb2dccd496bf8c..ba79c2a1ec9b47b33a06818b0bea2aa703c8de9d 100644 GIT binary patch delta 8713 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 CYwI@v delta 8652 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 T))WkZfY)mU4f$GGi_rfEu7-L= diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index e833adc31fc..f5743b2a8ea 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -196,14 +196,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/horizon/library) -"aeT" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/floor/grass/alt, -/area/hallway/primary/central_two) "afe" = ( /obj/machinery/light/small/red{ dir = 4 @@ -1862,11 +1854,10 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "aST" = ( -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/spline/plain/cee{ dir = 4 }, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/floor/grass/alt, +/turf/simulated/floor/carpet/rubber, /area/hallway/primary/central_two) "aSV" = ( /obj/effect/floor_decal/corner/blue{ @@ -2973,14 +2964,6 @@ }, /turf/simulated/floor/wood, /area/chapel/main) -"bve" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/floor/grass/alt, -/area/hallway/primary/central_two) "bvV" = ( /obj/structure/plasticflaps/airtight, /obj/machinery/door/window/westleft{ @@ -9728,16 +9711,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/reinforced, /area/storage/secure) -"fsb" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/floor/grass/alt, -/area/hallway/primary/central_two) "fsf" = ( /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, @@ -11525,6 +11498,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 1 }, +/obj/structure/railing/mapped, /turf/simulated/floor/reinforced, /area/hallway/primary/central_two) "glt" = ( @@ -12293,6 +12267,9 @@ /obj/effect/floor_decal/spline/fancy{ dir = 8 }, +/obj/structure/railing/mapped{ + dir = 4 + }, /turf/simulated/floor/reinforced, /area/hallway/primary/central_two) "gDq" = ( @@ -13464,14 +13441,11 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "hjG" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/bluegrid{ + name = "cooled mainframe floor"; + temperature = 278 }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/floor/grass/alt, /area/hallway/primary/central_two) "hjI" = ( /obj/machinery/door/firedoor, @@ -13618,6 +13592,9 @@ /obj/effect/floor_decal/spline/fancy{ dir = 4 }, +/obj/structure/railing/mapped{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/hallway/primary/central_two) "hoa" = ( @@ -14947,6 +14924,9 @@ /obj/effect/floor_decal/spline/fancy{ dir = 8 }, +/obj/structure/railing/mapped{ + dir = 4 + }, /turf/simulated/floor/reinforced, /area/hallway/primary/central_two) "ibx" = ( @@ -16878,6 +16858,9 @@ dir = 1 }, /obj/effect/floor_decal/spline/fancy, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/reinforced, /area/hallway/primary/central_two) "jgZ" = ( @@ -17507,6 +17490,9 @@ dir = 1 }, /obj/effect/floor_decal/spline/fancy, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/reinforced, /area/hallway/primary/central_two) "jvL" = ( @@ -21698,7 +21684,18 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "lTn" = ( -/turf/simulated/floor/grass/alt, +/obj/machinery/stargazer, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain/corner, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 1 + }, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 8 + }, +/turf/simulated/floor/carpet/rubber, /area/hallway/primary/central_two) "lTs" = ( /obj/effect/floor_decal/industrial/warning{ @@ -22089,11 +22086,10 @@ /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "meM" = ( -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/spline/plain/cee{ dir = 8 }, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/floor/grass/alt, +/turf/simulated/floor/carpet/rubber, /area/hallway/primary/central_two) "mfq" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -26737,11 +26733,10 @@ /turf/simulated/floor/tiled/dark, /area/hallway/engineering) "oFp" = ( -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/spline/plain/cee{ dir = 1 }, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/floor/grass/alt, +/turf/simulated/floor/carpet/rubber, /area/hallway/primary/central_two) "oGm" = ( /obj/structure/cable/green{ @@ -34134,6 +34129,9 @@ /obj/effect/floor_decal/spline/fancy{ dir = 4 }, +/obj/structure/railing/mapped{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/hallway/primary/central_two) "sFk" = ( @@ -44916,13 +44914,8 @@ /turf/simulated/floor/tiled, /area/storage/primary) "ygu" = ( -/obj/structure/window/reinforced, -/obj/structure/flora/tree/jungle/small{ - desc = "A lush and healthy tree. A small golden plaque at its base reads its name, in plain text, Patience."; - name = "Patience"; - pixel_y = 5 - }, -/turf/simulated/floor/grass/alt, +/obj/effect/floor_decal/spline/plain/cee, +/turf/simulated/floor/carpet/rubber, /area/hallway/primary/central_two) "ygw" = ( /obj/effect/floor_decal/corner/green{ @@ -67011,7 +67004,7 @@ tHk gkM hjG meM -aeT +hjG jgz gBE uXq @@ -67413,9 +67406,9 @@ bVf ept pWR gkM -fsb +hjG aST -bve +hjG jgz gBE uXq diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 027d8e6c019..e169210e28b 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -841,12 +841,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) "bC" = ( -/obj/structure/lattice, -/obj/machinery/light{ - dir = 8 +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, -/turf/simulated/open, -/area/horizon/hallway/deck_three/primary/starboard) +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "bD" = ( /obj/effect/floor_decal/corner/green/full{ dir = 4 @@ -1078,6 +1078,14 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/selfdestruct) +"bZ" = ( +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/horizon/deck_three/cafeteria) "ca" = ( /obj/machinery/requests_console{ department = "Consular's Office"; @@ -1144,6 +1152,10 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) +"cg" = ( +/obj/structure/flora/ausbushes/pointybush, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "ch" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Deck 3 Central Stairwell" @@ -1258,6 +1270,16 @@ }, /turf/simulated/floor/tiled, /area/engineering/break_room) +"ct" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/flora/ausbushes/fullgrass, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "cu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, @@ -1544,6 +1566,19 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/fitness/pool) +"cV" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/horizon/hallway/deck_three/primary/starboard) "cW" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-33" @@ -1962,6 +1997,9 @@ /obj/structure/railing/mapped{ dir = 8 }, +/obj/structure/railing/mapped{ + dir = 4 + }, /obj/structure/lattice, /turf/simulated/open, /area/horizon/hallway/deck_three/primary/starboard) @@ -2307,11 +2345,11 @@ pixel_x = -32 }, /obj/machinery/button/remote/blast_door{ + dir = 1; id = "blastdoors_tcomms"; name = "Blast Door"; pixel_x = -25; pixel_y = -25; - dir = 1; req_access = list(61) }, /turf/simulated/floor, @@ -2788,6 +2826,17 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/port) +"fj" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/horizon/hallway/deck_three/primary/starboard) "fk" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -2889,8 +2938,8 @@ /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/requests_console{ department = "Conference Room"; - pixel_y = -32; - name = "Conference Room Requests Console" + name = "Conference Room Requests Console"; + pixel_y = -32 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -4192,6 +4241,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/primary/port) +"hV" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "hW" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -5293,6 +5349,15 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/maintenance/security_starboard) +"jK" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/structure/flora/pottedplant{ + icon_state = "plant-33" + }, +/turf/simulated/floor/wood, +/area/horizon/deck_three/cafeteria) "jL" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -5407,12 +5472,8 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "jY" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/obj/structure/bed/stool/chair{ - dir = 4 - }, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/table/wood, /turf/simulated/floor/wood, /area/horizon/deck_three/cafeteria) "jZ" = ( @@ -5650,6 +5711,15 @@ }, /turf/simulated/open, /area/horizon/hallway/deck_three/primary/starboard) +"ku" = ( +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/wood, +/area/horizon/deck_three/cafeteria) "kv" = ( /obj/structure/table/reinforced/wood, /obj/item/modular_computer/laptop/preset/command/captain, @@ -5766,6 +5836,11 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) +"kG" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "kH" = ( /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -6582,12 +6657,16 @@ }, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) +"mc" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "md" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/crew_quarters/captain) "me" = ( /obj/structure/lattice, -/obj/machinery/light{ +/obj/structure/railing/mapped{ dir = 1 }, /turf/simulated/open, @@ -7222,6 +7301,16 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) +"nn" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/horizon/deck_three/cafeteria) "no" = ( /obj/machinery/firealarm/south, /obj/structure/table/standard, @@ -7725,6 +7814,12 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) +"ok" = ( +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/open, +/area/horizon/deck_three/cafeteria) "ol" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8279,6 +8374,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, /area/lawoffice/representative) +"pm" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/horizon/deck_three/cafeteria) "pn" = ( /obj/machinery/power/terminal{ dir = 1 @@ -8813,6 +8915,13 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/fitness/gym) +"qm" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "qn" = ( /turf/simulated/floor/reinforced, /area/bridge/selfdestruct) @@ -8840,6 +8949,13 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) +"qq" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "qr" = ( /obj/machinery/light/small/emergency{ dir = 4 @@ -8946,16 +9062,7 @@ /turf/simulated/floor/wood, /area/horizon/hallway/deck_three/primary/starboard) "qD" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/obj/structure/flora/pottedplant{ - icon_state = "plant-21"; - pixel_x = -4 - }, +/obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/horizon/deck_three/cafeteria) "qE" = ( @@ -10035,12 +10142,12 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "sD" = ( -/obj/structure/railing/mapped{ - dir = 4 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/obj/structure/lattice, -/turf/simulated/open, -/area/horizon/hallway/deck_three/primary/starboard) +/obj/structure/table/wood, +/turf/simulated/floor/wood, +/area/horizon/deck_three/cafeteria) "sE" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -10072,12 +10179,9 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) "sI" = ( -/obj/structure/lattice, -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/simulated/open, -/area/horizon/hallway/deck_three/primary/starboard) +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "sJ" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 1 @@ -11217,6 +11321,16 @@ /obj/machinery/light, /turf/simulated/floor/grass/alt, /area/horizon/deck_three/nature_showcase) +"uJ" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "uK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11785,6 +11899,12 @@ }, /turf/simulated/floor/tiled, /area/security/vacantoffice) +"vK" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/horizon/deck_three/cafeteria) "vL" = ( /obj/structure/bed/stool/chair{ dir = 1 @@ -11975,6 +12095,15 @@ }, /turf/simulated/floor/tiled, /area/bridge/controlroom) +"we" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/structure/flora/pottedplant{ + icon_state = "plant-21" + }, +/turf/simulated/floor/wood, +/area/horizon/deck_three/cafeteria) "wf" = ( /obj/effect/floor_decal/corner/blue/diagonal, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, @@ -12727,14 +12856,12 @@ /turf/simulated/floor/tiled/dark, /area/security/vacantoffice2) "xz" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/obj/structure/bed/stool/chair{ +/obj/structure/railing/mapped{ dir = 8 }, -/turf/simulated/floor/wood, -/area/horizon/deck_three/cafeteria) +/obj/structure/lattice, +/turf/simulated/open, +/area/horizon/hallway/deck_three/primary/starboard) "xA" = ( /turf/simulated/wall, /area/security/vacantoffice) @@ -13387,16 +13514,8 @@ /turf/simulated/floor/reinforced/airless, /area/template_noop) "yJ" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/obj/structure/flora/pottedplant{ - icon_state = "plant-33"; - pixel_x = -4; - pixel_y = 16 + dir = 1 }, /turf/simulated/floor/wood, /area/horizon/deck_three/cafeteria) @@ -13954,6 +14073,12 @@ }, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/hallway/deck_three/primary/starboard/docks) +"zM" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/horizon/deck_three/cafeteria) "zN" = ( /obj/effect/floor_decal/corner/lime{ dir = 5 @@ -14168,15 +14293,8 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "Ak" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/grass/alt, -/area/horizon/hallway/deck_three/primary/starboard) +/area/horizon/deck_three/cafeteria) "Al" = ( /obj/structure/table/rack, /obj/item/towel, @@ -14803,9 +14921,9 @@ secured_wires = 1 }, /obj/machinery/door/blast/shutters{ - name = "Decrepit Maintenance Shutter"; id = "shutters_runcaprun"; - is_critical = 1 + is_critical = 1; + name = "Decrepit Maintenance Shutter" }, /obj/structure/curtain/black, /turf/simulated/floor/tiled, @@ -14943,10 +15061,10 @@ /turf/simulated/floor/tiled, /area/bridge) "BK" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, /obj/structure/bed/stool/chair/sofa/right/red, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, /turf/simulated/floor/wood, /area/horizon/deck_three/cafeteria) "BL" = ( @@ -15032,6 +15150,9 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/wood, /area/horizon/deck_three/cafeteria) "BV" = ( @@ -15341,6 +15462,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) +"CB" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/bed/stool/chair/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/horizon/deck_three/cafeteria) "CC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15699,6 +15827,16 @@ }, /turf/simulated/floor, /area/maintenance/security_starboard) +"Dk" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "Dl" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/spline/fancy/wood{ @@ -15773,7 +15911,9 @@ /area/maintenance/aux_atmospherics/deck_3) "Dt" = ( /obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/table/wood, +/obj/structure/bed/stool/chair/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/deck_three/cafeteria) "Du" = ( @@ -16129,6 +16269,11 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) +"Eg" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "Eh" = ( /turf/simulated/wall/r_wall, /area/medical/ward/isolation) @@ -17378,6 +17523,9 @@ /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/fitness/hallway) +"Gx" = ( +/turf/simulated/open, +/area/horizon/deck_three/cafeteria) "Gy" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -17462,6 +17610,9 @@ /area/bridge/minibar) "GE" = ( /obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 4 + }, /obj/structure/lattice, /turf/simulated/open, /area/horizon/hallway/deck_three/primary/starboard) @@ -17648,13 +17799,9 @@ /turf/simulated/floor/tiled, /area/security/forensics_morgue) "GV" = ( -/obj/structure/lattice, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/railing/mapped, -/turf/simulated/open, -/area/horizon/hallway/deck_three/primary/starboard) +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "GW" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 1 @@ -18025,6 +18172,11 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) +"HD" = ( +/obj/structure/flora/ausbushes/genericbush, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "HE" = ( /obj/structure/bed/stool/chair/padded/beige{ dir = 8 @@ -18433,6 +18585,15 @@ }, /turf/simulated/floor/tiled, /area/bridge) +"Io" = ( +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/horizon/deck_three/cafeteria) "Ip" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18924,6 +19085,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/washroom) +"Jg" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "Jh" = ( /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; @@ -19271,6 +19436,7 @@ /area/horizon/deck_three/cafeteria) "JO" = ( /obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/light, /turf/simulated/floor/wood, /area/horizon/deck_three/cafeteria) "JP" = ( @@ -19572,10 +19738,10 @@ pixel_y = -11 }, /obj/machinery/button/remote/blast_door{ - pixel_y = 25; - pixel_x = 25; - name = "Escape Route Shutter"; id = "shutters_runcaprun"; + name = "Escape Route Shutter"; + pixel_x = 25; + pixel_y = 25; req_access = list(20) }, /turf/simulated/open, @@ -19636,6 +19802,13 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) +"Kt" = ( +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/open, +/area/horizon/deck_three/cafeteria) "Ku" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -19764,6 +19937,10 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry/emergency) +"KF" = ( +/obj/structure/flora/ausbushes/palebush, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "KG" = ( /obj/effect/floor_decal/spline/plain/cee, /turf/simulated/floor/carpet/rubber, @@ -20429,6 +20606,7 @@ /obj/structure/railing/mapped{ dir = 4 }, +/obj/structure/lattice, /turf/simulated/open, /area/horizon/hallway/deck_three/primary/starboard) "LS" = ( @@ -20483,14 +20661,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) -"LZ" = ( -/obj/structure/lattice, -/obj/machinery/light, -/obj/structure/railing/mapped{ - dir = 1 - }, -/turf/simulated/open, -/area/horizon/hallway/deck_three/primary/starboard) "Ma" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20984,6 +21154,12 @@ /obj/item/hullbeacon/red, /turf/simulated/open/airless, /area/template_noop) +"MR" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/horizon/deck_three/cafeteria) "MS" = ( /obj/machinery/vending/snack, /obj/effect/floor_decal/corner/green{ @@ -21472,13 +21648,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) -"NN" = ( -/obj/effect/floor_decal/spline/fancy/wood/cee{ - dir = 1 - }, -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass/alt, -/area/horizon/hallway/deck_three/primary/starboard) "NO" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22014,8 +22183,8 @@ /turf/simulated/floor/tiled, /area/horizon/stairwell/bridge) "OI" = ( +/obj/structure/railing/mapped, /obj/structure/lattice, -/obj/machinery/light, /turf/simulated/open, /area/horizon/hallway/deck_three/primary/starboard) "OJ" = ( @@ -22075,6 +22244,12 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) +"OM" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/open, +/area/horizon/deck_three/cafeteria) "ON" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -23764,6 +23939,10 @@ /area/security/forensics_office{ name = "Security - Investigations Office" }) +"RM" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "RN" = ( /obj/machinery/alarm{ dir = 8; @@ -23813,6 +23992,12 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/captain) +"RQ" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/horizon/deck_three/cafeteria) "RR" = ( /obj/machinery/cryopod, /obj/effect/floor_decal/corner/green{ @@ -24234,6 +24419,10 @@ }, /turf/simulated/floor/carpet/rubber, /area/horizon/crew_quarters/fitness/gym) +"SG" = ( +/obj/structure/railing/mapped, +/turf/simulated/open, +/area/horizon/deck_three/cafeteria) "SH" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -24293,6 +24482,15 @@ /obj/machinery/recharger, /turf/simulated/floor/carpet/rubber, /area/bridge/controlroom) +"SO" = ( +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/open, +/area/horizon/deck_three/cafeteria) "SQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/reinforced, @@ -24525,8 +24723,8 @@ }, /obj/machinery/door/blast/regular{ dir = 4; - is_critical = 1; - id = "blastdoors_tcomms" + id = "blastdoors_tcomms"; + is_critical = 1 }, /turf/simulated/floor/tiled, /area/tcommsat/chamber) @@ -25381,6 +25579,13 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) +"UQ" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "UR" = ( /obj/effect/floor_decal/corner/green{ dir = 5 @@ -25452,9 +25657,9 @@ /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/changing) "Va" = ( -/obj/effect/map_effect/window_spawner/full/reinforced, -/turf/simulated/floor/tiled/dark/full, -/area/horizon/hallway/deck_three/primary/starboard) +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "Vb" = ( /obj/effect/floor_decal/corner/paleblue/full{ dir = 1 @@ -25677,6 +25882,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/ward) +"Vu" = ( +/obj/structure/flora/ausbushes/sunnybush, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "Vv" = ( /obj/machinery/door/firedoor, /obj/structure/grille, @@ -25743,10 +25955,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "VA" = ( -/obj/effect/floor_decal/spline/fancy/wood/cee, -/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/tree/jungle/small/patience, /turf/simulated/floor/grass/alt, -/area/horizon/hallway/deck_three/primary/starboard) +/area/horizon/deck_three/cafeteria) "VB" = ( /obj/machinery/door/airlock/glass_command{ icon_state = "door_locked"; @@ -27302,6 +27513,13 @@ /obj/machinery/light, /turf/simulated/floor/wood, /area/lawoffice/representative) +"Ys" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/grass/alt, +/area/horizon/deck_three/cafeteria) "Yt" = ( /obj/machinery/light/small{ dir = 1 @@ -48733,15 +48951,15 @@ uV Ko kb KM -vY +xz dG -vY -vY -vY -vY -vY +fj +MR +RQ +zM +cV dG -vY +xz NG cS eP @@ -48935,15 +49153,15 @@ Ie JJ iy UV -UV -WD -UV -UV -UV -UV -UV -WD -UV +OI +hV +uJ +ku +vK +Io +Dk +qq +me UV oB Ou @@ -49135,19 +49353,19 @@ cb JS gl ag -AG -UV +PM WD -YE +OI +Vu +sI +Jg +RM +sI +Jg +Eg +me WD -kt -kt -kt -WD -YE -WD -UV -in +OI TJ uk uk @@ -49337,19 +49555,19 @@ hY kF tR iY -PM -WD +AG +UV OI -Va +qm GV -NN +Va Ak VA -LZ Va +kG me -WD -GE +UV +in Ou uk uk @@ -49541,15 +49759,15 @@ gl iY AG UV -WD +OI bC -WD +cg sI +KF +mc sI -sI -WD -bC -WD +HD +me UV in Ou @@ -49741,19 +49959,19 @@ Ei Vm GO Yb -AG -UV -UV +PM WD -UV -UV -UV -UV -UV +OI +we +zM +Ys +ct +UQ +MR +jK +me WD -UV -UV -in +OI Ou YD op @@ -49945,15 +50163,15 @@ UH JB AG UV -UV +OI sD -TN -UV -UV -UV -TN -sD -UV +qD +nn +pm +bZ +yJ +CB +PM UV in Ou @@ -50147,15 +50365,15 @@ aK iY AG UV -in +OI BK qD -AG -UV -in +OM +Gx +SG yJ jY -AG +PM UV in Ou @@ -50349,15 +50567,15 @@ cp ag AG UV -in +OI sF JO -AG -UV -in +OM +Gx +SG BU Dt -AG +PM UV in TJ @@ -50551,14 +50769,14 @@ xk iY gn TN -KO +GE cm Wy -gn -TN -KO +SO +ok +Kt JN -xz +Wy LR TN KO