From 28e2e1c65296f8457903e6855437c6c0767fd33b Mon Sep 17 00:00:00 2001
From: dapnee <33661984+dapnee@users.noreply.github.com>
Date: Sat, 26 Sep 2020 19:31:27 -0600
Subject: [PATCH] more fixes

adresses issues that were brought up, will update changelog later
---
 _maps/map_files/LambdaStation/dorms.dmm  | 318 ++++++++++++++++++-----
 _maps/map_files/LambdaStation/lambda.dmm |  76 +++++-
 2 files changed, 329 insertions(+), 65 deletions(-)

diff --git a/_maps/map_files/LambdaStation/dorms.dmm b/_maps/map_files/LambdaStation/dorms.dmm
index a4854bde53..e5003965ed 100644
--- a/_maps/map_files/LambdaStation/dorms.dmm
+++ b/_maps/map_files/LambdaStation/dorms.dmm
@@ -45,6 +45,18 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/recreation)
+"ah" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/obj/item/radio/intercom{
+	dir = 1;
+	name = "Station Intercom";
+	pixel_y = -28
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "ai" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
 /obj/effect/turf_decal/trimline/green/filled/line{
@@ -353,6 +365,13 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
+"aQ" = (
+/obj/machinery/door/airlock/hatch{
+	name = "Telecomms Control Room";
+	req_one_access_txt = "19; 61"
+	},
+/turf/open/floor/plating/airless,
+/area/tcommsat/chamber)
 "aR" = (
 /obj/item/electropack/shockcollar,
 /obj/item/assembly/signaler,
@@ -1192,6 +1211,15 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/kitchen)
+"dg" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/tcommsat/chamber)
 "dh" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1418,6 +1446,20 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/bar)
+"dQ" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/obj/item/radio/intercom{
+	dir = 1;
+	name = "Station Intercom";
+	pixel_y = -28
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "dR" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -1798,6 +1840,19 @@
 /obj/effect/turf_decal/trimline/neutral/filled/line,
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
+"eV" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 4
+	},
+/obj/item/radio/intercom{
+	name = "Station Intercom";
+	pixel_x = -26
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "eW" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line,
 /obj/machinery/status_display/ai{
@@ -4068,6 +4123,16 @@
 	},
 /turf/open/floor/plasteel,
 /area/hydroponics)
+"kF" = (
+/obj/machinery/door/airlock/hatch{
+	name = "Telecomms Control Room";
+	req_one_access_txt = "19; 61"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating/airless,
+/area/tcommsat/chamber)
 "kH" = (
 /obj/effect/spawner/structure/window/reinforced/tinted,
 /turf/open/floor/plating,
@@ -4430,6 +4495,9 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/service)
+"lz" = (
+/turf/closed/wall/r_wall,
+/area/tcommsat/chamber)
 "lA" = (
 /turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
@@ -4665,6 +4733,11 @@
 /obj/machinery/sleeper{
 	dir = 4
 	},
+/obj/item/radio/intercom{
+	frequency = 1485;
+	name = "Station Intercom (Medbay)";
+	pixel_x = -30
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/zone2)
 "mg" = (
@@ -4760,6 +4833,16 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
+"mr" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/item/radio/intercom{
+	name = "Station Intercom";
+	pixel_x = 26
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "mt" = (
 /obj/structure/sign/poster/contraband/random{
 	pixel_x = -32
@@ -6513,6 +6596,10 @@
 /obj/item/clothing/suit/apron/chef,
 /turf/open/floor/plating,
 /area/maintenance/central)
+"qT" = (
+/obj/machinery/telecomms/relay/preset/station,
+/turf/open/floor/plasteel/dark,
+/area/tcommsat/chamber)
 "qU" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 1
@@ -7624,6 +7711,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
 /turf/open/floor/carpet/blue,
 /area/security/vacantoffice)
+"tS" = (
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating/airless,
+/area/tcommsat/chamber)
 "tT" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -8029,6 +8122,17 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
+"vd" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/item/radio/intercom{
+	dir = 1;
+	name = "Station Intercom";
+	pixel_y = -28
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
 "ve" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 4
@@ -8728,6 +8832,11 @@
 /obj/machinery/camera/autoname{
 	dir = 10
 	},
+/obj/item/radio/intercom{
+	dir = 1;
+	name = "Station Intercom";
+	pixel_y = -28
+	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "xb" = (
@@ -9201,8 +9310,8 @@
 	c_tag = "Above Comms";
 	dir = 10
 	},
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/turf/open/floor/plasteel/dark,
+/area/tcommsat/chamber)
 "yq" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
 	dir = 4
@@ -9715,6 +9824,17 @@
 	},
 /turf/open/floor/plating,
 /area/hydroponics/garden/abandoned)
+"zA" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 8
+	},
+/obj/item/radio/intercom{
+	name = "Station Intercom";
+	pixel_x = 26
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "zB" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 8
@@ -10006,6 +10126,9 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/recreation)
+"Ao" = (
+/turf/closed/wall,
+/area/tcommsat/chamber)
 "Ap" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 1
@@ -10085,6 +10208,10 @@
 /area/crew_quarters/fitness/recreation)
 "AD" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1,
+/obj/item/radio/intercom{
+	name = "Station Intercom";
+	pixel_y = 26
+	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/service)
 "AE" = (
@@ -10569,6 +10696,15 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/zone2)
+"BS" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/smes{
+	charge = 5e+006
+	},
+/turf/open/floor/plasteel/dark,
+/area/tcommsat/chamber)
 "BT" = (
 /obj/machinery/holopad,
 /obj/effect/turf_decal/bot,
@@ -12319,6 +12455,12 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/central)
+"Gq" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/tcommsat/chamber)
 "Gr" = (
 /obj/machinery/button/door{
 	id = "Cabin6";
@@ -12452,6 +12594,17 @@
 /obj/structure/lattice,
 /turf/closed/wall/r_wall,
 /area/maintenance/solars/starboard)
+"GJ" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 9
+	},
+/obj/item/radio/intercom{
+	name = "Station Intercom";
+	pixel_x = 26
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "GK" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{
 	dir = 8
@@ -14211,9 +14364,6 @@
 /area/hallway/primary/central)
 "La" = (
 /obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -14222,6 +14372,9 @@
 	},
 /obj/machinery/vending/cola/random,
 /obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/central)
 "Lb" = (
@@ -14397,6 +14550,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
+"LC" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/tcommsat/chamber)
 "LD" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
