From 1e80295d1036e0b14518e4c6781d33700cc35a20 Mon Sep 17 00:00:00 2001 From: Captain277 Date: Tue, 19 Sep 2023 15:45:27 -0700 Subject: [PATCH 1/4] Sens Shivers Down Your Spine --- maps/rift/levels/rift-04-surface1.dmm | 15 +- maps/rift/levels/rift-05-surface2.dmm | 491 ++++--- maps/rift/levels/rift-06-surface3.dmm | 1271 ++++++++--------- maps/triumph/levels/deck2.dmm | 1849 ++++++++++++------------- 4 files changed, 1685 insertions(+), 1941 deletions(-) diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm index 6793659d219c..e50f3d48d03e 100644 --- a/maps/rift/levels/rift-04-surface1.dmm +++ b/maps/rift/levels/rift-04-surface1.dmm @@ -3104,8 +3104,6 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) "cdP" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, /obj/structure/window/reinforced{ dir = 1 }, @@ -3120,7 +3118,8 @@ /obj/structure/railing/grey{ dir = 4 }, -/turf/simulated/floor/grass, +/obj/structure/flora/pumpkin/carved, +/turf/simulated/floor/outdoors/mud, /area/hallway/primary/surfaceone) "cdW" = ( /obj/structure/grille, @@ -15254,8 +15253,6 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/outpost/xenobiology/outpost_hallway) "jER" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/sunnybush, /obj/structure/window/reinforced{ dir = 1 }, @@ -15264,7 +15261,8 @@ /obj/structure/railing/grey{ dir = 1 }, -/turf/simulated/floor/grass, +/obj/structure/bonfire/permanent, +/turf/simulated/floor/outdoors/mud, /area/hallway/primary/surfaceone) "jEU" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -25615,8 +25613,6 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "pJn" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/genericbush, /obj/structure/window/reinforced{ dir = 1 }, @@ -25625,7 +25621,8 @@ /obj/structure/railing/grey{ dir = 1 }, -/turf/simulated/floor/grass, +/obj/structure/flora/pumpkin/carved/scream, +/turf/simulated/floor/outdoors/mud, /area/hallway/primary/surfaceone) "pJC" = ( /obj/effect/floor_decal/industrial/outline/yellow, diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm index 16947e1594f1..d331fbf5be52 100644 --- a/maps/rift/levels/rift-05-surface2.dmm +++ b/maps/rift/levels/rift-05-surface2.dmm @@ -1255,31 +1255,6 @@ /obj/structure/lattice, /turf/simulated/open, /area/maintenance/research/rnd) -"aRq" = ( -/obj/structure/table/marble, -/obj/item/reagent_containers/food/drinks/cup, -/obj/item/reagent_containers/food/drinks/cup{ - pixel_x = -8; - pixel_y = 8 - }, -/obj/item/reagent_containers/food/drinks/cup{ - pixel_y = 8 - }, -/obj/item/reagent_containers/food/drinks/cup{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/reagent_containers/food/drinks/cup{ - pixel_x = -8 - }, -/obj/item/reagent_containers/food/drinks/cup{ - pixel_x = 8 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/simulated/floor/lino, -/area/crew_quarters/coffee_shop) "aRs" = ( /obj/structure/toilet{ pixel_y = 9 @@ -1302,11 +1277,6 @@ /obj/effect/floor_decal/corner_techfloor_gray, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/hammerhead/general) -"aTl" = ( -/obj/effect/floor_decal/spline/plain, -/obj/structure/table/marble, -/turf/simulated/floor/lino, -/area/crew_quarters/coffee_shop) "aTs" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -1643,6 +1613,9 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/breakroom) +"bbg" = ( +/turf/simulated/floor/outdoors/mud, +/area/crew_quarters/coffee_shop) "bch" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3264,7 +3237,8 @@ /obj/structure/bed/chair/wood{ dir = 8 }, -/turf/simulated/floor/wood, +/obj/structure/catwalk, +/turf/simulated/floor/water/blood/deep, /area/crew_quarters/coffee_shop) "bXx" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -3899,8 +3873,8 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "cwF" = ( -/obj/structure/table/wooden_reinforced, -/turf/simulated/floor/wood, +/obj/effect/gateway/active/cult, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "cwG" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -5129,7 +5103,8 @@ /turf/simulated/floor/tiled/dark, /area/security/range) "dqp" = ( -/turf/simulated/floor/lino, +/obj/structure/flora/pumpkin/pumpkin_patch/presents, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/coffee_shop) "drb" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -5983,15 +5958,15 @@ /turf/simulated/open, /area/rift/station/public_garden/gantry) "dJH" = ( -/obj/structure/table/wooden_reinforced, -/obj/structure/flora/pottedplant/flower{ - pixel_y = 14 - }, /obj/machinery/camera/network/civilian{ dir = 4 }, /obj/machinery/computer/timeclock/premade/west, -/turf/simulated/floor/wood, +/obj/machinery/holopad, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "dJK" = ( /obj/structure/railing{ @@ -7012,7 +6987,7 @@ name = "Station Intercom (General)"; pixel_x = 24 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "eze" = ( /obj/effect/floor_decal/borderfloor{ @@ -7670,6 +7645,12 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"eVH" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/cult, +/area/crew_quarters/coffee_shop) "eVT" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -8799,23 +8780,24 @@ /turf/simulated/floor/reinforced, /area/security/hammerhead_bay) "fHU" = ( -/obj/structure/bed/chair/wood{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 8 - }, /obj/structure/curtain/open/bed{ name = "brown curtain"; pixel_x = -32 }, -/turf/simulated/floor/wood, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "fIg" = ( +/obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/spline/plain{ - dir = 10 + dir = 8 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/coffee_shop) "fIH" = ( /obj/structure/railing, @@ -9602,6 +9584,19 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) +"geM" = ( +/obj/structure/curtain/open/bed{ + name = "brown curtain"; + pixel_x = -32 + }, +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/cult, +/area/crew_quarters/coffee_shop) "gfL" = ( /obj/structure/table/bench/wooden, /obj/effect/mist, @@ -9989,8 +9984,8 @@ /turf/simulated/floor/plating, /area/maintenance/substation/research/telescience_lab) "gsZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, +/obj/structure/cult/talisman, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "gts" = ( /obj/structure/closet/secure_closet/medical3, @@ -10828,12 +10823,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab/storage) -"gSq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/coffee_shop) "gSO" = ( /obj/structure/disposalpipe/up{ dir = 1 @@ -11403,9 +11392,7 @@ /area/crew_quarters/heads/hor) "hoN" = ( /obj/effect/floor_decal/spline/plain, -/obj/structure/table/marble, -/obj/item/reagent_containers/food/drinks/cup, -/turf/simulated/floor/lino, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/coffee_shop) "hpv" = ( /obj/machinery/conveyor{ @@ -12514,6 +12501,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/security/hallway) +"hSQ" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel, +/area/crew_quarters/coffee_shop) "hSS" = ( /obj/structure/railing{ dir = 4 @@ -12714,10 +12710,9 @@ /turf/simulated/floor/tiled/monotile, /area/crew_quarters/heads/hor) "ibd" = ( -/obj/structure/fireplace{ - pixel_y = 14 - }, -/turf/simulated/floor/wood, +/obj/structure/flora/pumpkin/carved, +/obj/effect/debris/cleanable/cobweb2, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "ibv" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -13194,9 +13189,10 @@ /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_slimepens) "ipQ" = ( -/obj/structure/table/wooden_reinforced, -/obj/machinery/light, -/turf/simulated/floor/wood, +/obj/structure/catwalk, +/obj/structure/table/fancyblack, +/obj/item/deck/tarot, +/turf/simulated/floor/water/blood/deep, /area/crew_quarters/coffee_shop) "ipW" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -13630,6 +13626,9 @@ }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) +"iHo" = ( +/turf/simulated/floor/cult, +/area/crew_quarters/coffee_shop) "iHH" = ( /obj/structure/cable{ icon_state = "2-8" @@ -14101,10 +14100,8 @@ /area/security/brig) "iVL" = ( /obj/structure/railing, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/wood, +/obj/structure/cult/pylon, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "iWe" = ( /turf/simulated/open, @@ -14350,9 +14347,6 @@ "jcV" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/structure/curtain/open/bed{ - name = "brown curtain" - }, /obj/machinery/door/firedoor/glass{ dir = 1 }, @@ -14365,6 +14359,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/curtain/black, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "jcW" = ( @@ -15680,8 +15675,11 @@ dir = 1 }, /obj/structure/railing, -/obj/machinery/holopad, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "jYp" = ( /obj/structure/cable/green{ @@ -16567,10 +16565,12 @@ dir = 8; pixel_x = 32 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 +/obj/structure/cult/pylon, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "kvL" = ( /obj/structure/cable/green{ @@ -16816,7 +16816,7 @@ dir = 8 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-4" }, /turf/simulated/floor/tiled/steel, /area/crew_quarters/coffee_shop) @@ -17404,6 +17404,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"kWR" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/coffee_shop) "kWU" = ( /obj/structure/table/rack/shelf, /obj/item/suit_cooling_unit, @@ -17898,13 +17907,14 @@ /turf/simulated/floor/tiled/monotile, /area/security/hallway) "lib" = ( -/obj/structure/table/wooden_reinforced, -/obj/item/reagent_containers/food/condiment/small/sugar, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, -/turf/simulated/floor/wood, +/obj/structure/catwalk, +/obj/structure/table/fancyblack, +/obj/structure/spirit_board/prop, +/turf/simulated/floor/water/blood/deep, /area/crew_quarters/coffee_shop) "lig" = ( /obj/machinery/firealarm{ @@ -20051,12 +20061,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) -"mvC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/coffee_shop) "mwd" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, @@ -20263,14 +20267,6 @@ }, /turf/simulated/floor/carpet, /area/security/warden) -"mCt" = ( -/obj/structure/table/marble, -/obj/machinery/chemical_dispenser/catering/bar_coffee, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/lino, -/area/crew_quarters/coffee_shop) "mCK" = ( /obj/structure/closet/secure_closet/medical3, /obj/item/soap/nanotrasen, @@ -21215,6 +21211,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"ndo" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/obj/effect/floor_decal/spline/plain/corner{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/coffee_shop) "ner" = ( /obj/machinery/door/airlock/glass/research{ name = "Research Staircase" @@ -21252,7 +21257,8 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) "neF" = ( -/turf/simulated/floor/wood, +/obj/structure/catwalk, +/turf/simulated/floor/water/blood/deep, /area/crew_quarters/coffee_shop) "nfd" = ( /turf/simulated/wall/r_wall/prepainted/security, @@ -21270,7 +21276,8 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/turf/simulated/floor/lino, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/coffee_shop) "ngr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21764,7 +21771,7 @@ /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "nxY" = ( -/turf/simulated/wall/r_wall/prepainted, +/turf/simulated/wall/cult, /area/crew_quarters/coffee_shop) "nyq" = ( /obj/structure/cable/green{ @@ -21954,15 +21961,15 @@ /turf/simulated/floor/tiled/steel, /area/rnd/lockers) "nCx" = ( -/obj/structure/bed/chair/wood, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 1 - }, /obj/structure/curtain/open/bed{ name = "brown curtain"; pixel_x = -32 }, -/turf/simulated/floor/wood, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/bed/chair/wood, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "nDj" = ( /obj/effect/floor_decal/borderfloor{ @@ -22714,15 +22721,13 @@ "obO" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/structure/curtain/open/bed{ - name = "brown curtain" - }, /obj/machinery/door/firedoor/glass{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, +/obj/structure/curtain/black, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "obW" = ( @@ -23197,16 +23202,14 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/table/marble, -/obj/item/toy/plushie/coffee_fox{ - name = "Cream" - }, /obj/machinery/button/holosign{ id = "cafe_sign"; pixel_x = -24; pixel_y = -6 }, -/turf/simulated/floor/lino, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/debris/cleanable/cobweb, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/coffee_shop) "owO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -24480,6 +24483,7 @@ /area/maintenance/asmaint2) "piR" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/structure/curtain/black, /turf/simulated/floor/plating, /area/crew_quarters/coffee_shop) "pjd" = ( @@ -24768,7 +24772,11 @@ /obj/structure/bed/chair/wood{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/effect/debris/cleanable/cobweb{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/water/blood/deep, /area/crew_quarters/coffee_shop) "pqQ" = ( /obj/effect/floor_decal/spline/plain{ @@ -24845,13 +24853,11 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/structure/curtain/open/bed{ - name = "brown curtain" - }, /obj/machinery/door/firedoor/glass{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/curtain/black, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "puy" = ( @@ -24865,9 +24871,6 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/structure/curtain/open/bed{ - name = "brown curtain" - }, /obj/machinery/door/firedoor/glass{ dir = 1 }, @@ -24875,6 +24878,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/curtain/black, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "pvo" = ( @@ -24949,6 +24953,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/security/interrogation) +"pwu" = ( +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/wood, +/area/crew_quarters/coffee_shop) "pwA" = ( /obj/machinery/door/blast/regular, /turf/simulated/floor/tiled/techfloor/grid, @@ -25463,8 +25471,6 @@ /turf/simulated/floor/tiled/white, /area/medical/chemistry) "pRF" = ( -/obj/structure/table/wooden_reinforced, -/obj/item/flame/candle, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 }, @@ -25472,10 +25478,15 @@ name = "brown curtain"; pixel_x = -32 }, +/obj/item/flame/candle/black, +/obj/structure/table/fancyblack, +/obj/item/toy/plushie/coffee_fox{ + name = "Cream" + }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "1-2" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "pRO" = ( /obj/item/slime_extract/grey, @@ -26267,9 +26278,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "qrc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) @@ -27037,7 +27047,7 @@ name = "brown curtain"; pixel_x = -32 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "qRv" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -27119,10 +27129,13 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/simulated/floor/tiled/steel, /area/crew_quarters/coffee_shop) @@ -27282,6 +27295,9 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) +"qWH" = ( +/turf/simulated/wall/cult, +/area/medical/chemistry) "qWP" = ( /obj/machinery/light/small{ dir = 8 @@ -27925,19 +27941,16 @@ /turf/simulated/floor/plating, /area/maintenance/security/upper) "rnE" = ( -/obj/structure/table/wooden_reinforced, -/obj/item/flame/candle, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 8 - }, /obj/structure/curtain/open/bed{ name = "brown curtain"; pixel_x = -32 }, -/turf/simulated/floor/wood, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/table/fancyblack, +/obj/item/flame/candle/black, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "rnL" = ( /obj/effect/floor_decal/borderfloor{ @@ -28707,11 +28720,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/sink/kitchen{ - dir = 4; - pixel_x = -14 - }, -/turf/simulated/floor/lino, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/coffee_shop) "rOF" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -30102,11 +30111,14 @@ /turf/simulated/floor/plating, /area/security/breakroom) "sMm" = ( -/obj/structure/table/wooden_reinforced, -/obj/structure/flora/pottedplant/stoutbush{ - pixel_y = 12 +/obj/structure/flora/pumpkin, +/obj/effect/debris/cleanable/cobweb{ + dir = 4 }, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "sMx" = ( /obj/effect/floor_decal/borderfloorwhite, @@ -30788,9 +30800,6 @@ /obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) -"tnj" = ( -/turf/simulated/wall/prepainted, -/area/crew_quarters/coffee_shop) "tnu" = ( /obj/effect/floor_decal/corner_techfloor_grid/full{ dir = 8 @@ -31419,61 +31428,15 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/structure/table/marble, -/obj/item/reagent_containers/food/condiment/small/sugar{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/reagent_containers/food/condiment/small/packet/coffee{ - pixel_y = 9 - }, -/obj/item/reagent_containers/food/condiment/small/packet/coffee{ - pixel_y = 6 - }, -/obj/item/reagent_containers/food/condiment/small/packet/coffee{ - pixel_y = 3 - }, -/obj/item/reagent_containers/food/condiment/small/packet/coffee, -/obj/item/reagent_containers/food/condiment/small/packet/tea{ - pixel_x = 6; - pixel_y = 9 - }, -/obj/item/reagent_containers/food/condiment/small/packet/tea{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/reagent_containers/food/condiment/small/packet/tea{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/reagent_containers/food/condiment/small/packet/tea{ - pixel_x = 6 - }, -/obj/item/reagent_containers/food/condiment/small/packet/sugar{ - pixel_x = 12; - pixel_y = 9 - }, -/obj/item/reagent_containers/food/condiment/small/packet/sugar{ - pixel_x = 12; - pixel_y = 6 - }, -/obj/item/reagent_containers/food/condiment/small/packet/sugar{ - pixel_x = 12; - pixel_y = 3 - }, -/obj/item/reagent_containers/food/condiment/small/packet/sugar{ - pixel_x = 12 - }, -/obj/item/reagent_containers/glass/rag{ - pixel_x = -10; - pixel_y = 6 - }, /obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 }, -/turf/simulated/floor/lino, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/coffee_shop) "tGe" = ( /obj/structure/railing{ @@ -31484,10 +31447,9 @@ /turf/simulated/floor/plating, /area/maintenance/security/upper) "tGt" = ( -/obj/structure/bed/chair/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, +/obj/effect/rune, +/obj/item/flame/candle/everburn/black, +/turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "tGv" = ( /obj/effect/floor_decal/spline/plain{ @@ -31939,6 +31901,13 @@ /obj/structure/bed/chair, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) +"uaj" = ( +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/coffee_shop) "uax" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -32917,9 +32886,10 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "uMP" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, +/obj/effect/floor_decal/spline/plain/corner, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "uMY" = ( @@ -33996,12 +33966,11 @@ /turf/simulated/floor/tiled/steel, /area/assembly/robotics) "voC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/spline/plain{ dir = 5 }, +/obj/effect/floor_decal/spline/plain/corner, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "vpB" = ( @@ -35325,7 +35294,8 @@ /area/rnd/workshop) "wlU" = ( /obj/structure/bed/chair/wood, -/turf/simulated/floor/wood, +/obj/structure/catwalk, +/turf/simulated/floor/water/blood/deep, /area/crew_quarters/coffee_shop) "wms" = ( /obj/effect/floor_decal/borderfloor, @@ -35734,10 +35704,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/lino, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/coffee_shop) "wBK" = ( /obj/machinery/oxygen_pump/mobile/anesthetic, @@ -35941,6 +35908,12 @@ /obj/effect/floor_decal/industrial/halfstair{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/crew_quarters/coffee_shop) "wHt" = ( @@ -49270,14 +49243,14 @@ nxY nxY qQk pRF -fHU +geM dJH nCx rnE fHU neF pqG -tnj +nxY hJs hJs hJs @@ -49459,19 +49432,19 @@ qXG vUk cHW oRV -tnj +nxY ovs rOE fIg uMP -neF -neF -neF -neF -neF +kWR +kWR +kWR +ndo +eVH wlU lib -tnj +nxY pBA pBA pBA @@ -49653,19 +49626,19 @@ wbl jQD cHW oRV -tnj -mCt +nxY +bbg dqp hoN -uMP -wlU -cwF +pwu tGt -neF -neF +iHo +tGt +uaj +eVH wlU ipQ -tnj +nxY tyH nsG pBA @@ -49847,19 +49820,19 @@ gvq rNr cHW oRV -tnj -aRq -dqp -aTl -uMP -wlU +nxY +bbg +bbg +hoN +pwu +iHo cwF -tGt -neF -neF +iHo +uaj +eVH neF bXk -tnj +nxY tyH iiF iiF @@ -50041,17 +50014,17 @@ rjB wKw cHW oRV -tnj +nxY tFF ngn wBI qrc +tGt gsZ -gsZ -mvC +tGt voC -gSq -neF +eVH +iHo eyX oFi tyH @@ -50235,19 +50208,19 @@ hKi hKi hKi hKi -tnj -tnj +nxY +nxY ibd iVL kBf -wHa +hSQ jYd wHa qTL kvB sMm -tnj -tnj +nxY +nxY alV fUs tyH @@ -50430,17 +50403,17 @@ wwg sbA lDM ylV -hik -tnj -tnj +qWH +nxY +nxY puA obO tfk ptH jcV -tnj -tnj -tnj +nxY +nxY +nxY eTP eTP eTP diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index c38e4a6ad017..498ee697ea3d 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -24,13 +24,13 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/captain) "aaf" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/white, +/obj/effect/debris/cleanable/blood/drip, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aag" = ( /obj/effect/spider/stickyweb/dark, @@ -141,7 +141,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "aav" = ( /obj/landmark/spawnpoint/job/cyborg, @@ -356,13 +356,10 @@ /obj/item/stack/material/sandstone{ amount = 5 }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/item/clothing/under/scarecrow, +/obj/item/clothing/mask/gas/scarecrow, +/obj/item/clothing/head/scarecrow, +/turf/simulated/floor/wood, /area/hydroponics) "abk" = ( /obj/structure/bed/chair/bay/comfy/black{ @@ -469,7 +466,7 @@ name = "brown curtain"; pixel_x = -32 }, -/obj/structure/flora/pottedplant/largebush, +/obj/structure/flora/pumpkin/carved/owo, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "abD" = ( @@ -524,8 +521,6 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "abH" = ( -/obj/structure/table/reinforced, -/obj/effect/floor_decal/corner/grey/diagonal, /obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, @@ -537,7 +532,9 @@ name = "Kitchen Shutters" }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "abI" = ( /obj/structure/metal_edge, @@ -674,10 +671,10 @@ /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/civvie/cockpit) "ach" = ( -/obj/structure/bed/chair/sofa/black/left, /obj/machinery/status_display{ pixel_y = 30 }, +/obj/structure/bed/chair/sofa/brown/left, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "aci" = ( @@ -828,18 +825,14 @@ }, /area/exploration/courser_dock) "acJ" = ( -/obj/structure/table/standard{ - name = "plastic table frame" - }, /obj/item/plant_analyzer, /obj/item/plant_analyzer, /obj/item/material/minihoe, /obj/item/material/minihoe, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/item/material/knife/machete/hatchet, /obj/item/material/knife/machete/hatchet, -/turf/simulated/floor/tiled, +/obj/structure/table/fancyblack, +/turf/simulated/floor/wood, /area/hydroponics) "acM" = ( /obj/structure/flora/pottedplant/minitree{ @@ -983,10 +976,8 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "adj" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/landmark/spawnpoint/job/chef, -/obj/effect/debris/cleanable/flour, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "adk" = ( /obj/effect/floor_decal/borderfloorblack/corner{ @@ -1015,15 +1006,9 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "adp" = ( /obj/structure/table/reinforced, @@ -1073,9 +1058,9 @@ /area/bridge/bridge_hallway) "adt" = ( /obj/effect/floor_decal/spline/plain{ - dir = 4 + dir = 5 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "adx" = ( /obj/structure/railing, @@ -1109,7 +1094,7 @@ dir = 4; pixel_x = 24 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "adC" = ( /obj/structure/table/reinforced, @@ -1323,8 +1308,7 @@ /obj/machinery/smartfridge/drying_rack{ dir = 8 }, -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/grass, +/turf/simulated/floor/wood, /area/hydroponics) "aec" = ( /obj/structure/catwalk, @@ -1522,7 +1506,7 @@ name = "brown curtain"; pixel_x = -32 }, -/obj/structure/bed/chair/sofa/black/corner{ +/obj/structure/bed/chair/sofa/brown/corner{ dir = 1 }, /turf/simulated/floor/carpet/bcarpet, @@ -1539,8 +1523,10 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "aeO" = ( -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aeP" = ( /obj/machinery/light{ @@ -1563,7 +1549,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "aeT" = ( /obj/structure/cable{ @@ -1762,16 +1748,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "afA" = ( /obj/effect/floor_decal/borderfloorblack, @@ -1958,10 +1938,10 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "agc" = ( -/obj/structure/bed/chair/sofa/black/left, /obj/effect/floor_decal/spline/plain{ dir = 5 }, +/obj/structure/bed/chair/pew/right, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "age" = ( @@ -1999,12 +1979,10 @@ /obj/machinery/vending/hydronutrients{ req_one_access = list(30,35,47,77) }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/structure/closet/hydrant{ pixel_y = -32 }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "agp" = ( /obj/structure/cable/green{ @@ -2161,7 +2139,7 @@ icon_state = "1-2" }, /obj/machinery/media/jukebox, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "agP" = ( /obj/structure/railing{ @@ -2206,11 +2184,9 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "agS" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/machinery/light, /obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "agW" = ( /obj/structure/cable/green{ @@ -2447,12 +2423,10 @@ /area/bridge/bunker) "ahC" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "ahD" = ( /obj/machinery/computer/card{ @@ -2537,7 +2511,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "ahM" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ @@ -2672,7 +2646,7 @@ "aii" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/grass, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aij" = ( /obj/structure/cable{ @@ -2715,11 +2689,6 @@ }, /turf/simulated/floor/wood, /area/bridge/bunker) -"aiq" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/floor/grass, -/area/hydroponics) "air" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -2741,11 +2710,10 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfaceeva/aa/cliff_south) "aiu" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/table/standard, /obj/item/material/knife/butch, /obj/item/material/kitchen/rollingpin, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aiv" = ( /obj/structure/cable{ @@ -2766,8 +2734,10 @@ /area/exploration/pathfinder_office) "aix" = ( /obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aiy" = ( /obj/structure/cable/green{ @@ -3287,13 +3257,7 @@ /area/exploration) "ajM" = ( /obj/machinery/appliance/cooker/oven, -/obj/effect/floor_decal/corner/grey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/grey{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "ajN" = ( /obj/structure/table/standard, @@ -3490,7 +3454,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "ake" = ( -/obj/structure/table/marble, /obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, @@ -3515,30 +3478,21 @@ pixel_x = 8; pixel_y = 16 }, -/obj/effect/floor_decal/corner/grey{ - dir = 10 - }, -/obj/effect/floor_decal/corner/grey{ - dir = 5 - }, /obj/structure/noticeboard{ pixel_y = 29 }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "akg" = ( /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, /obj/item/tool/wrench, /obj/item/tool/wrench, -/obj/structure/table/standard{ - name = "plastic table frame" - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/item/material/knife, /obj/item/material/knife, -/turf/simulated/floor/tiled, +/obj/structure/table/fancyblack, +/turf/simulated/floor/wood, /area/hydroponics) "aki" = ( /obj/machinery/power/apc{ @@ -3672,25 +3626,18 @@ /area/maintenance/station/exploration) "akB" = ( /obj/machinery/appliance/cooker/fryer, -/obj/effect/floor_decal/corner/grey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/grey{ - dir = 10 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/debris/cleanable/cobweb, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "akC" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "akD" = ( /obj/structure/cable/green{ @@ -3804,7 +3751,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "akQ" = ( /obj/structure/cable/green{ @@ -4051,7 +3998,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/wood, /area/hydroponics) "alv" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -4120,8 +4067,10 @@ /turf/simulated/floor/carpet/tealcarpet, /area/shuttle/civvie/general) "alH" = ( -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/grass, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "alM" = ( /obj/structure/sign/directions/bridge{ @@ -4143,7 +4092,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "alN" = ( -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/wood, /area/hydroponics) "alO" = ( /obj/structure/railing, @@ -4227,11 +4176,10 @@ /turf/simulated/floor/tiled/dark, /area/bridge/office) "alX" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "alY" = ( /obj/effect/floor_decal/techfloor{ @@ -4287,7 +4235,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, +/obj/structure/flora/pumpkin/carved/girly, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "ame" = ( /obj/structure/railing{ @@ -4511,14 +4460,13 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "amJ" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "amK" = ( /obj/structure/bed/chair/bay/chair, @@ -4697,6 +4645,7 @@ /obj/machinery/vending/boozeomat{ req_access = null }, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "ann" = ( @@ -4718,7 +4667,7 @@ /area/rift/surfaceeva/airlock/arrivals/secondary) "ans" = ( /obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/grass, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "ant" = ( /obj/effect/floor_decal/spline/plain{ @@ -4793,7 +4742,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "any" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -4926,10 +4875,10 @@ name = "brown curtain"; pixel_x = -32 }, -/obj/structure/bed/chair/sofa/black/right, /obj/effect/floor_decal/spline/plain{ dir = 1 }, +/obj/structure/bed/chair/pew/left, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "anQ" = ( @@ -4956,7 +4905,7 @@ /area/ai) "anT" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "anW" = ( /obj/structure/flora/pottedplant/minitree{ @@ -4973,19 +4922,11 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "anX" = ( -/obj/structure/table/hardwoodtable, /obj/machinery/computer/security/telescreen{ pixel_x = -64; pixel_y = -3 }, -/obj/item/storage/pill_bottle/dice_nerd{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/pill_bottle/dice{ - pixel_x = -2; - pixel_y = -2 - }, +/obj/structure/table/fancyblack, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "anZ" = ( @@ -5087,7 +5028,10 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/debris/cleanable/cobweb{ + dir = 8 + }, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "aot" = ( /obj/machinery/holoposter{ @@ -5181,15 +5125,6 @@ }, /turf/simulated/floor/carpet/blue, /area/bridge/meeting_room) -"aoF" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/hydroponics) "aoG" = ( /obj/machinery/washing_machine, /obj/structure/window/reinforced/tinted/frosted{ @@ -5198,12 +5133,13 @@ /turf/simulated/floor/tiled/steel_grid, /area/bridge/bunker) "aoH" = ( -/obj/structure/bed/chair/sofa/black/corner{ - dir = 1 - }, /obj/machinery/holoposter{ pixel_y = 32 }, +/obj/structure/bed/chair/sofa/brown/corner{ + dir = 1 + }, +/obj/effect/debris/cleanable/cobweb, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "aoI" = ( @@ -5265,14 +5201,8 @@ /obj/item/packageWrap, /obj/item/packageWrap, /obj/item/packageWrap, -/obj/effect/floor_decal/corner/grey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/grey{ - dir = 10 - }, /obj/machinery/light, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aoQ" = ( /obj/structure/bed/chair/bay/chair, @@ -5375,7 +5305,7 @@ dir = 4; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "apd" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ @@ -5540,13 +5470,7 @@ /area/shuttle/excursion/cargo) "apx" = ( /obj/machinery/holopad, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/wood, /area/hydroponics) "apA" = ( /obj/structure/handrail{ @@ -5632,7 +5556,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/wood, /area/hydroponics) "apO" = ( /obj/structure/cable{ @@ -5862,10 +5786,8 @@ /turf/simulated/floor/plating, /area/bridge/bridge_hallway) "aqy" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/light, -/obj/effect/debris/cleanable/egg_smudge, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aqz" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ @@ -5885,13 +5807,11 @@ /area/bridge/bunker) "aqD" = ( /obj/machinery/seed_storage/garden, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/machinery/air_alarm{ dir = 1; pixel_y = -24 }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "aqF" = ( /obj/machinery/door/airlock{ @@ -6295,7 +6215,7 @@ dir = 8; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/wood, /area/hydroponics) "arA" = ( /obj/machinery/door/airlock/voidcraft/vertical, @@ -6377,7 +6297,6 @@ /turf/simulated/floor/tiled/steel_ridged, /area/hallway/primary/surfacethree) "arI" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -6385,15 +6304,8 @@ dir = 5 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) -"arJ" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/grass, -/area/hydroponics) "arK" = ( /obj/machinery/firealarm{ dir = 8; @@ -6402,10 +6314,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/bridge/bunker) "arL" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/chem_master/condimaster, /obj/structure/table/reinforced, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "arM" = ( /obj/structure/bed/chair/comfy/brown, @@ -6466,7 +6377,7 @@ name = "brown curtain"; pixel_x = -32 }, -/obj/structure/table/hardwoodtable, +/obj/structure/table/fancyblack, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "arW" = ( @@ -6509,8 +6420,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "asc" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/table/standard, /obj/machinery/reagentgrinder, /obj/item/reagent_containers/dropper{ pixel_y = -12 @@ -6521,7 +6430,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "asd" = ( /obj/effect/floor_decal/industrial/warning/full, @@ -6775,7 +6685,6 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -6785,6 +6694,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "asM" = ( @@ -6851,7 +6761,7 @@ /area/exploration/explorer_prep) "atb" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "atd" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -6911,17 +6821,11 @@ /area/bridge/bridge_hallway) "atj" = ( /obj/machinery/appliance/cooker/grill, -/obj/effect/floor_decal/corner/grey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/grey{ - dir = 10 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "atk" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central6, @@ -7265,7 +7169,10 @@ /obj/structure/sink/kitchen{ pixel_y = 30 }, -/turf/simulated/floor/grass, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aue" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, @@ -7379,7 +7286,7 @@ name = "Hydroponics"; req_one_access = list(35,28) }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "aur" = ( /obj/structure/table/reinforced, @@ -7762,7 +7669,7 @@ /obj/item/honey_frame, /obj/item/honey_frame, /obj/item/honey_frame, -/turf/simulated/floor/grass, +/turf/simulated/floor/wood, /area/hydroponics) "avw" = ( /obj/structure/sink{ @@ -8440,7 +8347,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "awS" = ( /obj/structure/toilet{ @@ -8537,7 +8444,19 @@ pixel_y = 32 }, /obj/item/reagent_containers/glass/rag, -/turf/simulated/floor/lino, +/obj/item/storage/pill_bottle/dice_nerd{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/pill_bottle/dice{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/deck/cards{ + pixel_x = -2; + pixel_y = -2 + }, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "axc" = ( /obj/structure/cable{ @@ -8589,7 +8508,7 @@ id_tag = "bathroomlock17"; name = "Bar Toilet 1" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "axi" = ( /obj/structure/table/standard, @@ -8601,13 +8520,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) -"axj" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/grass, -/area/hydroponics) "axm" = ( /obj/structure/table/bench/standard, /turf/simulated/floor/tiled/steel, @@ -8717,12 +8629,10 @@ /turf/simulated/floor/outdoors/safeice/lythios43c/indoors, /area/rift/surfacebase/outside/outside3) "axB" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/debris/cleanable/flour, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "axF" = ( /obj/structure/railing/grey, @@ -8768,11 +8678,6 @@ /obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor/plating, /area/maintenance/bar) -"axO" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/debris/cleanable/egg_smudge, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "axR" = ( /mob/living/simple_mob/animal/giant_spider/frost, /turf/simulated/floor/outdoors/safeice/lythios43c/indoors, @@ -8839,13 +8744,7 @@ /obj/item/packageWrap, /obj/item/packageWrap, /obj/item/packageWrap, -/obj/effect/floor_decal/corner/grey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/grey{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aya" = ( /obj/machinery/crystal/lava, @@ -8886,11 +8785,10 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) "ayg" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/floor/grass, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "ayh" = ( -/obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/light{ dir = 4 }, @@ -8911,6 +8809,7 @@ pixel_x = 24; pixel_y = 8 }, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "ayi" = ( @@ -8960,7 +8859,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "ayp" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -9295,11 +9194,11 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "azm" = ( -/obj/item/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 5 }, -/turf/simulated/floor/wood, +/obj/structure/table/bench/marble, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "azn" = ( /obj/structure/railing{ @@ -9467,13 +9366,14 @@ /turf/simulated/floor/plating, /area/exploration/excursion_dock) "azG" = ( -/obj/effect/floor_decal/corner/beige{ - dir = 5 +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, +/obj/effect/floor_decal/corner/orange/diagonal, /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "azH" = ( /obj/machinery/light{ @@ -9486,7 +9386,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "azL" = ( /obj/effect/floor_decal/borderfloorblack, @@ -9517,17 +9417,11 @@ /turf/simulated/floor/bluegrid, /area/ai_upload) "azR" = ( -/obj/effect/floor_decal/corner/grey{ - dir = 10 - }, -/obj/effect/floor_decal/corner/grey{ - dir = 5 - }, /obj/machinery/vending/dinnerware{ dir = 1 }, /obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "azT" = ( /obj/structure/bed/chair/shuttle{ @@ -9631,7 +9525,11 @@ dir = 1; pixel_y = -24 }, -/turf/simulated/floor/wood, +/obj/structure/flora/pumpkin, +/obj/effect/debris/cleanable/cobweb2{ + dir = 8 + }, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aAk" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -9693,7 +9591,7 @@ /area/rift/surfacebase/outside/outside3) "aAx" = ( /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "aAz" = ( @@ -9848,24 +9746,18 @@ /turf/simulated/floor/wood, /area/bridge/bunker) "aAZ" = ( -/obj/structure/table/standard, /obj/item/book/manual/chef_recipes, /obj/item/paper{ desc = ""; info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper."; name = "Important notice from Rancher Jim" }, -/obj/effect/floor_decal/corner/grey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/grey{ - dir = 10 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aBa" = ( /obj/structure/railing{ @@ -9942,10 +9834,10 @@ /turf/simulated/floor/tiled/monotile, /area/rift/trade_shop/landing_pad) "aBn" = ( -/obj/structure/bed/chair/sofa/black/right{ +/obj/effect/floor_decal/spline/plain, +/obj/structure/bed/chair/sofa/brown/right{ dir = 1 }, -/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "aBr" = ( @@ -9953,7 +9845,7 @@ dir = 6 }, /obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/grass, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aBv" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -9982,7 +9874,10 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/obj/effect/debris/cleanable/cobweb{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aBz" = ( /obj/structure/railing{ @@ -10023,9 +9918,7 @@ /area/crew_quarters/captain) "aBE" = ( /obj/machinery/biogenerator, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "aBF" = ( /turf/simulated/floor/wood, @@ -10066,7 +9959,6 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "aBM" = ( -/obj/structure/table/marble, /obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, @@ -10090,13 +9982,8 @@ pixel_x = 8; pixel_y = 16 }, -/obj/effect/floor_decal/corner/grey{ - dir = 10 - }, -/obj/effect/floor_decal/corner/grey{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aBO" = ( /obj/effect/floor_decal/spline/plain, @@ -10195,17 +10082,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"aCb" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/grass, -/area/hydroponics) "aCd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -10228,8 +10104,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "aCk" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/turf/simulated/floor/tiled/white, +/obj/effect/debris/cleanable/blood, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aCl" = ( /obj/structure/bed/double/padded, @@ -10406,14 +10282,11 @@ "aCF" = ( /obj/structure/table/bench/wooden, /obj/landmark/spawnpoint/job/botanist, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "aCG" = ( /obj/landmark/spawnpoint/job/botanist, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/grass, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aCI" = ( /obj/structure/grille, @@ -10586,8 +10459,11 @@ /area/bridge) "aDn" = ( /obj/structure/bed, -/obj/item/bedsheet/green, -/turf/simulated/floor/lino, +/obj/item/handcuffs, +/obj/effect/debris/cleanable/blood, +/obj/item/bedsheet/red, +/obj/effect/debris/cleanable/cobweb2, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "aDo" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -10649,8 +10525,6 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "aDC" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/table/standard, /obj/machinery/microwave, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -10658,7 +10532,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aDD" = ( /obj/structure/railing/grey{ @@ -10738,7 +10613,10 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/captain) "aDP" = ( -/turf/simulated/floor/tiled/steel, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/hydroponics) "aDR" = ( /obj/structure/barricade, @@ -10853,7 +10731,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aEm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -10878,14 +10756,14 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "aEp" = ( -/obj/structure/table/hardwoodtable, /obj/effect/floor_decal/spline/plain, /obj/machinery/door/blast/shutters{ dir = 2; id = "bar_shutters"; name = "Bar Shutters" }, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/table/fancyblack, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "aEt" = ( @@ -11009,7 +10887,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/wood, /area/hydroponics) "aEM" = ( /obj/machinery/door/airlock/maintenance/int{ @@ -11256,8 +11134,6 @@ /turf/simulated/floor/tiled/steel, /area/exploration) "aFu" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/table/standard, /obj/machinery/microwave, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -11265,7 +11141,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aFv" = ( /obj/structure/table/wooden_reinforced, @@ -11275,17 +11152,14 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/captain) "aFw" = ( -/obj/structure/table/hardwoodtable, -/obj/item/flame/candle{ - pixel_x = -16 - }, /obj/item/deck/tarot{ pixel_x = 2; pixel_y = 2 }, -/obj/item/deck/cards{ - pixel_x = -2; - pixel_y = -2 +/obj/structure/table/fancyblack, +/obj/item/flame/candle/candelabra/everburn{ + pixel_x = -16; + pixel_y = 6 }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) @@ -11363,12 +11237,12 @@ /turf/simulated/floor/tiled/monotile, /area/exploration/pathfinder_office) "aFF" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/marble, /obj/machinery/chemical_dispenser/catering/bar_soft{ pixel_y = 4 }, -/turf/simulated/floor/tiled/white, +/obj/effect/debris/cleanable/cobweb2, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aFG" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -11683,13 +11557,14 @@ /turf/simulated/floor/carpet/blue, /area/bridge/meeting_room) "aGB" = ( -/obj/structure/table/hardwoodtable, -/obj/item/flame/candle{ - pixel_x = -16 - }, /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/structure/table/fancyblack, +/obj/item/flame/candle/candelabra/everburn{ + pixel_x = -16; + pixel_y = 6 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "aGC" = ( @@ -11703,7 +11578,7 @@ /mob/living/simple_mob/animal/passive/cow{ name = "Betsy" }, -/turf/simulated/floor/grass, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aGE" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -11798,7 +11673,7 @@ id_tag = "bathroomlock18"; name = "Bar Toilet 2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "aGX" = ( /turf/simulated/floor/tiled/dark, @@ -11823,8 +11698,7 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfaceeva/aa/cliff_north) "aHa" = ( -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aHc" = ( /obj/machinery/computer/aifixer{ @@ -12105,12 +11979,11 @@ /area/exploration/meeting) "aHL" = ( /obj/machinery/honey_extractor, -/obj/structure/flora/ausbushes/leafybush, /obj/machinery/light{ dir = 8; light_range = 12 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/wood, /area/hydroponics) "aHM" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -12132,7 +12005,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aHR" = ( /obj/structure/railing/grey, @@ -12457,7 +12330,7 @@ name = "Bar requests console"; pixel_x = -32 }, -/obj/structure/bed/chair/sofa/black/right{ +/obj/structure/bed/chair/sofa/brown/right{ dir = 4 }, /turf/simulated/floor/carpet/bcarpet, @@ -12576,14 +12449,13 @@ /turf/simulated/floor/tiled/dark, /area/exploration/courser_dock) "aIZ" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/table/standard, /obj/item/storage/box/beakers{ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3 }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aJb" = ( /obj/structure/table/steel, @@ -12662,6 +12534,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/debris/cleanable/blood, /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) "aJm" = ( @@ -12695,7 +12568,7 @@ dir = 5 }, /obj/machinery/light/small, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "aJq" = ( /obj/structure/table/wooden_reinforced, @@ -12771,33 +12644,16 @@ /turf/simulated/floor/tiled/monotile, /area/exploration) "aJx" = ( -/obj/structure/table/standard{ - name = "plastic table frame" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 6 - }, /obj/machinery/reagentgrinder, /obj/item/reagent_containers/dropper, -/turf/simulated/floor/tiled/steel, +/obj/structure/table/fancyblack, +/obj/effect/debris/cleanable/cobweb2{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/hydroponics) "aJB" = ( /obj/machinery/disposal, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/bordercorner2{ - dir = 8 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -12805,15 +12661,18 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/simulated/floor/tiled/steel, +/obj/effect/debris/cleanable/cobweb2{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/hydroponics) "aJC" = ( /obj/structure/curtain/open/bed{ name = "brown curtain"; pixel_x = -32 }, -/obj/structure/flora/pottedplant/large, -/turf/simulated/floor/wood, +/obj/structure/flora/pumpkin/carved, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aJD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12909,7 +12768,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/wood, /area/hydroponics) "aJR" = ( /obj/machinery/light/small, @@ -12951,10 +12810,10 @@ name = "brown curtain"; pixel_x = -32 }, -/obj/structure/bed/chair/sofa/black/corner{ +/obj/effect/floor_decal/spline/plain, +/obj/structure/bed/chair/sofa/brown/corner{ dir = 4 }, -/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "aJZ" = ( @@ -13027,10 +12886,10 @@ /area/shuttle/courser/cockpit) "aKg" = ( /obj/item/material/ashtray/glass, -/obj/structure/bed/chair/sofa/black{ +/obj/effect/floor_decal/spline/plain, +/obj/structure/bed/chair/sofa/brown{ dir = 1 }, -/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "aKi" = ( @@ -13120,7 +12979,10 @@ /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) "aKv" = ( -/turf/simulated/floor/grass, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aKx" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -13163,13 +13025,6 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) -"aKC" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "aKD" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -13195,7 +13050,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "aKG" = ( -/obj/structure/table/hardwoodtable, /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -13205,7 +13059,8 @@ name = "Bar Shutters" }, /obj/machinery/recharger, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/table/fancyblack, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "aKH" = ( @@ -13317,7 +13172,10 @@ pixel_y = 32 }, /obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled/steel, +/obj/effect/debris/cleanable/cobweb{ + dir = 1 + }, +/turf/simulated/floor/wood, /area/hydroponics) "aLa" = ( /obj/structure/grille, @@ -13438,13 +13296,12 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cargo) "aLp" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aLr" = ( /obj/structure/window/reinforced, @@ -13620,17 +13477,16 @@ dir = 8; pixel_x = -24 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "aLZ" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aMa" = ( /obj/structure/cable/green{ @@ -13642,7 +13498,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "aMb" = ( @@ -13781,9 +13637,6 @@ /turf/simulated/floor/tiled/steel_grid, /area/exploration/explorer_prep) "aMs" = ( -/obj/effect/floor_decal/corner/beige/full{ - dir = 1 - }, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -13793,11 +13646,15 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/stool/padded, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/bench/marble, +/obj/effect/floor_decal/corner/orange/diagonal, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "aMv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13842,7 +13699,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aMB" = ( /obj/structure/bed/chair/bay/comfy/black, @@ -13864,7 +13721,7 @@ }, /obj/item/storage/fancy/candle_box, /obj/item/storage/fancy/blackcandle_box, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "aMD" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -13906,13 +13763,13 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) "aMH" = ( -/obj/structure/bed/chair/sofa/black{ - dir = 4 - }, /obj/machinery/light{ dir = 8; light_range = 12 }, +/obj/structure/bed/chair/sofa/brown{ + dir = 4 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "aMI" = ( @@ -14025,7 +13882,6 @@ /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/civvie/general) "aNf" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -14033,17 +13889,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aNg" = ( -/obj/item/stool/padded, -/obj/effect/floor_decal/corner/beige{ - dir = 5 +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, +/obj/structure/table/bench/marble, +/obj/effect/floor_decal/corner/purple/diagonal, /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "aNh" = ( /obj/structure/closet/crate, @@ -14080,7 +13937,7 @@ dir = 4; icon_state = "pipe-c" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aNp" = ( /turf/simulated/floor/tiled/steel, @@ -14089,7 +13946,7 @@ /obj/structure/bed/chair/comfy/beige{ dir = 4 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "aNt" = ( /obj/structure/table/woodentable, @@ -14110,7 +13967,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "aNv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -14134,7 +13991,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aNy" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -14283,7 +14140,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aNV" = ( /obj/machinery/portable_atmospherics/hydroponics, @@ -14479,9 +14336,8 @@ /turf/simulated/floor/tiled/monotile, /area/exploration) "aOq" = ( -/obj/structure/flora/ausbushes/lavendergrass, /obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/grass, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aOr" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -14693,7 +14549,6 @@ /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside3) "aOS" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/button/remote/blast_door{ id = "kitchen_shutters"; name = "Kitchen Shutter control"; @@ -14703,7 +14558,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aOT" = ( /obj/structure/cable/green{ @@ -14910,7 +14765,10 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/grass, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aPA" = ( /obj/machinery/door/airlock/command{ @@ -15105,7 +14963,7 @@ /obj/machinery/light_switch{ pixel_y = -24 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "aQb" = ( /obj/machinery/computer/ship/helm{ @@ -15154,7 +15012,7 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aQh" = ( /obj/structure/metal_edge, @@ -15177,8 +15035,10 @@ /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "aQl" = ( -/obj/structure/flora/ausbushes/genericbush, -/turf/simulated/floor/grass, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aQm" = ( /obj/structure/bed/chair/comfy/brown{ @@ -15473,7 +15333,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aRf" = ( /obj/structure/handrail, @@ -15623,18 +15483,12 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 5 }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "aRz" = ( /obj/structure/catwalk, @@ -15676,7 +15530,7 @@ pixel_x = 24; range = 10 }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "aRE" = ( /obj/machinery/computer/secure_data{ @@ -15693,7 +15547,7 @@ /area/bridge) "aRF" = ( /obj/landmark/spawnpoint/job/bartender, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "aRG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15733,7 +15587,7 @@ pixel_y = 32 }, /obj/machinery/seed_extractor, -/turf/simulated/floor/grass, +/turf/simulated/floor/wood, /area/hydroponics) "aRP" = ( /obj/machinery/nuclearbomb{ @@ -15839,7 +15693,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aSg" = ( /obj/structure/plasticflaps/mining, @@ -16225,10 +16079,9 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) "aTa" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/appliance/mixer/cereal, -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aTd" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -16247,7 +16100,7 @@ /area/exploration/explorer_prep) "aTf" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "aTh" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -16329,11 +16182,6 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled/dark, /area/bridge) -"aTs" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/debris/cleanable/flour, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "aTt" = ( /obj/structure/railing, /obj/machinery/light/flamp, @@ -16614,14 +16462,14 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "aUj" = ( -/obj/structure/table/reinforced, -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/door/blast/shutters{ id = "kitchen_shutters"; name = "Kitchen Shutters" }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/corner/orange/diagonal, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "aUm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -16633,7 +16481,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aUo" = ( /obj/structure/bed/chair/bay/shuttle, @@ -16643,17 +16491,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) "aUp" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/obj/structure/table/standard{ - name = "plastic table frame" - }, /obj/item/multitool/ai_detector, -/turf/simulated/floor/tiled, +/obj/structure/table/fancyblack, +/obj/item/clothing/head/pumpkinhead, +/obj/item/clothing/head/pumpkinhead, +/turf/simulated/floor/wood, /area/hydroponics) "aUr" = ( /obj/structure/handrail, @@ -16692,7 +16534,7 @@ /area/rift/surfacebase/shuttle) "aUv" = ( /obj/structure/table/bench/wooden, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "aUy" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -16771,17 +16613,11 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cockpit) "aUE" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 1 - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "aUF" = ( /obj/effect/decal/remains/tajaran, @@ -16808,14 +16644,14 @@ /turf/simulated/floor/plating, /area/maintenance/station/exploration) "aUI" = ( -/obj/structure/bed/chair/sofa/black/left{ - dir = 1 - }, /obj/structure/curtain/open/bed{ name = "brown curtain"; pixel_x = -32 }, /obj/effect/floor_decal/spline/plain, +/obj/structure/bed/chair/pew/left{ + dir = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "aUJ" = ( @@ -16886,12 +16722,13 @@ /area/ai_upload) "aUV" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/table/woodentable, /obj/machinery/door/window/westright{ dir = 1; req_one_access = list(35,28) }, -/turf/simulated/floor/tiled/steel, +/obj/structure/table/fancyblack, +/obj/structure/curtain/black, +/turf/simulated/floor/wood, /area/hydroponics) "aUY" = ( /obj/machinery/atmospherics/component/unary/heater{ @@ -16928,19 +16765,15 @@ /turf/simulated/floor/tiled/steel, /area/exploration) "aVf" = ( -/obj/structure/table/standard{ - name = "plastic table frame" - }, /obj/item/storage/box/syringes, /obj/item/reagent_scanner, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, -/turf/simulated/floor/tiled/steel, +/obj/structure/table/fancyblack, +/turf/simulated/floor/wood, /area/hydroponics) "aVh" = ( /obj/structure/bed/chair/sofa/black/right, @@ -17047,7 +16880,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aVv" = ( /obj/structure/closet/secure_closet/hydroponics, @@ -17056,16 +16889,13 @@ /obj/item/stack/material/sandstone{ amount = 5 }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/item/clothing/under/scarecrow, +/obj/item/clothing/mask/gas/scarecrow, +/obj/item/clothing/head/scarecrow, +/turf/simulated/floor/wood, /area/hydroponics) "aVw" = ( /turf/simulated/floor/reinforced/lythios43c, @@ -17206,9 +17036,9 @@ /turf/simulated/floor, /area/shuttle/civvie/general) "aVT" = ( -/obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/grass, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "aVX" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -17248,7 +17078,6 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "aWd" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -17256,7 +17085,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aWg" = ( /obj/structure/disposalpipe/segment{ @@ -17773,7 +17602,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "aXC" = ( /obj/machinery/conveyor{ @@ -17801,11 +17630,6 @@ }, /turf/simulated/floor/tiled/dark, /area/exploration/showers) -"aXE" = ( -/obj/structure/flora/ausbushes/reedbush, -/obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/grass, -/area/hydroponics) "aXF" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -17989,10 +17813,9 @@ /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) "aYm" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/appliance/mixer/candy, -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aYn" = ( /obj/effect/floor_decal/industrial/halfstair{ @@ -18005,7 +17828,7 @@ dir = 4; pixel_x = 12 }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "aYp" = ( /obj/machinery/atmospherics/pipe/tank/air{ @@ -18025,11 +17848,10 @@ /turf/simulated/floor/bluegrid, /area/ai_upload) "aYs" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aYu" = ( /obj/structure/bed/chair/bay/chair, @@ -18126,7 +17948,7 @@ /obj/structure/sink/kitchen{ pixel_y = 26 }, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "aYI" = ( @@ -18184,8 +18006,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "aYN" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/table/standard, /obj/item/storage/box/donkpockets{ pixel_x = 2; pixel_y = 2 @@ -18197,7 +18017,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "aYO" = ( /obj/effect/floor_decal/borderfloor{ @@ -18301,20 +18122,20 @@ /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside3) "aZf" = ( -/obj/structure/bed/chair/sofa/black/right{ - dir = 1 - }, /obj/effect/floor_decal/spline/plain{ dir = 6 }, +/obj/structure/bed/chair/pew/right{ + dir = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "aZg" = ( -/obj/effect/floor_decal/corner/red/diagonal, /obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "aZh" = ( @@ -18338,7 +18159,7 @@ /turf/simulated/floor/wood, /area/bridge/bunker) "aZm" = ( -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aZn" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -18504,7 +18325,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "aZQ" = ( /obj/structure/table/woodentable, @@ -18625,7 +18446,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "bjs" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/cult, /area/maintenance/bar) "bnc" = ( /obj/machinery/door/firedoor/glass{ @@ -18789,7 +18610,7 @@ name = "Bar Backroom"; req_access = list(25) }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "bFr" = ( /obj/structure/sign/warning/falling, @@ -18810,7 +18631,7 @@ /area/hallway/secondary/docking_hallway) "bIN" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "bMK" = ( /obj/structure/cable/green{ @@ -18867,9 +18688,6 @@ "bPV" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/heads/hop) -"bQP" = ( -/turf/simulated/wall/prepainted/civilian, -/area/crew_quarters/bar) "bQX" = ( /obj/machinery/door/airlock/maintenance/engi{ name = "Landing Pads Substation" @@ -18893,11 +18711,11 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/blueshield) "bSo" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/white, +/obj/effect/debris/cleanable/blood/drip, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "bUd" = ( /obj/structure/closet/secure_closet/freezer/fridge, @@ -18934,18 +18752,18 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "bWm" = ( -/obj/structure/table/hardwoodtable, /obj/effect/floor_decal/spline/plain, /obj/machinery/door/blast/shutters{ dir = 2; id = "bar_shutters"; name = "Bar Shutters" }, -/obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/computer/security/telescreen{ pixel_x = 32; pixel_y = 158 }, +/obj/structure/table/fancyblack, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "bWN" = ( @@ -19123,7 +18941,7 @@ /obj/machinery/door/airlock{ name = "Toilet" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "cEA" = ( /obj/structure/cable/green{ @@ -19138,7 +18956,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "cIq" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/wood/hardwood, /area/hydroponics) "cJZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -19153,7 +18971,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "cPs" = ( /obj/structure/table/steel, @@ -19196,12 +19014,12 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "cSf" = ( -/obj/item/stool/padded, /obj/landmark/spawnpoint/job/assistant, /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/floor/wood, +/obj/structure/table/bench/marble, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "cYb" = ( /obj/machinery/door/airlock/multi_tile/glass/civilian{ @@ -19345,7 +19163,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "dxW" = ( /obj/item/trash/unajerky, @@ -19394,6 +19212,10 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"dCC" = ( +/obj/effect/debris/cleanable/blood/drip, +/turf/simulated/floor/wood, +/area/crew_quarters/kitchen) "dDb" = ( /obj/machinery/door/firedoor/glass{ dir = 1 @@ -19460,12 +19282,13 @@ /turf/simulated/floor/plating, /area/rift/turbolift/maint) "dMD" = ( -/obj/structure/table/hardwoodtable, -/obj/item/flame/candle, +/obj/structure/table/fancyblack, +/obj/item/scrying{ + anchored = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "dOT" = ( -/obj/structure/table/hardwoodtable, /obj/effect/floor_decal/spline/plain, /obj/machinery/door/blast/shutters{ dir = 2; @@ -19475,7 +19298,11 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/table/fancyblack, +/obj/item/flame/candle/candelabra/everburn{ + pixel_y = 6 + }, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "dRq" = ( @@ -19622,7 +19449,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/wood, /area/hydroponics) "egu" = ( /obj/structure/disposalpipe/segment, @@ -19772,7 +19599,7 @@ /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) "exk" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/wood/hardwood, /area/maintenance/substation/surface_three) "exW" = ( /obj/structure/catwalk, @@ -19832,7 +19659,7 @@ dir = 8; pixel_x = 24 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "ezI" = ( /obj/machinery/computer/station_alert/security, @@ -19927,11 +19754,10 @@ /turf/simulated/floor/plating, /area/maintenance/research/xenobio) "eGU" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "eIi" = ( /obj/machinery/air_alarm{ @@ -20107,7 +19933,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "eZd" = ( /obj/effect/floor_decal/borderfloor{ @@ -20143,7 +19969,7 @@ /obj/machinery/holoposter{ pixel_x = 32 }, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "fam" = ( @@ -20268,11 +20094,6 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) "fpt" = ( -/obj/structure/table/standard{ - name = "plastic table frame" - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/item/destTagger{ pixel_x = 4; pixel_y = 3 @@ -20284,17 +20105,18 @@ /obj/item/packageWrap, /obj/item/packageWrap, /obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/tiled/steel, +/obj/structure/table/fancyblack, +/turf/simulated/floor/wood, /area/hydroponics) "fro" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, /area/maintenance/ai) "fsc" = ( -/obj/structure/bed/chair/sofa/black/right, /obj/effect/floor_decal/spline/plain{ dir = 9 }, +/obj/structure/bed/chair/pew/left, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "fsv" = ( @@ -20303,7 +20125,7 @@ /turf/simulated/floor/plating, /area/exploration/courser_dock) "fua" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, +/turf/simulated/wall/wood/hardwood, /area/crew_quarters/freezer) "fuM" = ( /turf/simulated/wall/r_wall/prepainted, @@ -20315,7 +20137,7 @@ }, /obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/corner/black/diagonal, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "fyf" = ( @@ -20413,6 +20235,9 @@ "fHr" = ( /turf/simulated/wall/r_wall/prepainted, /area/hallway/secondary/docking_hallway2) +"fHL" = ( +/turf/simulated/floor/wood, +/area/crew_quarters/kitchen) "fIe" = ( /obj/machinery/light/small{ dir = 8 @@ -20467,7 +20292,7 @@ /obj/structure/disposalpipe/segment, /obj/landmark/observer_spawn, /obj/machinery/holopad/ship, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "fRp" = ( /turf/simulated/wall/r_wall/prepainted, @@ -20576,14 +20401,13 @@ /turf/simulated/floor/tiled/steel, /area/exploration) "ghf" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "ghR" = ( /obj/machinery/door/blast/shutters{ @@ -20765,17 +20589,13 @@ dir = 8 }, /obj/machinery/power/apc/direction_bump/west, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "gBE" = ( /obj/structure/bed/chair/wood{ dir = 1 }, -/obj/structure/curtain/open/bed{ - name = "brown curtain"; - pixel_y = 32 - }, -/turf/simulated/floor/grass, +/turf/simulated/floor/wood, /area/hydroponics) "gDw" = ( /obj/structure/cable/orange{ @@ -20799,10 +20619,10 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/ai_cyborg_station) "gHz" = ( -/obj/structure/table/hardwoodtable, /obj/effect/floor_decal/spline/plain{ dir = 8 }, +/obj/structure/table/fancyblack, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "gHV" = ( @@ -20819,7 +20639,7 @@ /turf/simulated/floor/tiled/steel, /area/security/checkpoint2) "gNz" = ( -/obj/structure/bed/chair/sofa/black, +/obj/structure/bed/chair/sofa/brown, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "gOf" = ( @@ -21028,6 +20848,15 @@ }, /turf/simulated/wall/r_wall/prepainted/command, /area/ai) +"hwd" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/orange/diagonal, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "hAi" = ( /obj/machinery/light{ dir = 1 @@ -21085,12 +20914,12 @@ /area/crew_quarters/heads/blueshield) "hBM" = ( /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/red/diagonal, /obj/structure/table/hardwoodtable, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/glass/rag{ pixel_x = -4 }, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "hCW" = ( @@ -21282,11 +21111,11 @@ dir = 10 }, /obj/machinery/camera/network/civilian, -/obj/effect/floor_decal/corner/red/diagonal, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/recipe_lookup/drinks{ pixel_y = 32 }, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "hXj" = ( @@ -21315,7 +21144,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "icY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -21357,7 +21186,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "ieJ" = ( /turf/simulated/wall/prepainted/exploration, @@ -21568,7 +21397,7 @@ /obj/machinery/light{ light_range = 12 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "iJw" = ( /turf/simulated/wall/r_wall/prepainted/command, @@ -21694,7 +21523,7 @@ /area/crew_quarters/heads/blueshield) "jcq" = ( /obj/landmark/spawnpoint/job/bartender, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "jil" = ( @@ -21813,7 +21642,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "jsv" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, +/turf/simulated/wall/cult, /area/crew_quarters/bar) "jtQ" = ( /obj/structure/cable/green{ @@ -21880,7 +21709,7 @@ name = "Mr. Deempisi portrait"; pixel_y = 31 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "jEm" = ( /obj/structure/cable{ @@ -22091,7 +21920,7 @@ /area/maintenance/research/xenobio) "jVy" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "jWh" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -22206,7 +22035,7 @@ /turf/simulated/floor/plating, /area/shuttle/courser/general) "kkA" = ( -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "klE" = ( @@ -22248,13 +22077,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/excursion_dock) -"kol" = ( -/obj/structure/curtain/open/bed{ - name = "brown curtain"; - pixel_y = 32 - }, -/turf/simulated/floor/grass, -/area/hydroponics) "kps" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -22293,10 +22115,12 @@ /turf/simulated/floor/plating, /area/rift/turbolift/maint) "krG" = ( -/obj/structure/flora/ausbushes/ywflowers, /obj/structure/reagent_dispensers/watertank/high, /obj/item/reagent_containers/glass/bucket, -/turf/simulated/floor/grass, +/obj/effect/debris/cleanable/cobweb2{ + dir = 1 + }, +/turf/simulated/floor/wood, /area/hydroponics) "kAO" = ( /obj/structure/closet/secure_closet/blueshield, @@ -22336,11 +22160,11 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) "kIf" = ( -/obj/item/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/floor/wood, +/obj/structure/table/bench/marble, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "kIR" = ( /obj/effect/floor_decal/techfloor{ @@ -22361,9 +22185,8 @@ /turf/simulated/floor/plating, /area/teleporter/departing) "kKC" = ( -/obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/beehive, -/turf/simulated/floor/grass, +/turf/simulated/floor/wood, /area/hydroponics) "kLO" = ( /obj/structure/cable{ @@ -22429,7 +22252,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/exploration/excursion_dock) "lbu" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, +/turf/simulated/wall/wood/hardwood, /area/crew_quarters/kitchen) "lcP" = ( /obj/structure/bed/chair{ @@ -22556,7 +22379,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "lud" = ( /obj/structure/cable, @@ -22598,8 +22421,14 @@ /obj/item/retail_scanner/civilian, /obj/item/retail_scanner/civilian, /obj/item/clothing/accessory/hawaii/random, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) +"lDN" = ( +/obj/structure/kitchenspike, +/obj/effect/debris/cleanable/cobweb, +/obj/effect/debris/cleanable/blood, +/turf/simulated/floor/tiled/freezer/cold, +/area/crew_quarters/freezer) "lDX" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -22804,12 +22633,11 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) "lXN" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/sink/kitchen{ dir = 8; pixel_x = 13 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "lYj" = ( /obj/machinery/door/firedoor{ @@ -22952,7 +22780,7 @@ }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/disposalpipe/trunk, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "mrb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -23019,9 +22847,6 @@ /turf/simulated/wall/r_wall/prepainted, /area/hallway/secondary/docking_hallway) "mxx" = ( -/obj/effect/floor_decal/corner/beige/full{ - dir = 8 - }, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -23031,7 +22856,11 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/purple/diagonal, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "mAj" = ( /turf/simulated/wall/prepainted, @@ -23154,7 +22983,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "mOy" = ( /turf/simulated/floor/tiled, @@ -23262,12 +23091,15 @@ /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "naw" = ( -/obj/structure/bed/chair/sofa/black/left{ - dir = 1 - }, /obj/effect/floor_decal/spline/plain{ dir = 8 }, +/obj/structure/bed/chair/sofa/brown/left{ + dir = 1 + }, +/obj/structure/bed/chair/pew/left{ + dir = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "nbB" = ( @@ -23420,6 +23252,13 @@ }, /turf/simulated/floor/reinforced, /area/rnd/telescience_lab/chamber) +"nqR" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/outdoors/mud, +/area/hydroponics) "nsi" = ( /obj/structure/railing{ dir = 8 @@ -23479,6 +23318,17 @@ }, /turf/simulated/floor/reinforced, /area/rnd/telescience_lab/chamber) +"nEV" = ( +/obj/machinery/door/blast/shutters{ + id = "kitchen_shutters"; + name = "Kitchen Shutters" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/table/hardwoodtable, +/obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie, +/obj/effect/floor_decal/corner/orange/diagonal, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/kitchen) "nGT" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -23635,6 +23485,17 @@ /obj/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals) +"ojL" = ( +/obj/effect/floor_decal/spline/plain, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "bar_shutters"; + name = "Bar Shutters" + }, +/obj/structure/table/fancyblack, +/obj/effect/floor_decal/corner/orange/diagonal, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "okY" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, @@ -23760,8 +23621,6 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) "oxo" = ( -/obj/structure/table/reinforced, -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/door/blast/shutters{ id = "kitchen_shutters"; name = "Kitchen Shutters" @@ -23773,7 +23632,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "oxv" = ( /obj/structure/catwalk, @@ -23885,7 +23746,7 @@ /obj/machinery/reagentgrinder{ pixel_y = 9 }, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "oJN" = ( @@ -24091,8 +23952,8 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/smartfridge/drinks, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "psa" = ( @@ -24102,7 +23963,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "psu" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -24202,9 +24063,6 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rift/surfacebase/outside/outside3) -"pJa" = ( -/turf/simulated/wall/prepainted/civilian, -/area/crew_quarters/barrestroom) "pJi" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -24238,7 +24096,6 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "pKJ" = ( -/obj/structure/table/hardwoodtable, /obj/effect/floor_decal/spline/plain{ dir = 10 }, @@ -24252,34 +24109,14 @@ id = "bar_shutters"; name = "Bar Shutters" }, -/obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/computer/security/telescreen{ pixel_y = 158 }, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/newspaper{ - pixel_x = 8; - pixel_y = 5 - }, -/obj/item/newspaper{ - pixel_x = 8; - pixel_y = 3 - }, -/obj/item/newspaper{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/item/newspaper{ - pixel_x = 8; - pixel_y = -1 - }, -/obj/item/pen{ - pixel_x = 8; - pixel_y = -2 +/obj/structure/table/fancyblack, +/obj/item/flame/candle/candelabra/everburn{ + pixel_y = 6 }, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "pLB" = ( @@ -24436,7 +24273,8 @@ }, /obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/corner/black/diagonal, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/debris/cleanable/cobweb2, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "qjW" = ( @@ -24478,9 +24316,6 @@ /obj/effect/debris/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/commandmaint) -"qmp" = ( -/turf/simulated/wall/prepainted/civilian, -/area/crew_quarters/freezer) "qmQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/effect/floor_decal/industrial/warning/corner{ @@ -24567,6 +24402,7 @@ "qzK" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/smartfridge, +/obj/structure/curtain/black, /turf/simulated/floor/plating, /area/hydroponics) "qAJ" = ( @@ -24656,7 +24492,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "qGN" = ( /obj/structure/catwalk, @@ -24678,9 +24514,9 @@ /area/rnd/telescience_lab) "qJf" = ( /obj/machinery/beehive, -/obj/structure/flora/ausbushes/stalkybush, /obj/machinery/camera/network/civilian, -/turf/simulated/floor/grass, +/obj/effect/debris/cleanable/cobweb2, +/turf/simulated/floor/wood, /area/hydroponics) "qKp" = ( /obj/machinery/door/firedoor/glass, @@ -24720,9 +24556,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) -"qSL" = ( -/turf/simulated/wall/prepainted/civilian, -/area/crew_quarters/kitchen) "qTg" = ( /obj/machinery/light/small/emergency, /turf/simulated/floor/plating, @@ -24740,7 +24573,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "qVU" = ( /turf/simulated/wall/prepainted, @@ -24798,7 +24631,7 @@ /area/maintenance/bar) "rba" = ( /obj/machinery/smartfridge/food, -/turf/simulated/wall/prepainted, +/turf/simulated/wall/prepainted/science, /area/crew_quarters/kitchen) "rcq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24816,7 +24649,7 @@ /turf/simulated/floor/plating, /area/rift/turbolift/maint) "rdX" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, +/turf/simulated/wall/cult, /area/crew_quarters/barrestroom) "rgZ" = ( /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, @@ -25018,6 +24851,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/surface_three) +"rNZ" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/structure/table/bench/marble, +/obj/effect/floor_decal/corner/orange/diagonal, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "rQR" = ( /obj/structure/railing{ dir = 4 @@ -25038,11 +24882,11 @@ /area/rift/surfaceeva/airlock/arrivals) "rQU" = ( /obj/structure/disposalpipe/segment, -/obj/item/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/floor/wood, +/obj/structure/table/bench/marble, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "rRh" = ( /obj/structure/catwalk, @@ -25184,14 +25028,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) -"szx" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/debris/cleanable/egg_smudge, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "sEW" = ( /obj/machinery/light/spot{ dir = 4; @@ -25252,7 +25088,7 @@ /turf/simulated/open, /area/maintenance/station/exploration) "sOh" = ( -/obj/structure/bed/chair/sofa/black/left, +/obj/structure/bed/chair/sofa/brown/left, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "sON" = ( @@ -25288,7 +25124,6 @@ /turf/simulated/floor/outdoors/gravsnow/lythios43c, /area/rift/surfacebase/outside/outside3) "sYS" = ( -/obj/structure/table/hardwoodtable, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/spline/plain, /obj/machinery/door/blast/shutters{ @@ -25296,7 +25131,8 @@ id = "bar_shutters"; name = "Bar Shutters" }, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/table/fancyblack, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "tai" = ( @@ -25373,6 +25209,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/exploration/excursion_dock) +"tjO" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/hydroponics) "tlr" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -25392,7 +25234,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "tnS" = ( /obj/machinery/power/apc{ @@ -25452,10 +25294,10 @@ }, /obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/corner/black/diagonal, -/obj/effect/floor_decal/corner/red/diagonal, /obj/structure/sign/double/barsign{ pixel_y = 32 }, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "tvZ" = ( @@ -25468,7 +25310,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "tyY" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/air_alarm{ dir = 1; pixel_y = -24 @@ -25476,8 +25317,12 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) +"tAc" = ( +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "tAo" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/bridge) @@ -25654,6 +25499,7 @@ "tQO" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/palebottlegreen, +/obj/structure/curtain/black, /turf/simulated/floor/plating, /area/crew_quarters/bar) "tSU" = ( @@ -25702,7 +25548,7 @@ /obj/structure/bed/chair/comfy/beige{ dir = 8 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "uag" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -25804,7 +25650,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "urI" = ( @@ -26087,7 +25933,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "uZf" = ( /obj/structure/cable{ @@ -26102,7 +25948,7 @@ /obj/machinery/holosign/bar{ id = "bar_sign" }, -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/cult, /area/crew_quarters/bar) "vcT" = ( /obj/structure/cable{ @@ -26292,7 +26138,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc/direction_bump/west, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "vuT" = ( /obj/machinery/door/airlock/maintenance/common, @@ -26498,7 +26344,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "vLy" = ( /obj/structure/railing{ @@ -26565,7 +26411,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "vRB" = ( @@ -26729,7 +26575,7 @@ /obj/machinery/camera/network/civilian{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "wgh" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -26747,6 +26593,9 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/checkpoint2) +"wjC" = ( +/turf/simulated/wall/cult, +/area/maintenance/substation/surface_three) "wlu" = ( /obj/structure/sign/department/commander, /turf/simulated/wall/r_wall/prepainted/command, @@ -26787,7 +26636,7 @@ /area/bridge/bridge_hallway) "woK" = ( /obj/machinery/status_display, -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/cult, /area/maintenance/substation/surface_three) "wpI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -26857,7 +26706,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "wzN" = ( /obj/effect/floor_decal/borderfloor{ @@ -27106,7 +26955,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc/direction_bump/west, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "xtN" = ( /obj/machinery/light/small/emergency, @@ -27209,7 +27058,7 @@ name = "Station Intercom (General)"; pixel_x = -24 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "xvY" = ( /turf/simulated/wall/r_wall/prepainted, @@ -27219,7 +27068,7 @@ /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "xxP" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/cult, /area/crew_quarters/bar_backroom) "xyj" = ( /obj/structure/disposalpipe/segment{ @@ -27363,14 +27212,18 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"xXX" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/debris/cleanable/cobweb2, +/turf/simulated/floor/plating, +/area/hydroponics) "xYy" = ( -/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-8" }, /obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "xZp" = ( /obj/machinery/door/firedoor/glass, @@ -27487,7 +27340,7 @@ name = "Bar Backroom"; req_access = list(25) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/maintenance/bar) "yku" = ( /obj/machinery/firealarm{ @@ -38850,15 +38703,15 @@ acH acH acH fuM -pJa -pJa -pJa -pJa +rdX +rdX +rdX +rdX cEg -pJa -pJa -pJa -pJa +rdX +rdX +rdX +rdX cBD uTO uTO @@ -38873,7 +38726,7 @@ naw aHQ aNg aUj -aCk +fHL aYN aiu aFu @@ -39050,7 +38903,7 @@ aRc fyf aRc aXS -bQP +jsv anm ppQ asL @@ -39065,15 +38918,15 @@ agc aGB aZf aHQ -aNg +rNZ abH -aCk -aKC +dCC +axB adj aLZ aCk -qSL -aJu +lbu +lDN aJu fua fua @@ -39244,7 +39097,7 @@ bjs bjs ykb bjs -bQP +jsv aYH kkA aMa @@ -39260,8 +39113,8 @@ aZm aZm aHQ aNg -aUj -axO +nEV +fHL asc aIZ aDC @@ -39439,11 +39292,11 @@ vtz mLA aLX bFp -vRz +hwd vRz uoG -kkA -aEp +tAc +ojL cSf aSf aVu @@ -39460,7 +39313,7 @@ amJ aWd ghf xYy -qSL +lbu bUd aGq afw @@ -39645,16 +39498,16 @@ axY aZP iIQ woK -exk -exk -exk +wjC +wjC +wjC exk ake -aCk +fHL arL eGU aAZ -qSL +lbu aGx aJl aPK @@ -39828,10 +39681,10 @@ eYo aQa xxP tvp -kkA +tAc oHL -kkA -aEp +tAc +ojL cSf aZm ltt @@ -39846,9 +39699,9 @@ exk aBM aCk aYm -szx +eGU axZ -qSL +lbu aKu aPi aPK @@ -40032,20 +39885,20 @@ ltt aYK tnR qGh -exk +wjC aLh auW ajf exk azR -aTs +fHL aTa eGU aoP -qSL -qmp -qmp -qmp +lbu +fua +fua +fua fua cnu cnu @@ -40232,7 +40085,7 @@ nKj rMY exk aFF -aCk +fHL lXN bSo aYs @@ -40409,10 +40262,10 @@ xxP xxP xxP xxP -bQP -bQP -bQP -bQP +jsv +jsv +jsv +jsv vaJ wZh ocP @@ -40620,8 +40473,8 @@ avv aHL aeb aRL -alH -aoF +alN +alN apc aJB cIq @@ -40809,10 +40662,10 @@ mID tLm evR kaE -aPz +tjO aeO -aKv -aKv +aQl +aQl aQl alH apx @@ -41004,12 +40857,12 @@ aIg rtY aUV gBE +nqR ans ans -aXE ans aii -aoF +alN apN agS cIq @@ -41197,13 +41050,13 @@ ajS aWg fVI qzK -kol +alN aix -aKv +aHa aGD aHa aOq -aoF +alN aJQ akC atY @@ -41393,11 +41246,11 @@ odR kaE kKC aKv -aiq +ans ans ans aii -aoF +alN aEK ahC cIq @@ -41587,11 +41440,11 @@ eJQ kaE qJf aKv -aeO -axj -aKv +aHa +aHa +aHa aVT -aoF +alN aEK agn cIq @@ -41782,10 +41635,10 @@ cIq cIq aud ans -arJ +ans ans aii -aoF +alN aEK aBE cIq @@ -41977,9 +41830,9 @@ kaE aPz ayg aCG -ayg -alH -aoF +aHa +aOq +alN aEK aqD cIq @@ -42170,10 +42023,10 @@ guk kaE adt azI -aCb +azI azI aBr -aoF +alN aEK acJ cIq @@ -42559,7 +42412,7 @@ kaE aRD aYo aDP -aDP +alN aUv aCF alN @@ -42753,7 +42606,7 @@ cIq cIq cIq aKZ -aDP +alN abi aVv aUp @@ -43722,7 +43575,7 @@ cnu aUi aTv cIq -aws +xXX aqW aws cIq diff --git a/maps/triumph/levels/deck2.dmm b/maps/triumph/levels/deck2.dmm index 369de9d24def..59b2414b5aff 100644 --- a/maps/triumph/levels/deck2.dmm +++ b/maps/triumph/levels/deck2.dmm @@ -4,7 +4,10 @@ dir = 8; pixel_x = 24 }, -/turf/simulated/floor/tiled/white, +/obj/effect/debris/cleanable/cobweb{ + dir = 1 + }, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "ac" = ( /obj/structure/sign/department/cargo_dock, @@ -139,9 +142,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central6, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) -"ar" = ( -/turf/simulated/wall/prepainted/civilian, -/area/triumph/surfacebase/bar_backroom) "as" = ( /obj/structure/table/standard, /obj/item/coin/silver, @@ -311,6 +311,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "aR" = ( @@ -320,18 +321,9 @@ /turf/simulated/floor/plating, /area/vacant/vacant_office) "aT" = ( -/obj/item/stool/padded, -/obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet/bcarpet, +/obj/effect/floor_decal/spline/plain, +/obj/structure/flora/pumpkin/pumpkin_patch/presents, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/bar) "aV" = ( /obj/structure/sink{ @@ -492,7 +484,8 @@ pixel_y = 26 }, /obj/machinery/camera/network/civilian, -/obj/structure/flora/pottedplant/orientaltree, +/obj/structure/flora/pumpkin, +/obj/effect/debris/cleanable/cobweb, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "bq" = ( @@ -550,7 +543,7 @@ /area/crew_quarters/toilet) "bv" = ( /obj/machinery/appliance/cooker/grill, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "bw" = ( /obj/machinery/camera/network/civilian{ @@ -601,13 +594,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "bC" = ( -/obj/structure/window/basic{ - dir = 1 - }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 5 }, -/obj/structure/bed/chair/sofa/black/left, +/obj/structure/bed/chair/pew/right, +/obj/structure/window/phoronbasic{ + dir = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "bD" = ( @@ -618,7 +611,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "bF" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -666,7 +659,7 @@ /obj/machinery/door/airlock/glass{ name = "Bar" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "bL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -681,12 +674,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) -"bO" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hydroponics) "bP" = ( /obj/structure/adherent_bath, /turf/simulated/floor/crystal, @@ -738,11 +725,9 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "bZ" = ( -/obj/item/stool/padded, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/turf/simulated/floor/carpet/bcarpet, +/obj/structure/table/bench/marble, +/obj/effect/floor_decal/corner/orange/diagonal, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "ca" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -887,7 +872,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "cx" = ( /obj/effect/floor_decal/techfloor, @@ -994,7 +979,7 @@ /area/maintenance/cargo) "cI" = ( /obj/landmark/spawnpoint/job/chef, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "cK" = ( /obj/structure/cable{ @@ -1119,17 +1104,18 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "de" = ( -/obj/structure/table/marble, /obj/item/storage/box/wings, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/table/hardwoodtable, /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; layer = 3.3; name = "Bar Shutters" }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "df" = ( @@ -1166,12 +1152,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "dh" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, /obj/structure/closet/crate/hydroponics{ desc = "All you need to start your own honey farm."; name = "beekeeping crate" @@ -1185,7 +1165,7 @@ /obj/item/bee_smoker, /obj/item/bee_pack, /obj/item/tool/crowbar, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "dj" = ( /obj/machinery/photocopier/faxmachine{ @@ -1232,6 +1212,12 @@ /obj/machinery/recharge_station, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/coffee_shop) +"dr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "ds" = ( /obj/structure/sink/kitchen{ dir = 4; @@ -1240,6 +1226,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "dt" = ( @@ -1294,16 +1281,15 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) "dB" = ( -/obj/structure/bed/chair/sofa/right, +/obj/structure/bed/chair/pew/left, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "dE" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/computer/arcade/battle, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/carpet/bcarpet, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/bar) "dG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1320,12 +1306,6 @@ /turf/simulated/wall/prepainted, /area/crew_quarters/fitness) "dI" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, /obj/machinery/power/apc{ cell_type = /obj/item/cell/super; dir = 8; @@ -1335,7 +1315,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "dJ" = ( /obj/effect/floor_decal/corner/red{ @@ -1356,7 +1336,7 @@ dir = 4; pixel_x = 25 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "dO" = ( /obj/structure/adherent_pylon, @@ -1413,7 +1393,10 @@ frequency = 1441; pixel_y = 22 }, -/obj/structure/table/marble, +/obj/structure/table/hardwoodtable, +/obj/item/scrying{ + anchored = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "dW" = ( @@ -1481,13 +1464,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/bed/chair/sofa/black/left, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/bed/chair/pew/right, +/obj/structure/window/phoronbasic{ + dir = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "ee" = ( @@ -1644,9 +1630,11 @@ /area/janitor) "eG" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "eH" = ( /obj/structure/closet/l3closet/janitor, @@ -1700,14 +1688,21 @@ /turf/simulated/floor/crystal, /area/station/stairs_two) "eO" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/spawner/window/low_wall/full/firelocks/nogrille, /obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/structure/window/phoronbasic, +/obj/structure/window/phoronbasic{ + dir = 1 + }, +/obj/structure/window/phoronbasic{ + dir = 4 + }, +/obj/structure/window/phoronbasic{ + dir = 8 + }, +/obj/structure/bonfire/permanent, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/bar) "eR" = ( /turf/simulated/floor/wood, @@ -1778,7 +1773,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "fb" = ( /obj/structure/cable{ @@ -1943,9 +1938,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/machinery/suit_storage_unit/mining{ - boots_stored_TYPE = /obj/item/clothing/shoes/magboots - }, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/storage) "fA" = ( @@ -1998,7 +1991,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "fK" = ( /obj/structure/closet/crate/bin{ @@ -2109,7 +2102,7 @@ dir = 1 }, /obj/machinery/light/small, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "gb" = ( /obj/machinery/airlock_sensor{ @@ -2127,7 +2120,7 @@ /area/quartermaster/miningdock) "gc" = ( /obj/machinery/smartfridge, -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/wood/hardwood, /area/crew_quarters/kitchen) "ge" = ( /turf/simulated/wall/prepainted, @@ -2146,7 +2139,10 @@ /obj/machinery/camera/network/civilian{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "gi" = ( /obj/item/radio/intercom{ @@ -2169,6 +2165,12 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) +"gl" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "gm" = ( /turf/simulated/wall/r_wall, /area/space) @@ -2253,17 +2255,17 @@ /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled, /area/hallway/primary/port) -"gx" = ( -/obj/structure/table/marble, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/structure/flora/pottedplant/smallcactus, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/bar) "gA" = ( /turf/simulated/wall/prepainted/cargo, /area/triumph/surfacebase/mining_main/uxstorage) +"gC" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/turf/simulated/floor/outdoors/mud, +/area/hydroponics) "gD" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/techfloor{ @@ -2312,7 +2314,10 @@ dir = 8; pixel_x = 24 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/debris/cleanable/cobweb{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "gO" = ( /obj/machinery/power/apc{ @@ -2365,23 +2370,41 @@ /area/maintenance/substation/cargo) "gU" = ( /obj/machinery/holopad, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "gV" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/item/radio/intercom{ pixel_y = -24 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "gW" = ( /turf/simulated/wall/prepainted, /area/maintenance/dormitory) "gX" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/wood/hardwood, /area/crew_quarters/kitchen) +"hb" = ( +/obj/effect/floor_decal/corner/orange/diagonal, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) +"hc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/cult, +/area/crew_quarters/bar) "hd" = ( /obj/structure/table/marble, /obj/item/material/knife/butch, @@ -2460,7 +2483,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "hn" = ( /obj/effect/floor_decal/techfloor, @@ -2611,9 +2634,9 @@ /turf/simulated/floor/plating, /area/quartermaster/qm) "hL" = ( -/obj/structure/table/marble, /obj/machinery/microwave, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "hM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2681,14 +2704,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) -"hX" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/hydroponics) "hY" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, @@ -2722,7 +2737,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "ig" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 9 }, /turf/simulated/floor/carpet/bcarpet, @@ -2837,14 +2852,11 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "ix" = ( -/obj/effect/floor_decal/techfloor{ - dir = 5 - }, /obj/structure/closet/firecloset, -/turf/simulated/floor/tiled, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "iy" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/wood/hardwood, /area/hydroponics) "iz" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -2856,13 +2868,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/dormitory) -"iA" = ( -/obj/structure/table/marble, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/bar) "iB" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2908,7 +2913,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "iH" = ( /obj/machinery/computer/supplycomp/control{ @@ -2917,20 +2922,11 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "iI" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/item/stool/padded, -/turf/simulated/floor/carpet/bcarpet, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/bar) "iJ" = ( /obj/machinery/status_display/supply_display{ @@ -2977,7 +2973,7 @@ desc = "Ah, it's Pete. They're not known for their pleasant disposition and now they're gonna eat all your plants."; name = "Pete" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "iR" = ( /obj/structure/cable/green{ @@ -3046,8 +3042,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor, -/turf/simulated/floor/tiled, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "jb" = ( /obj/structure/railing{ @@ -3061,10 +3056,8 @@ pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "jd" = ( /obj/machinery/light{ @@ -3081,10 +3074,13 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "jg" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/bed/chair/sofa/black/right, +/obj/structure/bed/chair/pew/left, +/obj/structure/window/phoronbasic{ + dir = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "ji" = ( @@ -3153,7 +3149,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "jp" = ( /obj/machinery/door/firedoor, @@ -3175,17 +3171,17 @@ /turf/simulated/floor/plating, /area/vacant/vacant_shop) "ju" = ( -/obj/structure/table/marble, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/table/hardwoodtable, /obj/machinery/door/blast/shutters{ dir = 8; id = "kitchen-c"; layer = 3.3; name = "Kitchen Service Shutters" }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "jv" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, @@ -3319,9 +3315,7 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/station/stairs_two) "jT" = ( @@ -3437,6 +3431,10 @@ /obj/structure/table/marble, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"kg" = ( +/obj/effect/debris/cleanable/blood/drip, +/turf/simulated/floor/wood, +/area/crew_quarters/kitchen) "ki" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_1) @@ -3496,7 +3494,7 @@ /obj/structure/sign/directions/evac{ dir = 4 }, -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/cult, /area/crew_quarters/barrestroom) "kw" = ( /obj/structure/bed/chair/comfy/teal{ @@ -3514,8 +3512,12 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) +"kz" = ( +/obj/effect/debris/cleanable/blood, +/turf/simulated/floor/cult, +/area/crew_quarters/barrestroom) "kA" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/sign/directions/roomnum{ @@ -3588,7 +3590,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "kJ" = ( /obj/structure/cable/green{ @@ -3624,15 +3626,9 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "kO" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "kP" = ( /obj/structure/extinguisher_cabinet{ @@ -3675,17 +3671,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) "la" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, /obj/machinery/air_alarm{ dir = 4; pixel_x = -22 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "lb" = ( /obj/structure/cable/green{ @@ -3715,9 +3705,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "ld" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/station/stairs_two) "le" = ( @@ -3782,16 +3770,10 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "lm" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "ln" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -3910,7 +3892,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "lP" = ( /obj/machinery/power/apc{ @@ -3972,6 +3954,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "lY" = ( @@ -3979,7 +3962,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "lZ" = ( /obj/structure/cable{ @@ -4010,7 +3993,8 @@ /obj/machinery/computer/security/telescreen{ pixel_x = 32 }, -/turf/simulated/floor/wood, +/obj/structure/flora/pumpkin/carved/owo, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "mg" = ( /obj/structure/flora/pottedplant/subterranean, @@ -4040,6 +4024,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "mo" = ( @@ -4058,7 +4043,7 @@ /obj/machinery/door/airlock{ name = "Restroom" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "mq" = ( /obj/structure/undies_wardrobe, @@ -4078,7 +4063,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "mv" = ( /obj/structure/lattice, @@ -4181,7 +4166,7 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/refinery) "mM" = ( -/obj/structure/bed/chair/comfy/blue{ +/obj/structure/bed/chair/wood{ dir = 4 }, /turf/simulated/floor/carpet/bcarpet, @@ -4212,10 +4197,6 @@ /obj/machinery/camera/network/civilian, /turf/simulated/open, /area/station/stairs_two) -"mS" = ( -/obj/effect/floor_decal/borderfloorblack, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) "mT" = ( /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled, @@ -4261,7 +4242,7 @@ pixel_x = -27 }, /obj/machinery/holopad, -/obj/effect/floor_decal/spline/fancy/wood, +/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "mZ" = ( @@ -4294,7 +4275,7 @@ /area/maintenance/dormitory) "nd" = ( /obj/machinery/appliance/cooker/oven, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "ne" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -4330,16 +4311,10 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "no" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, /obj/structure/closet/crate/bin{ anchored = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "nq" = ( /obj/machinery/newscaster{ @@ -4392,6 +4367,9 @@ dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/port) "nz" = ( @@ -4427,13 +4405,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/crystal, /area/station/stairs_two) -"nE" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hydroponics) "nF" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -4526,10 +4497,9 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "nR" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/turf/simulated/floor/carpet/bcarpet, +/obj/structure/table/bench/marble, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "nS" = ( /obj/structure/table/marble, @@ -4600,7 +4570,8 @@ /obj/machinery/chemical_dispenser/catering/bar_soft{ pixel_y = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "og" = ( /obj/machinery/firealarm{ @@ -4644,7 +4615,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "oj" = ( /obj/structure/lattice, @@ -4665,9 +4636,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/suit_storage_unit/mining{ - boots_stored_TYPE = /obj/item/clothing/shoes/magboots - }, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/storage) "ol" = ( @@ -4713,7 +4682,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "ou" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4877,27 +4846,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "oS" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, /obj/machinery/camera/network/civilian{ dir = 8 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, /area/hydroponics) "oT" = ( -/obj/structure/table/marble, /obj/machinery/reagentgrinder, /obj/item/reagent_containers/glass/rag, /obj/machinery/camera/network/civilian{ dir = 4 }, +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "oU" = ( @@ -4931,7 +4896,7 @@ req_one_access = list(28) }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "oY" = ( /obj/structure/table/rack, @@ -4939,9 +4904,6 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "pa" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -5098,9 +5060,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) "py" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 2; id = "cafe"; @@ -5117,12 +5077,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "pA" = ( -/obj/structure/window/basic, /obj/landmark/observer_spawn, -/obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/bed/chair/sofa/black{ +/obj/effect/floor_decal/spline/plain, +/obj/structure/bed/chair/pew{ dir = 1 }, +/obj/structure/window/phoronbasic, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "pB" = ( @@ -5131,7 +5091,7 @@ name = "Station Intercom (General)"; pixel_y = 21 }, -/obj/structure/bed/chair/comfy/blue{ +/obj/structure/bed/chair/wood{ dir = 8 }, /turf/simulated/floor/carpet/bcarpet, @@ -5146,19 +5106,6 @@ "pD" = ( /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/refinery) -"pH" = ( -/obj/structure/table/marble, -/obj/machinery/door/blast/shutters{ - dir = 8; - id = "kitchen"; - layer = 3.3; - name = "Kitchen Service Shutters" - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/kitchen) "pJ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5241,7 +5188,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "pV" = ( /obj/structure/bed/chair{ @@ -5305,16 +5252,16 @@ dir = 8; icon_state = "pipe-c" }, -/obj/structure/window/basic{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 5 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/bed/chair/pew/right, +/obj/structure/window/phoronbasic{ + dir = 1 }, -/obj/structure/bed/chair/sofa/black/left, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "qe" = ( @@ -5366,9 +5313,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "ql" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 2; id = "cafe"; @@ -5384,6 +5329,13 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled, /area/hallway/primary/port) +"qn" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/cult, +/area/crew_quarters/bar) "qq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -5395,17 +5347,15 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "qr" = ( -/obj/structure/table/marble, +/obj/machinery/door/firedoor, +/obj/structure/table/hardwoodtable, /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen-c"; layer = 3.3; name = "Kitchen Service Shutters" }, -/obj/machinery/door/firedoor{ - dir = 2 - }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "qt" = ( /obj/machinery/conveyor{ @@ -5499,7 +5449,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "qK" = ( /turf/simulated/shuttle/wall/voidcraft/blue, @@ -5508,7 +5458,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/structure/table/marble, /obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, @@ -5532,7 +5481,8 @@ pixel_x = 8; pixel_y = 16 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "qM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5677,16 +5627,17 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "rg" = ( -/obj/structure/table/marble, /obj/item/storage/box/wings, /obj/machinery/door/firedoor, +/obj/machinery/recharger, +/obj/structure/table/hardwoodtable, /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; layer = 3.3; name = "Bar Shutters" }, -/obj/machinery/recharger, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "rh" = ( @@ -5780,10 +5731,10 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "rt" = ( -/obj/structure/window/basic, -/obj/structure/bed/chair/sofa/black{ +/obj/structure/bed/chair/pew{ dir = 1 }, +/obj/structure/window/phoronbasic, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "ru" = ( @@ -5816,6 +5767,7 @@ }, /obj/landmark/spawnpoint/job/bartender, /obj/item/stool/padded, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "rz" = ( @@ -5835,20 +5787,17 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "rD" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "rF" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "rG" = ( /obj/structure/cable/green{ @@ -6027,7 +5976,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "sh" = ( /turf/simulated/floor/wood, @@ -6161,23 +6110,19 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "sB" = ( -/obj/structure/table/marble, /obj/item/material/knife/butch, /obj/item/material/kitchen/rollingpin, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "sC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "sD" = ( /obj/structure/cable/green{ @@ -6248,7 +6193,10 @@ /obj/structure/mirror{ pixel_x = -28 }, -/turf/simulated/floor/tiled/white, +/obj/effect/debris/cleanable/cobweb{ + dir = 8 + }, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "sK" = ( /obj/effect/shuttle_landmark/triumph/deck2/starboard, @@ -6381,18 +6329,15 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "ti" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 5 - }, /obj/structure/sink/kitchen{ dir = 8; name = "sink"; pixel_x = 13 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/wood, /area/hydroponics) "tj" = ( /obj/machinery/shower{ @@ -6456,8 +6401,8 @@ icon_state = "superjuke-nopower"; state_base = "superjuke" }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) @@ -6514,13 +6459,15 @@ /area/quartermaster/warehouse) "tB" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/machinery/firealarm{ dir = 1; pixel_y = -25 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "tD" = ( /obj/random/trash_pile, @@ -6585,17 +6532,17 @@ /turf/simulated/floor/tiled, /area/maintenance/dormitory) "tN" = ( -/obj/structure/table/marble, /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/table/hardwoodtable, /obj/machinery/door/blast/shutters{ dir = 8; id = "kitchen"; layer = 3.3; name = "Kitchen Service Shutters" }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "tQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6615,7 +6562,7 @@ /area/maintenance/dormitory) "tW" = ( /obj/machinery/appliance/mixer/cereal, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "tY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6668,7 +6615,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "uf" = ( /obj/machinery/firealarm{ @@ -6738,7 +6685,7 @@ name = "xeno_spawn"; pixel_x = -1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "un" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -6771,14 +6718,8 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "us" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, /obj/machinery/seed_extractor, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "ut" = ( /obj/structure/toilet{ @@ -6802,7 +6743,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/triumph/surfacebase/mining_main/refinery) "ux" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, +/turf/simulated/wall/cult, /area/triumph/surfacebase/bar_backroom) "uz" = ( /obj/machinery/firealarm{ @@ -6831,6 +6772,13 @@ "uD" = ( /turf/simulated/wall/prepainted/civilian, /area/maintenance/substation/cargo) +"uF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/kitchen) "uG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6873,15 +6821,9 @@ /turf/simulated/floor/tiled, /area/maintenance/bar/lower) "uK" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, /obj/machinery/camera/network/civilian, /obj/machinery/honey_extractor, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "uN" = ( /turf/simulated/floor/holofloor/tiled/dark, @@ -6951,6 +6893,12 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) +"uW" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/kitchen) "uX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -6958,19 +6906,11 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "uY" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/wood, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "va" = ( /obj/structure/railing, @@ -7025,6 +6965,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "vf" = ( @@ -7119,7 +7060,7 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "vo" = ( -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "vp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7174,16 +7115,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "vt" = ( -/obj/structure/window/basic{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/structure/bed/chair/pew, +/obj/structure/window/phoronbasic{ dir = 1 }, -/obj/structure/bed/chair/sofa/black, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "vv" = ( @@ -7382,8 +7323,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock{ - name = "Restroom"; - id_tag = "restroom ad" + id_tag = "restroom ad"; + name = "Restroom" }, /turf/simulated/floor/tiled/white, /area/station/stairs_two) @@ -7425,7 +7366,7 @@ /turf/simulated/floor/wood, /area/triumph/surfacebase/bar_backroom) "wb" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/cult, /area/crew_quarters/barrestroom) "wc" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -7512,6 +7453,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/bar) "wu" = ( @@ -7530,7 +7474,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 4 }, /turf/simulated/floor/carpet/bcarpet, @@ -7590,6 +7534,7 @@ "wB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "wC" = ( @@ -7622,6 +7567,7 @@ /area/crew_quarters/sleep/Dorm_11) "wE" = ( /obj/machinery/chem_master/condimaster, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "wF" = ( @@ -7642,7 +7588,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "wH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -7657,16 +7603,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) -"wJ" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hydroponics) "wK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/ai_status_display{ @@ -7741,16 +7677,17 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "wX" = ( -/obj/structure/table/marble, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/table/hardwoodtable, /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; layer = 3.3; name = "Bar Shutters" }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "wZ" = ( @@ -7824,10 +7761,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, -/turf/simulated/floor/carpet/bcarpet, +/obj/structure/table/bench/marble, +/obj/effect/floor_decal/corner/orange/diagonal, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "xh" = ( /obj/structure/cable/green{ @@ -7857,11 +7793,11 @@ /turf/simulated/floor/crystal, /area/station/stairs_two) "xj" = ( -/obj/effect/floor_decal/techfloor{ - dir = 10 - }, /obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/tiled, +/obj/effect/debris/cleanable/cobweb{ + dir = 8 + }, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "xk" = ( /obj/machinery/newscaster{ @@ -7870,10 +7806,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) "xl" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "xm" = ( /obj/structure/closet/crate/trashcart, @@ -7952,11 +7895,11 @@ dir = 10 }, /obj/machinery/button/remote/airlock{ + dir = 8; id = "mine_black"; name = "Door Lock"; - specialfunctions = 4; - dir = 8; - pixel_x = 24 + pixel_x = 24; + specialfunctions = 4 }, /turf/simulated/floor/tiled/white, /area/station/stairs_two) @@ -7965,9 +7908,7 @@ dir = 8; pixel_x = 25 }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 2; id = "cafe"; @@ -8013,6 +7954,7 @@ desc = "The bartenders newest pet on the station. They seem like they want to help you out."; name = "Brewster" }, +/obj/effect/debris/cleanable/cobweb2, /turf/simulated/floor/wood, /area/triumph/surfacebase/bar_backroom) "xE" = ( @@ -8021,29 +7963,23 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) +"xH" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/bar) "xI" = ( /obj/landmark/spawnpoint/latejoin/station/cryogenics, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) -"xK" = ( -/obj/item/stool/padded, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet/bcarpet, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +"xK" = ( +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/bar) "xL" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -8133,7 +8069,7 @@ /obj/machinery/door/airlock{ name = "Restroom" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "yb" = ( /obj/machinery/light, @@ -8221,7 +8157,8 @@ pixel_x = -24; pixel_y = -10 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/debris/cleanable/blood, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "yn" = ( /obj/effect/floor_decal/borderfloor{ @@ -8295,7 +8232,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "yw" = ( /obj/structure/cable{ @@ -8310,7 +8247,7 @@ /turf/simulated/floor/wood, /area/quartermaster/foyer) "yx" = ( -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "yy" = ( /obj/machinery/firealarm{ @@ -8320,8 +8257,8 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "yz" = ( -/obj/structure/table/marble, -/turf/simulated/floor/tiled, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "yA" = ( /obj/effect/floor_decal/techfloor{ @@ -8348,12 +8285,6 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "yD" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, @@ -8363,7 +8294,10 @@ /obj/structure/closet/secure_closet/hydroponics{ req_access = list(28) }, -/turf/simulated/floor/tiled, +/obj/item/clothing/under/scarecrow, +/obj/item/clothing/mask/gas/scarecrow, +/obj/item/clothing/head/scarecrow, +/turf/simulated/floor/wood, /area/hydroponics) "yE" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -8466,7 +8400,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/structure/table/marble, /obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, @@ -8491,7 +8424,8 @@ pixel_x = 8; pixel_y = 16 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "yR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -8577,6 +8511,12 @@ "zc" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/triumph/surfacebase/mining_main/uxstorage) +"zd" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/cult, +/area/crew_quarters/bar) "ze" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -8591,6 +8531,7 @@ "zf" = ( /obj/item/stool/padded, /obj/landmark/spawnpoint/job/bartender, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "zg" = ( @@ -8635,7 +8576,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/obj/effect/debris/cleanable/blood/drip, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "zk" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -8678,7 +8620,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "zq" = ( /obj/structure/cable/green{ @@ -8706,7 +8648,7 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "zs" = ( -/obj/effect/floor_decal/spline/fancy/wood, +/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "zt" = ( @@ -8733,11 +8675,19 @@ /turf/simulated/floor/tiled, /area/crew_quarters/lounge/kitchen_freezer) "zB" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "zD" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -8783,12 +8733,32 @@ id = "barsign1"; pixel_y = 24 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled, /area/hallway/primary/port) "zK" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"zL" = ( +/obj/machinery/door/window/westright{ + name = "Service Counter"; + req_access = list(25); + req_one_access = list(25) + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/kitchen) "zM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8866,12 +8836,15 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/effect/floor_decal/corner/purple/diagonal, +/obj/effect/debris/cleanable/cobweb, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "zZ" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/structure/flora/pumpkin/carved/girly, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "Aa" = ( @@ -8943,7 +8916,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Ah" = ( /obj/structure/closet/hydrant{ @@ -8975,7 +8948,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "Am" = ( /obj/structure/cable/green{ @@ -9167,7 +9140,7 @@ name = "Kitchen"; req_one_access = list(28) }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "AO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9255,6 +9228,10 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/bar) +"Be" = ( +/obj/effect/debris/cleanable/blood, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/freezer) "Bf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9413,7 +9390,8 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/debris/cleanable/blood, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "BO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -9421,7 +9399,7 @@ }, /obj/landmark/spawnpoint/job/botanist, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "BP" = ( /obj/machinery/firealarm{ @@ -9450,7 +9428,7 @@ /obj/item/packageWrap, /obj/item/packageWrap, /obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "BS" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ @@ -9491,7 +9469,7 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "Cc" = ( /obj/effect/floor_decal/techfloor, @@ -9752,17 +9730,11 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "CT" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "CU" = ( /turf/simulated/floor/tiled/dark, @@ -9796,13 +9768,10 @@ /area/hallway/primary/starboard) "CY" = ( /obj/machinery/smartfridge/food, -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/wood/hardwood, /area/crew_quarters/kitchen) "CZ" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "Da" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9845,6 +9814,7 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "De" = ( @@ -9867,7 +9837,7 @@ /area/quartermaster/warehouse) "Dh" = ( /obj/machinery/holopad/ship, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "Dj" = ( /turf/simulated/wall/prepainted, @@ -9882,12 +9852,6 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/port) "Dl" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, /obj/machinery/camera/network/civilian{ dir = 4 }, @@ -9895,7 +9859,7 @@ layer = 3.3; pixel_x = -27 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "Dm" = ( /obj/structure/closet/secure_closet/quartermaster, @@ -9926,15 +9890,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) -"Dv" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/borderfloorblack, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) "Dw" = ( /obj/structure/table/woodentable, /obj/machinery/reagentgrinder, @@ -10104,7 +10059,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/lounge/kitchen_freezer) "DY" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/cult, /area/crew_quarters/bar) "DZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10123,10 +10078,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) -"Eb" = ( -/obj/item/stool/padded, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "Ec" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Deck 2 Subgrid"; @@ -10196,12 +10147,12 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area_hallway) "En" = ( -/obj/structure/table/marble, /obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Eo" = ( /obj/machinery/air_alarm{ @@ -10211,15 +10162,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/crew_quarters/lounge/kitchen_freezer) -"Ep" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) "Eq" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10228,10 +10170,10 @@ dir = 1; pixel_y = -24 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, -/obj/structure/bed/chair/sofa/black/right{ +/obj/structure/bed/chair/pew/right{ dir = 1 }, /turf/simulated/floor/carpet/bcarpet, @@ -10284,33 +10226,25 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/machinery/suit_storage_unit/mining{ - boots_stored_TYPE = /obj/item/clothing/shoes/magboots - }, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/storage) "EA" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "EB" = ( /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, /obj/structure/closet/crate/bin{ anchored = 1 }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "ED" = ( @@ -10392,7 +10326,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "ES" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -10493,7 +10427,8 @@ /area/crew_quarters/lounge/kitchen_freezer) "Fi" = ( /obj/machinery/light, -/turf/simulated/floor/tiled/dark, +/obj/effect/debris/cleanable/blood, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Fk" = ( /obj/machinery/camera/network/civilian{ @@ -10511,16 +10446,16 @@ "Fm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/obj/structure/window/basic, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/bed/chair/sofa/black/right{ +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/obj/structure/bed/chair/pew/right{ dir = 1 }, +/obj/structure/window/phoronbasic, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "Fo" = ( @@ -10552,6 +10487,7 @@ /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "Ft" = ( @@ -10839,9 +10775,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) -"Gn" = ( -/turf/simulated/floor/tiled, -/area/crew_quarters/kitchen) "Go" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -10857,7 +10790,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Gr" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -10947,7 +10880,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "GH" = ( /obj/machinery/door/firedoor, @@ -10998,13 +10931,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "GO" = ( -/obj/structure/window/basic{ - dir = 1 - }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 9 }, -/obj/structure/bed/chair/sofa/black/right, +/obj/structure/bed/chair/pew/left, +/obj/structure/window/phoronbasic{ + dir = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "GP" = ( @@ -11038,7 +10971,7 @@ /area/crew_quarters/sleep/Dorm_10) "GU" = ( /obj/machinery/smartfridge/drinks, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/cult, /area/crew_quarters/bar) "GV" = ( /obj/structure/undies_wardrobe, @@ -11146,9 +11079,7 @@ dir = 1 }, /obj/machinery/camera/network/cargo, -/obj/machinery/suit_storage_unit/mining{ - boots_stored_TYPE = /obj/item/clothing/shoes/magboots - }, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/storage) "Hk" = ( @@ -11208,21 +11139,21 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 4 }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "Ht" = ( /obj/machinery/appliance/mixer/candy, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Hu" = ( -/obj/structure/table/marble, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Hv" = ( /obj/structure/coatrack, @@ -11299,7 +11230,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/effect/debris/cleanable/blood/drip, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "HJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11341,9 +11273,6 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/coffee_shop) -"HO" = ( -/turf/simulated/wall/prepainted/civilian, -/area/maintenance/bar/lower) "HQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ @@ -11388,16 +11317,16 @@ /area/quartermaster/office) "Ia" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/window/basic, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/bed/chair/sofa/black/right{ +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/bed/chair/pew/right{ dir = 1 }, +/obj/structure/window/phoronbasic, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "Ib" = ( @@ -11490,7 +11419,7 @@ "Is" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "It" = ( /obj/effect/floor_decal/industrial/warning{ @@ -11594,12 +11523,6 @@ /obj/machinery/vending/nifsoft_shop, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) -"IJ" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/bar) "IK" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -11651,24 +11574,26 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "IP" = ( -/obj/structure/table/marble, /obj/machinery/chemical_dispenser/catering/bar_soft{ dir = 4 }, +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "IR" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 10 +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/spline/plain{ + dir = 9 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/effect/debris/cleanable/cobweb2{ + dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/outdoors/mud, /area/hydroponics) "IS" = ( /obj/structure/table/woodentable, @@ -11741,15 +11666,16 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/refinery) "Je" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, +/obj/structure/flora/pumpkin/carved, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "Jf" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -11772,7 +11698,7 @@ /obj/structure/sign/directions/evac{ dir = 8 }, -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/wood/hardwood, /area/hallway/primary/port) "Ji" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11786,7 +11712,6 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "Jo" = ( -/obj/structure/table/marble, /obj/machinery/reagentgrinder, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -11795,7 +11720,8 @@ pixel_x = 5 }, /obj/item/reagent_containers/dropper, -/turf/simulated/floor/tiled, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Jp" = ( /obj/structure/reagent_dispensers/fueltank, @@ -11834,7 +11760,7 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "Jy" = ( /obj/machinery/power/apc{ @@ -11880,6 +11806,7 @@ "JE" = ( /obj/item/stool/padded, /obj/item/toy/plushie/deer, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "JF" = ( @@ -11989,7 +11916,8 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/tiled, +/obj/effect/debris/cleanable/blood/drip, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "JS" = ( /obj/machinery/light, @@ -12031,16 +11959,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "Ka" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/bar) "Kb" = ( /obj/structure/cable/green{ @@ -12072,6 +11994,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "Ke" = ( @@ -12082,11 +12005,6 @@ /obj/item/paper_bin, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"Kh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/hydroponics) "Ki" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12162,6 +12080,9 @@ pixel_x = -30 }, /obj/fiftyspawner/steel, +/obj/effect/debris/cleanable/cobweb{ + dir = 8 + }, /turf/simulated/floor/wood, /area/triumph/surfacebase/bar_backroom) "Kq" = ( @@ -12185,19 +12106,14 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "Kt" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, /obj/machinery/light{ dir = 4 }, /obj/machinery/light_switch{ pixel_x = 25 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, /area/hydroponics) "Kv" = ( /obj/structure/window/basic{ @@ -12215,16 +12131,16 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "Kz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 5 - }, /obj/structure/closet/secure_closet/hydroponics{ req_access = list(28) }, -/turf/simulated/floor/tiled, +/obj/item/clothing/under/scarecrow, +/obj/item/clothing/mask/gas/scarecrow, +/obj/item/clothing/head/scarecrow, +/obj/effect/debris/cleanable/cobweb{ + dir = 1 + }, +/turf/simulated/floor/wood, /area/hydroponics) "KB" = ( /obj/structure/ladder/up, @@ -12243,11 +12159,9 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/refinery) "KD" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "KE" = ( /obj/machinery/recharge_station, @@ -12260,20 +12174,20 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "KG" = ( -/obj/structure/window/basic, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/bed/chair/sofa/black/left{ +/obj/structure/bed/chair/pew/left{ dir = 1 }, +/obj/structure/window/phoronbasic, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "KH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "KI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12428,7 +12342,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "Lg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12470,6 +12384,7 @@ /turf/simulated/wall/r_wall/prepainted/cargo, /area/triumph/surfacebase/mining_main/eva) "Ln" = ( +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "Lq" = ( @@ -12497,6 +12412,10 @@ /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) +"Lt" = ( +/obj/effect/debris/cleanable/blood, +/turf/simulated/floor/wood, +/area/crew_quarters/kitchen) "Lv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -12505,6 +12424,9 @@ /area/crew_quarters/showers) "Lw" = ( /obj/machinery/chem_master/condimaster, +/obj/effect/debris/cleanable/cobweb{ + dir = 4 + }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "Lx" = ( @@ -12515,11 +12437,8 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "Ly" = ( -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, /obj/structure/closet/emcloset, -/turf/simulated/floor/tiled, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "Lz" = ( /obj/structure/cable/green{ @@ -12666,7 +12585,13 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "LR" = ( -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "LU" = ( /obj/machinery/power/solar, @@ -12804,7 +12729,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Mt" = ( /obj/item/storage/toolbox/mechanical, @@ -12850,15 +12775,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) -"MH" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "MJ" = ( /obj/machinery/light{ @@ -12916,7 +12833,7 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "MO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13055,6 +12972,12 @@ /obj/structure/bed/chair/comfy/teal, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) +"Nf" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/kitchen) "Ng" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -13141,7 +13064,7 @@ "Np" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/cult, /area/crew_quarters/bar) "Nq" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -13246,10 +13169,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/port) -"NC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/hydroponics) "ND" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/computer/guestpass{ @@ -13258,6 +13177,13 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) +"NF" = ( +/obj/structure/closet/secure_closet/freezer/meat{ + anchored = 1 + }, +/obj/effect/debris/cleanable/cobweb2, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/freezer) "NH" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) @@ -13291,6 +13217,14 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/dormitory) +"NL" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/turf/simulated/floor/outdoors/mud, +/area/hydroponics) "NM" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -13345,13 +13279,13 @@ "NZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/marble, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, /obj/item/hand_labeler, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Oa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -13360,10 +13294,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "Oc" = ( /obj/machinery/light/small{ @@ -13437,14 +13371,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "Op" = ( -/obj/machinery/computer/arcade/orion_trail, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/carpet/bcarpet, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/bar) "Os" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -13474,13 +13401,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "Ov" = ( -/obj/structure/table/marble, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "bar"; - layer = 3.3; - name = "Bar Shutters" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -13490,6 +13410,14 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/table/hardwoodtable, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "bar"; + layer = 3.3; + name = "Bar Shutters" + }, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "Ow" = ( @@ -13583,15 +13511,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) -"OF" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloorblack, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) "OG" = ( /turf/simulated/floor/wood, /area/triumph/surfacebase/bar_backroom) @@ -13611,7 +13530,7 @@ /area/hydroponics) "OJ" = ( /obj/machinery/vending/hydronutrients, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/wood, /area/hydroponics) "OK" = ( /obj/machinery/door/airlock{ @@ -13628,7 +13547,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "OL" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -13723,7 +13642,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Pa" = ( /turf/simulated/floor/tiled, @@ -13765,7 +13684,7 @@ /obj/structure/table/standard, /obj/structure/bedsheetbin, /obj/random/soap, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "Pj" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -13785,9 +13704,8 @@ req_access = list(25); req_one_access = list(25) }, -/obj/machinery/door/firedoor{ - dir = 2 - }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "Pm" = ( @@ -14000,17 +13918,14 @@ }, /turf/simulated/floor/crystal, /area/station/stairs_two) -"PN" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, -/area/crew_quarters/bar) "PO" = ( -/obj/structure/window/basic, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 10 }, -/obj/structure/bed/chair/sofa/black/left{ +/obj/structure/bed/chair/pew/left{ dir = 1 }, +/obj/structure/window/phoronbasic, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "PR" = ( @@ -14020,7 +13935,10 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "PS" = ( -/obj/structure/bed/chair/sofa/black, +/obj/structure/bed/chair/pew, +/obj/structure/window/phoronbasic{ + dir = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "PT" = ( @@ -14036,7 +13954,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "PU" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 5 }, /turf/simulated/floor/carpet/bcarpet, @@ -14083,10 +14001,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "Qf" = ( /obj/machinery/power/smes/buildable{ @@ -14152,6 +14067,17 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/port) +"Qo" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/structure/mirror{ + pixel_x = -28 + }, +/turf/simulated/floor/cult, +/area/crew_quarters/barrestroom) "Qp" = ( /turf/simulated/floor/tiled, /area/crew_quarters/bar) @@ -14163,10 +14089,9 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "Qs" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Qt" = ( /obj/machinery/light{ @@ -14191,20 +14116,24 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "Qz" = ( -/obj/structure/table/marble, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/item/flame/candle/candelabra/everburn{ + pixel_x = -16; + pixel_y = 6 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "QA" = ( /obj/machinery/door/airlock{ name = "Cyborg Recharging" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "QE" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/wood/hardwood, /area/maintenance/dormitory) "QG" = ( /obj/landmark/spawnpoint/job/cargo_technician, @@ -14228,6 +14157,7 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "QK" = ( @@ -14280,7 +14210,7 @@ /obj/machinery/door/airlock/glass{ name = "Bar" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "QS" = ( /obj/machinery/air_alarm{ @@ -14367,7 +14297,7 @@ "Rh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "Ri" = ( /obj/structure/cable/green{ @@ -14475,6 +14405,20 @@ /obj/machinery/scale, /turf/simulated/floor/wood, /area/crew_quarters/fitness) +"Ru" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/table/hardwoodtable, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "bar"; + layer = 3.3; + name = "Bar Shutters" + }, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "Rw" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -14522,17 +14466,11 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "RC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 9 - }, /obj/machinery/light{ dir = 1 }, /obj/machinery/biogenerator, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "RD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -14644,12 +14582,8 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "RS" = ( -/obj/structure/table/marble, /obj/item/storage/pill_bottle/dice_nerd, /obj/item/deck/cards, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, /obj/machinery/light, /obj/item/deck/unus{ pixel_x = 7 @@ -14657,6 +14591,10 @@ /obj/item/deck/cah{ pixel_x = -8 }, +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "RT" = ( @@ -14725,13 +14663,13 @@ "Sb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/table/marble, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "Sc" = ( @@ -14759,8 +14697,10 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "Sf" = ( -/obj/item/stool/padded, -/turf/simulated/floor/tiled/dark, +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Sh" = ( /turf/simulated/floor/wood, @@ -14795,13 +14735,11 @@ pixel_y = -24 }, /obj/machinery/recipe_lookup/drinks{ - pixel_x = -32; + pixel_x = -32 }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/bar) -"Sm" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/orange/diagonal, +/obj/effect/debris/cleanable/cobweb2{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) @@ -14816,7 +14754,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "Sq" = ( /obj/structure/cable{ @@ -14865,7 +14803,7 @@ /turf/simulated/wall/r_wall/prepainted, /area/maintenance/cargo) "Sx" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, +/turf/simulated/wall/cult, /area/maintenance/bar/lower) "Sy" = ( /obj/structure/extinguisher_cabinet{ @@ -14879,9 +14817,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/port) -"SA" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, -/area/hallway/primary/port) "SC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -14950,9 +14885,12 @@ dir = 1; pixel_y = -22 }, -/obj/structure/bed/chair/sofa/left{ +/obj/structure/bed/chair/pew/left{ dir = 1 }, +/obj/effect/debris/cleanable/cobweb2{ + dir = 8 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "SK" = ( @@ -14984,10 +14922,6 @@ /obj/machinery/computer/ship/engines, /turf/simulated/floor/airless, /area/shuttle/mining_ship/general) -"SQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/kitchen) "SR" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15006,7 +14940,7 @@ /area/quartermaster/warehouse) "ST" = ( /obj/machinery/smartfridge/drying_rack, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/wood, /area/hydroponics) "SU" = ( /obj/machinery/door/airlock/glass{ @@ -15101,10 +15035,10 @@ /obj/item/radio/intercom{ pixel_y = -24 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 10 }, -/obj/structure/bed/chair/sofa/black/left{ +/obj/structure/bed/chair/pew/left{ dir = 1 }, /turf/simulated/floor/carpet/bcarpet, @@ -15145,18 +15079,6 @@ "Tn" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/foyer) -"To" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hydroponics) "Tp" = ( /obj/structure/ladder/up, /obj/structure/railing, @@ -15190,14 +15112,19 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "Tw" = ( -/obj/structure/flora/pottedplant/orientaltree, /obj/machinery/computer/security/telescreen{ pixel_x = 32 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/debris/cleanable/cobweb2, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/bar) "Ty" = ( /obj/machinery/vending/boozeomat, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "TB" = ( @@ -15326,11 +15253,10 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "TY" = ( -/obj/structure/table/marble, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/flora/pottedplant/small, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "TZ" = ( @@ -15346,7 +15272,7 @@ "Ua" = ( /obj/machinery/seed_storage/garden, /obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/wood, /area/hydroponics) "Ub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15422,7 +15348,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Ul" = ( /obj/machinery/door/firedoor, @@ -15472,8 +15398,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "Uq" = ( -/obj/machinery/computer/arcade/battle, -/turf/simulated/floor/carpet/bcarpet, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/outdoors/mud, /area/crew_quarters/bar) "Us" = ( /obj/effect/floor_decal/techfloor{ @@ -15504,23 +15432,24 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "Uv" = ( -/obj/structure/table/marble, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/recharger, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "bar"; - layer = 3.3; - name = "Bar Shutters" - }, /obj/machinery/light{ dir = 1 }, /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/table/hardwoodtable, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "bar"; + layer = 3.3; + name = "Bar Shutters" + }, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "Uw" = ( @@ -15548,11 +15477,8 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "UC" = ( -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/obj/random/trash, -/turf/simulated/floor/tiled, +/obj/effect/debris/cleanable/blood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "UD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -15567,7 +15493,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "UF" = ( /obj/machinery/mech_recharger, @@ -15604,8 +15530,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/table/marble, /obj/machinery/chemical_dispenser/catering/bar_coffee, +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "UL" = ( @@ -15641,15 +15568,15 @@ /obj/machinery/computer/security/telescreen{ pixel_y = -32 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "UP" = ( -/obj/structure/table/marble, /obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "UQ" = ( /turf/simulated/floor/carpet/purcarpet, @@ -15689,7 +15616,7 @@ dir = 1; pixel_y = -24 }, -/obj/structure/bed/chair/sofa/black/right{ +/obj/structure/bed/chair/pew/right{ dir = 1 }, /turf/simulated/floor/carpet/bcarpet, @@ -15757,13 +15684,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/table/marble, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "Vf" = ( @@ -15826,8 +15753,9 @@ /obj/structure/sign/double/barsign{ pixel_y = 30 }, -/obj/structure/table/marble, /obj/machinery/chemical_dispenser/catering/bar_alc, +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "Vn" = ( @@ -15846,8 +15774,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) "Vr" = ( -/obj/structure/table/marble, -/obj/structure/flora/pottedplant/small, +/obj/structure/table/hardwoodtable, +/obj/item/flame/candle/candelabra/everburn{ + pixel_y = 6 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "Vt" = ( @@ -15870,7 +15800,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "Vy" = ( /obj/structure/extinguisher_cabinet{ @@ -15886,7 +15816,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "VB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -15896,7 +15826,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_11) "VC" = ( -/obj/structure/table/marble, +/obj/structure/table/hardwoodtable, +/obj/structure/spirit_board/prop, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "VD" = ( @@ -16028,16 +15959,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "VT" = ( -/obj/structure/window/basic{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain{ dir = 9 }, -/obj/structure/bed/chair/sofa/black/right, +/obj/structure/bed/chair/pew/left, +/obj/structure/window/phoronbasic{ + dir = 1 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "VU" = ( @@ -16046,6 +15977,11 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_office) +"VV" = ( +/obj/structure/table/hardwoodtable, +/obj/item/deck/tarot, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/bar) "VW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16146,15 +16082,16 @@ /area/crew_quarters/sleep/Dorm_11) "Wj" = ( /obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 4; + icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Wk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16165,9 +16102,10 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "Wl" = ( -/obj/structure/table/marble, /obj/item/reagent_containers/glass/rag, /obj/item/reagent_containers/food/drinks/shaker, +/obj/structure/table/hardwoodtable, +/obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "Wo" = ( @@ -16209,7 +16147,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/structure/bed/chair/sofa/left, +/obj/structure/bed/chair/pew/right, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "Wx" = ( @@ -16394,7 +16332,7 @@ /area/crew_quarters/sleep/Dorm_3) "Xc" = ( /obj/machinery/vending/dinnerware, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Xd" = ( /obj/item/radio/intercom{ @@ -16436,10 +16374,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/cult, /area/crew_quarters/bar) "Xi" = ( /obj/machinery/conveyor_switch/oneway{ @@ -16474,6 +16409,9 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"Xn" = ( +/turf/simulated/wall/wood/hardwood, +/area/hallway/primary/port) "Xo" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 @@ -16503,10 +16441,10 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "Xt" = ( -/obj/structure/table/marble, /obj/item/material/kitchen/rollingpin, /obj/item/material/knife/butch, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/hardwoodtable, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Xu" = ( /obj/structure/undies_wardrobe, @@ -16523,7 +16461,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/crew_quarters/kitchen) "Xy" = ( /obj/structure/closet/emcloset, @@ -16555,23 +16493,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/coffee_shop) -"XD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/window/westright{ - name = "Service Counter"; - req_access = list(25); - req_one_access = list(25) - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/kitchen) "XE" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -16619,19 +16540,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "XO" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, /obj/machinery/computer/ship/navigation/telescreen{ pixel_x = -32 }, /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "XP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -16685,7 +16600,7 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "XY" = ( -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/hydroponics) "Yb" = ( /obj/structure/cryofeed{ @@ -16877,8 +16792,8 @@ /turf/simulated/floor/wood, /area/station/stairs_two) "YE" = ( -/obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light, +/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "YF" = ( @@ -17067,12 +16982,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "Zi" = ( /obj/structure/sign/deck/second, -/turf/simulated/wall/r_wall/prepainted/civilian, +/turf/simulated/wall/wood/hardwood, /area/hallway/primary/port) +"Zk" = ( +/obj/item/storage/box/wings, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/table/hardwoodtable, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "bar"; + layer = 3.3; + name = "Bar Shutters" + }, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "Zl" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -17086,18 +17016,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) -"Zm" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hydroponics) "Zo" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -17116,7 +17034,7 @@ /turf/space, /area/space) "Zs" = ( -/turf/simulated/wall/prepainted/civilian, +/turf/simulated/wall/wood/hardwood, /area/crew_quarters/freezer) "Zt" = ( /obj/structure/cable/green{ @@ -17133,15 +17051,6 @@ }, /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/storage) -"Zv" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hydroponics) "Zw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17222,6 +17131,18 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) +"ZH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/cult, +/area/crew_quarters/bar) "ZI" = ( /obj/machinery/air_alarm{ dir = 4; @@ -17242,7 +17163,7 @@ /area/triumph/surfacebase/mining_main/storage) "ZL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "ZM" = ( /obj/machinery/light/small{ @@ -25961,20 +25882,20 @@ aG cW cW cW -PN +DY Nb Nb -PN +DY Nb Nb -PN +DY Nb -PN -PN +DY +DY Nb Nb Nb -PN +DY cW cW cW @@ -26155,7 +26076,7 @@ aG cW cW cW -PN +DY zX IP ds @@ -26168,7 +26089,7 @@ DY dB VC SJ -PN +DY cW cW cW @@ -26349,20 +26270,20 @@ aG cW cW cW -PN +DY Vm Ln -Ln +hb mn +hb Ln -Ln -Ln +hb Dd DY Wu -VC +VV UU -PN +DY cW cW cW @@ -26541,14 +26462,14 @@ HY HY HY Sx -PN -PN -PN +DY +DY +DY UK -Ln +hb Ln ve -wB +dr Fs Kd wB @@ -26734,7 +26655,7 @@ DT HY Bp Ky -HO +Sx bp mX Pl @@ -26748,15 +26669,15 @@ ry Ln QJ Sp -LR -LR +CZ +CZ Bf OG OG Gu RQ Kp -ar +ux Bb iT Ye @@ -26928,29 +26849,29 @@ DT HY Bx RU -HO +Sx mM YE GU Uv wX -de -wX +Zk wX +Ru de Ov wX rg -LR -LR +CZ +CZ UE -ar +ux Dw OG OG OG oc -ar +ux XI it Ye @@ -27122,29 +27043,29 @@ DT HY rY nF -HO +Sx dU zs Jx xg +nR bZ -bZ -bZ +nR bZ nR Xh -Ln -mS -LR -LR +CZ +CZ +CZ +CZ MN -ar +ux OG OG OG mG eU -ar +ux XI wd Ye @@ -27316,29 +27237,29 @@ DT HY eu ui -HO +Sx pB zs -LR +CZ iG -LR -LR -LR -LR -LR +CZ +CZ +CZ +CZ +CZ Xh -Ln -mS -LR -LR +CZ +CZ +CZ +CZ VA -ar +ux xD vG zi fK sE -ar +ux XI cx Ye @@ -27512,27 +27433,27 @@ bH ri Sx EB -nR -LR +xH +CZ VT -gx +TY KG jg -iA +TY PO Xh -Ln -mS +CZ +CZ GO TY Tg -ar -ar -ar -ar -ar +ux +ux +ux +ux +ux wa -ar +ux vz Gz Ye @@ -27709,14 +27630,14 @@ Is sC LR vt -VC +Vr rt PS Vr pA Xh Dh -mS +CZ bC Qz Eq @@ -27899,7 +27820,7 @@ dZ rj SI LX -zB +qn uY zB qd @@ -27910,13 +27831,13 @@ Sb Fm Qd fa -Dv -MH +MD +MD Al hk QR -Ep -IJ +ja +ja ja bK is @@ -28091,26 +28012,26 @@ Ye Ye HY xu -HO +Sx DY dE iI -LR -LR +ZH +CZ zp -LR +CZ mu -LR -LR +CZ +CZ Xh -Sm -mS -LR +VA +CZ +CZ Sp UO DY ix -Oc +zd UC DY Go @@ -28289,16 +28210,16 @@ JK DY Uq aT -LR -LR +ZH +CZ Le -LR +CZ Sp -LR -LR +CZ +CZ Xh -Sm -mS +VA +CZ ig RS DY @@ -28483,21 +28404,21 @@ Pj DY Op xK -LR -LR -LR -LR -LR -LR -LR +ZH +CZ +CZ +CZ +CZ +CZ +CZ Xh -Sm -mS +VA +CZ PU ts DY oi -sH +Qo sH wb DY @@ -28677,16 +28598,16 @@ EG DY Tw Ka -LR -Eb -Eb -Eb -Eb -Eb +hc +nR +bZ +nR +bZ +nR mf Oa Je -OF +MD IO MD mp @@ -28870,8 +28791,8 @@ kH op gX gX -XD -ju +gX +zL ju ju ju @@ -28886,7 +28807,7 @@ DY DY ue qJ -vo +kz vo wb wb @@ -29068,8 +28989,8 @@ Wj xl gU Sf -yx -yx +uW +Nf Fi gX nx @@ -29260,14 +29181,14 @@ gX of Uk jc -SQ Qs -yx +Qs +uF gh yx gX zI -DO +gl KM wb wb @@ -29454,8 +29375,8 @@ gX gX OK gX -pH -pH +tN +tN tN CY oX @@ -30039,7 +29960,7 @@ Ht Jo Gp En -Gn +yx yx qr eb @@ -30050,7 +29971,7 @@ RC la dI CT -Zv +XY XO Dl IR @@ -30233,8 +30154,8 @@ tW yz Xx UP -Gn yx +Lt qr sW oV @@ -30243,9 +30164,9 @@ VL us XY fJ -nE +NL rC -nE +NL XY eG iy @@ -30425,9 +30346,9 @@ BR kI Hu Xt -yx +kg hL -Gn +yx yx qr sW @@ -30437,9 +30358,9 @@ VL uK rC bE -nE +eG KH -nE +eG XY tB iy @@ -30617,11 +30538,11 @@ gL gX cv JR +Ms HH -HH -HH -HH -HH +Ms +Ms +Ms Ms AN ep @@ -30631,9 +30552,9 @@ VL dh KH ot -nE +gC KH -nE +eG XY eG iy @@ -30827,9 +30748,9 @@ KH bE OI yv -nE +gC XY -eG +gC iy Nq PX @@ -31022,7 +30943,7 @@ sf lY BO Rh -Kh +KD KD Tj nM @@ -31215,9 +31136,9 @@ yD no EA XY -nE +NL XY -eG +NL iy tM PX @@ -31395,11 +31316,11 @@ jH mV GE Gr -KU +Be KU Mo -bT -bT +Xn +Xn uj hO uj @@ -31407,9 +31328,9 @@ iy iy iy Ua -Zm +EA iQ -nE +eG XY gV iy @@ -31591,20 +31512,20 @@ xE Oj KU bh -bT -SA +Xn +Xn Zi Oz Qn TJ Zi -SA -bT +Xn +Xn OJ -To -NC -hX -bO +EA +XY +gC +XY eG iy Xe @@ -31779,13 +31700,13 @@ Ea JW UG Zs -wT +NF FZ xE Oj FZ Lw -bT +Xn xn qm sW @@ -31793,13 +31714,13 @@ LL pZ kb xn -bT +Xn ST ti oS Kt rF -wJ +gC iy sN PX @@ -31978,7 +31899,7 @@ Zs Zs Zs Zs -bT +Xn Jh HC On @@ -31987,8 +31908,8 @@ gn If jb Do -bT -bT +Xn +Xn iy iy iy From 11de2b9835df35e09f2f2d3a492d280713a0308d Mon Sep 17 00:00:00 2001 From: Captain277 Date: Thu, 28 Sep 2023 14:43:14 -0700 Subject: [PATCH 2/4] Map conflicts are tedious. --- maps/rift/levels/rift-05-surface2.dmm | 295 ++----------------- maps/rift/levels/rift-06-surface3.dmm | 393 +------------------------- 2 files changed, 43 insertions(+), 645 deletions(-) diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm index 237158259146..7ba2d1902681 100644 --- a/maps/rift/levels/rift-05-surface2.dmm +++ b/maps/rift/levels/rift-05-surface2.dmm @@ -709,7 +709,7 @@ pixel_x = -32 }, /obj/structure/cable/green{ - icon_state = "0-4" + icon_state = "0-2" }, /turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) @@ -1271,9 +1271,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/crew_quarters/coffee_shop) "aUD" = ( @@ -4134,6 +4131,9 @@ /obj/effect/floor_decal/spline/plain/corner{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "cMl" = ( @@ -7767,9 +7767,6 @@ }, /obj/structure/railing, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "fik" = ( @@ -7840,7 +7837,7 @@ }, /obj/machinery/computer/timeclock/premade/west, /obj/machinery/holopad, -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/cult, @@ -8772,20 +8769,11 @@ dir = 5 }, /obj/effect/floor_decal/spline/plain/corner, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "2-4" }, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "4-8" }, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) @@ -10419,9 +10407,6 @@ }, /obj/structure/cult/pylon, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-8" - }, /turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "gHJ" = ( @@ -11047,15 +11032,8 @@ /area/crew_quarters/showers) "hid" = ( /obj/effect/floor_decal/spline/plain, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/spline/plain, /obj/structure/table/marble, /obj/item/reagent_containers/food/drinks/cup, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/outdoors/mud, /area/crew_quarters/coffee_shop) "hij" = ( @@ -11355,30 +11333,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 }, -/obj/structure/curtain/open/bed{ - name = "brown curtain"; - pixel_x = -32 - }, /obj/item/flame/candle/black, /obj/structure/table/fancyblack, /obj/item/toy/plushie/coffee_fox{ name = "Cream" }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/table/wooden_reinforced, -/obj/item/flame/candle, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 1 - }, -/obj/structure/curtain/open/bed{ - name = "brown curtain"; - pixel_x = -32 - }, /turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "hsX" = ( @@ -11648,14 +11607,10 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacetwo) "hDh" = ( -/obj/structure/curtain/open/bed{ - name = "brown curtain"; - pixel_x = -32 - }, -/obj/structure/cable{ +/obj/structure/bed/chair/wood, +/obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/bed/chair/wood, /turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "hDK" = ( @@ -14291,27 +14246,6 @@ "jjc" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/curtain/black, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/structure/curtain/open/bed{ - name = "brown curtain" - }, /obj/machinery/door/firedoor/glass{ dir = 1 }, @@ -14327,6 +14261,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/curtain/black, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "jjr" = ( @@ -14365,9 +14300,6 @@ /obj/effect/floor_decal/industrial/halfstair{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/steel, /area/crew_quarters/coffee_shop) "jkT" = ( @@ -16174,21 +16106,6 @@ "kpm" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/assembly/chargebay) -"kpz" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/cult, -/area/crew_quarters/coffee_shop) "kpD" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research{ @@ -17446,13 +17363,6 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "kYZ" = ( @@ -17509,39 +17419,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab/foyer) -"laS" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/curtain/black, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/structure/curtain/open/bed{ - name = "brown curtain" - }, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/surfacetwo) "lbx" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -21566,21 +21443,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/industrial/halfstair{ - dir = 8 - }, -/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" }, @@ -21788,13 +21650,6 @@ /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "nMg" = ( -/obj/structure/curtain/open/bed{ - name = "brown curtain"; - pixel_x = -32 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/structure/bed/chair/wood{ dir = 1 }, @@ -22274,18 +22129,6 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, /turf/simulated/floor/outdoors/mud, /area/crew_quarters/coffee_shop) "obw" = ( @@ -22796,14 +22639,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) "otm" = ( -/obj/structure/curtain/open/bed{ - name = "brown curtain"; - pixel_x = -32 - }, /obj/structure/bed/chair/wood{ dir = 1 }, -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/cult, @@ -24080,20 +23919,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) -"peh" = ( -/obj/effect/rune, -/obj/item/flame/candle/everburn/black, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/cult, -/area/crew_quarters/coffee_shop) "peR" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/paleblue{ @@ -24853,21 +24678,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) -"pGc" = ( -/obj/effect/floor_decal/industrial/halfstair{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/industrial/halfstair{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/crew_quarters/coffee_shop) "pGf" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -25595,6 +25405,9 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "qgH" = ( @@ -27022,19 +26835,9 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/general) "rdi" = ( -/obj/effect/floor_decal/spline/plain, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj{ - name = "---Merge conflict marker---" - }, /obj/effect/floor_decal/spline/plain{ dir = 10 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/outdoors/mud, /area/crew_quarters/coffee_shop) "rdl" = ( @@ -31563,18 +31366,6 @@ /obj/structure/bed/chair, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) -"uau" = ( -/obj/effect/rune, -/obj/item/flame/candle/everburn/black, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/cult, -/area/crew_quarters/coffee_shop) "uax" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -34717,12 +34508,6 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/maintenance/dormitory) -"wcw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/cult, -/area/crew_quarters/coffee_shop) "wcF" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor/grid, @@ -35173,14 +34958,7 @@ /area/medical/resleeving) "wtK" = ( /obj/effect/floor_decal/spline/plain, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/spline/plain, /obj/structure/table/marble, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/outdoors/mud, /area/crew_quarters/coffee_shop) "wuF" = ( @@ -35206,13 +34984,6 @@ /area/security/hallway) "wuW" = ( /obj/structure/cult/talisman, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "wwg" = ( @@ -35392,6 +35163,10 @@ /obj/structure/kitchenspike, /turf/simulated/floor/tiled/techfloor, /area/maintenance/dormitory) +"wDj" = ( +/obj/item/toy/plushie/carp, +/turf/simulated/floor/cult, +/area/crew_quarters/coffee_shop) "wDE" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -35633,15 +35408,11 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "wMv" = ( -/obj/structure/curtain/open/bed{ - name = "brown curtain"; - pixel_x = -32 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/table/fancyblack, /obj/item/flame/candle/black, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) "wMA" = ( @@ -36364,9 +36135,6 @@ dir = 8 }, /obj/effect/floor_decal/spline/plain/corner, -/obj{ - name = "---Merge conflict marker---" - }, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "xkX" = ( @@ -37846,9 +37614,6 @@ /area/maintenance/dormitory) "ydU" = ( /obj/effect/floor_decal/spline/plain, -/obj{ - name = "---Merge conflict marker---" - }, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "yem" = ( @@ -49141,7 +48906,7 @@ jGC jGC jGC cLy -wcw +fmy wZw xkX cqf @@ -49332,10 +49097,10 @@ usC hid ydU vPE -fmy +wDj vPE qgA -wcw +fmy wZw ibo cqf @@ -49529,7 +49294,7 @@ fmy hsX fmy qgA -wcw +fmy fLD tsb cqf @@ -49719,11 +49484,11 @@ vmG kHS obn kYQ -uau +vPE wuW -peh +vPE fNx -kpz +iQK iQK ujW hpi @@ -49912,7 +49677,7 @@ cqf cqf huA hBf -pGc +jjL jjL fij aUf @@ -50106,7 +49871,7 @@ ylV vRp cqf cqf -laS +oUQ eXs tfk oUQ diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index f15304a4dcf8..ca550e1d018e 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -13616,9 +13616,6 @@ }, /turf/simulated/floor/cult, /area/crew_quarters/barrestroom) -"cIq" = ( -/turf/simulated/wall/prepainted/civilian, -/area/hydroponics) "cJo" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13694,16 +13691,6 @@ pixel_x = -16; pixel_y = 6 }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/table/hardwoodtable, -/obj/item/flame/candle{ - pixel_x = -16 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -13806,16 +13793,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/kitchen) "cUZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -13850,9 +13827,6 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/light{ dir = 4 }, @@ -13861,22 +13835,6 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/beige/full{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_x = 32 - }, -/obj/item/stool/padded, -/obj/machinery/light{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "cYF" = ( @@ -14738,13 +14696,6 @@ /obj/structure/bed/chair/sofa/brown/right{ dir = 1 }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/bed/chair/sofa/black/right{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -15193,19 +15144,6 @@ }, /obj/structure/table/hardwoodtable, /obj/effect/floor_decal/corner/purple/diagonal, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/table/reinforced, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/door/blast/shutters{ - id = "kitchen_shutters"; - name = "Kitchen Shutters" - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/light{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "fhj" = ( @@ -15647,15 +15585,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/purple/diagonal, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "fHQ" = ( @@ -15774,9 +15703,6 @@ /turf/simulated/floor/carpet, /area/bridge/bridge_hallway) "fSV" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -15784,16 +15710,6 @@ dir = 9 }, /obj/effect/floor_decal/corner/orange/diagonal, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red/diagonal, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -16528,10 +16444,6 @@ /area/maintenance/station/exploration) "hkW" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/debris/cleanable/cobweb2, -/obj{ - name = "---Merge conflict marker---" - }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "hkX" = ( @@ -16957,18 +16869,6 @@ dir = 4 }, /obj/structure/table/hardwoodtable, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/table/standard, -/obj/machinery/microwave, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -17157,14 +17057,6 @@ dir = 1 }, /obj/structure/table/bench/marble, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/item/stool/padded, -/obj/landmark/spawnpoint/job/assistant, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -17237,7 +17129,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/wood/hardwood, +/turf/simulated/wall/prepainted/engineering, /area/maintenance/substation/exploration) "iwj" = ( /turf/simulated/wall/wood/hardwood, @@ -17449,16 +17341,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) -"iLu" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/turf/simulated/floor/wood, -/area/crew_quarters/kitchen) "iLO" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -19074,17 +18956,6 @@ /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) -"lGp" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, -/turf/simulated/floor/wood, -/area/hydroponics) "lGQ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -19220,13 +19091,6 @@ dir = 5 }, /obj/structure/bed/chair/pew/right, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/bed/chair/sofa/black/left, -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -19808,16 +19672,9 @@ icon_state = "2-8" }, /obj/effect/debris/cleanable/blood/drip, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, /turf/simulated/floor/wood, /area/crew_quarters/kitchen) "myS" = ( @@ -19967,15 +19824,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/orange/diagonal, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "mHU" = ( @@ -20074,10 +19922,6 @@ /area/ai_upload_foyer) "mSe" = ( /obj/effect/floor_decal/corner/purple/diagonal, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/red/diagonal, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -20157,15 +20001,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/effect/debris/cleanable/blood/drip, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -21375,17 +21210,6 @@ dir = 5 }, /obj/structure/disposalpipe/segment, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -21668,18 +21492,6 @@ dir = 10 }, /obj/structure/table/hardwoodtable, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/table/standard, -/obj/machinery/microwave, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -21983,17 +21795,6 @@ }, /obj/structure/table/fancyblack, /obj/effect/floor_decal/corner/orange/diagonal, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/table/hardwoodtable, -/obj/effect/floor_decal/spline/plain, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "bar_shutters"; - name = "Bar Shutters" - }, -/obj/effect/floor_decal/corner/red/diagonal, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -22390,16 +22191,7 @@ /area/crew_quarters/bar) "qEx" = ( /obj/structure/cable/green, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/power/apc/direction_bump/south, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/power/apc/direction_bump/south, -/obj/structure/cable/green, /turf/simulated/floor/wood, /area/crew_quarters/kitchen) "qGL" = ( @@ -22836,19 +22628,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/button/remote/blast_door{ id = "kitchen_shutters"; name = "Kitchen Shutter control"; pixel_x = -26; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -23183,15 +22968,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -23810,9 +23586,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) -"tqJ" = ( -/turf/simulated/wall/wood/hardwood, -/area/maintenance/substation/exploration) "trR" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/lightgrey/bordercorner, @@ -24130,24 +23903,6 @@ dir = 8 }, /obj/effect/floor_decal/corner/purple/diagonal, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/beige/full{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -24270,16 +24025,6 @@ /turf/simulated/floor/tiled/dark, /area/exploration/showers) "uer" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -24301,25 +24046,10 @@ /obj/item/packageWrap, /obj/machinery/power/apc/direction_bump/south, /obj/structure/table/fancyblack, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/table/standard{ - name = "plastic table frame" - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/obj/item/packageWrap, -/obj/item/packageWrap, -/obj/machinery/power/apc/direction_bump/south, -/obj/structure/cable/green, /turf/simulated/floor/wood, /area/hydroponics) "ugj" = ( @@ -24574,16 +24304,9 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "uFi" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -24638,28 +24361,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/effect/floor_decal/corner/orange/diagonal, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/door/window/brigdoor/eastleft{ - dir = 8; - name = "Bar Access"; - req_access = list(25) - }, /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "uLC" = ( @@ -25621,9 +25326,6 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) "wfc" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -25631,16 +25333,6 @@ dir = 8 }, /obj/effect/floor_decal/corner/purple/diagonal, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "wfy" = ( @@ -25835,21 +25527,6 @@ pixel_x = -16; pixel_y = 6 }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/table/hardwoodtable, -/obj/item/flame/candle{ - pixel_x = -16 - }, -/obj/item/deck/tarot{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/deck/cards{ - pixel_x = -2; - pixel_y = -2 - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -26110,15 +25787,6 @@ /obj/structure/bed/chair/pew/right{ dir = 1 }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/bed/chair/sofa/black/right{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -26724,19 +26392,10 @@ /turf/simulated/floor/wood, /area/hydroponics) "xDb" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/structure/flora/pumpkin/carved/girly, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/cult, /area/crew_quarters/bar) "xDl" = ( @@ -26817,17 +26476,6 @@ /turf/simulated/floor/wood, /area/hydroponics) "xKw" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -26989,10 +26637,6 @@ /area/shuttle/excursion/general) "ybh" = ( /obj/structure/bed/chair/sofa/brown/left, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/bed/chair/sofa/black/left, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -27058,17 +26702,6 @@ /turf/simulated/floor/tiled, /area/rnd/telescience_lab) "ygG" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/landmark/spawnpoint/job/chef, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/floor_decal/corner/grey/diagonal, /obj/landmark/spawnpoint/job/chef, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -39066,7 +38699,7 @@ lrI eWS cYC fgT -iLu +gMZ uFi ygG uer @@ -40816,7 +40449,7 @@ wbw htY dwj pee -lGp +dwj arW aTv aTv @@ -42558,7 +42191,7 @@ use aKd iwj iwj -cIq +iwj iwj iwj iwj @@ -42944,11 +42577,11 @@ myS cnu qcL arS -tqJ +luo eHU eBu hNb -tqJ +luo arS aUi ahj @@ -43142,7 +42775,7 @@ rEk wod yjM iKY -tqJ +luo aUi aUi akk @@ -43332,11 +42965,11 @@ daS cnu aUi aTv -tqJ +luo hkW shQ apv -tqJ +luo azw aUi aUi @@ -43526,11 +43159,11 @@ myS cnu vOW aTv -tqJ -tqJ -tqJ +luo +luo +luo rfk -tqJ +luo aPF aUi aUi From 30b0378b8e08c0cb77f432228991d78eeee2389a Mon Sep 17 00:00:00 2001 From: Captain277 Date: Thu, 28 Sep 2023 15:01:21 -0700 Subject: [PATCH 3/4] Final First Iteration Adjustments --- maps/rift/levels/rift-05-surface2.dmm | 12 ++---------- maps/rift/levels/rift-06-surface3.dmm | 6 ------ 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm index 7ba2d1902681..0a19c5dd36a7 100644 --- a/maps/rift/levels/rift-05-surface2.dmm +++ b/maps/rift/levels/rift-05-surface2.dmm @@ -11340,10 +11340,6 @@ }, /turf/simulated/floor/cult, /area/crew_quarters/coffee_shop) -"hsX" = ( -/obj/effect/gateway/active/cult, -/turf/simulated/floor/cult, -/area/crew_quarters/coffee_shop) "huA" = ( /obj/structure/flora/pumpkin/carved, /obj/effect/debris/cleanable/cobweb2, @@ -35163,10 +35159,6 @@ /obj/structure/kitchenspike, /turf/simulated/floor/tiled/techfloor, /area/maintenance/dormitory) -"wDj" = ( -/obj/item/toy/plushie/carp, -/turf/simulated/floor/cult, -/area/crew_quarters/coffee_shop) "wDE" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -49097,7 +49089,7 @@ usC hid ydU vPE -wDj +fmy vPE qgA fmy @@ -49291,7 +49283,7 @@ dcW wtK ydU fmy -hsX +fmy fmy qgA fmy diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index ca550e1d018e..ecb8da4cf6eb 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -13827,9 +13827,6 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/machinery/light{ - dir = 4 - }, /obj/structure/table/bench/marble, /obj/effect/floor_decal/corner/orange/diagonal, /obj/effect/floor_decal/spline/plain{ @@ -23899,9 +23896,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 8 - }, /obj/effect/floor_decal/corner/purple/diagonal, /obj/structure/cable/green{ icon_state = "1-2" From f642402077b533e5f999d91d2ac5cfd76bb3df58 Mon Sep 17 00:00:00 2001 From: Captain277 Date: Sun, 1 Oct 2023 01:44:26 -0700 Subject: [PATCH 4/4] Fixes open air turf placements. --- code/game/turfs/simulated/floors/outdoors.dm | 3 ++ code/game/turfs/simulated/floors/water.dm | 8 +++- maps/rift/levels/rift-05-surface2.dmm | 43 ++++++++------------ maps/rift/levels/rift-06-surface3.dmm | 38 ++++++++--------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/code/game/turfs/simulated/floors/outdoors.dm b/code/game/turfs/simulated/floors/outdoors.dm index febd7eb096cd..093b65561e04 100644 --- a/code/game/turfs/simulated/floors/outdoors.dm +++ b/code/game/turfs/simulated/floors/outdoors.dm @@ -13,6 +13,9 @@ name = "mud" icon_state = "mud_dark" +/turf/simulated/floor/outdoors/mud/indoors + outdoors = FALSE + /turf/simulated/floor/outdoors/rocks name = "rocks" desc = "Hard as a rock." diff --git a/code/game/turfs/simulated/floors/water.dm b/code/game/turfs/simulated/floors/water.dm index 0151dc32c569..d7f3d464ad9a 100644 --- a/code/game/turfs/simulated/floors/water.dm +++ b/code/game/turfs/simulated/floors/water.dm @@ -106,7 +106,7 @@ /turf/simulated/floor/water/deep/indoors outdoors = FALSE - + /turf/simulated/floor/water/pool name = "pool" desc = "Don't worry, it's not closed." @@ -415,6 +415,9 @@ var/list/shoreline_icon_cache = list() to_chat(L, "You climb out of \the [src].") ..() +/turf/simulated/floor/water/blood/indoors + outdoors = FALSE + /turf/simulated/floor/water/blood/deep name = "deep coagulating pool" desc = "A body of crimson fluid. It smells like pennies and gasoline. It seems quite deep." @@ -422,3 +425,6 @@ var/list/shoreline_icon_cache = list() under_state = "abyss" slowdown = 8 depth = 7 + +/turf/simulated/floor/water/blood/deep/indoors + outdoors = FALSE diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm index 0a19c5dd36a7..c0ceec0a4f6e 100644 --- a/maps/rift/levels/rift-05-surface2.dmm +++ b/maps/rift/levels/rift-05-surface2.dmm @@ -4540,7 +4540,7 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/heads/hor) "dcW" = ( -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/crew_quarters/coffee_shop) "ddZ" = ( /turf/simulated/floor/outdoors/gravsnow/lythios43c/indoors, @@ -8668,7 +8668,7 @@ /area/maintenance/medbay) "fLD" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/blood/deep, +/turf/simulated/floor/water/blood/deep/indoors, /area/crew_quarters/coffee_shop) "fLK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11032,9 +11032,7 @@ /area/crew_quarters/showers) "hid" = ( /obj/effect/floor_decal/spline/plain, -/obj/structure/table/marble, -/obj/item/reagent_containers/food/drinks/cup, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/crew_quarters/coffee_shop) "hij" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -12511,7 +12509,7 @@ /obj/structure/catwalk, /obj/structure/table/fancyblack, /obj/item/deck/tarot, -/turf/simulated/floor/water/blood/deep, +/turf/simulated/floor/water/blood/deep/indoors, /area/crew_quarters/coffee_shop) "ibv" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -13695,7 +13693,7 @@ }, /obj/structure/flora/ausbushes/sparsegrass, /obj/effect/debris/cleanable/cobweb, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/crew_quarters/coffee_shop) "iRD" = ( /obj/structure/window/reinforced{ @@ -16772,7 +16770,7 @@ dir = 4 }, /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/crew_quarters/coffee_shop) "kIF" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -22125,7 +22123,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/crew_quarters/coffee_shop) "obw" = ( /obj/machinery/door/blast/regular{ @@ -26834,7 +26832,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 10 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/crew_quarters/coffee_shop) "rdl" = ( /obj/machinery/atmospherics/pipe/zpipe/down/supply, @@ -28611,7 +28609,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/crew_quarters/coffee_shop) "sjS" = ( /obj/structure/undies_wardrobe, @@ -29932,10 +29930,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "tfk" = ( -/obj/structure/curtain/open/bed{ - name = "brown curtain" - }, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/structure/curtain/black, /turf/simulated/floor/plating, /area/hallway/primary/surfacetwo) "tfp" = ( @@ -30347,7 +30343,7 @@ dir = 8 }, /obj/structure/catwalk, -/turf/simulated/floor/water/blood/deep, +/turf/simulated/floor/water/blood/deep/indoors, /area/crew_quarters/coffee_shop) "tsj" = ( /obj/machinery/door/blast/regular{ @@ -30590,7 +30586,7 @@ dir = 8 }, /obj/structure/catwalk, -/turf/simulated/floor/water/blood/deep, +/turf/simulated/floor/water/blood/deep/indoors, /area/crew_quarters/coffee_shop) "tBX" = ( /obj/machinery/light{ @@ -31858,7 +31854,7 @@ /area/security/range) "usC" = ( /obj/structure/flora/pumpkin/pumpkin_patch/presents, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/crew_quarters/coffee_shop) "usM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -33280,7 +33276,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/crew_quarters/coffee_shop) "vnk" = ( /obj/structure/marker_beacon/red, @@ -34952,11 +34948,6 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/resleeving) -"wtK" = ( -/obj/effect/floor_decal/spline/plain, -/obj/structure/table/marble, -/turf/simulated/floor/outdoors/mud, -/area/crew_quarters/coffee_shop) "wuF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -35784,7 +35775,7 @@ "wZw" = ( /obj/structure/bed/chair/wood, /obj/structure/catwalk, -/turf/simulated/floor/water/blood/deep, +/turf/simulated/floor/water/blood/deep/indoors, /area/crew_quarters/coffee_shop) "xax" = ( /obj/structure/railing{ @@ -36137,7 +36128,7 @@ /obj/structure/catwalk, /obj/structure/table/fancyblack, /obj/structure/spirit_board/prop, -/turf/simulated/floor/water/blood/deep, +/turf/simulated/floor/water/blood/deep/indoors, /area/crew_quarters/coffee_shop) "xln" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -49280,7 +49271,7 @@ oRV cqf dcW dcW -wtK +hid ydU fmy fmy diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 7e871349fa22..f88aea592b04 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -4145,7 +4145,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "amZ" = ( /obj/machinery/computer/station_alert/all, @@ -16608,7 +16608,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "aZt" = ( /obj/effect/floor_decal/borderfloor{ @@ -17428,7 +17428,7 @@ "cGx" = ( /obj/effect/floor_decal/spline/plain, /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "cHl" = ( /obj/machinery/door/blast/shutters{ @@ -19065,7 +19065,7 @@ /area/rift/surfaceeva/airlock/arrivals) "gou" = ( /obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "gpa" = ( /turf/simulated/wall/r_wall/prepainted, @@ -19572,7 +19572,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "hEX" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -20003,7 +20003,7 @@ /turf/simulated/floor/cult, /area/crew_quarters/barrestroom) "iCm" = ( -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "iCv" = ( /obj/structure/disposalpipe/segment{ @@ -20967,7 +20967,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "kLl" = ( /obj/structure/closet/gmcloset{ @@ -21011,7 +21011,7 @@ /mob/living/simple_mob/animal/passive/cow{ name = "Betsy" }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "kPD" = ( /obj/effect/floor_decal/spline/plain, @@ -21162,7 +21162,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 10 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "lhu" = ( /obj/machinery/light{ @@ -22362,7 +22362,7 @@ /area/crew_quarters/bar) "nzW" = ( /obj/landmark/spawnpoint/job/botanist, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "nCn" = ( /obj/structure/ladder{ @@ -23208,7 +23208,7 @@ dir = 6 }, /obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "pBE" = ( /obj/effect/floor_decal/borderfloor{ @@ -23627,7 +23627,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "quy" = ( /obj/structure/grille, @@ -23725,7 +23725,7 @@ /area/rift/surfacebase/outside/outside3) "qEq" = ( /obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "qGN" = ( /obj/structure/catwalk, @@ -23783,7 +23783,7 @@ /area/crew_quarters/barrestroom) "qNK" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "qOi" = ( /turf/simulated/wall/cult, @@ -23883,7 +23883,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 9 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "raY" = ( /obj/machinery/holoposter{ @@ -23980,7 +23980,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "rtY" = ( /obj/effect/floor_decal/borderfloor, @@ -24255,7 +24255,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 5 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "slu" = ( /obj/structure/railing{ @@ -24650,7 +24650,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "tEl" = ( /obj/effect/floor_decal/borderfloor{ @@ -24831,7 +24831,7 @@ "tQY" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/outdoors/mud, +/turf/simulated/floor/outdoors/mud/indoors, /area/hydroponics) "tSU" = ( /obj/machinery/door/blast/shutters{