From ba498a8818a8746e7c21d20b71717496cf448566 Mon Sep 17 00:00:00 2001
From: Custodi <31255302+Custodi@users.noreply.github.com>
Date: Tue, 4 Mar 2025 01:22:47 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B5?=
=?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BB-=D0=B2=D0=B0=20=D0=B8?=
=?UTF-8?q?=D0=BD=D1=82=D0=B5=D1=80=D0=BA=D0=BE=D0=BC=D0=BE=D0=B2=20=D0=BD?=
=?UTF-8?q?=D0=B0=20=D0=BA=D0=B0=D1=80=D1=82=D0=B0=D1=85=20(#1837)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Что этот PR делает
Добавлено больше интеркомов на всех станциях, в места, которые непокрыты
ими + в отдельных зонах, где их нет.
Визуально исправлено расположение интеркомов (повернуты не в ту сторону,
выходят за край стены, наслоение друг на друга).
Интеркомы на стойке РНД приближены ближе к точке выхода для удобной
коммуникации.
## Почему это хорошо для игры
Добавляет больше точек связи игрокам на станции
Оптимизирует карту в связи с отключением общей волны
## Изображения изменений

## Тестирование
Проверил запуск большинства интеркомов + места изменений позиций других
приборов (терминал временных доступов, выключатель)
## Changelog
:cl:
add: Добавлено больше интеркомов на всех станциях
tweak: Интеркомы в РНД перемещы ближе к стойке
fix: Поправлено "кривое" расположение интеркомов на станции
/:cl:
## Summary by Sourcery
Увеличьте количество интеркомов на всех станциях для улучшения покрытия
связи и скорректируйте их размещение для лучшего визуального
выравнивания.
Новые функции:
- Добавлено больше интеркомов на всех станциях для покрытия ранее
неохваченных областей и конкретных зон, где их не хватало.
Улучшения:
- Скорректировано визуальное размещение интеркомов для исправления
проблем с ориентацией и предотвращения наложения на стены.
Original summary in English
## Summary by Sourcery
Increase the number of intercoms on all stations to improve
communication coverage and adjust their placement for better visual
alignment.
New Features:
- Added more intercoms across all stations to cover previously uncovered
areas and specific zones lacking them.
Enhancements:
- Adjusted the visual placement of intercoms to correct orientation
issues and prevent overlap with walls.
---
_maps/map_files220/stations/boxstation.dmm | 148 ++++++++++++++-----
_maps/map_files220/stations/deltastation.dmm | 132 ++++++++++++++---
_maps/map_files220/stations/metastation.dmm | 116 ++++++++-------
3 files changed, 280 insertions(+), 116 deletions(-)
diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm
index 79cf1754388a..85dc244e9a3b 100644
--- a/_maps/map_files220/stations/boxstation.dmm
+++ b/_maps/map_files220/stations/boxstation.dmm
@@ -831,10 +831,10 @@
},
/obj/item/radio/intercom/custom{
dir = 8;
- pixel_x = 36
+ pixel_x = 37
},
/obj/item/radio/intercom/department/security{
- pixel_x = 22;
+ pixel_x = 24;
dir = 8
},
/turf/simulated/floor/plasteel{
@@ -2509,6 +2509,7 @@
/obj/item/reagent_containers/spray/pepper{
pixel_x = 8
},
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "red"
@@ -3191,12 +3192,12 @@
/obj/item/pen,
/obj/machinery/requests_console/directional/south,
/obj/item/radio/intercom/department/security{
- pixel_x = -22;
+ pixel_x = -24;
dir = 4
},
/obj/item/radio/intercom/custom{
dir = 4;
- pixel_x = -36
+ pixel_x = -37
},
/turf/simulated/floor/plasteel{
dir = 10;
@@ -3778,7 +3779,7 @@
/area/station/security/brig)
"arC" = (
/obj/item/radio/intercom/department/security{
- pixel_y = 22
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -5468,10 +5469,10 @@
"axQ" = (
/obj/item/radio/intercom/custom{
dir = 1;
- pixel_y = -36
+ pixel_y = -37
},
/obj/item/radio/intercom/department/security{
- pixel_y = -22;
+ pixel_y = -24;
dir = 1
},
/obj/structure/table,
@@ -20158,6 +20159,7 @@
/turf/simulated/floor/plating,
/area/station/supply/sorting)
"bDW" = (
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "blue"
@@ -21467,13 +21469,11 @@
/turf/simulated/floor/plasteel,
/area/station/supply/office)
"bJr" = (
-/obj/machinery/computer/guestpass{
- pixel_y = 30
- },
/obj/machinery/r_n_d/circuit_imprinter,
/obj/machinery/button/windowtint/west{
id = "rnd"
},
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "purple"
@@ -24476,6 +24476,7 @@
/area/station/medical/sleeper)
"bXP" = (
/obj/machinery/door/firedoor,
+/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -27504,6 +27505,7 @@
c_tag = "Medbay Hallway Center";
dir = 4
},
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -32093,6 +32095,7 @@
dir = 6;
network = list("SS13","RD")
},
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -33733,10 +33736,6 @@
/area/station/science/robotics)
"cIO" = (
/obj/machinery/economy/vending/scidrobe,
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -35362,6 +35361,7 @@
c_tag = "Engineering Lobby West";
network = list("SS13","Engineering")
},
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellow"
@@ -42319,6 +42319,13 @@
icon_state = "vault"
},
/area/station/command/office/ce)
+"dqc" = (
+/obj/item/radio/intercom/directional/south,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "purplecorner"
+ },
+/area/station/hallway/primary/starboard/east)
"dqk" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -42738,6 +42745,7 @@
"dsy" = (
/obj/item/flag/sec,
/obj/machinery/light_switch/south,
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
icon_state = "darkredfull"
},
@@ -43877,6 +43885,18 @@
icon_state = "whitebluecorner"
},
/area/station/medical/sleeper)
+"dJJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/item/radio/intercom/directional/east,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "whiteblue"
+ },
+/area/station/medical/medbay2)
"dJW" = (
/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
autolink_id = "n2_out";
@@ -46476,6 +46496,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
+/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "darkblue"
},
@@ -48342,6 +48363,7 @@
c_tag = "Engineering Lobby East";
network = list("SS13","Engineering")
},
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellow"
@@ -50109,6 +50131,7 @@
pixel_x = -6;
pixel_y = 8
},
+/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whiteblue"
@@ -53103,9 +53126,12 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/aft)
"hcb" = (
-/obj/item/radio/intercom,
-/turf/simulated/wall,
-/area/station/engineering/atmos)
+/obj/item/radio/intercom/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "browncorner"
+ },
+/area/station/hallway/primary/central/nw)
"hcy" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -53859,7 +53885,7 @@
},
/obj/item/radio/intercom/locked/prison{
name = "Prison Intercom (General)";
- pixel_y = 22
+ pixel_y = 28
},
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -55440,7 +55466,7 @@
/obj/machinery/light/small/directional/west,
/obj/item/radio/intercom/locked/prison{
name = "Prison Intercom (General)";
- pixel_y = 24
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -57649,6 +57675,7 @@
/turf/simulated/floor/mineral/tranquillite,
/area/station/service/mime)
"iRV" = (
+/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "blue"
@@ -58231,10 +58258,10 @@
/area/station/security/prisonershuttle)
"jeS" = (
/obj/item/radio/intercom/department/security{
- pixel_y = 22
+ pixel_y = 24
},
/obj/item/radio/intercom/custom{
- pixel_y = 36
+ pixel_y = 37
},
/obj/structure/filingcabinet/security,
/obj/machinery/light/small/directional/north,
@@ -71969,6 +71996,7 @@
dir = 4
},
/obj/machinery/light/directional/south,
+/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "yellow"
},
@@ -72539,6 +72567,9 @@
"oyO" = (
/obj/item/stack/package_wrap,
/obj/structure/table/glass,
+/obj/machinery/computer/guestpass{
+ pixel_y = 30
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whitepurple"
@@ -80555,8 +80586,16 @@
/obj/machinery/light/small/directional/north,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
+"rvX" = (
+/obj/item/radio/intercom/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "bluecorner"
+ },
+/area/station/hallway/primary/central/se)
"rwb" = (
/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellow"
@@ -80661,9 +80700,11 @@
/obj/structure/filingcabinet,
/obj/item/radio/intercom/private{
dir = 4;
- pixel_x = -36
+ pixel_x = -37
+ },
+/obj/item/radio/intercom/directional/west{
+ pixel_x = -24
},
-/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/carpet/royalblue,
/area/station/command/office/captain)
"ryo" = (
@@ -81503,7 +81544,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/radio/intercom/locked/prison{
name = "Prison Intercom (General)";
- pixel_y = 24
+ pixel_y = 28
},
/obj/effect/landmark/start/prisoner,
/turf/simulated/floor/plasteel{
@@ -81941,6 +81982,13 @@
icon_state = "darkbluecorners"
},
/area/station/engineering/ai_transit_tube)
+"rZA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/item/radio/intercom/directional/south,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/port)
"rZF" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -88214,6 +88262,13 @@
icon_state = "whitegreenfull"
},
/area/station/medical/virology)
+"uqv" = (
+/obj/item/radio/intercom/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "arrival"
+ },
+/area/station/hallway/secondary/entry)
"uqy" = (
/obj/structure/disposalpipe/segment/corner{
dir = 4
@@ -93075,6 +93130,15 @@
icon_state = "darkpurple"
},
/area/station/science/genetics)
+"wfP" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/item/radio/intercom/directional/east,
+/turf/simulated/floor/plasteel{
+ icon_state = "whitepurplecorner"
+ },
+/area/station/science/hallway)
"wgs" = (
/obj/structure/disposalpipe/segment/corner{
dir = 2
@@ -94355,7 +94419,7 @@
/obj/item/radio/intercom/locked/prison{
dir = 4;
name = "Prison Intercom (General)";
- pixel_x = -22
+ pixel_x = -28
},
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
@@ -95309,6 +95373,16 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"wZY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/item/radio/intercom/directional/east,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/entry)
"wZZ" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -108309,7 +108383,7 @@ aaa
aaa
aaa
aLd
-gGY
+uqv
aMB
aSd
aSd
@@ -114204,7 +114278,7 @@ blV
blV
bls
fMG
-fMG
+wZY
bnu
boW
tde
@@ -119086,7 +119160,7 @@ aab
beL
bgA
vJv
-oll
+rZA
blQ
cFP
bnK
@@ -123462,7 +123536,7 @@ cdX
bun
bun
gzl
-bun
+hcb
bxi
urU
bzM
@@ -126628,7 +126702,7 @@ isi
oWM
osz
ooa
-hcb
+nVh
gCX
cSd
uCC
@@ -131695,7 +131769,7 @@ bCY
bEw
bFU
nis
-bFU
+rvX
bOz
bFO
bTG
@@ -134020,7 +134094,7 @@ caA
cbv
dZB
bXP
-bXD
+caA
caP
bXD
bQV
@@ -137618,7 +137692,7 @@ caA
cbU
dZB
bXP
-bXD
+caA
caP
bXD
ylO
@@ -138151,7 +138225,7 @@ dXp
hYs
cCR
oiA
-avO
+dJJ
bYv
lHM
bXI
@@ -141714,7 +141788,7 @@ bwv
bwv
bwv
eiU
-cXh
+dqc
bte
cuQ
djr
@@ -146871,7 +146945,7 @@ awK
ctI
wci
keJ
-ggx
+wfP
spl
cgq
ufq
@@ -146895,7 +146969,7 @@ ggx
hug
spl
spl
-spl
+fTR
rKV
yku
mCV
diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm
index c746346f9c51..fed89a854d03 100644
--- a/_maps/map_files220/stations/deltastation.dmm
+++ b/_maps/map_files220/stations/deltastation.dmm
@@ -558,7 +558,6 @@
/area/shuttle/pod_4)
"aff" = (
/obj/structure/closet/emcloset,
-/obj/item/radio/intercom/directional/west,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -7606,6 +7605,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/wood/fancy,
/area/station/public/sleep_female)
"aHR" = (
@@ -9941,6 +9941,7 @@
/obj/machinery/camera{
c_tag = "Mining Access North"
},
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -9980,6 +9981,7 @@
"aSb" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/west,
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
@@ -10139,6 +10141,7 @@
dir = 10;
initialize_directions = 10
},
+/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/atmos)
"aSM" = (
@@ -11172,6 +11175,7 @@
/area/station/public/locker)
"aXV" = (
/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "brown"
@@ -17189,6 +17193,7 @@
c_tag = "Cargo Dock SouthEast";
dir = 8
},
+/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "brown"
@@ -20910,6 +20915,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/tech_storage)
"bKz" = (
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "arrival"
@@ -23462,12 +23468,10 @@
/turf/simulated/floor/bluegrid,
/area/station/turret_protected/ai_upload)
"bSL" = (
-/obj/item/radio/intercom/private{
- pixel_y = -28
- },
/obj/machinery/computer/borgupload{
dir = 1
},
+/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/bluegrid,
/area/station/turret_protected/ai_upload)
"bSM" = (
@@ -28837,12 +28841,12 @@
/turf/simulated/floor/carpet,
/area/station/command/office/hop)
"cnp" = (
-/obj/item/radio/intercom/directional/west,
+/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
},
-/area/station/hallway/primary/central/sw)
+/area/station/hallway/primary/port)
"cnt" = (
/obj/item/kirbyplants/large,
/obj/machinery/light_switch/south,
@@ -32013,6 +32017,7 @@
pixel_x = 6;
pixel_y = 4
},
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -33774,6 +33779,7 @@
/area/station/medical/reception)
"cJl" = (
/obj/machinery/light/directional/east,
+/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "green"
@@ -37662,6 +37668,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -41004,6 +41011,7 @@
c_tag = "Research North Hallway";
network = list("Research","SS13")
},
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -41984,6 +41992,19 @@
icon_state = "whitepurple"
},
/area/station/science/misc_lab)
+"due" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/item/radio/intercom/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/secondary/bridge)
"duf" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
@@ -47310,6 +47331,13 @@
icon_state = "dark"
},
/area/station/service/chapel)
+"dXg" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/item/radio/intercom/directional/east,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/entry)
"dXj" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -50506,6 +50534,11 @@
},
/turf/simulated/floor/plating,
/area/station/engineering/mechanic)
+"ePa" = (
+/obj/item/kirbyplants/large,
+/obj/item/radio/intercom/directional/west,
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/arrival/station)
"ePd" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -55688,6 +55721,13 @@
icon_state = "whitebluecorner"
},
/area/station/medical/sleeper)
+"gzh" = (
+/obj/item/radio/intercom/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/central/nw)
"gzk" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -59998,6 +60038,7 @@
/area/station/service/janitor)
"hTj" = (
/obj/machinery/light/directional/west,
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "green"
@@ -64891,6 +64932,12 @@
icon_state = "redcorner"
},
/area/station/security/brig)
+"jrS" = (
+/obj/item/radio/intercom/directional/south,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
+/area/station/security/brig)
"jrU" = (
/obj/structure/closet,
/obj/effect/decal/cleanable/dirt,
@@ -67071,6 +67118,13 @@
/obj/machinery/atmospherics/meter,
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/atmos)
+"kaA" = (
+/obj/item/radio/intercom/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "yellowcorner"
+ },
+/area/station/hallway/primary/port)
"kaG" = (
/obj/effect/turf_decal/siding/white,
/turf/simulated/floor/plasteel/freezer,
@@ -68060,6 +68114,7 @@
/area/station/maintenance/starboard2)
"krc" = (
/obj/machinery/optable,
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkblue"
@@ -74558,6 +74613,7 @@
c_tag = "Central Ring Hallway West";
dir = 4
},
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -75182,6 +75238,7 @@
/area/station/maintenance/fore2)
"mIc" = (
/obj/item/flag/command,
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "brown"
@@ -79825,6 +79882,7 @@
/area/station/maintenance/starboard)
"nYh" = (
/obj/machinery/light/directional/east,
+/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitegreencorner"
@@ -83126,6 +83184,18 @@
/obj/effect/turf_decal/siding/wood/oak,
/turf/simulated/floor/wood/fancy/oak,
/area/station/legal/magistrate)
+"pbE" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/item/radio/intercom/directional/south,
+/turf/simulated/floor/plasteel{
+ icon_state = "arrival"
+ },
+/area/station/hallway/secondary/entry)
"pbQ" = (
/obj/item/radio/intercom/directional/south,
/obj/structure/chair/sofa/pew/right{
@@ -84469,6 +84539,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/wood/fancy,
/area/station/public/sleep_male)
"pvZ" = (
@@ -86640,6 +86711,7 @@
c_tag = "Cargo Disposals Sorting";
dir = 8
},
+/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
@@ -89990,12 +90062,12 @@
},
/area/station/engineering/atmos/control)
"reW" = (
-/obj/item/radio/intercom/directional/east,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+/obj/item/radio/intercom/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralcorner"
},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/entry)
+/area/station/hallway/primary/central/west)
"rfd" = (
/turf/simulated/wall/r_wall,
/area/station/security/interrogation/observation)
@@ -96368,6 +96440,7 @@
dir = 8
},
/obj/machinery/light/directional/west,
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"tfF" = (
@@ -97616,6 +97689,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -102772,6 +102846,7 @@
},
/obj/machinery/photocopier,
/obj/machinery/newscaster/directional/north,
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "red"
@@ -104529,6 +104604,14 @@
icon_state = "blue"
},
/area/station/command/bridge/checkpoint/south)
+"vPw" = (
+/obj/machinery/light/directional/west,
+/obj/item/radio/intercom/directional/west,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/fore)
"vPO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -105421,6 +105504,7 @@
codes_txt = "patrol;next_patrol=hall9e";
location = "hall9d"
},
+/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -138376,7 +138460,7 @@ bty
byF
bty
bfE
-bty
+kaA
bty
bGO
bWz
@@ -141660,7 +141744,7 @@ aeb
aeb
ltw
aeb
-reW
+aeb
amB
amL
ant
@@ -141727,7 +141811,7 @@ bOC
bOC
bSy
oAE
-bWH
+cnp
bYj
bYj
bYj
@@ -142692,7 +142776,7 @@ abj
aaa
acC
ant
-anP
+pbE
adb
aor
aoR
@@ -144293,7 +144377,7 @@ eDP
eDP
bDR
bDR
-wdz
+gzh
liZ
xTh
pzY
@@ -144302,7 +144386,7 @@ oUR
gXY
oUR
mKB
-oUR
+reW
oUR
xVw
oUR
@@ -144310,7 +144394,7 @@ oUR
oUR
coE
bwm
-cnp
+bwm
bwm
bwm
muZ
@@ -148331,7 +148415,7 @@ agD
agE
agT
ahC
-ahV
+ePa
ail
ail
ail
@@ -148419,7 +148503,7 @@ chm
iUV
cku
iyc
-iyc
+due
iyc
fIB
fwX
@@ -148877,7 +148961,7 @@ bhO
aWq
bhO
bhO
-bsi
+vPw
nME
phe
bhO
@@ -151674,7 +151758,7 @@ acC
aec
akb
aeb
-aeb
+dXg
aeb
aeb
aeb
@@ -153559,7 +153643,7 @@ xwQ
ciV
xwQ
xwQ
-xwQ
+iru
aER
eZo
lDQ
@@ -163814,7 +163898,7 @@ osD
hWM
smr
raT
-off
+jrS
vBg
lSQ
bvh
diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm
index ad13af50c811..ef12abe049e2 100644
--- a/_maps/map_files220/stations/metastation.dmm
+++ b/_maps/map_files220/stations/metastation.dmm
@@ -2256,6 +2256,7 @@
icon_state = "1-2"
},
/obj/item/flag/mime,
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -3205,6 +3206,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
+/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/plasteel,
/area/station/engineering/gravitygenerator)
"avI" = (
@@ -4181,7 +4183,7 @@
/area/station/maintenance/solar_maintenance/aft_starboard)
"azC" = (
/obj/item/radio/intercom/department/security{
- pixel_y = 22
+ pixel_y = 28
},
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -5526,6 +5528,7 @@
"aFZ" = (
/obj/effect/turf_decal/delivery,
/obj/structure/closet/firecloset,
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"aGb" = (
@@ -7453,6 +7456,7 @@
dir = 8
},
/obj/machinery/light/directional/west,
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"aMS" = (
@@ -11248,6 +11252,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "greenblue"
@@ -15621,16 +15626,13 @@
/area/station/procedure/trainer_office)
"bmR" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/radio/intercom{
- name = "east bump";
- pixel_x = 28
- },
/obj/structure/sink{
dir = 4;
pixel_x = 12
},
/obj/structure/janitorialcart,
/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
"bmT" = (
@@ -15645,9 +15647,7 @@
pixel_y = -4
},
/obj/item/camera,
-/obj/item/radio/intercom/private{
- pixel_x = -28
- },
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/carpet,
/area/station/command/office/captain/bedroom)
"bmV" = (
@@ -17381,9 +17381,7 @@
/obj/structure/rack,
/obj/item/restraints/handcuffs,
/obj/item/flash,
-/obj/item/radio/intercom/department/security{
- pixel_y = 22
- },
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "red"
@@ -18828,9 +18826,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/obj/item/radio/intercom/private{
- pixel_x = -28
- },
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/wood,
/area/station/command/office/captain)
"bwn" = (
@@ -23282,6 +23278,7 @@
/obj/machinery/light/directional/east,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "arrival"
@@ -28407,7 +28404,7 @@
"ceU" = (
/obj/structure/chair,
/obj/item/radio/intercom/locked/confessional{
- pixel_x = -22;
+ pixel_x = -28;
dir = 4
},
/turf/simulated/floor/plasteel{
@@ -31788,7 +31785,7 @@
dir = 1
},
/obj/item/radio/intercom/locked/confessional{
- pixel_x = 22;
+ pixel_x = 28;
dir = 8
},
/turf/simulated/floor/plasteel{
@@ -32132,7 +32129,7 @@
/turf/simulated/floor/plating/airless,
/area/station/maintenance/turbine)
"ctw" = (
-/obj/machinery/light_switch/west,
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -32699,6 +32696,7 @@
/area/station/hallway/primary/aft)
"cvJ" = (
/obj/item/kirbyplants/large/alien/alien6,
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
icon_state = "darkgreycheck"
},
@@ -35484,6 +35482,7 @@
dir = 8
},
/obj/effect/landmark/start/geneticist,
+/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -36754,6 +36753,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkblue"
@@ -42091,6 +42091,13 @@
icon_state = "white"
},
/area/station/medical/medbay)
+"dMf" = (
+/obj/item/radio/intercom/directional/north,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
+/area/station/security/permabrig)
"dMK" = (
/obj/machinery/atmospherics/binary/valve/open,
/turf/simulated/floor/plating,
@@ -47191,13 +47198,10 @@
},
/area/station/security/brig)
"gmn" = (
-/obj/item/radio/intercom/locked/prison{
- name = "Prison Intercom (General)";
- pixel_y = 25
- },
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "black"
@@ -52724,7 +52728,7 @@
/area/station/engineering/controlroom)
"iTG" = (
/obj/item/radio/intercom/department/security{
- pixel_y = -22;
+ pixel_y = -28;
dir = 1
},
/turf/simulated/floor/plasteel,
@@ -54642,9 +54646,7 @@
req_access = list(74)
},
/obj/item/clothing/head/helmet/skull/yorick,
-/obj/item/radio/intercom/department/security{
- pixel_y = 22
- },
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/carpet,
/area/station/legal/magistrate)
"jXo" = (
@@ -58254,6 +58256,7 @@
"lHl" = (
/obj/machinery/light/directional/north,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
@@ -59068,6 +59071,13 @@
},
/turf/simulated/floor/plating,
/area/station/engineering/control)
+"mbS" = (
+/obj/item/radio/intercom/directional/east,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "yellow"
+ },
+/area/station/engineering/break_room)
"mcd" = (
/obj/structure/chair/office/dark{
dir = 8
@@ -61055,9 +61065,7 @@
/area/space/nearstation)
"mZe" = (
/obj/machinery/r_n_d/protolathe,
-/obj/machinery/computer/guestpass{
- pixel_y = 30
- },
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whitepurple"
@@ -62548,6 +62556,7 @@
/area/station/engineering/break_room)
"nIi" = (
/obj/machinery/light/directional/north,
+/obj/machinery/light_switch/north,
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -62985,14 +62994,10 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"nVX" = (
-/obj/item/radio/intercom/directional/west,
-/obj/item/radio/intercom/department/security{
- pixel_x = -34;
- dir = 4
- },
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -63552,8 +63557,10 @@
/turf/space,
/area/space/nearstation)
"onF" = (
-/obj/item/radio/intercom/directional/north,
/obj/machinery/papershredder,
+/obj/machinery/computer/guestpass{
+ pixel_y = 30
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -67450,6 +67457,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 10
},
+/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "cautioncorner"
@@ -69278,9 +69286,11 @@
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
"rpt" = (
-/obj/item/radio/intercom/directional/west,
+/obj/item/radio/intercom/directional/west{
+ pixel_x = -24
+ },
/obj/item/radio/intercom/department/security{
- pixel_x = -34;
+ pixel_x = -37;
dir = 4
},
/obj/structure/disposalpipe/segment,
@@ -69506,7 +69516,7 @@
/area/station/science/storage)
"ruH" = (
/obj/item/radio/intercom/department/security{
- pixel_x = 22;
+ pixel_x = 28;
dir = 8
},
/obj/machinery/flasher/portable,
@@ -74004,9 +74014,6 @@
/obj/machinery/light_switch/west{
pixel_y = 6
},
-/obj/item/radio/intercom/directional/west{
- pixel_y = -8
- },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "yellow"
@@ -75548,15 +75555,12 @@
},
/area/station/security/brig)
"uGn" = (
-/obj/item/radio/intercom/locked/prison{
- name = "Prison Intercom (General)";
- pixel_x = -25
- },
+/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "red"
+ dir = 4;
+ icon_state = "cautioncorner"
},
-/area/station/security/permabrig)
+/area/station/hallway/primary/starboard)
"uGy" = (
/obj/item/bodybag,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -77737,9 +77741,11 @@
"vKy" = (
/obj/structure/table/wood,
/obj/effect/spawner/random/officetoys,
-/obj/item/radio/intercom/directional/east,
+/obj/item/radio/intercom/directional/east{
+ pixel_x = 24
+ },
/obj/item/radio/intercom/department/security{
- pixel_x = 34;
+ pixel_x = 37;
dir = 8
},
/obj/machinery/light/directional/east,
@@ -80358,7 +80364,7 @@
/obj/machinery/light/directional/north,
/obj/item/radio/intercom/locked/prison{
name = "Prison Intercom (General)";
- pixel_y = 25
+ pixel_y = 28
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -103418,7 +103424,7 @@ smH
udK
udK
udK
-mKI
+dMf
iqe
udK
odW
@@ -103674,7 +103680,7 @@ rqq
obJ
oaX
oaX
-uGn
+oaX
fCF
eyZ
rLO
@@ -118374,7 +118380,7 @@ aaa
aaa
aaa
blo
-bnr
+uGn
hfi
bqA
blC
@@ -124288,7 +124294,7 @@ iet
fDS
ftQ
sSj
-qJz
+mbS
qJz
ims
qQw
@@ -124545,7 +124551,7 @@ hSu
kEv
mDR
vug
-hHE
+bCN
hHE
hHE
bNg