@@ -16371,6 +16530,10 @@
 /obj/machinery/camera/autoname{
 	dir = 9
 	},
+/obj/item/radio/intercom{
+	name = "Station Intercom";
+	pixel_x = 26
+	},
 /turf/open/floor/carpet,
 /area/crew_quarters/theatre)
 "QN" = (
@@ -17336,6 +17499,15 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/crew_quarters/dorms)
+"Tu" = (
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc/highcap/ten_k{
+	pixel_y = 23
+	},
+/turf/open/floor/plasteel/dark,
+/area/tcommsat/chamber)
 "Tv" = (
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/dorms)
@@ -17538,6 +17710,17 @@
 /obj/structure/table/wood,
 /turf/open/floor/carpet,
 /area/crew_quarters/dorms)
+"TW" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/obj/item/radio/intercom{
+	name = "Station Intercom";
+	pixel_y = 26
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "TY" = (
 /obj/machinery/vending/wardrobe/chap_wardrobe,
 /turf/open/floor/plasteel/grimy,
@@ -17851,6 +18034,18 @@
 	},
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/kitchen)
+"UI" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/green,
+/obj/item/radio/intercom{
+	dir = 1;
+	name = "Station Intercom";
+	pixel_y = -28
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "UJ" = (
 /obj/machinery/light,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
@@ -18253,6 +18448,9 @@
 /obj/structure/lattice,
 /turf/open/space,
 /area/space/nearstation)
+"VF" = (
+/turf/open/floor/plasteel/dark,
+/area/tcommsat/chamber)
 "VG" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -18944,6 +19142,10 @@
 	pixel_x = 25;
 	pixel_y = 25
 	},
