diff --git a/html/changelog.html b/html/changelog.html index ec9b479d02a65..de6cb99f5e2ef 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -28,6 +28,19 @@

Sierra SS13

-->
+

25.11 - 2023

+

Обновления KandJX:

+
+
Значительные мапфиксы.
+
ГП имеет полный доступ, кроме АВД, Капитана и Внутренних Дел.
+
Выдан доступ Research всему ЭК.
+
Выдан доступ Research Storage всему отделу РнД. Отвечает за доступы в офис и раздевалку.
+
Выдан доступ EXTERNAL информационному технику
+
Доступ к инженерному коридору убран
+
Доступ к коридору вокруг чекпойна СБ 4ой палубы изменен с ЭКСТЕРНАЛ, на (СБ, МЕД, ИНЖ).
+
Охлаждение СМ теперь будет работать. Однако все равно ждём /turf/space/open от @sprtn
+
+

24.11 - 2023

Обновления Kam_Survivor:

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 805da4cb01a7a..efdb34b4c78e5 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -22469,3 +22469,36 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY sierra_genchangelog.p \u044F\u0442\u044C \u043F\u0430\u0441\u043F\u043E\u0440\u0442 \u0443\u043D\u0430\ \u0442\u0438 \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0430\u043C\u0438\ \ \u0439\u043E\u0437\u0430'\u0443\u043D\u0430\u0442\u0438" +2023-11-25: + KandJX: + - maptweak: "\u0417\u043D\u0430\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435\ + \ \u043C\u0430\u043F\u0444\u0438\u043A\u0441\u044B." + - tweak: "\u0413\u041F \u0438\u043C\u0435\u0435\u0442 \u043F\u043E\u043B\u043D\u044B\ + \u0439 \u0434\u043E\u0441\u0442\u0443\u043F, \u043A\u0440\u043E\u043C\u0435\ + \ \u0410\u0412\u0414, \u041A\u0430\u043F\u0438\u0442\u0430\u043D\u0430 \u0438\ + \ \u0412\u043D\u0443\u0442\u0440\u0435\u043D\u043D\u0438\u0445 \u0414\u0435\u043B\ + ." + - tweak: "\u0412\u044B\u0434\u0430\u043D \u0434\u043E\u0441\u0442\u0443\u043F Research\ + \ \u0432\u0441\u0435\u043C\u0443 \u042D\u041A." + - tweak: "\u0412\u044B\u0434\u0430\u043D \u0434\u043E\u0441\u0442\u0443\u043F Research\ + \ Storage \u0432\u0441\u0435\u043C\u0443 \u043E\u0442\u0434\u0435\u043B\u0443\ + \ \u0420\u043D\u0414. \u041E\u0442\u0432\u0435\u0447\u0430\u0435\u0442 \u0437\ + \u0430 \u0434\u043E\u0441\u0442\u0443\u043F\u044B \u0432 \u043E\u0444\u0438\u0441\ + \ \u0438 \u0440\u0430\u0437\u0434\u0435\u0432\u0430\u043B\u043A\u0443." + - tweak: "\u0412\u044B\u0434\u0430\u043D \u0434\u043E\u0441\u0442\u0443\u043F EXTERNAL\ + \ \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E\ + \u043C\u0443 \u0442\u0435\u0445\u043D\u0438\u043A\u0443" + - maptweak: "\u0414\u043E\u0441\u0442\u0443\u043F \u043A \u0438\u043D\u0436\u0435\ + \u043D\u0435\u0440\u043D\u043E\u043C\u0443 \u043A\u043E\u0440\u0438\u0434\u043E\ + \u0440\u0443 \u0443\u0431\u0440\u0430\u043D" + - maptweak: "\u0414\u043E\u0441\u0442\u0443\u043F \u043A \u043A\u043E\u0440\u0438\ + \u0434\u043E\u0440\u0443 \u0432\u043E\u043A\u0440\u0443\u0433 \u0447\u0435\u043A\ + \u043F\u043E\u0439\u043D\u0430 \u0421\u0411 4\u043E\u0439 \u043F\u0430\u043B\ + \u0443\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0435\u043D \u0441 \u042D\u041A\ + \u0421\u0422\u0415\u0420\u041D\u0410\u041B, \u043D\u0430 (\u0421\u0411, \u041C\ + \u0415\u0414, \u0418\u041D\u0416)." + - maptweak: "\u041E\u0445\u043B\u0430\u0436\u0434\u0435\u043D\u0438\u0435 \u0421\ + \u041C \u0442\u0435\u043F\u0435\u0440\u044C \u0431\u0443\u0434\u0435\u0442 \u0440\ + \u0430\u0431\u043E\u0442\u0430\u0442\u044C. \u041E\u0434\u043D\u0430\u043A\u043E\ + \ \u0432\u0441\u0435 \u0440\u0430\u0432\u043D\u043E \u0436\u0434\u0451\u043C\ + \ /turf/space/open \u043E\u0442 @sprtn" diff --git a/maps/sierra/areas/z1_sierra_deck4.dm b/maps/sierra/areas/z1_sierra_deck4.dm index f59d1633c74f8..2b01237a2e0f9 100644 --- a/maps/sierra/areas/z1_sierra_deck4.dm +++ b/maps/sierra/areas/z1_sierra_deck4.dm @@ -1,7 +1,7 @@ /area/hallway/primary/fourthdeck/fore name = "Fourth Deck - Hallway - Fore" icon_state = "hallF" - req_access = list(access_external_airlocks) + req_access = list(list(access_engine, access_medical, access_security)) holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/fourthdeck/center diff --git a/maps/sierra/areas/z2_sierra_deck3.dm b/maps/sierra/areas/z2_sierra_deck3.dm index c6671dd3ac88e..e3bb5a826a4e6 100644 --- a/maps/sierra/areas/z2_sierra_deck3.dm +++ b/maps/sierra/areas/z2_sierra_deck3.dm @@ -1,7 +1,6 @@ /area/hallway/primary/thirddeck/fore name = "Third Deck - Hallway - Fore" icon_state = "hallF" - req_access = list(access_external_airlocks) holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/thirddeck/center diff --git a/maps/sierra/areas/z4_sierra_deck1.dm b/maps/sierra/areas/z4_sierra_deck1.dm index 7fa05a52fb5a2..2c8429d2676b0 100644 --- a/maps/sierra/areas/z4_sierra_deck1.dm +++ b/maps/sierra/areas/z4_sierra_deck1.dm @@ -143,10 +143,12 @@ /area/rnd/locker name = "First Deck - RND - Locker Room" icon_state = "locker" + req_access = list(access_research_storage) /area/rnd/office name = "First Deck - RND - Research Office" icon_state = "locker" + req_access = list(access_research_storage) /area/rnd/servers name = "First Deck - RND - Servers" diff --git a/maps/sierra/job/jobs_command.dm b/maps/sierra/job/jobs_command.dm index 595a979aa3ea2..33c1be9f43f3f 100644 --- a/maps/sierra/job/jobs_command.dm +++ b/maps/sierra/job/jobs_command.dm @@ -89,12 +89,13 @@ access_robotics, access_kitchen, access_cargo, access_construction, access_chemistry, access_cargo_bot, access_hydroponics, access_library, access_virology, access_cmo, access_qm, access_network, access_surgery, access_mailsorting, access_heads_vault, - access_ce, access_hop, access_hos, access_RC_announce, access_keycard_auth, access_tcomsat, + access_ce, access_rd, access_hop, access_hos, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_sec_doors, access_psychiatrist, access_medical_equip, access_gun, access_expedition_shuttle, access_guppy, access_seneng, access_senmed, access_hangar, access_guppy_helm, access_expedition_shuttle_helm, access_explorer, access_el, access_tox, access_tox_storage, access_research, access_mining, access_mining_office, access_mining_station, - access_xenobiology, access_xenoarch, access_petrov, access_petrov_helm, access_actor + access_xenobiology, access_xenoarch, access_petrov, access_petrov_helm, access_actor, access_chief_steward, + access_bar, access_commissary, access_pilot, access_field_eng, access_field_med, access_network_admin, access_research_storage ) software_on_spawn = list( /datum/computer_file/program/comm, diff --git a/maps/sierra/job/jobs_engineering.dm b/maps/sierra/job/jobs_engineering.dm index 415f71345f7c1..e04ad38983689 100644 --- a/maps/sierra/job/jobs_engineering.dm +++ b/maps/sierra/job/jobs_engineering.dm @@ -184,7 +184,7 @@ max_skill = list( SKILL_ELECTRICAL = SKILL_MAX, SKILL_COMPUTER = SKILL_MAX) - access = list( access_maint_tunnels, access_network, + access = list( access_maint_tunnels, access_network, access_external_airlocks, access_tech_storage, access_emergency_storage, access_tcomsat) diff --git a/maps/sierra/job/jobs_exploration.dm b/maps/sierra/job/jobs_exploration.dm index dba13b66773af..e80f743c0dbe3 100644 --- a/maps/sierra/job/jobs_exploration.dm +++ b/maps/sierra/job/jobs_exploration.dm @@ -43,7 +43,8 @@ access_expedition_shuttle, access_expedition_shuttle_helm, access_guppy, - access_hangar + access_hangar, + access_research ) software_on_spawn = list( /datum/computer_file/program/deck_management, @@ -102,7 +103,8 @@ access_guppy_helm, access_expedition_shuttle, access_guppy, - access_hangar + access_hangar, + access_research ) software_on_spawn = list(/datum/computer_file/program/deck_management) @@ -158,7 +160,8 @@ access_expedition_shuttle, access_guppy, access_hangar, - access_expedition_shuttle_helm + access_expedition_shuttle_helm, + access_research ) software_on_spawn = list(/datum/computer_file/program/deck_management) @@ -212,7 +215,8 @@ access_guppy_helm, access_expedition_shuttle, access_guppy, - access_hangar + access_hangar, + access_research ) software_on_spawn = list(/datum/computer_file/program/deck_management) @@ -277,7 +281,8 @@ access_guppy_helm, access_expedition_shuttle, access_guppy, - access_hangar + access_hangar, + access_research ) software_on_spawn = list(/datum/computer_file/program/deck_management) diff --git a/maps/sierra/job/jobs_research.dm b/maps/sierra/job/jobs_research.dm index 05708fcc6f96d..9175a89d2d7e6 100644 --- a/maps/sierra/job/jobs_research.dm +++ b/maps/sierra/job/jobs_research.dm @@ -22,7 +22,8 @@ access = list( access_tox, access_tox_storage, access_research, access_mining, access_mining_office, access_mining_station, access_xenobiology, access_xenoarch, access_robotics, access_guppy_helm, - access_expedition_shuttle, access_guppy, access_hangar, access_petrov, access_petrov_helm + access_expedition_shuttle, access_guppy, access_hangar, access_petrov, access_petrov_helm, + access_research_storage ) @@ -95,7 +96,7 @@ access = list( access_tox, access_tox_storage, access_research, access_petrov, access_petrov_helm, access_mining_office, access_mining_station, access_xenobiology, access_guppy_helm, access_hangar, - access_xenoarch, access_expedition_shuttle, access_guppy + access_xenoarch, access_expedition_shuttle, access_guppy, access_research_storage ) @@ -157,7 +158,8 @@ access = list( access_robotics, access_research, - access_tech_storage + access_tech_storage, + access_research_storage ) @@ -205,7 +207,8 @@ access = list( access_research, access_mining_office, access_petrov, access_expedition_shuttle, - access_guppy, access_hangar + access_guppy, access_hangar, + access_research_storage ) diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 6b40eeb45fa9b..4a5088ee975e8 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -1425,7 +1425,7 @@ "akx" = ( /obj/structure/closet/secure_closet/guncabinet/sierra_armory/stun, /obj/floor_decal/industrial/outline/grey, -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, @@ -2155,13 +2155,6 @@ }, /turf/simulated/floor/reinforced, /area/thruster/d3port) -"apW" = ( -/obj/structure/railing/mapped, -/obj/structure/railing/mapped, -/turf/simulated/floor/reinforced{ - map_airless = 1 - }, -/area/space) "aqb" = ( /obj/floor_decal/techfloor{ dir = 1 @@ -4683,6 +4676,9 @@ "aHV" = ( /obj/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/powered/pump, +/obj/machinery/light/spot{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/containment) "aIe" = ( @@ -4763,6 +4759,7 @@ /obj/floor_decal/corner/red/border{ dir = 4 }, +/obj/structure/railing/mapped, /turf/simulated/floor/reinforced{ map_airless = 1 }, @@ -7318,11 +7315,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/storage/eva) "bcv" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8 + }, +/turf/simulated/floor/reinforced{ + map_airless = 1 }, -/obj/structure/lattice, -/turf/simulated/open, /area/space) "bcy" = ( /obj/structure/window/basic, @@ -7341,15 +7339,11 @@ /turf/simulated/floor/tiled/dark/monotile, /area/medical/locker) "bcI" = ( -/obj/floor_decal/industrial/warning{ - dir = 5 - }, -/obj/structure/railing/mapped{ - dir = 4; - init_color = "#8c911d"; - color = "#8c911d" +/obj/floor_decal/corner/purple/border{ + dir = 1 }, -/turf/simulated/floor/plating, +/obj/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "bcJ" = ( /obj/machinery/door/firedoor, @@ -8836,7 +8830,10 @@ pixel_x = 24 }, /obj/item/stack/material/plasteel/fifty, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "bqj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10036,8 +10033,15 @@ /turf/simulated/floor/plating, /area/maintenance/fourthdeck/starboard) "byi" = ( -/obj/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/railing/mapped{ + init_color = "#8c911d"; + dir = 1; + color = "#8c911d" + }, +/obj/structure/railing/mapped{ + dir = 8; + init_color = "#8c911d"; + color = "#8c911d" }, /turf/simulated/floor/plating, /area/rnd/misc_lab) @@ -11138,6 +11142,14 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/floor_decal/corner/purple/border{ + dir = 9 + }, +/obj/item/stack/material/steel/ten, +/obj/item/stack/material/steel/ten, /turf/simulated/floor/tiled/white, /area/rnd/misc_lab) "bGP" = ( @@ -11370,14 +11382,13 @@ /turf/simulated/floor/tiled, /area/maintenance/abandoned_hydroponics) "bIW" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6 - }, -/turf/simulated/floor/reinforced{ - map_airless = 1 +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/area/space) +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/containment) "bJb" = ( /obj/structure/cable/green{ d1 = 1; @@ -13683,12 +13694,9 @@ /turf/simulated/floor/tiled/dark, /area/chapel/mortuary) "cbd" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6 - }, -/obj/structure/lattice, -/turf/simulated/open, -/area/space) +/obj/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/white, +/area/rnd/misc_lab) "cbm" = ( /obj/structure/railing/mapped, /obj/machinery/shieldgen, @@ -18325,11 +18333,22 @@ dir = 4 }, /obj/structure/table/rack, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "cLl" = ( /obj/floor_decal/steeldecal/steel_decals6, @@ -20235,10 +20254,13 @@ /turf/simulated/floor/tiled/techfloor, /area/turret_protected/ai_cyborg_station) "cZc" = ( -/obj/floor_decal/industrial/warning{ +/obj/floor_decal/corner/purple/border{ dir = 10 }, -/turf/simulated/floor/plating, +/obj/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "cZj" = ( /obj/structure/cable/green, @@ -20615,7 +20637,7 @@ /obj/floor_decal/industrial/danger{ dir = 9 }, -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 1 }, /turf/simulated/floor/tiled/steel_grid, @@ -21702,10 +21724,13 @@ dir = 4; pixel_x = -24 }, -/obj/floor_decal/industrial/warning{ +/obj/floor_decal/corner/purple/border{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "djN" = ( /obj/floor_decal/techfloor{ @@ -21974,10 +21999,9 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "dmo" = ( -/obj/floor_decal/corner/red/bordercorner{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 }, -/obj/machinery/nav_light, /turf/simulated/floor/reinforced{ map_airless = 1 }, @@ -22762,10 +22786,7 @@ /area/crew_quarters/heads/office/ce) "dsg" = ( /obj/structure/closet/bombcloset, -/obj/floor_decal/techfloor{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "dsj" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel{ @@ -23200,8 +23221,8 @@ /turf/simulated/floor/tiled/dark, /area/bridge/nano) "dvc" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, /obj/structure/lattice, /turf/simulated/floor/reinforced{ @@ -23305,10 +23326,9 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "dvW" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 }, -/obj/structure/lattice, /turf/simulated/floor/reinforced{ map_airless = 1 }, @@ -24884,7 +24904,14 @@ }, /obj/item/stack/material/aluminium/fifty, /obj/item/stack/material/plastic/fifty, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 1; + icon_state = "railing0-1" + }, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "dHu" = ( /obj/machinery/firealarm{ @@ -25769,6 +25796,23 @@ dir = 8 }, /obj/structure/table/standard, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply{ + pixel_y = -8; + pixel_x = -4 + }, +/obj/random/tech_supply{ + pixel_y = 7; + pixel_x = 6 + }, +/obj/random/tool{ + pixel_y = -3; + pixel_x = 4 + }, +/obj/random/tool{ + pixel_x = -2 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "dNR" = ( @@ -27986,7 +28030,7 @@ /obj/floor_decal/corner/red/bordercorner2{ dir = 9 }, -/obj/machinery/light, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/hallway/aft) "eep" = ( @@ -28964,6 +29008,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/floor_decal/corner/purple/border{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/rnd/misc_lab) "emo" = ( @@ -30633,10 +30683,6 @@ /obj/floor_decal/corner/black/border{ dir = 9 }, -/obj/machinery/light_switch{ - pixel_x = -22; - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/security/sierra/interrogation/second) "eyF" = ( @@ -31197,9 +31243,6 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) "eCZ" = ( -/obj/floor_decal/industrial/warning{ - dir = 6 - }, /obj/structure/railing/mapped{ dir = 4; init_color = "#8c911d"; @@ -32549,7 +32592,7 @@ /obj/floor_decal/corner/purple/border{ dir = 8 }, -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 8 }, /turf/simulated/floor/tiled/monotile, @@ -33829,6 +33872,7 @@ pixel_y = 4; pixel_x = 5 }, +/obj/machinery/light/spot, /turf/simulated/floor/reinforced, /area/rnd/containment) "eXV" = ( @@ -34057,6 +34101,10 @@ name = "Test Chamber Blast Doors"; dir = 4 }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/reinforced, /area/rnd/containment) "eZB" = ( @@ -34494,7 +34542,17 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/holoplant, +/obj/structure/table/standard, +/obj/item/device/scanner/spectrometer/adv, +/obj/item/stack/material/phoron{ + amount = 5 + }, +/obj/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/floor_decal/corner/purple/border{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/rnd/misc_lab) "fda" = ( @@ -37264,17 +37322,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitors) "fyN" = ( -/obj/floor_decal/corner/purple/border, -/obj/floor_decal/corner/purple/bordercorner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/railing/mapped{ + init_color = "#8c911d"; + color = "#8c911d" }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/plating, /area/rnd/misc_lab) "fyW" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -37449,6 +37501,7 @@ /obj/floor_decal/spline/fancy/wood{ dir = 6 }, +/obj/item/paper/sierra, /turf/simulated/floor/wood/walnut, /area/crew_quarters/cafe) "fAm" = ( @@ -37688,7 +37741,14 @@ /obj/item/stack/material/glass{ amount = 10 }, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 1; + icon_state = "railing0-1" + }, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "fCG" = ( /obj/floor_decal/techfloor/corner{ @@ -38022,6 +38082,16 @@ dir = 8 }, /obj/structure/table/standard, +/obj/machinery/fabricator/micro/bartender{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/floor_decal/corner/purple/border{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/rnd/misc_lab) "fEY" = ( @@ -38257,14 +38327,13 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/bluespace) "fGI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 - }, -/obj/structure/lattice, -/turf/simulated/floor/reinforced{ - map_airless = 1 +/obj/structure/railing/mapped{ + init_color = "#8c911d"; + dir = 1; + color = "#8c911d" }, -/area/space) +/turf/simulated/floor/plating, +/area/rnd/misc_lab) "fGK" = ( /obj/structure/bed/chair/padded/yellow{ dir = 4 @@ -38543,13 +38612,16 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "fIG" = ( -/obj/floor_decal/industrial/warning, /obj/machinery/camera/network/research{ c_tag = "Research - Misc. Test Chamber - Large"; network = list("Research","Miscellaneous Reseach"); dir = 1 }, -/turf/simulated/floor/plating, +/obj/floor_decal/corner/purple/border, +/obj/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "fIJ" = ( /obj/floor_decal/corner/paleblue{ @@ -40778,21 +40850,15 @@ /turf/simulated/floor/wood/yew, /area/crew_quarters/heads/office/ce/cobed) "fZL" = ( -/obj/floor_decal/corner/purple/bordercorner{ - dir = 4 - }, -/obj/floor_decal/corner/purple/bordercorner{ - dir = 1 - }, -/obj/floor_decal/corner/purple/bordercorner, -/obj/floor_decal/corner/purple/bordercorner{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/floor_decal/industrial/warning, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "fZM" = ( @@ -41086,19 +41152,16 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/seconddeck/starboard) "gbC" = ( -/obj/floor_decal/corner/purple/bordercorner{ - dir = 4 - }, -/obj/floor_decal/corner/purple/bordercorner{ - dir = 8 - }, -/obj/floor_decal/corner/purple/bordercorner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/floor_decal/industrial/warning, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "gbE" = ( @@ -42164,11 +42227,16 @@ /turf/simulated/floor/tiled/techmaint, /area/maintenance/seconddeck/aftport) "gkG" = ( -/obj/machinery/light{ - dir = 8 +/obj/floor_decal/corner/yellow{ + dir = 1 }, -/turf/simulated/floor/reinforced, -/area/rnd/containment) +/obj/machinery/button/blast_door{ + dir = 4; + pixel_x = -24; + id_tag = "miners_restroom_sierra" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/hangar_stairs) "gkQ" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/galley/freezer) @@ -45225,13 +45293,6 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/forestarboard) "gKz" = ( -/obj/floor_decal/industrial/warning{ - dir = 6 - }, -/obj/structure/railing/mapped{ - init_color = "#8c911d"; - color = "#8c911d" - }, /obj/structure/railing/mapped{ dir = 4; init_color = "#8c911d"; @@ -45468,14 +45529,18 @@ /turf/simulated/floor/tiled/dark, /area/chapel/office) "gMC" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6 +/obj/structure/railing/mapped{ + dir = 8; + init_color = "#8c911d"; + color = "#8c911d" }, -/obj/structure/lattice, -/turf/simulated/floor/reinforced{ - map_airless = 1 +/obj/structure/railing/mapped{ + init_color = "#8c911d"; + dir = 1; + color = "#8c911d" }, -/area/space) +/turf/simulated/floor/plating, +/area/rnd/misc_lab) "gMI" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -45855,8 +45920,11 @@ pixel_x = 32; pixel_y = -37 }, -/obj/floor_decal/industrial/warning, -/turf/simulated/floor/plating, +/obj/floor_decal/corner/purple/border, +/obj/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "gPL" = ( /obj/floor_decal/borderfloor{ @@ -49054,9 +49122,29 @@ dir = 4 }, /obj/structure/table/standard, -/obj/random/tech_loot, -/obj/random/tech_loot, -/obj/random/tech_loot, +/obj/random/tech_supply{ + pixel_y = 5 + }, +/obj/random/tech_supply{ + pixel_y = -7; + pixel_x = -6 + }, +/obj/random/tech_supply{ + pixel_y = 7; + pixel_x = 7 + }, +/obj/random/tool{ + pixel_y = -4; + pixel_x = 4 + }, +/obj/random/tool{ + pixel_y = 9; + pixel_x = -3 + }, +/obj/random/tank{ + pixel_y = 7; + pixel_x = -1 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "hnL" = ( @@ -49728,18 +49816,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/forestarboard) "hui" = ( -/obj/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/floor_decal/industrial/warning/corner, -/obj/machinery/camera/network/engine{ - c_tag = "Engine - R-UST - TOKAMAK Interior"; - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 }, /turf/simulated/floor/reinforced{ map_airless = 1 }, -/area/vacant/prototype/engine) +/area/space) "hux" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -51235,6 +51318,9 @@ /obj/floor_decal/corner/red/border{ dir = 4 }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/reinforced{ map_airless = 1 }, @@ -53164,6 +53250,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/assembly/office) "hVT" = ( @@ -53534,9 +53623,6 @@ /area/maintenance/seconddeck/hangar) "hZK" = ( /obj/structure/disposalpipe/segment, -/obj/floor_decal/corner/purple/border{ - dir = 8 - }, /obj/floor_decal/corner/purple/bordercorner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -53544,6 +53630,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "hZL" = ( @@ -55543,19 +55632,15 @@ /turf/simulated/floor/tiled, /area/exploration_shuttle/cargo_l) "ipu" = ( -/obj/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/structure/railing/mapped{ - dir = 8; - init_color = "#8c911d"; - color = "#8c911d" - }, /obj/machinery/camera/network/research{ c_tag = "Research - Misc. Test Chamber"; network = list("Research","Miscellaneous Reseach") }, -/turf/simulated/floor/plating, +/obj/floor_decal/corner/purple/border{ + dir = 1 + }, +/obj/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "ipR" = ( /obj/paint_stripe/yellow, @@ -56571,13 +56656,10 @@ pixel_x = 21; dir = 8 }, -/obj/structure/bed/chair/pew/down{ - pixel_x = -3; - dir = 4 - }, /obj/floor_decal/spline/fancy/wood{ dir = 4 }, +/obj/item/stool/wood, /turf/simulated/floor/wood/walnut, /area/security/sierra/breakroom) "iyp" = ( @@ -56665,10 +56747,13 @@ /turf/simulated/floor/plating, /area/vacant/prototype/engine) "iyO" = ( -/obj/structure/mopbucket, -/obj/item/mop, +/obj/machinery/disposal, /obj/item/mop, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "iyZ" = ( /obj/machinery/papershredder, @@ -58570,10 +58655,6 @@ /turf/simulated/floor/plating, /area/maintenance/bridgedeck/port) "iNo" = ( -/obj/floor_decal/corner/purple/border, -/obj/floor_decal/corner/purple/bordercorner{ - dir = 4 - }, /obj/structure/cable/green{ d1 = 1; d2 = 8; @@ -58585,6 +58666,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/floor_decal/industrial/warning, +/obj/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/floor_decal/industrial/warning/corner{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "iNp" = ( @@ -61439,10 +61527,10 @@ "jiU" = ( /obj/structure/table/standard, /obj/floor_decal/borderfloorblack{ - dir = 4 + dir = 5 }, /obj/floor_decal/corner/purple/border{ - dir = 4 + dir = 5 }, /obj/item/paper_bin, /obj/item/pen/multi, @@ -63126,7 +63214,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light, +/obj/machinery/light/spot, /obj/floor_decal/corner/purple/border, /obj/structure/disposalpipe/segment{ dir = 4 @@ -64824,13 +64912,13 @@ /area/hallway/primary/seconddeck/aft) "jMM" = ( /obj/structure/disposalpipe/segment, -/obj/floor_decal/corner/purple/border{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "jMS" = ( @@ -65085,18 +65173,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/floor_decal/corner/purple/bordercorner{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/floor_decal/industrial/warning{ + dir = 8 }, -/obj/floor_decal/corner/purple/bordercorner{ +/obj/floor_decal/industrial/warning{ dir = 4 }, -/obj/floor_decal/corner/purple/bordercorner, -/obj/floor_decal/corner/purple/bordercorner{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "jPi" = ( @@ -65370,6 +65454,9 @@ detail_color = "#a2819e"; color = "#a2819e" }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/assembly/office) "jRh" = ( @@ -66215,9 +66302,9 @@ /turf/simulated/wall/prepainted, /area/maintenance/firstdeck/aftport) "jVZ" = ( -/obj/structure/railing/mapped, -/obj/floor_decal/corner/red/border{ - dir = 4 +/obj/floor_decal/spline/plain/black, +/obj/structure/railing/mapped{ + dir = 1 }, /turf/simulated/floor/reinforced{ map_airless = 1 @@ -67074,8 +67161,11 @@ dir = 1; pixel_y = -24 }, -/obj/floor_decal/industrial/warning, -/turf/simulated/floor/plating, +/obj/floor_decal/corner/purple/border, +/obj/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "kcp" = ( /obj/structure/cable/green{ @@ -67926,6 +68016,11 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/containment) "kiH" = ( @@ -69844,6 +69939,7 @@ pixel_y = 11; pixel_x = -6 }, +/obj/item/paper/sierra, /turf/simulated/floor/carpet/magenta, /area/crew_quarters/cafe) "kxG" = ( @@ -72009,12 +72105,10 @@ /area/maintenance/solar/starboard) "kMW" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 4 + dir = 10 }, /obj/structure/lattice, -/turf/simulated/floor/reinforced{ - map_airless = 1 - }, +/turf/space, /area/space) "kMY" = ( /obj/structure/cable{ @@ -72275,6 +72369,11 @@ dir = 8 }, /obj/item/stool/padded, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/containment) "kOJ" = ( @@ -72498,9 +72597,12 @@ /obj/floor_decal/corner/purple/border{ dir = 4 }, -/obj/floor_decal/corner/purple/border{ +/obj/floor_decal/corner/purple/bordercorner{ dir = 8 }, +/obj/floor_decal/industrial/warning/corner{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "kQE" = ( @@ -72673,6 +72775,7 @@ pixel_y = 14; pixel_x = -4 }, +/obj/item/paper/sierra, /turf/simulated/floor/carpet/green, /area/crew_quarters/cafe) "kRK" = ( @@ -73227,7 +73330,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitors) "kWG" = ( -/obj/floor_decal/industrial/warning, +/obj/structure/railing/mapped{ + dir = 8; + init_color = "#8c911d"; + color = "#8c911d" + }, /turf/simulated/floor/plating, /area/rnd/misc_lab) "kWI" = ( @@ -76573,10 +76680,8 @@ /turf/simulated/floor/tiled/dark/monotile, /area/medical/staging) "lxi" = ( -/obj/machinery/atmospherics/pipe/zpipe/down/cyan{ - dir = 1 - }, /obj/structure/lattice, +/obj/machinery/atmospherics/pipe/zpipe/down/cyan, /turf/simulated/open, /area/space) "lxj" = ( @@ -76666,9 +76771,25 @@ dir = 8 }, /obj/structure/table/standard, -/obj/random/tech_loot, -/obj/random/tech_loot, -/obj/random/tech_loot, +/obj/random/tech_supply{ + pixel_y = -6 + }, +/obj/random/tech_supply{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/random/tech_supply{ + pixel_y = -6; + pixel_x = 8 + }, +/obj/random/tool{ + pixel_y = 5; + pixel_x = 10 + }, +/obj/random/tool{ + pixel_y = -2; + pixel_x = -3 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "lyk" = ( @@ -79577,6 +79698,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/purple/border{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/rnd/misc_lab) "lUd" = ( @@ -80621,11 +80748,27 @@ pixel_x = -24 }, /obj/structure/table/rack, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 1; + icon_state = "railing0-1" + }, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tank, +/obj/random/tank, +/obj/random/tank, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "mde" = ( /obj/machinery/computer/air_control{ @@ -80657,7 +80800,7 @@ /area/crew_quarters/cafe) "mdp" = ( /obj/structure/table/reinforced, -/obj/machinery/fabricator/micro{ +/obj/machinery/fabricator/micro/bartender{ pixel_x = 9; pixel_y = 7 }, @@ -83771,7 +83914,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/white/monotile, /area/rnd/office) "mBr" = ( @@ -83922,12 +84065,15 @@ /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/center) "mDb" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 +/obj/floor_decal/industrial/warning{ + dir = 1 }, -/turf/simulated/open, -/area/space) +/obj/machinery/camera/network/engine{ + c_tag = "Engine - R-UST - TOKAMAK Interior"; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/vacant/prototype/engine) "mDe" = ( /obj/machinery/conveyor{ dir = 1; @@ -86706,6 +86852,9 @@ /obj/floor_decal/corner/blue/bordercorner2{ dir = 5 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/security/sierra/forensic/lab) "mZt" = ( @@ -86828,7 +86977,22 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/clean, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "nai" = ( /obj/floor_decal/industrial/outline/yellow, @@ -87136,10 +87300,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/floor_decal/corner/purple/border, -/obj/floor_decal/corner/purple/border{ +/obj/floor_decal/corner/purple/bordercorner{ + dir = 8 + }, +/obj/floor_decal/corner/purple/bordercorner{ dir = 1 }, +/obj/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "ncQ" = ( @@ -89534,7 +89704,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/light, +/obj/machinery/light/spot, /obj/floor_decal/borderfloor/corner2, /obj/floor_decal/corner/red/bordercorner2, /turf/simulated/floor/tiled/steel_grid, @@ -90493,20 +90663,16 @@ /area/maintenance/seconddeck/aftstarboard) "nCl" = ( /obj/structure/table/standard, -/obj/item/stack/material/phoron{ - amount = 5 - }, -/obj/item/device/scanner/spectrometer/adv, /obj/item/storage/box/beakers/insulated, /obj/item/reagent_containers/glass/beaker/large, /obj/structure/window/reinforced{ dir = 8 }, /obj/floor_decal/borderfloorblack{ - dir = 1 + dir = 9 }, /obj/floor_decal/corner/purple/border{ - dir = 1 + dir = 9 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, @@ -93896,6 +94062,8 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/forestarboard) "ofJ" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/purple/border, /turf/simulated/floor/tiled/white, /area/rnd/misc_lab) "ofK" = ( @@ -94473,10 +94641,11 @@ }, /area/space) "okg" = ( -/obj/floor_decal/industrial/warning{ +/obj/floor_decal/corner/purple/border{ dir = 9 }, -/turf/simulated/floor/plating, +/obj/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "okh" = ( /obj/structure/lattice, @@ -94833,6 +95002,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/containment) "omy" = ( @@ -100198,16 +100372,12 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "pbY" = ( -/obj/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/railing/mapped{ - init_color = "#8c911d"; - dir = 1; - color = "#8c911d" +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 }, -/turf/simulated/floor/plating, -/area/rnd/misc_lab) +/obj/structure/lattice, +/turf/space, +/area/space) "pcc" = ( /obj/floor_decal/spline/fancy/black{ dir = 8 @@ -100777,8 +100947,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/floor_decal/borderfloorblack, -/obj/floor_decal/corner/purple/border, +/obj/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/floor_decal/corner/purple/border{ + dir = 10 + }, /obj/structure/table/standard, /obj/item/device/integrated_electronics/debugger{ pixel_x = -5 @@ -100866,9 +101040,6 @@ /area/crew_quarters/actor/stage) "pfV" = ( /obj/structure/disposalpipe/segment, -/obj/floor_decal/corner/purple/border{ - dir = 8 - }, /obj/floor_decal/corner/purple/bordercorner{ dir = 4 }, @@ -100876,6 +101047,12 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/floor_decal/corner/purple/bordercorner{ + dir = 1 + }, +/obj/floor_decal/industrial/warning/corner{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "pfZ" = ( @@ -101350,12 +101527,12 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_room) "pjA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/light/spot{ + dir = 1 }, -/obj/structure/lattice, -/turf/simulated/open, -/area/space) +/turf/simulated/floor/reinforced, +/area/rnd/containment) "pjE" = ( /obj/structure/cable/green{ d1 = 1; @@ -101834,7 +102011,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/white/monotile, /area/rnd/office) "pmW" = ( @@ -103827,8 +104004,11 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralstarboard) "pCe" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, -/obj/structure/lattice, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/reinforced{ map_airless = 1 }, @@ -105416,7 +105596,7 @@ }, /obj/floor_decal/borderfloor, /obj/floor_decal/corner/red/border, -/obj/machinery/light, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/hallway/aft) "pPu" = ( @@ -107006,6 +107186,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/white, /area/rnd/misc_lab) "qbA" = ( @@ -107096,7 +107277,7 @@ }, /obj/floor_decal/corner/grey/diagonal, /obj/floor_decal/industrial/outline/yellow, -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 1 }, /turf/simulated/floor/tiled, @@ -107242,15 +107423,13 @@ pixel_x = -21; pixel_y = 8 }, -/obj/floor_decal/industrial/warning{ - dir = 9 +/obj/floor_decal/corner/purple/border{ + dir = 8 }, -/obj/structure/railing/mapped{ - init_color = "#8c911d"; - dir = 1; - color = "#8c911d" +/obj/floor_decal/industrial/warning{ + dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "qdi" = ( /obj/machinery/door/firedoor, @@ -107338,9 +107517,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/exploration_shuttle/airlock) "qeg" = ( -/obj/floor_decal/industrial/warning{ - dir = 10 - }, /obj/structure/railing/mapped{ init_color = "#8c911d"; color = "#8c911d" @@ -107539,13 +107715,10 @@ /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "qfB" = ( -/obj/floor_decal/techfloor{ - dir = 4 - }, /obj/machinery/vending/generic{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor/grid, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "qfC" = ( /obj/floor_decal/spline/fancy/wood{ @@ -107710,10 +107883,13 @@ /turf/simulated/floor/tiled, /area/security/sierra/prison) "qgy" = ( -/obj/machinery/light, -/obj/floor_decal/industrial/warning, -/turf/simulated/floor/plating, -/area/rnd/misc_lab) +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, +/turf/simulated/floor/reinforced{ + map_airless = 1 + }, +/area/space) "qgA" = ( /obj/shuttle_landmark/sierra/deck4/crucian, /turf/space, @@ -108503,7 +108679,7 @@ }, /obj/floor_decal/borderfloor, /obj/floor_decal/corner/red/border, -/obj/machinery/light, +/obj/machinery/light/spot, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -109456,7 +109632,10 @@ /obj/item/stack/material/steel{ amount = 20 }, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "qvJ" = ( /obj/floor_decal/carpet{ @@ -109928,7 +110107,7 @@ /obj/machinery/vending/parts/research{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "qzQ" = ( /obj/structure/cable/green{ @@ -110095,15 +110274,13 @@ /turf/simulated/floor/wood, /area/maintenance/firstdeck/forestarboard) "qBg" = ( -/obj/floor_decal/industrial/warning{ - dir = 10 - }, -/obj/structure/railing/mapped{ - init_color = "#8c911d"; - color = "#8c911d" +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/rnd/misc_lab) +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/containment) "qBk" = ( /obj/floor_decal/borderfloorblack{ dir = 5 @@ -111843,10 +112020,10 @@ /area/crew_quarters/bar) "qOG" = ( /obj/floor_decal/borderfloorblack{ - dir = 4 + dir = 6 }, /obj/floor_decal/corner/purple/border{ - dir = 4 + dir = 6 }, /obj/machinery/smartfridge/secure/medbay{ req_access = list() @@ -113911,10 +114088,6 @@ /obj/floor_decal/corner/black/border{ dir = 5 }, -/obj/machinery/light_switch{ - pixel_x = 22; - dir = 8 - }, /obj/machinery/button/windowtint{ dir = 8; id = "interrogation_no1_windows"; @@ -114377,15 +114550,15 @@ /area/crew_quarters/heads/captain/secret_room/level_one) "rgN" = ( /obj/structure/disposalpipe/segment, -/obj/floor_decal/corner/purple/border{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "rgQ" = ( @@ -115600,19 +115773,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"rrk" = ( -/obj/floor_decal/corner/purple/border, -/obj/floor_decal/corner/purple/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/misc_lab) "rrl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -115773,9 +115933,7 @@ icon_state = "0-8" }, /obj/paint_stripe/red, -/obj/wallframe_spawn/reinforced/polarized{ - id = "cadetwindow" - }, +/obj/wallframe_spawn/reinforced, /turf/simulated/floor/plating, /area/security/range) "rsq" = ( @@ -116384,7 +116542,7 @@ "rwM" = ( /obj/structure/closet/secure_closet/guncabinet/sierra_armory/egun, /obj/floor_decal/industrial/hatch/yellow, -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -116754,10 +116912,10 @@ /area/engineering/engineering_monitoring) "rzI" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 10 + dir = 4 }, /obj/structure/lattice, -/turf/simulated/open, +/turf/space, /area/space) "rzP" = ( /obj/structure/catwalk, @@ -117033,7 +117191,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/hangar_atmos) "rBL" = ( -/obj/machinery/light, +/obj/machinery/light/spot, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -117150,7 +117308,7 @@ /obj/item/clothing/head/helmet/ballistic, /obj/item/clothing/head/helmet/ballistic, /obj/floor_decal/industrial/outline/grey, -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, @@ -117392,7 +117550,11 @@ d2 = 8; icon_state = "0-8" }, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/structure/table/standard, +/obj/item/cell/high, +/obj/item/cell/high, +/obj/machinery/cell_charger, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "rEd" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ @@ -118633,7 +118795,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 1 }, /turf/simulated/floor/tiled, @@ -119841,13 +120003,13 @@ /area/maintenance/firstdeck/aftport) "rXr" = ( /obj/structure/disposalpipe/segment, -/obj/floor_decal/corner/purple/border{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "rXt" = ( @@ -120822,15 +120984,11 @@ /turf/simulated/floor/tiled/white/monotile, /area/medical/virology) "seF" = ( +/obj/floor_decal/corner/purple/border, /obj/floor_decal/industrial/warning{ - dir = 6 - }, -/obj/structure/railing/mapped{ - dir = 4; - init_color = "#8c911d"; - color = "#8c911d" + dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "seK" = ( /obj/floor_decal/borderfloor{ @@ -122712,6 +122870,9 @@ /obj/machinery/alarm{ pixel_y = 24 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/assembly/office) "stL" = ( @@ -124029,7 +124190,7 @@ /turf/simulated/floor/tiled/monotile, /area/rnd/locker) "sDo" = ( -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 1 }, /obj/machinery/light_switch{ @@ -124054,9 +124215,6 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/foreport) "sDx" = ( -/obj/floor_decal/industrial/warning{ - dir = 5 - }, /obj/structure/railing/mapped{ dir = 4; init_color = "#8c911d"; @@ -125665,7 +125823,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/table/standard, +/obj/machinery/vending/generic, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "sNV" = ( @@ -125730,6 +125888,9 @@ /obj/floor_decal/corner/blue/border{ dir = 9 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/security/sierra/forensic/lab) "sON" = ( @@ -126548,6 +126709,11 @@ name = "south bump"; pixel_y = -24 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/containment) "sTU" = ( @@ -128169,7 +128335,7 @@ /obj/floor_decal/corner/purple/border{ dir = 1 }, -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 1 }, /turf/simulated/floor/tiled/monotile, @@ -129744,8 +129910,10 @@ /turf/simulated/floor/tiled/white/monotile, /area/medical/surgery) "tvE" = ( -/obj/machinery/atmospherics/pipe/zpipe/down/cyan, /obj/structure/lattice, +/obj/machinery/atmospherics/pipe/zpipe/down/cyan{ + dir = 1 + }, /turf/simulated/open, /area/space) "tvF" = ( @@ -130333,25 +130501,23 @@ /turf/simulated/floor/plating, /area/maintenance/bridgedeck/starboard) "tzT" = ( -/obj/floor_decal/industrial/warning{ +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/structure/railing/mapped{ - dir = 4; - init_color = "#8c911d"; - color = "#8c911d" +/turf/simulated/floor/reinforced{ + map_airless = 1 }, -/turf/simulated/floor/plating, -/area/rnd/misc_lab) +/area/space) "tzU" = ( /obj/structure/disposalpipe/segment, -/obj/floor_decal/corner/purple/border{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "tzW" = ( @@ -132818,9 +132984,12 @@ /turf/simulated/floor/tiled, /area/hydroponics) "tST" = ( -/obj/floor_decal/industrial/warning, -/obj/machinery/light, -/turf/simulated/floor/plating, +/obj/machinery/light/spot, +/obj/floor_decal/corner/purple/border, +/obj/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "tSV" = ( /obj/floor_decal/borderfloorblack{ @@ -133252,17 +133421,14 @@ }, /area/crew_quarters/garden_room) "tVt" = ( -/obj/floor_decal/corner/purple/border, -/obj/floor_decal/corner/purple/border{ +/obj/floor_decal/spline/plain/black{ dir = 1 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/railing/mapped, +/turf/simulated/floor/reinforced{ + map_airless = 1 }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/misc_lab) +/area/space) "tVx" = ( /obj/structure/cable/green{ d1 = 4; @@ -133696,6 +133862,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/containment) "tZc" = ( @@ -135524,7 +135695,6 @@ /turf/simulated/floor/plating, /area/vacant/prototype/engine) "uoZ" = ( -/obj/floor_decal/corner/purple/bordercee, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -135535,6 +135705,13 @@ icon_state = "0-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/floor_decal/corner/purple/border{ + dir = 1 + }, +/obj/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "uph" = ( @@ -136368,10 +136545,8 @@ /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/machinery/camera/network/research{ - c_tag = "Research - Containment Control"; - dir = 8; - network = list("Research","Miscellaneous Reseach") +/obj/machinery/light/spot{ + dir = 4 }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/containment) @@ -137737,12 +137912,6 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "uGS" = ( -/obj/floor_decal/corner/purple/border{ - dir = 4 - }, -/obj/floor_decal/corner/purple/border{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -137750,6 +137919,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "uGT" = ( @@ -137891,8 +138066,15 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) "uIc" = ( -/obj/floor_decal/industrial/warning{ - dir = 4 +/obj/structure/railing/mapped{ + init_color = "#8c911d"; + dir = 1; + color = "#8c911d" + }, +/obj/structure/railing/mapped{ + dir = 4; + init_color = "#8c911d"; + color = "#8c911d" }, /turf/simulated/floor/plating, /area/rnd/misc_lab) @@ -139717,9 +139899,7 @@ icon_state = "0-8" }, /obj/paint_stripe/red, -/obj/wallframe_spawn/reinforced/polarized{ - id = "cadetwindow" - }, +/obj/wallframe_spawn/reinforced, /turf/simulated/floor/plating, /area/security/range) "uWu" = ( @@ -139788,10 +139968,6 @@ /turf/simulated/wall/prepainted, /area/hallway/primary/bridgedeck/center) "uXb" = ( -/obj/structure/bed/chair/pew/up{ - pixel_x = -3; - dir = 4 - }, /obj/floor_decal/spline/fancy/wood{ dir = 6 }, @@ -139799,6 +139975,7 @@ pixel_x = 24; dir = 8 }, +/obj/item/stool/wood, /turf/simulated/floor/wood/walnut, /area/security/sierra/breakroom) "uXj" = ( @@ -140196,9 +140373,7 @@ icon_state = "0-4" }, /obj/paint_stripe/red, -/obj/wallframe_spawn/reinforced/polarized{ - id = "cadetwindow" - }, +/obj/wallframe_spawn/reinforced, /turf/simulated/floor/plating, /area/security/range) "vaa" = ( @@ -142746,12 +142921,18 @@ /turf/simulated/floor/tiled/dark, /area/command/bsa) "vso" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/lattice, -/turf/simulated/open, -/area/space) +/obj/structure/holoplant, +/obj/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/floor_decal/corner/purple/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/misc_lab) "vsz" = ( /obj/floor_decal/borderfloor{ dir = 8 @@ -143700,18 +143881,18 @@ /area/quartermaster/hangar/upper) "vzO" = ( /obj/structure/disposalpipe/segment, -/obj/floor_decal/corner/purple/bordercorner{ - dir = 8 - }, -/obj/floor_decal/corner/purple/bordercorner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/floor_decal/industrial/warning/corner{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "vzX" = ( @@ -145946,8 +146127,10 @@ /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/machinery/light{ - dir = 4 +/obj/machinery/camera/network/research{ + c_tag = "Research - Containment Control"; + dir = 8; + network = list("Research","Miscellaneous Reseach") }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/containment) @@ -146360,13 +146543,14 @@ /turf/simulated/floor/tiled, /area/crew_quarters/garden_room) "vUQ" = ( -/obj/floor_decal/industrial/warning{ +/obj/machinery/light/spot{ dir = 1 }, -/obj/machinery/light{ +/obj/floor_decal/corner/purple/border{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "vUU" = ( /obj/item/device/radio/intercom{ @@ -146855,7 +147039,8 @@ }, /obj/wallframe_spawn/reinforced, /obj/machinery/door/blast/regular{ - dir = 8 + dir = 8; + id_tag = "miners_restroom_sierra" }, /turf/simulated/floor/plating, /area/quartermaster/hangar_stairs) @@ -151275,7 +151460,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/heads/captain/secret_room/level_one) "wJA" = ( -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 4 }, /obj/floor_decal/corner/purple/border{ @@ -151675,10 +151860,13 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/seconddeck/aftstarboard) "wNF" = ( -/obj/floor_decal/industrial/warning{ +/obj/floor_decal/corner/purple/border{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "wNH" = ( /obj/structure/cable/green{ @@ -153568,11 +153756,11 @@ /turf/simulated/floor/plating, /area/shuttle/petrov/scan) "xcu" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 4 }, /obj/structure/lattice, -/turf/simulated/open, +/turf/space, /area/space) "xcw" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ @@ -153700,12 +153888,11 @@ dir = 4; pixel_x = -21 }, -/obj/machinery/disposal, -/obj/floor_decal/industrial/hatch/yellow, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/floor_decal/industrial/outline/yellow, +/obj/structure/disposalpipe/segment, +/obj/structure/mopbucket, +/obj/item/mop, +/turf/simulated/floor/tiled/techfloor, /area/rnd/storage) "xdv" = ( /obj/structure/sign/warning/hot_exhaust, @@ -157883,9 +158070,34 @@ dir = 8 }, /obj/structure/table/standard, -/obj/random/tech_loot, -/obj/random/tech_loot, -/obj/random/tech_loot, +/obj/random/tech_supply{ + pixel_y = 5; + pixel_x = -6 + }, +/obj/random/tech_supply{ + pixel_y = -8; + pixel_x = -9 + }, +/obj/random/tech_supply{ + pixel_y = 6; + pixel_x = 5 + }, +/obj/random/tech_supply{ + pixel_y = -8; + pixel_x = 7 + }, +/obj/random/tool{ + pixel_y = 2; + pixel_x = 4 + }, +/obj/random/tool{ + pixel_y = -2; + pixel_x = -5 + }, +/obj/random/tank{ + pixel_y = -1; + pixel_x = 8 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/misc_lab) "xKB" = ( @@ -158761,13 +158973,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_room) -"xQM" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 9 - }, -/obj/structure/lattice, -/turf/simulated/open, -/area/space) "xQT" = ( /obj/machinery/light_switch{ pixel_x = -6; @@ -158829,6 +159034,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/floor_decal/corner/purple/border{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/rnd/misc_lab) "xRA" = ( @@ -182787,7 +182998,7 @@ fOl ofP anD cXj -xdN +gkG xdN xdN jqX @@ -206806,7 +207017,7 @@ krn qQY vDv rRV -ahf +mDb aSX aSX tXe @@ -207207,7 +207418,7 @@ wNV xvT gAD iYT -hui +qqj bXN ogH nxu @@ -270826,9 +271037,9 @@ tng uYw uYw uYw -uYw +hui tvE -mDb +uYw tng kAq pxc @@ -270844,9 +271055,9 @@ liJ liJ kAq tng -bIW +nKE lxi -uYw +qgy uYw uYw uYw @@ -271019,19 +271230,19 @@ fvG fvG fvG uqd -fvG -fvG -fvG -fvG -dmo -cbd -vso -vso -dvc -dvc +fpU +uYw +uYw +uYw +qMW +uYw +uYw +uYw +nKE dvc -pCe -fGI +nKE +nKE +nKE kAq uYw liJ @@ -271045,19 +271256,19 @@ doM liJ uYw kAq -gMC -pCe -dvc -dvc -dvc -vso -vso -pjA +nKE +nKE +nKE +tzT +nKE +uYw +uYw +uYw +uYw +uYw +uYw +uYw rTO -fvG -fvG -fvG -fvG wgP fvG xTI @@ -271220,25 +271431,25 @@ rZL rZL rZL rZL -rZL -rZL -rZL -rZL iQn hLJ +hui bcv bcv bcv -dvW -dvW -dvW -dvW -dvW +bcv +bcv +bcv +bcv +dmo +uYw +uYw +uYw kAq -apW -hLv +uYw +jVZ lHt -bFr +tVt jev uYw uYw @@ -271247,20 +271458,20 @@ uYw uYw uYw kAq +uYw +uYw +uYw dvW -dvW -dvW -dvW -dvW bcv bcv bcv +bcv +bcv +bcv +bcv +qgy vOQ -vlW -rZL -rZL -rZL -rZL +gYE rZL rZL rtT @@ -271422,25 +271633,25 @@ rtT rtT rtT rtT -rtT -rtT -rtT -rtT idA hLJ xcu xcu xcu xcu -kMW -kMW -kMW -kMW -kAq -ehW -hLv +xcu +xcu +xcu +xcu +dYA +nxJ +nxJ +nxJ +nkV +uYw +jVZ lHt -bFr +tVt jev uYw uYw @@ -271448,11 +271659,15 @@ uYw uYw uYw uYw -kAq -kMW -kMW -kMW -kMW +pCe +nxJ +nxJ +nxJ +gWF +xcu +xcu +xcu +xcu xcu xcu xcu @@ -271461,10 +271676,6 @@ vOQ gSd rtT rtT -rtT -rtT -rtT -rtT wJN wJN wJN @@ -271624,25 +271835,25 @@ rtT rtT rtT rtT -rtT -rtT -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -kMW -kMW -kMW -kMW +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI kAq -ehW -hLv +uYw +uYw +uYw +uYw +uYw +jVZ lHt -bFr +tVt jev uYw uYw @@ -271650,23 +271861,23 @@ uYw uYw uYw uYw +uYw +uYw +uYw +uYw kAq -kMW -kMW -kMW -kMW -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd rtT rtT -rtT -rtT -rtT -rtT wJN wJN wJN @@ -271826,25 +272037,25 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -kMW -kMW -kMW -kMW +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI kAq -ehW -hLv +uYw +uYw +uYw +uYw +uYw +jVZ lHt -bFr +tVt jev uYw uYw @@ -271852,21 +272063,21 @@ uYw uYw uYw uYw +uYw +uYw +uYw +uYw kAq -kMW -kMW -kMW -kMW -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd -rtT -rtT -wJN -wJN wJN wJN wJN @@ -272028,25 +272239,25 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -kMW -kMW -kMW -kMW +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI kAq -ehW -hLv +uYw +uYw +uYw +uYw +uYw +jVZ lHt -bFr +tVt jev uYw uYw @@ -272054,19 +272265,21 @@ uYw uYw uYw uYw +uYw +uYw +uYw +uYw kAq -kMW -kMW -kMW -kMW -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd -rtT -rtT wJN wJN wJN @@ -272149,43 +272362,42 @@ wJN wJN wJN wJN +"} +(149,1,3) = {" +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN wJN wJN -"} -(149,1,3) = {" -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN wJN wJN wJN @@ -272229,23 +272441,22 @@ wJN wJN wJN wJN -wJN -wJN -wJN -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -kMW -kMW -kMW -kMW +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI kAq uYw +uYw +uYw +uYw +uYw hLv lHt bFr @@ -272256,21 +272467,21 @@ uYw uYw uYw uYw +uYw +uYw +uYw +uYw kAq -kMW -kMW -kMW -kMW -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd -rtT -rtT -wJN -wJN wJN wJN wJN @@ -272432,25 +272643,25 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -kMW -kMW -kMW -kMW +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI kAq -ehW -hLv +uYw +uYw +uYw +uYw +uYw +jVZ lHt -bFr +tVt jev uYw uYw @@ -272458,21 +272669,21 @@ uYw uYw uYw uYw +uYw +uYw +uYw +uYw kAq -kMW -kMW -kMW -kMW -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd -rtT -rtT -wJN -wJN wJN wJN wJN @@ -272634,22 +272845,22 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -xcu -kMW -kMW -kMW +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI uJj -jVZ +fvG +fvG +fvG +fvG +fvG hFW lHt aIC @@ -272660,21 +272871,21 @@ fvG fvG fvG fvG +fvG +fvG +fvG +fvG uuA -kMW -kMW -kMW -kMW -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd -rtT -rtT -wJN -wJN wJN wJN wJN @@ -272836,22 +273047,22 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA -huG -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu -lVP +hLJ +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI +ciz vlW +rZL +rZL +rZL +rZL rtT rtT rtT @@ -272861,20 +273072,22 @@ rZL rZL rZL rZL -cBU -rvv -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu -voL +rZL +rZL +rZL +rZL +iQn +xxf +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI +vOQ gSd -rtT -rtT wJN wJN wJN @@ -272957,32 +273170,40 @@ wJN wJN wJN wJN +"} +(153,1,3) = {" +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN +wJN wJN wJN -"} -(153,1,3) = {" -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN wJN wJN wJN @@ -273028,31 +273249,17 @@ wJN wJN wJN wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -wJN -rtT -rtT idA -hLJ -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu -ciz +huG +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI +lVP gSd rtT rtT @@ -273063,22 +273270,26 @@ rtT rtT rtT rtT -idA -xxf -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu -vOQ -gSd rtT rtT -wJN -wJN +rtT +rtT +rtT +rtT +rtT +rtT +idA +rvv +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI +voL +gSd wJN wJN wJN @@ -273240,20 +273451,16 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI ciz gSd rtT @@ -273265,22 +273472,26 @@ rtT rtT rtT rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT idA xxf -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd -rtT -rtT -wJN -wJN wJN wJN wJN @@ -273442,20 +273653,16 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI ciz gSd rtT @@ -273467,22 +273674,26 @@ rtT rtT rtT rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT idA xxf -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd -rtT -rtT -wJN -wJN wJN wJN wJN @@ -273644,20 +273855,16 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI ciz gSd rtT @@ -273669,22 +273876,26 @@ rtT rtT rtT rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT idA xxf -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd -rtT -rtT -wJN -wJN wJN wJN wJN @@ -273846,20 +274057,16 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI ciz gSd rtT @@ -273871,22 +274078,26 @@ rtT rtT rtT rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT idA xxf -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd -rtT -rtT -wJN -wJN wJN wJN wJN @@ -274048,20 +274259,16 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI ciz gSd rtT @@ -274070,25 +274277,29 @@ rtT rtT rtT rtT +rtT +rtT +rtT +rtT eML rtT rtT +rtT +rtT +rtT +rtT idA xxf -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd -rtT -rtT -wJN -wJN wJN wJN wJN @@ -274250,20 +274461,16 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI ciz gSd rtT @@ -274275,22 +274482,26 @@ rtT rtT rtT rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT idA xxf -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd -rtT -rtT -wJN -wJN wJN wJN wJN @@ -274452,21 +274663,24 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA hLJ -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI ciz +gSd +rtT +rtT +rtT +rtT +rtT +rtT rtT rtT rtT @@ -274478,21 +274692,18 @@ rtT rtT rtT rtT +idA xxf -xcu -xcu -xcu -xcu -xcu -xcu -xcu -xcu +rzI +rzI +rzI +rzI +rzI +rzI +rzI +rzI vOQ gSd -rtT -rtT -wJN -wJN wJN wJN wJN @@ -274654,22 +274865,17 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT idA -huG +hLJ +rzI +rzI +rzI +rzI rzI -xQM rzI -xQM rzI -xQM rzI -xQM ciz -gSd rtT rtT rtT @@ -274679,22 +274885,27 @@ rtT rtT rtT rtT -idA +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT +rtT xxf rzI -xQM rzI -xQM rzI -xQM rzI -xQM -voL +rzI +rzI +rzI +rzI +vOQ gSd -rtT -rtT -wJN -wJN wJN wJN wJN @@ -274856,22 +275067,21 @@ wJN wJN wJN wJN -wJN -wJN +idA +huG +kMW +pbY +kMW +pbY +kMW +pbY +kMW +pbY +ciz +gSd rtT rtT rtT -kdR -hWt -hWt -hWt -hWt -hWt -hWt -hWt -cGY -frl -gSd rtT rtT rtT @@ -274881,22 +275091,23 @@ rtT rtT rtT rtT -idA -wvG -vLv -hWt -hWt -hWt -hWt -hWt -hWt -hWt -tXi rtT rtT rtT -wJN -wJN +rtT +rtT +idA +xxf +kMW +pbY +kMW +pbY +kMW +pbY +kMW +pbY +voL +gSd wJN wJN wJN @@ -275058,21 +275269,21 @@ wJN wJN wJN wJN -wJN -wJN rtT +kdR +hWt +hWt +hWt +hWt +hWt +hWt +hWt +cGY +frl +gSd rtT rtT rtT -rZL -rZL -rZL -rtT -rZL -rZL -rZL -uqg -rZL rtT rtT rtT @@ -275084,18 +275295,20 @@ rtT rtT rtT rtT -rZL -uqg -rZL -rZL -rZL -rtT -rZL -rZL -rZL rtT rtT rtT +idA +wvG +vLv +hWt +hWt +hWt +hWt +hWt +hWt +hWt +tXi rtT wJN wJN @@ -275115,8 +275328,6 @@ wJN wJN wJN wJN -wJN -wJN qVo wJN wJN @@ -275260,23 +275471,17 @@ wJN wJN wJN wJN -wJN -wJN -rtT -rtT -rtT -rtT -rtT -rtT -rtT -rtT -rtT -rtT -rtT -rtT rtT rtT +rZL +rZL +rZL rtT +rZL +rZL +rZL +uqg +rZL rtT rtT rtT @@ -275296,7 +275501,15 @@ rtT rtT rtT rtT +rZL +uqg +rZL +rZL +rZL rtT +rZL +rZL +rZL rtT rtT wJN @@ -275381,8 +275594,6 @@ wJN wJN wJN wJN -wJN -wJN "} (165,1,3) = {" wJN @@ -298922,7 +299133,7 @@ oJs uXp uXp emC -gkG +uXp uXp peP oJs @@ -299121,7 +299332,7 @@ kyw nmb dPt oJs -aYE +pjA uXp dIu vdV @@ -300333,8 +300544,8 @@ oJA fVM xsz uTl -uTl -uTl +bIW +qBg kiD kiD omr @@ -304180,7 +304391,7 @@ jjV gNW okg wNF -qBg +wNF ncM qdg wNF @@ -304381,13 +304592,13 @@ xZd gaA gNW vUQ -aIU +gMC kWG fZL byi -aIU -aIU -qgy +kWG +qeg +tST qSx xiV jJA @@ -304585,10 +304796,10 @@ gNW bcI uIc gKz -tVt -pbY +fZL aIU aIU +fyN kcn qSx tkY @@ -304788,9 +304999,9 @@ uoZ jPh uGS iNo -pbY aIU aIU +fyN gPJ qSx fns @@ -304987,12 +305198,12 @@ cBf ibv gNW ipu -wNF +byi qeg -rrk -pbY +gbC aIU aIU +fyN fIG qSx jVT @@ -305188,14 +305399,14 @@ vHa gET izl gNW -byi +bcI +fGI aIU -kWG -fyN -pbY +gbC aIU aIU -kWG +fyN +seF qSx bXc jmN @@ -305391,12 +305602,12 @@ sDM cFh gNW vUQ +fGI aIU -kWG gbC -byi aIU aIU +fyN tST qSx xDk @@ -305595,10 +305806,10 @@ gNW bcI uIc eCZ -rrk +gbC sDx -uIc -tzT +aIU +eCZ seF qSx dtn @@ -306203,7 +306414,7 @@ xRf fcT fEX bGO -fcT +vso emi pfq qSx @@ -306402,7 +306613,7 @@ sIl gNW xEk qby -ofJ +cbd ofJ lUa qCV diff --git a/maps/sierra/z6_admin.dmm b/maps/sierra/z6_admin.dmm index 5bfc0c07265b9..4df22e4c4067e 100644 --- a/maps/sierra/z6_admin.dmm +++ b/maps/sierra/z6_admin.dmm @@ -5325,8 +5325,11 @@ }, /area/centcom/holding) "aQf" = ( -/obj/floor_decal/spline/fancy/wood, -/turf/simulated/floor/holofloor/wood, +/obj/floor_decal/carpet{ + dir = 4 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) "aQj" = ( /obj/decal/cleanable/filth, @@ -5467,9 +5470,11 @@ }, /area/centcom/living) "aSi" = ( -/obj/structure/table/holo_woodentable, -/obj/floor_decal/spline/fancy/wood, -/turf/simulated/floor/holofloor/wood, +/obj/floor_decal/carpet{ + dir = 8 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) "aSq" = ( /obj/floor_decal/spline/fancy/wood{ @@ -5513,25 +5518,16 @@ /area/holodeck/source_meetinghall) "aSG" = ( /obj/floor_decal/spline/fancy/wood{ - dir = 1 + dir = 4 }, -/turf/simulated/floor/holofloor/tiled/dark, +/turf/simulated/floor/holofloor/lino, /area/holodeck/source_meetinghall) "aSH" = ( -/obj/floor_decal/carpet{ - dir = 5 - }, -/obj/floor_decal/carpet{ - dir = 6 - }, -/obj/floor_decal/carpet{ - dir = 9 - }, -/obj/floor_decal/carpet{ - dir = 10 +/obj/floor_decal/spline/plain{ + dir = 1 }, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_meetinghall) +/turf/simulated/floor/holofloor/tiled, +/area/space) "aSI" = ( /turf/unsimulated/floor/techfloor, /area/centcom) @@ -5618,37 +5614,19 @@ /turf/simulated/floor/exoplanet/concrete, /area/holodeck/source_military) "aSX" = ( -/obj/structure/holostool, -/obj/floor_decal/carpet{ - dir = 8 - }, -/obj/floor_decal/carpet{ - dir = 1 - }, -/obj/floor_decal/carpet{ - dir = 9 - }, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_meetinghall) +/turf/simulated/floor/holofloor/tiled, +/area/space) "aSZ" = ( -/obj/structure/holostool, -/obj/floor_decal/carpet{ - dir = 1 +/obj/floor_decal/spline/fancy/wood{ + dir = 8 }, -/turf/simulated/floor/holofloor/carpet, +/turf/simulated/floor/holofloor/lino, /area/holodeck/source_meetinghall) "aTa" = ( -/obj/structure/holostool, -/obj/floor_decal/carpet{ - dir = 4 - }, -/obj/floor_decal/carpet{ - dir = 1 - }, -/obj/floor_decal/carpet{ - dir = 5 +/obj/floor_decal/spline/fancy/wood{ + dir = 9 }, -/turf/simulated/floor/holofloor/carpet, +/turf/simulated/floor/holofloor/lino, /area/holodeck/source_meetinghall) "aTB" = ( /obj/floor_decal/spline/plain/grey{ @@ -6160,27 +6138,12 @@ /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) "aYS" = ( -/obj/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/holofloor/tiled, -/area/holodeck/source_theatre) -"aYT" = ( -/obj/floor_decal/carpet{ - dir = 8 - }, /obj/floor_decal/carpet{ dir = 4 }, -/obj/floor_decal/carpet{ - dir = 1 - }, -/obj/floor_decal/carpet{ - dir = 5 - }, -/obj/floor_decal/carpet{ - dir = 9 - }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) +"aYT" = ( /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) "aYU" = ( @@ -6282,6 +6245,7 @@ /obj/floor_decal/carpet{ dir = 1 }, +/obj/structure/holostool, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) "aZA" = ( @@ -6297,13 +6261,10 @@ /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) "aZB" = ( -/obj/floor_decal/carpet{ - dir = 8 - }, -/obj/floor_decal/carpet{ - dir = 4 +/obj/structure/window/reinforced/holowindow{ + dir = 1 }, -/turf/simulated/floor/holofloor/carpet, +/turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_theatre) "aZC" = ( /obj/floor_decal/carpet{ @@ -6543,21 +6504,8 @@ /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) "bbH" = ( -/obj/floor_decal/carpet{ - dir = 8 - }, -/obj/floor_decal/carpet{ - dir = 4 - }, -/obj/floor_decal/carpet, -/obj/floor_decal/carpet{ - dir = 6 - }, -/obj/floor_decal/carpet{ - dir = 10 - }, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_theatre) +/turf/simulated/floor/holofloor/tiled/dark, +/area/space) "bbI" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -6613,20 +6561,11 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_theatre) "bce" = ( -/obj/floor_decal/carpet{ - dir = 5 - }, -/obj/floor_decal/carpet{ - dir = 6 - }, -/obj/floor_decal/carpet{ +/obj/floor_decal/spline/fancy/wood{ dir = 10 }, -/obj/floor_decal/carpet{ - dir = 9 - }, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_theatre) +/turf/simulated/floor/holofloor/lino, +/area/holodeck/source_meetinghall) "bcf" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -6859,42 +6798,32 @@ /turf/simulated/floor/holofloor/snow, /area/holodeck/source_snowfield) "bdJ" = ( -/obj/floor_decal/carpet{ +/obj/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/floor_decal/carpet, -/obj/floor_decal/carpet{ - dir = 1 +/obj/floor_decal/spline/fancy/wood{ + dir = 8 }, +/turf/simulated/floor/holofloor/lino, +/area/holodeck/source_meetinghall) +"bdK" = ( /obj/floor_decal/carpet{ - dir = 9 + dir = 8 }, /obj/floor_decal/carpet{ - dir = 10 + dir = 1 }, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_meetinghall) -"bdK" = ( -/obj/floor_decal/carpet, /obj/floor_decal/carpet{ - dir = 1 + dir = 9 }, +/obj/structure/holostool, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) "bdL" = ( -/obj/floor_decal/carpet{ - dir = 4 - }, -/obj/floor_decal/carpet, /obj/floor_decal/carpet{ dir = 1 }, -/obj/floor_decal/carpet{ - dir = 5 - }, -/obj/floor_decal/carpet{ - dir = 6 - }, +/obj/structure/holostool, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) "bdM" = ( @@ -7077,6 +7006,7 @@ /turf/simulated/floor/holofloor/snow, /area/holodeck/source_snowfield) "beW" = ( +/obj/floor_decal/spline/fancy/wood, /turf/simulated/floor/holofloor/lino, /area/holodeck/source_meetinghall) "beX" = ( @@ -7257,21 +7187,16 @@ /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_cafe) "bgu" = ( -/obj/structure/holostool, -/obj/floor_decal/carpet{ - dir = 8 - }, -/turf/simulated/floor/holofloor/carpet, +/obj/floor_decal/stairs, +/turf/simulated/floor/holofloor/wood, /area/holodeck/source_meetinghall) "bgv" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) "bgw" = ( +/obj/floor_decal/carpet, /obj/structure/holostool, -/obj/floor_decal/carpet{ - dir = 4 - }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) "bgx" = ( @@ -7426,13 +7351,11 @@ /turf/simulated/floor/holofloor/snow, /area/holodeck/source_snowfield) "bhu" = ( -/obj/structure/holostool, -/obj/floor_decal/carpet{ - dir = 4 - }, -/turf/simulated/floor/holofloor/carpet{ - dir = 8 +/obj/structure/table/holo_woodentable, +/obj/floor_decal/spline/fancy/wood{ + dir = 1 }, +/turf/simulated/floor/holofloor/wood, /area/holodeck/source_meetinghall) "bhv" = ( /obj/machinery/door/window/holowindoor{ @@ -7482,28 +7405,34 @@ /area/holodeck/source_boxingcourt) "bhQ" = ( /obj/structure/holostool, +/obj/floor_decal/carpet, /obj/floor_decal/carpet{ dir = 8 }, -/obj/floor_decal/carpet, +/obj/floor_decal/carpet{ + dir = 1 + }, /obj/floor_decal/carpet{ dir = 10 }, +/obj/floor_decal/carpet{ + dir = 9 + }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) "bhR" = ( /obj/structure/holostool, /obj/floor_decal/carpet, +/obj/floor_decal/carpet{ + dir = 1 + }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) "bhS" = ( -/obj/structure/holostool, /obj/floor_decal/carpet, +/obj/structure/holostool, /obj/floor_decal/carpet{ - dir = 4 - }, -/obj/floor_decal/carpet{ - dir = 6 + dir = 1 }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) @@ -8141,6 +8070,15 @@ icon_state = "techfloor_grid" }, /area/centcom/iccgn) +"cdB" = ( +/obj/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/window/reinforced/holowindow{ + dir = 1 + }, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_meetinghall) "ceK" = ( /obj/structure/table/standard, /obj/floor_decal/corner/paleblue{ @@ -8160,6 +8098,17 @@ /obj/paint_stripe/red, /turf/simulated/wall/r_titanium, /area/shuttle/transport1/centcom) +"che" = ( +/obj/floor_decal/carpet{ + dir = 4 + }, +/obj/floor_decal/carpet, +/obj/floor_decal/carpet{ + dir = 6 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) "cjY" = ( /obj/floor_decal/borderfloor/corner{ dir = 8 @@ -8320,6 +8269,19 @@ icon = 'icons/turf/flooring/grass.dmi' }, /area/centcom) +"cGp" = ( +/obj/floor_decal/carpet{ + dir = 4 + }, +/obj/floor_decal/carpet{ + dir = 1 + }, +/obj/floor_decal/carpet{ + dir = 5 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) "cHb" = ( /obj/structure/flora/pottedplant/floorleaf, /obj/floor_decal/corner/black/mono, @@ -10603,6 +10565,15 @@ icon_state = "vault" }, /area/tdome/testing) +"gZH" = ( +/obj/structure/flora/pottedplant{ + icon_state = "plant-06" + }, +/obj/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/holofloor/lino, +/area/holodeck/source_meetinghall) "hbe" = ( /obj/floor_decal/spline/fancy/wood{ dir = 9 @@ -12446,6 +12417,12 @@ icon_state = "techfloor_grid" }, /area/centcom/iccgn) +"kFk" = ( +/obj/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/holofloor/lino, +/area/holodeck/source_meetinghall) "kFF" = ( /obj/structure/table/rack/dark, /obj/floor_decal/industrial/outline/grey, @@ -12457,6 +12434,17 @@ /obj/item/stack/tile/carpetblue/fifty, /turf/unsimulated/floor/techfloor, /area/centcom/holding) +"kGv" = ( +/obj/floor_decal/carpet{ + dir = 8 + }, +/obj/floor_decal/carpet, +/obj/floor_decal/carpet{ + dir = 10 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) "kHi" = ( /obj/structure/closet/medical_wall{ pixel_y = 32 @@ -12900,6 +12888,12 @@ icon = 'icons/turf/flooring/tiles.dmi' }, /area/centcom/iccgn) +"lcr" = ( +/obj/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) "lcM" = ( /obj/floor_decal/spline/fancy/wood{ dir = 4 @@ -13238,6 +13232,19 @@ /obj/decal/cleanable/filth, /turf/unsimulated/floor/techfloor, /area/centcom/control) +"lKG" = ( +/obj/floor_decal/carpet{ + dir = 8 + }, +/obj/floor_decal/carpet{ + dir = 1 + }, +/obj/floor_decal/carpet{ + dir = 9 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) "lLo" = ( /obj/structure/bed/padded, /obj/item/bedsheet/red, @@ -13293,6 +13300,15 @@ name = "carpet" }, /area/centcom/living) +"lRl" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 1 + }, +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_theatre) "lUz" = ( /obj/floor_decal/borderfloorblack{ dir = 1 @@ -13973,6 +13989,19 @@ /obj/item/stack/cable_coil/yellow, /turf/simulated/floor, /area/tdome/testing/engineering) +"nzP" = ( +/obj/floor_decal/carpet{ + dir = 4 + }, +/obj/floor_decal/carpet{ + dir = 1 + }, +/obj/floor_decal/carpet{ + dir = 5 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) "nAl" = ( /obj/floor_decal/borderfloorwhite{ dir = 8 @@ -16150,6 +16179,10 @@ name = "carpet" }, /area/centcom/living) +"rut" = ( +/obj/floor_decal/stairs, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_theatre) "rva" = ( /obj/floor_decal/industrial/warning{ dir = 8 @@ -16162,6 +16195,24 @@ icon_state = "steel" }, /area/centcom) +"rwD" = ( +/obj/floor_decal/carpet, +/obj/floor_decal/carpet{ + dir = 4 + }, +/obj/floor_decal/carpet{ + dir = 6 + }, +/obj/structure/holostool, +/obj/structure/holostool, +/obj/floor_decal/carpet{ + dir = 1 + }, +/obj/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) "rwG" = ( /obj/floor_decal/corner/red/diagonal, /obj/floor_decal/borderfloorblack{ @@ -16390,6 +16441,18 @@ icon_state = "dark" }, /area/centcom/specops) +"rVo" = ( +/obj/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/window/reinforced/holowindow{ + dir = 1 + }, +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_meetinghall) "rWr" = ( /obj/structure/table/woodentable/walnut, /obj/floor_decal/carpet{ @@ -17151,6 +17214,12 @@ icon = 'icons/turf/flooring/tiles.dmi' }, /area/centcom) +"tmt" = ( +/obj/structure/flora/pottedplant{ + icon_state = "plant-06" + }, +/turf/simulated/floor/holofloor/tiled, +/area/space) "tnR" = ( /obj/structure/bed/chair/wood/wings/walnut{ dir = 8; @@ -26684,38 +26753,38 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +bbH +bbH +aSH +aSX +aSX +aSX +aSX +aSX +tmt aab asI -aWW -aXC +aZy +lcr +lcr +lcr +lcr +lcr +aYT +rut aXC -aYS -aZx -aZx -aZx -aZx -aZx -bcd +aWW aWd +beX +beX +beX +beX +beX +beX +beX +bgu bda -bda -aQf -aSE -aSH -aSH -beW -beW -beW -beW +bdb aWe "} (36,1,1) = {" @@ -26886,38 +26955,38 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +bbH +bbH +aSH +aSX +aSX +aSX +aSX +aSX +aSX aab asI -aWW -aXC -aXC +aZA aYS -aZx -aZx -aZx -aZx -aZx -aZx +aYS +aYS +aYS +aYS +aYT +rut +aXC +aWW aWd +beX +beX +beX +beX +beX +beX +beX +bgu bda bda -aQf -aSE -aSX -bgu -bgu -bgu -bhQ -beW aWe "} (37,1,1) = {" @@ -27088,9 +27157,9 @@ aab aab aab aab -aab -aab -aab +bbH +bbH +aSH aab aab aab @@ -27099,27 +27168,27 @@ aab aab aab asI -aWW -aXC -aXC -aYS -aZy -bad -bad -bad -bbE aZx +aZx +aZx +aZx +aZx +aZx +aZx +lRl +aXC +aWW aWd -bda +aTa bdJ -aSi -aSE aSZ -bgv -bgv -bgv -bhR -beW +aSZ +aSZ +aSZ +bce +rVo +bda +bda aWe "} (38,1,1) = {" @@ -27290,9 +27359,9 @@ aab aab aab aab -aab -aab -aab +bbH +bbH +aSH aab aab aab @@ -27301,27 +27370,27 @@ aab aab aab asI -aWW +aZx +aZx +lKG +bad +bad +bbE +aZx aXC aXC -aYS -aZz -bae -bae -bae -bbF -aZx +aWW aWd -bda +aSE bdK aSi -aSE -aSZ -bgv -bgv -bgv -bhR +aSi +aSi +kGv beW +bhu +bhQ +bda aWe "} (39,1,1) = {" @@ -27492,9 +27561,9 @@ aab aab aab aab -aab -aab -aab +bbH +bbH +aSH aab aab aab @@ -27503,27 +27572,27 @@ aab aab aab asI -aWW -aXC -aXC -aYS +aZx +aZx aZz bae bae -bae bbF aZx +aXC +aXC +aWW aWd -bda -bdK -aSi aSE -aSZ +bdL bgv bgv bgv -bhR +bgw beW +bhu +bhR +bda aWe "} (40,1,1) = {" @@ -27694,9 +27763,9 @@ aab aab aab aab -aab -aab -aab +bbH +bbH +aSH aab aab aab @@ -27705,27 +27774,27 @@ aab aab aab asI -aWW -aXC -aXC -aYS +aZx +aZx aZz bae bae -bae bbF aZx +aXC +aXC +aWW aWd -bda -bdK -aSi aSE -aSZ +bdL bgv bgv bgv -bhR +bgw beW +bhu +bhR +bda aWe "} (41,1,1) = {" @@ -27896,9 +27965,9 @@ aab aab aab aab -aab -aab -aab +bbH +bbH +aSH aab aab aab @@ -27907,27 +27976,27 @@ aab aab aab asI -aWW -aXC -aXC -aYS +aZx +aZx aZz bae bae -bae bbF aZx +aXC +aXC +aWW aWd -bda -bdL -aSi aSE -aSZ +bdL bgv bgv bgv -bhR +bgw beW +bhu +bhR +bda aWe "} (42,1,1) = {" @@ -28098,9 +28167,9 @@ aab aab aab aab -aab -aab -aab +bbH +bbH +aSH aab aab aab @@ -28109,27 +28178,27 @@ aab aab aab asI -aWW +aZx +aZx +aZz +bae +bae +bbF +aZx aXC aXC -aYS -aZA -baf -baf -baf -bbG -aZx +aWW aWd -bda -bda -aQf aSE -aTa -bgw +bdL +bgv +bgv +bgv bgw +beW bhu bhS -beW +bda aWe "} (43,1,1) = {" @@ -28300,38 +28369,38 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +bbH +bbH +aSH +aSX +aSX +aSX +aSX +aSX +aSX aab asI -aWW -aXC -aXC -aYS -aZx -aZx -aZx aZx aZx +nzP +baf +baf +bbG aZx +aXC +aXC +aWW aWd -bda -bda -aQf aSE +cGp +aQf +aQf +aQf +che beW -beW -beW -beW -beW -beW +bhu +rwD +bda aWe "} (44,1,1) = {" @@ -28502,8 +28571,8 @@ aab aab aab aab -aab -aab +bbH +bbH aab aab aab @@ -28513,27 +28582,27 @@ aab aab aab asI -aWW -aXC -aXC -aYT -aZB -aZB -aZB +bcd +aZx +aZx +aZx +aZx +aZx +aZx aZB -bbH -bce +aXC +aWW aWd -bdb -bda -aQf +gZH aSG -beX -beX -beX -beX -beX -beX +aSG +aSG +aSG +aSG +kFk +cdB +bda +bdb aWe "} (45,1,1) = {"