diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 497386cbd13..8a86bab89a5 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -36,10 +36,6 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/station/hallway/primary/port) -"aaX" = ( -/obj/structure/chair/sofa/bench/right, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "abb" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 @@ -114,6 +110,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"acD" = ( +/obj/structure/fluff/fokoff_sign, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "acE" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -1528,6 +1529,12 @@ /obj/effect/spawner/random/structure/billboard/nanotrasen, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) +"axL" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/marker_beacon/cerulean, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "axN" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -2145,6 +2152,23 @@ dir = 9 }, /area/station/science/explab) +"aIw" = ( +/obj/structure/cable, +/obj/structure/holosign/barrier/atmos/sturdy, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "minecraft_shutter"; + name = "Cart Shutters" + }, +/obj/structure/minecart_rail{ + dir = 1 + }, +/turf/open/floor/iron/textured, +/area/station/service/kitchen/coldroom) "aIA" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 9 @@ -3398,6 +3422,13 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/department/chapel) +"baS" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "baV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -5187,6 +5218,11 @@ dir = 1 }, /area/station/service/chapel) +"bAG" = ( +/obj/structure/marker_beacon/jade, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "bAM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6498,6 +6534,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"bRZ" = ( +/obj/structure/marker_beacon/burgundy, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "bSi" = ( /obj/structure/sign/warning/cold_temp/directional/south, /turf/open/floor/plating, @@ -10058,17 +10099,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/atmos) -"cQV" = ( -/obj/structure/barricade/wooden/snowed, -/obj/machinery/light/small/red/directional/north, -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "minecraft_shutter"; - name = "Cart Shutters"; - pixel_y = 0 - }, -/turf/open/floor/plating/snowed/coldroom, -/area/icemoon/underground/explored) "cRg" = ( /obj/structure/cable, /turf/open/floor/iron/dark/textured, @@ -10660,10 +10690,6 @@ /obj/structure/sign/warning/gas_mask, /turf/closed/wall, /area/station/service/chapel) -"daZ" = ( -/obj/structure/marker_beacon/jade, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "dbi" = ( /obj/structure/table, /obj/item/flashlight, @@ -13629,6 +13655,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/engineering/lobby) +"dVP" = ( +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) "dVX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random/directional/east, @@ -14045,6 +14078,13 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"edi" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 1 + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) "edn" = ( /obj/effect/turf_decal/bot_white/right, /obj/machinery/ore_silo, @@ -14166,11 +14206,6 @@ }, /turf/open/floor/wood, /area/station/commons/lounge) -"efi" = ( -/obj/structure/bed/dogbed, -/obj/effect/decal/cleanable/blood/gibs/body, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/underground/explored) "efk" = ( /obj/structure/cable, /turf/open/floor/iron/white/side, @@ -14999,6 +15034,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"ers" = ( +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "erw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, @@ -16530,6 +16572,17 @@ }, /turf/open/floor/iron/white, /area/station/science/genetics) +"eSO" = ( +/obj/structure/closet/crate/freezer/food{ + name = "cooler" + }, +/obj/item/reagent_containers/cup/glass/ice, +/obj/item/reagent_containers/cup/glass/ice, +/obj/item/reagent_containers/cup/glass/ice, +/obj/item/reagent_containers/cup/glass/ice, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/coldroom, +/area/icemoon/underground/explored) "eSY" = ( /obj/structure/closet/emcloset, /turf/open/floor/iron/smooth, @@ -16863,6 +16916,11 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"eWZ" = ( +/obj/structure/closet/crate, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "eXH" = ( /turf/closed/wall/r_wall, /area/station/medical/chemistry) @@ -17231,11 +17289,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/chapel) -"fdP" = ( -/obj/structure/bonfire, -/obj/item/melee/roastingstick, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/underground/explored) "fdX" = ( /obj/item/toy/cards/deck{ pixel_x = -9; @@ -17401,10 +17454,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) -"fhB" = ( -/obj/structure/chair/sofa/bench/left, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "fhS" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -17806,12 +17855,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"fna" = ( -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "fng" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17956,6 +17999,11 @@ /obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) +"fqa" = ( +/obj/machinery/hydroponics/soil, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "fqv" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18663,10 +18711,6 @@ dir = 8 }, /area/station/service/chapel) -"fBN" = ( -/obj/structure/marker_beacon/burgundy, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "fBQ" = ( /obj/structure/cable, /turf/open/floor/iron/white/corner{ @@ -21086,10 +21130,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/toilet) -"gnZ" = ( -/obj/structure/marker_beacon/burgundy, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "gob" = ( /obj/structure/closet/wardrobe/black, /obj/effect/decal/cleanable/cobweb, @@ -24799,16 +24839,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"hvi" = ( -/obj/structure/closet/crate/freezer/food{ - name = "cooler" - }, -/obj/item/reagent_containers/cup/glass/ice, -/obj/item/reagent_containers/cup/glass/ice, -/obj/item/reagent_containers/cup/glass/ice, -/obj/item/reagent_containers/cup/glass/ice, -/turf/open/misc/asteroid/snow/coldroom, -/area/icemoon/underground/explored) "hvm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -26424,14 +26454,6 @@ /obj/machinery/teleport/hub, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) -"hWv" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 2; - id = "botany_chasm_and_wolf_shutters" - }, -/turf/open/floor/plating, -/area/station/service/hydroponics) "hWI" = ( /obj/effect/turf_decal/box, /obj/effect/spawner/random/structure/closet_empty/crate/with_loot, @@ -28723,6 +28745,21 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"iGW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/obj/item/grown/log/tree, +/obj/item/grown/log/tree{ + pixel_y = 5; + pixel_x = 7 + }, +/obj/item/grown/log/tree{ + pixel_x = 7 + }, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) "iHc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -29834,10 +29871,6 @@ }, /turf/open/floor/plating, /area/station/science/research) -"iZm" = ( -/obj/structure/chair/wood, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "iZn" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/wood, @@ -29909,6 +29942,13 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet/locker) +"jad" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "jae" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -32186,24 +32226,6 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) -"jKL" = ( -/obj/structure/cable, -/obj/structure/holosign/barrier/atmos/sturdy, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters{ - dir = 1; - id = "minecraft_shutter"; - name = "Cart Shutters"; - pixel_y = 0 - }, -/obj/structure/minecart_rail{ - dir = 1 - }, -/turf/open/floor/iron/textured, -/area/station/service/kitchen/coldroom) "jKN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33150,12 +33172,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) -"jZN" = ( -/obj/structure/marker_beacon/burgundy{ - name = "landing marker" - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "jZU" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -33224,11 +33240,6 @@ /obj/effect/decal/cleanable/food/pie_smudge, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) -"kbp" = ( -/obj/structure/marker_beacon/burgundy, -/obj/structure/fluff/fokoff_sign, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "kbq" = ( /obj/machinery/conveyor{ dir = 1; @@ -33441,13 +33452,6 @@ /obj/docking_port/stationary/escape_pod, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) -"keu" = ( -/obj/structure/lattice/catwalk, -/obj/structure/marker_beacon/burgundy{ - name = "landing marker" - }, -/turf/open/openspace/icemoon/keep_below, -/area/icemoon/underground/explored) "kex" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -33670,6 +33674,12 @@ /obj/structure/lattice/catwalk, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) +"kgT" = ( +/obj/structure/bed/dogbed, +/obj/effect/decal/cleanable/blood/gibs/body, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) "kgX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/window/left/directional/west{ @@ -33734,10 +33744,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/atmos) -"khz" = ( -/obj/structure/marker_beacon/cerulean, -/turf/open/genturf, -/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "khF" = ( /obj/machinery/light/small/directional/north, /obj/structure/sign/warning/gas_mask/directional/north{ @@ -34939,6 +34945,14 @@ /obj/structure/closet/secure_closet/brig, /turf/open/floor/iron/smooth, /area/station/security/execution/transfer) +"kyw" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "pharmacy_shutters3"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/plating, +/area/station/service/kitchen) "kyy" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -36084,11 +36098,6 @@ }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) -"kPS" = ( -/obj/structure/railing, -/obj/structure/marker_beacon/cerulean, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "kPY" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -36253,12 +36262,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/robotics/mechbay) -"kRF" = ( -/obj/structure/chair/wood{ - dir = 8 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "kRH" = ( /obj/machinery/door/airlock/highsecurity{ name = "Chemistry Lab Exit" @@ -36839,6 +36842,11 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/vault, /area/station/security/prison/rec) +"kZS" = ( +/obj/effect/spawner/random/structure/crate, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "laa" = ( /obj/machinery/atmospherics/components/tank, /obj/effect/turf_decal/stripes/line{ @@ -37209,11 +37217,6 @@ }, /turf/open/floor/iron/textured, /area/station/security/brig) -"lgH" = ( -/obj/structure/flora/tree/pine/style_random, -/obj/structure/marker_beacon/cerulean, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "lgK" = ( /turf/closed/wall, /area/station/security/prison/visit) @@ -38418,6 +38421,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"lzW" = ( +/obj/structure/fake_stairs/wood/directional/north, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "lzX" = ( /obj/machinery/light/floor, /turf/open/floor/iron/white, @@ -42052,6 +42060,14 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark/textured_edge, /area/station/security/evidence) +"mKD" = ( +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) "mLa" = ( /obj/item/kirbyplants/random, /turf/open/floor/plating, @@ -42529,17 +42545,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"mTW" = ( -/obj/structure/fluff/tram_rail{ - pixel_y = 17 - }, -/obj/structure/fluff/tram_rail, -/obj/structure/lattice/catwalk, -/obj/structure/marker_beacon/burgundy{ - name = "landing marker" - }, -/turf/open/openspace/icemoon/keep_below, -/area/icemoon/underground/explored) "mTX" = ( /obj/structure/barricade/wooden, /obj/structure/sign/warning/cold_temp/directional/north, @@ -43128,10 +43133,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/kitchen/coldroom) -"nbP" = ( -/obj/structure/bonfire/prelit, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "nbT" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/delivery, @@ -43413,10 +43414,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) -"neM" = ( -/obj/machinery/hydroponics/soil, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "neQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43480,12 +43477,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"nfG" = ( -/obj/structure/marker_beacon/burgundy{ - name = "landing marker" - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/underground/explored) "nfK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45580,10 +45571,6 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"nJm" = ( -/obj/structure/fluff/fokoff_sign, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "nJo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -49756,15 +49743,6 @@ }, /turf/open/floor/wood/parquet, /area/station/service/bar/atrium) -"oVr" = ( -/obj/structure/table/wood/poker, -/obj/effect/spawner/random/entertainment/coin{ - pixel_x = -7; - pixel_y = 0 - }, -/obj/effect/spawner/random/clothing/bowler_or_that, -/turf/open/floor/wood/large, -/area/station/commons/lounge) "oVt" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -50477,6 +50455,11 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/maintenance/department/electrical) +"pfQ" = ( +/obj/structure/chair/sofa/bench/left, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "pgo" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 10 @@ -52149,6 +52132,12 @@ }, /turf/open/floor/iron, /area/station/security/prison/mess) +"pFb" = ( +/obj/structure/railing, +/obj/structure/marker_beacon/cerulean, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/genturf, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "pFg" = ( /obj/structure/chair{ dir = 8 @@ -53180,6 +53169,14 @@ }, /turf/open/floor/iron/white, /area/station/science/genetics) +"pUO" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/fake_stairs/wood/directional/north, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "pVl" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -56008,22 +56005,6 @@ /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"qKw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/table, -/obj/item/grown/log/tree, -/obj/item/grown/log/tree{ - pixel_y = 5; - pixel_x = 7 - }, -/obj/item/grown/log/tree{ - pixel_y = 0; - pixel_x = 7 - }, -/turf/open/floor/plating/snowed/coldroom, -/area/station/service/kitchen/coldroom) "qKx" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/bot, @@ -57141,6 +57122,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/command/teleporter) +"rah" = ( +/obj/structure/barricade/wooden/snowed, +/obj/machinery/light/small/red/directional/north, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "minecraft_shutter"; + name = "Cart Shutters" + }, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) "rai" = ( /obj/structure/table, /obj/item/clothing/ears/earmuffs{ @@ -59255,15 +59246,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"rEH" = ( -/obj/item/chair/stool/bar{ - dir = 2; - pixel_y = -2 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "rEP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -59624,15 +59606,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/range) -"rMi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "rMm" = ( /obj/machinery/airalarm/directional/west, /turf/open/openspace, @@ -59829,13 +59802,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"rPp" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/fake_stairs/wood/directional/north, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "rPL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -60036,10 +60002,6 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) -"rST" = ( -/obj/structure/marker_beacon/cerulean, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "rSW" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -61835,6 +61797,11 @@ dir = 1 }, /area/station/security/lockers) +"stu" = ( +/obj/structure/chair/wood, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "stA" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -65214,6 +65181,11 @@ dir = 1 }, /area/station/engineering/engine_smes) +"tvI" = ( +/obj/structure/marker_beacon/burgundy, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "tvJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65430,6 +65402,13 @@ }, /turf/open/floor/glass/reinforced, /area/station/engineering/atmos/pumproom) +"tza" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "botany_chasm_and_wolf_shutters" + }, +/turf/open/floor/plating, +/area/station/service/hydroponics) "tzf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68983,11 +68962,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/processing) -"uFg" = ( -/obj/structure/railing, -/obj/structure/marker_beacon/cerulean, -/turf/open/genturf, -/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "uFh" = ( /turf/open/floor/plating, /area/station/construction) @@ -70093,6 +70067,11 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/service) +"uZF" = ( +/obj/structure/bonfire/prelit, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "uZT" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -71221,15 +71200,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/security/courtroom) -"vrw" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 2; - id = "pharmacy_shutters3"; - name = "Pharmacy Shutters" - }, -/turf/open/floor/plating, -/area/station/service/kitchen) "vrC" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -72158,6 +72128,14 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/white, /area/station/medical/virology) +"vEK" = ( +/obj/item/chair/stool/bar{ + pixel_y = -2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "vEN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -72594,12 +72572,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/port/fore) -"vNM" = ( -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 1 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/underground/explored) "vOd" = ( /obj/item/wrench, /obj/machinery/atmospherics/components/binary/pump/off/supply/visible/layer4{ @@ -72981,6 +72953,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"vUA" = ( +/obj/structure/chair/sofa/bench/right, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "vUW" = ( /obj/item/stack/cable_coil{ amount = 7; @@ -73178,20 +73155,6 @@ }, /turf/open/floor/wood/large, /area/station/commons/lounge) -"vXO" = ( -/obj/structure/fluff/tram_rail, -/obj/structure/lattice/catwalk, -/obj/structure/fluff/tram_rail{ - pixel_y = 17 - }, -/obj/structure/marker_beacon/burgundy{ - name = "landing marker" - }, -/obj/structure/marker_beacon/burgundy{ - name = "landing marker" - }, -/turf/open/lava/plasma/ice_moon, -/area/icemoon/underground/explored) "vXU" = ( /obj/item/toy/snowball, /turf/open/misc/asteroid/snow/icemoon, @@ -73282,10 +73245,6 @@ }, /turf/open/floor/iron/large, /area/station/engineering/lobby) -"vYN" = ( -/obj/effect/spawner/random/structure/crate, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "vYY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74307,6 +74266,15 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) +"woX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "wpc" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" @@ -75414,6 +75382,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"wEX" = ( +/obj/structure/railing, +/obj/structure/marker_beacon/cerulean, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "wFe" = ( /obj/structure/railing{ dir = 1 @@ -75430,6 +75404,12 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"wFt" = ( +/obj/structure/marker_beacon/burgundy, +/obj/structure/fluff/fokoff_sign, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "wFN" = ( /mob/living/basic/slime, /turf/open/floor/engine, @@ -75935,6 +75915,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/security/processing) +"wOd" = ( +/obj/structure/bonfire, +/obj/item/melee/roastingstick, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) "wOn" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -76425,10 +76411,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"wUD" = ( -/obj/structure/fake_stairs/wood/directional/north, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "wUE" = ( /obj/machinery/light_switch/directional/north{ pixel_x = -7 @@ -77718,6 +77700,11 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/atmos) +"xoJ" = ( +/obj/structure/marker_beacon/cerulean, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "xpw" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -78736,13 +78723,6 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron, /area/station/security/prison/workout) -"xDQ" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/fake_stairs/wood/directional/north, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "xDU" = ( /obj/structure/table, /obj/effect/spawner/random/entertainment/drugs, @@ -79054,6 +79034,11 @@ /obj/structure/stairs/east, /turf/open/floor/plating, /area/station/security/brig) +"xHQ" = ( +/obj/structure/marker_beacon/cerulean, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/genturf, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "xHY" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -79365,6 +79350,29 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"xNp" = ( +/obj/structure/fluff/tram_rail, +/obj/structure/lattice/catwalk, +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/turf/open/lava/plasma/ice_moon, +/area/icemoon/underground/explored) +"xNz" = ( +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/fluff/tram_rail, +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon/burgundy{ + name = "landing marker" + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) "xNC" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -80035,6 +80043,14 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"xYi" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/fake_stairs/wood/directional/north, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "xYj" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -80071,6 +80087,14 @@ /obj/machinery/telecomms/server/presets/science, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +"xYM" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/random/entertainment/coin{ + pixel_x = -7 + }, +/obj/effect/spawner/random/clothing/bowler_or_that, +/turf/open/floor/wood/large, +/area/station/commons/lounge) "xYO" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -97163,7 +97187,7 @@ sYA ghx ghx ghx -vXO +xNp hMz ghx hMz @@ -107868,7 +107892,7 @@ ghx ghx ghx eZz -efi +kgT xhK nCQ swf @@ -108125,7 +108149,7 @@ ghx ghx ghx iDt -nbP +uZF xhK ikb swf @@ -114805,7 +114829,7 @@ jvM nTO nTO nTO -nJm +acD iDt xMq xMq @@ -115035,7 +115059,7 @@ iDt iDt iDt iDt -uEA +eWZ vjh aYQ bLL @@ -120306,7 +120330,7 @@ oSU szG szG iDt -daZ +bAG iDt szG oSU @@ -159095,7 +159119,7 @@ oif eJf eJf eJf -keu +mKD eJf eJf eJf @@ -162676,7 +162700,7 @@ szG szG myZ eJf -keu +mKD eJf eJf eJf @@ -162943,9 +162967,9 @@ szG gjq gjq gjq -mTW +xNz gjq -mTW +xNz gjq gjq gjq @@ -163214,18 +163238,18 @@ gjq gjq gjq gjq -keu +mKD eJf cMk yep cMk eJf -keu +mKD eJf eJf eJf eJf -keu +mKD eJf eJf eJf @@ -164224,7 +164248,7 @@ scw oif eJf eJf -keu +mKD eJf pfg sjb @@ -164765,7 +164789,7 @@ cMk eJf eJf eJf -keu +mKD eJf eJf oif @@ -165249,7 +165273,7 @@ gJK iwS wkB iDt -jZN +ers gjq gjq gjq @@ -165480,7 +165504,7 @@ gjq gjq gjq gjq -nfG +dVP qbU ivF jwH @@ -169345,7 +169369,7 @@ iDt iDt iDt iDt -nfG +dVP iDt iDt iDt @@ -169397,7 +169421,7 @@ jSQ cmZ xuo iDt -jZN +ers thA thA thA @@ -169849,7 +169873,7 @@ mri qQf ebd iDt -nfG +dVP pfw thA thA @@ -169865,7 +169889,7 @@ thA thA thA thA -nfG +dVP iDt iDt iDt @@ -170156,7 +170180,7 @@ nUi iDt iDt iDt -jZN +ers iDt iDt iDt @@ -170393,7 +170417,7 @@ iDt kJx iDt iDt -jZN +ers iDt iDt iDt @@ -170419,7 +170443,7 @@ iDt iDt iDt iDt -jZN +ers iDt thA thA @@ -171437,7 +171461,7 @@ iDt iDt iDt iDt -jZN +ers xMq thA thA @@ -171687,7 +171711,7 @@ oJD oJD scw sed -nfG +dVP scw iDt iDt @@ -172450,7 +172474,7 @@ kJx iDt iDt iDt -daZ +bAG iDt iDt kPz @@ -173219,7 +173243,7 @@ iDx iDx fQa iDt -daZ +bAG iDt iDt thA @@ -173485,7 +173509,7 @@ thA thA thA xMq -nfG +dVP iDt iDt iDt @@ -174248,7 +174272,7 @@ tLc vcj vcj aVq -daZ +bAG iDt xMq thA @@ -174508,7 +174532,7 @@ aVq iDt iDt iDt -nfG +dVP iDt iDt ebd @@ -175542,7 +175566,7 @@ xMq xMq thA xMq -nfG +dVP iDt iDt iDt @@ -175789,7 +175813,7 @@ iyd vlZ gCh alW -nfG +dVP iDt xMq xMq @@ -175807,11 +175831,11 @@ iDt iDt iDt iDt -nfG +dVP iDt iDt iDt -nfG +dVP xMq thA thA @@ -176815,7 +176839,7 @@ scw scw scw scw -nfG +dVP iDt iDt thA @@ -177578,7 +177602,7 @@ gjq gjq gjq gjq -nfG +dVP scw thA thA @@ -177869,7 +177893,7 @@ thA thA thA thA -nfG +dVP iDt iDt scw @@ -178641,10 +178665,10 @@ xMq iDt iDt iDt -nfG +dVP iDt iDt -nfG +dVP bID bID dmR @@ -179124,7 +179148,7 @@ gNu exw mPq iDt -neM +fqa qau xMq xMq @@ -179158,7 +179182,7 @@ iDt cCb iDt iDt -nfG +dVP bID anZ anZ @@ -179381,7 +179405,7 @@ mgy sIX nrh iDt -neM +fqa qau xMq xMq @@ -179642,7 +179666,7 @@ iDt qau iDt iDt -nfG +dVP iDt scw iDt @@ -179898,7 +179922,7 @@ iDt iDt xlp scw -fna +jad iDt iDt iDt @@ -180146,16 +180170,16 @@ exw ogu pOK kPY -hWv +tza urG -neM +fqa iDt scw iDt -neM +fqa qau -iZm -fdP +stu +wOd iDt iDt scw @@ -180403,16 +180427,16 @@ tjA hAK pOK txv -hWv +tza urG -neM +fqa iDt iDt scw -neM +fqa qau iDt -kRF +baS iDt scw iDt @@ -182207,7 +182231,7 @@ ubi psb xMq xMq -nfG +dVP xMq xMq btU @@ -183731,7 +183755,7 @@ jre jre ydG qfr -oVr +xYM hFj jre jre @@ -184002,7 +184026,7 @@ jre jre gSU phl -hvi +eSO psb fuH fuH @@ -184771,7 +184795,7 @@ tkY liv liv tkY -jKL +aIw rpJ psb fuH @@ -185022,7 +185046,7 @@ aoi ssm fpt mQk -qKw +iGW mQk fwB fwB @@ -185286,7 +185310,7 @@ fwB nRy fwB drw -cQV +rah psb psb fuH @@ -185346,7 +185370,7 @@ bWK bWK neu hjR -vNM +edi iDt iDt iDt @@ -186606,7 +186630,7 @@ thA thA thA thA -nfG +dVP gjq gjq alM @@ -186870,7 +186894,7 @@ wCo oxO wCo eJf -nfG +dVP upH cYi qqh @@ -191206,7 +191230,7 @@ thA iDt scw iDt -vYN +kZS xMq iDt iDt @@ -192245,7 +192269,7 @@ iDt iDt iDt iDt -nfG +dVP alM alM alM @@ -192759,7 +192783,7 @@ xMq iDt iDt iDt -nfG +dVP alM alM alM @@ -218075,7 +218099,7 @@ wNO wNO wNO wNO -aaX +vUA otC hHG hHG @@ -218332,7 +218356,7 @@ wNO wNO wNO wNO -fhB +pfQ otC hHG hHG @@ -218591,8 +218615,8 @@ wNO bln bln bln -xDQ -xDQ +xYi +xYi bln wNO wNO @@ -218677,11 +218701,11 @@ wNO wNO wNO bln -gnZ +tvI bln hcw lSu -gnZ +tvI bln wNO wNO @@ -218693,11 +218717,11 @@ wNO wNO wNO bln -gnZ +tvI lSu weW bln -gnZ +tvI bln bln bln @@ -218848,8 +218872,8 @@ wNO bln bln bln -rPp -rPp +pUO +pUO bln wNO wNO @@ -219711,7 +219735,7 @@ tqR sEB fUR lSu -gnZ +tvI jNZ sEB sEB @@ -219719,7 +219743,7 @@ sEB sEB sEB rzO -gnZ +tvI lSu fUR sEB @@ -220249,7 +220273,7 @@ bln bln bln bln -gnZ +tvI bln bln bln @@ -220261,7 +220285,7 @@ aBR aBR aBR aBR -gnZ +tvI aBR aBR aBR @@ -220512,7 +220536,7 @@ bln bln bln lSu -gnZ +tvI aBR aBR aBR @@ -220730,9 +220754,9 @@ bln bln bln bln -gnZ +tvI lSu -fBN +bRZ fUR irX kyg @@ -222060,7 +222084,7 @@ bln bln bln bln -gnZ +tvI aBR aBR aBR @@ -223590,19 +223614,19 @@ fUR bln uer bln -gnZ +tvI lSu bln bln bln lSu -gnZ +tvI bln bln bln bln bln -gnZ +tvI aBR aBR aBR @@ -227447,15 +227471,15 @@ tKI lSu bln bln -gnZ +tvI bln bln bln -gnZ +tvI bln bln bln -gnZ +tvI bln bln bln @@ -228483,7 +228507,7 @@ lSu lSu lSu bln -gnZ +tvI bln bln bln @@ -229511,7 +229535,7 @@ bNo maT sEB bln -gnZ +tvI bln bln bln @@ -233036,7 +233060,7 @@ tGr bln bln bln -gnZ +tvI bln tGr tGr @@ -234061,7 +234085,7 @@ tGr miY bln bln -gnZ +tvI mZf bln lSu @@ -235859,7 +235883,7 @@ tGr tGr bln jNZ -gnZ +tvI jNZ bln ntK @@ -237158,7 +237182,7 @@ ooL tDg tDg oFI -gnZ +tvI sgW akQ lSu @@ -237418,10 +237442,10 @@ kyy cJi abb oFI -gnZ +tvI abb oFI -gnZ +tvI abb oFI rzG @@ -245826,7 +245850,7 @@ wNO wNO wNO bln -aaX +vUA vbG tkU tkU @@ -246083,7 +246107,7 @@ wNO wNO wNO bln -fhB +pfQ vbG tkU tkU @@ -248493,7 +248517,7 @@ knl knl dGO ksR -rEH +vEK kKL giH qiA @@ -248656,7 +248680,7 @@ bln bln lBD bln -rST +xoJ bln bln qRv @@ -248666,7 +248690,7 @@ hHG wNO wNO wNO -khz +xHQ wNO wNO wNO @@ -248768,7 +248792,7 @@ oNN kGD kGD rbE -rMi +woX jyp hgh qit @@ -248917,10 +248941,10 @@ lBD bln bln bln -xDQ -xDQ +xYi +xYi bln -khz +xHQ wNO wNO wNO @@ -249174,8 +249198,8 @@ lBD bln lBD bln -wUD -wUD +lzW +lzW bln wNO wNO @@ -249431,8 +249455,8 @@ bln bln lBD lBD -wUD -wUD +lzW +lzW bln wNO wNO @@ -249688,8 +249712,8 @@ lBD lBD bln bln -wUD -wUD +lzW +lzW bln wNO wNO @@ -249945,8 +249969,8 @@ bln lBD bln bln -rPp -rPp +pUO +pUO bln wNO wNO @@ -250201,14 +250225,14 @@ lBD bln bln bln -kPS +wEX hHG hHG hHG -khz +xHQ wNO wNO -khz +xHQ wNO wNO wNO @@ -250564,7 +250588,7 @@ fkk fkk spj pBS -vrw +kyw jlT lso vwO @@ -250821,7 +250845,7 @@ tnz gcf gtw iZD -vrw +kyw sLy lso qEM @@ -251078,7 +251102,7 @@ dpa vlU gtw iZD -vrw +kyw krE lso cbs @@ -251335,7 +251359,7 @@ gtw gtw aHZ qWf -vrw +kyw jlT lso qEM @@ -252939,7 +252963,7 @@ vjZ sZF gar bln -fBN +bRZ vYq iAf tUh @@ -253375,7 +253399,7 @@ kKL pVl kKL kKL -kbp +wFt tlH tlH kKL @@ -253453,7 +253477,7 @@ vjZ sZF gar bln -fBN +bRZ vYq iAf qPY @@ -261250,7 +261274,7 @@ wNO wNO wNO wNO -khz +xHQ wNO otC hHG @@ -261509,14 +261533,14 @@ wNO wNO wNO wNO -uFg +pFb hHG hHG hHG -khz +xHQ wNO wNO -khz +xHQ wNO wNO wNO @@ -261767,8 +261791,8 @@ wNO wNO bln bln -xDQ -xDQ +xYi +xYi bln bln bln @@ -262024,8 +262048,8 @@ wNO wNO bln bln -wUD -wUD +lzW +lzW bln bln bln @@ -262281,8 +262305,8 @@ wNO wNO bln bln -rPp -rPp +pUO +pUO bln bln bln @@ -262791,17 +262815,17 @@ wNO wNO wNO wNO -khz +xHQ wNO -aaX +vUA otC hHG hHG hHG -khz +xHQ wNO wNO -khz +xHQ wNO wNO wNO @@ -263050,7 +263074,7 @@ wNO wNO wNO wNO -fhB +pfQ otC hHG hHG @@ -264424,7 +264448,7 @@ wNO wNO wNO bln -fBN +bRZ bln bln bln @@ -264455,7 +264479,7 @@ bln bln bln bln -fBN +bRZ bln bln cSx @@ -265709,7 +265733,7 @@ wNO wNO wNO bln -fBN +bRZ bln bln bln @@ -265740,7 +265764,7 @@ bln bln bln bln -fBN +bRZ bln bln bln @@ -266893,7 +266917,7 @@ wNO wNO wNO wNO -lgH +axL kDs kDs kDs @@ -266994,7 +267018,7 @@ wNO wNO wNO bln -fBN +bRZ bln bln bln @@ -267025,7 +267049,7 @@ bln bln bln bln -fBN +bRZ bln bln bln @@ -267665,7 +267689,7 @@ wNO wNO tkU tkU -lgH +axL hHG hHG hHG @@ -268279,7 +268303,7 @@ wNO wNO wNO bln -fBN +bRZ bln bln bln @@ -268310,7 +268334,7 @@ bln bln bln bln -fBN +bRZ bln bln bln @@ -268693,7 +268717,7 @@ wNO tkU tkU tkU -lgH +axL hHG hHG hHG @@ -269564,7 +269588,7 @@ wNO wNO wNO bln -fBN +bRZ bln bln bln @@ -269595,7 +269619,7 @@ bln bln bln bln -fBN +bRZ bln bln bln @@ -269610,9 +269634,9 @@ bln bln bln bln -fBN +bRZ bln -fBN +bRZ bln wNO wNO @@ -270235,7 +270259,7 @@ wNO wNO tkU tkU -lgH +axL hHG hHG hHG @@ -270849,7 +270873,7 @@ wNO wNO bln bln -fBN +bRZ bln bln bln @@ -270880,7 +270904,7 @@ bln bln bln bln -fBN +bRZ bln bln wNO @@ -271777,7 +271801,7 @@ wNO wNO wNO wNO -lgH +axL hHG hHG hHG @@ -272031,7 +272055,7 @@ wNO (235,1,3) = {" wNO wNO -lgH +axL wNO wNO wNO @@ -272288,7 +272312,7 @@ wNO (236,1,3) = {" wNO wNO -aaX +vUA wNO wNO wNO @@ -272545,7 +272569,7 @@ wNO (237,1,3) = {" wNO wNO -fhB +pfQ wNO wNO wNO @@ -272805,7 +272829,7 @@ wNO wNO wNO wNO -lgH +axL hHG hHG hHG @@ -274090,7 +274114,7 @@ wNO wNO wNO wNO -lgH +axL hHG hHG hHG @@ -274106,7 +274130,7 @@ otC hHG hHG hHG -aaX +vUA wNO wNO wNO @@ -274363,7 +274387,7 @@ otC hHG hHG hHG -fhB +pfQ wNO wNO wNO @@ -274861,7 +274885,7 @@ wNO wNO wNO wNO -lgH +axL hHG hHG hHG @@ -274874,8 +274898,8 @@ wNO wNO bln bln -xDQ -xDQ +xYi +xYi bln bln wNO @@ -275131,8 +275155,8 @@ wNO wNO bln bln -wUD -wUD +lzW +lzW bln bln bln @@ -275388,8 +275412,8 @@ wNO wNO bln bln -rPp -rPp +pUO +pUO bln bln bln @@ -275889,7 +275913,7 @@ wNO wNO wNO wNO -lgH +axL hHG hHG hHG @@ -276660,7 +276684,7 @@ wNO wNO wNO wNO -lgH +axL hHG hHG hHG diff --git a/code/__DEFINES/_flags.dm b/code/__DEFINES/_flags.dm index 6d034fb0f40..d6b388cf7d4 100644 --- a/code/__DEFINES/_flags.dm +++ b/code/__DEFINES/_flags.dm @@ -93,6 +93,9 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define IS_SOLID (1<<6) /// This turf will never be cleared away by other objects on Initialize. #define NO_CLEARING (1<<7) +/// This atom is a pseudo-floor that blocks map generation's checkPlaceAtom() from placing things like trees ontop of it. +#define TURF_BLOCKS_POPULATE_TERRAIN_FLORAFEATURES (1<<8) + ////////////////Area flags\\\\\\\\\\\\\\ /// If it's a valid territory for cult summoning or the CRAB-17 phone to spawn diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 3922e6a5ce9..4b5f7ff90c8 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -212,6 +212,7 @@ // ABOVE_GAME_PLANE layers #define NAVIGATION_EYE_LAYER 4.9 //#define FLY_LAYER 5 //For easy recordkeeping; this is a byond define +#define ABOVE_TREE_LAYER 5.01 #define GASFIRE_LAYER 5.05 #define RIPPLE_LAYER 5.1 diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index d298d24e3a0..75b9658ffb3 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -75,6 +75,7 @@ DEFINE_BITFIELD(turf_flags, list( "IS_SOLID" = IS_SOLID, "UNUSED_RESERVATION_TURF" = UNUSED_RESERVATION_TURF, "RESERVATION_TURF" = RESERVATION_TURF, + "TURF_BLOCKS_PLACEATOM" = TURF_BLOCKS_POPULATE_TERRAIN_FLORAFEATURES, )) DEFINE_BITFIELD(car_traits, list( diff --git a/code/datums/mapgen/CaveGenerator.dm b/code/datums/mapgen/CaveGenerator.dm index 5a7844f20bf..ccda08a2d30 100644 --- a/code/datums/mapgen/CaveGenerator.dm +++ b/code/datums/mapgen/CaveGenerator.dm @@ -126,30 +126,31 @@ // If we've spawned something yet var/spawned_something = FALSE - ///Spawning isn't done in procs to save on overhead on the 60k turfs we're going through. - //FLORA SPAWNING HERE - if(flora_allowed && prob(flora_spawn_chance)) - var/flora_type = pick(flora_spawn_list) - new flora_type(target_turf) - spawned_something = TRUE - - //FEATURE SPAWNING HERE - //we may have generated something from the flora list on the target turf, so let's not place - //a feature here if that's the case (because it would look stupid) - if(feature_allowed && !spawned_something && prob(feature_spawn_chance)) - var/can_spawn = TRUE - - var/atom/picked_feature = pick(feature_spawn_list) - - for(var/obj/structure/existing_feature in range(7, target_turf)) - if(istype(existing_feature, picked_feature)) - can_spawn = FALSE - break - - if(can_spawn) - new picked_feature(target_turf) + if(!(target_turf.turf_flags & TURF_BLOCKS_POPULATE_TERRAIN_FLORAFEATURES)) + ///Spawning isn't done in procs to save on overhead on the 60k turfs we're going through. + //FLORA SPAWNING HERE + if(flora_allowed && prob(flora_spawn_chance)) + var/flora_type = pick(flora_spawn_list) + new flora_type(target_turf) spawned_something = TRUE + //FEATURE SPAWNING HERE + //we may have generated something from the flora list on the target turf, so let's not place + //a feature here if that's the case (because it would look stupid) + if(feature_allowed && !spawned_something && prob(feature_spawn_chance)) + var/can_spawn = TRUE + + var/atom/picked_feature = pick(feature_spawn_list) + + for(var/obj/structure/existing_feature in range(7, target_turf)) + if(istype(existing_feature, picked_feature)) + can_spawn = FALSE + break + + if(can_spawn) + new picked_feature(target_turf) + spawned_something = TRUE + //MOB SPAWNING HERE if(mobs_allowed && !spawned_something && prob(mob_spawn_chance)) var/atom/picked_mob = pick(mob_spawn_list) diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index 2651684e39b..265bc025db5 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -8,14 +8,13 @@ density = TRUE anchored = TRUE pass_flags_self = LETPASSTHROW|PASSSTRUCTURE - layer = ABOVE_MOB_LAYER + layer = ABOVE_TREE_LAYER + plane = ABOVE_GAME_PLANE /// armor is a little bit less than a grille. max_integrity about half that of a grille. armor_type = /datum/armor/structure_railing max_integrity = 25 var/climbable = TRUE - ///Initial direction of the railing. - var/ini_dir ///item released when deconstructed var/item_deconstruct = /obj/item/stack/rods @@ -39,7 +38,6 @@ /obj/structure/railing/Initialize(mapload) . = ..() - ini_dir = dir if(climbable) AddElement(/datum/element/climbable) @@ -64,6 +62,24 @@ AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM) + return INITIALIZE_HINT_LATELOAD + +/obj/structure/railing/LateInitialize() + RegisterSignal(get_turf(src), COMSIG_TURF_CHANGE, PROC_REF(on_turf_change)) + turf_changed() + +/obj/structure/railing/proc/on_turf_change(turf/source, path, list/new_baseturfs, flags, list/post_change_callbacks) + SIGNAL_HANDLER + post_change_callbacks += CALLBACK(src, PROC_REF(turf_changed)) + +///Updates visibility when turfs change so that mineral turfs w/ overlays don't visibly appear underneath the railing. +/obj/structure/railing/proc/turf_changed() + var/turf/loc_turf = get_turf(src) + invisibility = 0 + if(loc_turf.overlays.len > 0) + invisibility = 100 + + /obj/structure/railing/examine(mob/user) . = ..() if(anchored == TRUE) @@ -168,8 +184,8 @@ adjust_dir_layer(new_dir) /obj/structure/railing/wooden_fence/proc/adjust_dir_layer(direction) - var/new_layer = (direction & NORTH) ? MOB_LAYER : ABOVE_MOB_LAYER - layer = new_layer + layer = (direction & NORTH) ? MOB_LAYER : initial(layer) + plane = (direction & NORTH) ? GAME_PLANE : initial(plane) /obj/structure/railing/corner/end/wooden_fence diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index a2ffa244679..456d3073c0b 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -586,6 +586,15 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) var/turf/T = get_turf(src) T.turf_flags |= NO_LAVA_GEN +INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_atoms_ontop) +/obj/effect/mapping_helpers/no_atoms_ontop + icon_state = "no_atoms_ontop" + +/obj/effect/mapping_helpers/no_atoms_ontop/Initialize(mapload) + . = ..() + var/turf/loc_turf = get_turf(src) + loc_turf.turf_flags |= TURF_BLOCKS_POPULATE_TERRAIN_FLORAFEATURES + ///Helpers used for injecting stuff into atoms on the map. /obj/effect/mapping_helpers/atom_injector name = "Atom Injector" diff --git a/code/modules/procedural_mapping/mapGeneratorModule.dm b/code/modules/procedural_mapping/mapGeneratorModule.dm index 7bf32d15195..46196b68034 100644 --- a/code/modules/procedural_mapping/mapGeneratorModule.dm +++ b/code/modules/procedural_mapping/mapGeneratorModule.dm @@ -108,7 +108,7 @@ //Checks and Rejects dense turfs /datum/map_generator_module/proc/checkPlaceAtom(turf/T) - if(!T) + if(!T || (T.turf_flags & TURF_BLOCKS_POPULATE_TERRAIN_FLORAFEATURES)) return FALSE if(T.density) return FALSE diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index 8bfe0af0854..ad09351e787 100644 Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