+/obj/item/radio/intercom{
+	name = "Station Intercom";
+	pixel_x = 26
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/bar)
 "XC" = (
@@ -36056,11 +36258,11 @@ Yv
 Yv
 Yv
 lQ
-lQ
-Yv
-Yv
-Yv
-Yv
+lz
+Ao
+Ao
+Ao
+Ao
 Yv
 Yv
 Yv
@@ -36311,13 +36513,13 @@ dh
 Yv
 Yv
 Yv
-Yv
 lQ
 lQ
-Yv
-Yv
-Yv
-Yv
+lz
+BS
+VF
+VF
+Ao
 Yv
 Yv
 Yv
@@ -36567,14 +36769,14 @@ Yv
 dh
 Yv
 Yv
-Yv
-Yv
-lQ
-lQ
-Yv
-Yv
-Yv
-sj
+lz
+lz
+lz
+Tu
+dg
+VF
+VF
+Ao
 sj
 sj
 Yv
@@ -36824,14 +37026,14 @@ Yv
 dh
 Yv
 Yv
-Yv
-Yv
-lQ
-lQ
-Yv
-Yv
+aQ
+tS
+kF
+Gq
+LC
+qT
 yp
-sj
+Ao
 lQ
 sj
 SH
@@ -37081,14 +37283,14 @@ Yv
 dh
 Yv
 Yv
-Yv
-Yv
-lQ
-lQ
-Yv
-Yv
-Yv
-sj
+lz
+lz
+lz
+VF
+VF
+VF
+VF
+Ao
 sj
 sj
 Yv
@@ -37339,13 +37541,13 @@ dh
 Yv
 Yv
 Yv
-Yv
 lQ
 lQ
-Yv
-Yv
-Yv
-Yv
+lz
+VF
+VF
+VF
+Ao
 Yv
 Yv
 Yv
@@ -37598,11 +37800,11 @@ Yv
 Yv
 Yv
 lQ
-lQ
-Yv
-Yv
-Yv
-Yv
+lz
+Ao
+Ao
+Ao
+Ao
 Yv
 Yv
 Yv
@@ -57866,7 +58068,7 @@ JH
 el
 el
 el
-el
+eV
 aB
 el
 Td
@@ -59390,7 +59592,7 @@ qo
 qo
 qo
 OA
-PD
+TW
 Fd
 PS
 rF
@@ -62476,7 +62678,7 @@ OA
 kS
 Og
 MJ
-pg
+ah
 OA
 XY
 cx
@@ -63520,7 +63722,7 @@ sm
 DS
 TM
 YL
-EQ
+vd
 DT
 Jt
 Dw
@@ -65560,7 +65762,7 @@ kA
 ra
 PD
 lk
-WB
+UI
 TM
 tf
 VT
@@ -66099,7 +66301,7 @@ UF
 Wh
 LI
 DT
-EV
+mr
 iQ
 MW
 Xf
@@ -68385,7 +68587,7 @@ dt
 gV
 iI
 OA
-PD
+TW
 XN
 zL
 ew
@@ -68672,7 +68874,7 @@ OA
 OA
 VX
 TB
-vP
+dQ
 OA
 Bs
 fl
@@ -69422,7 +69624,7 @@ mq
 bu
 CL
 OZ
-Yo
+zA
 Yo
 Yo
 Yo
@@ -69432,7 +69634,7 @@ Yo
 PM
 BK
 IO
-eG
+GJ
 Yo
 Qp
 Yo
diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm
index b45607bcde..5d104b798a 100644
--- a/_maps/map_files/LambdaStation/lambda.dmm
+++ b/_maps/map_files/LambdaStation/lambda.dmm
@@ -33113,6 +33113,11 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/neutral,
+/obj/item/radio/intercom{
+	dir = 1;
+	name = "Station Intercom";
+	pixel_y = -28
+	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "bmh" = (
@@ -53717,6 +53722,9 @@
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/aisat)
 "cus" = (
@@ -56361,6 +56369,7 @@
 /obj/structure/cable,
 /obj/machinery/power/apc/highcap/five_k{
 	areastring = "/area/ai_monitored/turret_protected/aisat/foyer";
+	dir = 8;
 	name = "MiniSat Foyer APC";
 	pixel_x = -29
 	},
@@ -59662,6 +59671,10 @@
 	dir = 8;
 	name = "cargo camera"
 	},
+/obj/item/radio/intercom{
+	name = "Station Intercom";
+	pixel_x = 26
+	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cLQ" = (
@@ -67212,6 +67225,29 @@
 /obj/structure/chair/stool,
 /turf/open/floor/plasteel,
 /area/engine/break_room)
+"kFC" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/machinery/camera/autoname{
+	dir = 1
+	},
+/obj/item/radio/intercom{
+	dir = 1;
+	name = "Station Intercom";
+	pixel_y = -28
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/command)
 "kJN" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
 /obj/structure/table,
@@ -73091,6 +73127,19 @@
 "xag" = (
 /turf/closed/wall,
 /area/science/circuit)
+"xaB" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 4
+	},
+/obj/item/radio/intercom{
+	name = "Station Intercom";
+	pixel_x = -26
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
 "xfQ" = (
 /obj/machinery/atmospherics/pipe/manifold/green/visible{
 	dir = 4
@@ -73568,6 +73617,19 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
+"yiX" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/yellow{
+	dir = 1
+	},
+/obj/item/radio/intercom{
+	name = "Station Intercom";
+	pixel_x = -26
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
 "yjs" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
 /turf/open/floor/plasteel/dark,
@@ -107392,7 +107454,7 @@ aTL
 aTJ
 brk
 bam
-ofD
+kFC
 bcl
 bcl
 bcl
@@ -111511,7 +111573,7 @@ bFL
 aSC
 uSM
 uSM
-uSM
+xaB
 bDA
 bpt
 bOj
@@ -113295,7 +113357,7 @@ adN
 aPY
 kXQ
 apk
-bDx
+apk
 bpw
 bpw
 bDx
@@ -113552,7 +113614,7 @@ btt
 aPY
 kXQ
 bfo
-bDx
+apk
 bpw
 bRI
 bpw
@@ -113809,7 +113871,7 @@ fEg
 aQb
 aSw
 bft
-bDx
+apk
 bpw
 bpw
 bpw
@@ -114066,7 +114128,7 @@ bbt
 aPY
 txO
 apk
-bDx
+apk
 bpw
 bpw
 bqa
@@ -122348,7 +122410,7 @@ cLu
 xQX
 cLu
 cLu
-cLu
+yiX
 dcB
 cTu
 goU