diff --git a/citadel.dme b/citadel.dme
index d285353ca10..91cbf1b6423 100644
--- a/citadel.dme
+++ b/citadel.dme
@@ -3213,6 +3213,7 @@
 #include "code\modules\mapping\map_helpers\_map_helpers.dm"
 #include "code\modules\mapping\map_helpers\baseturf.dm"
 #include "code\modules\mapping\map_helpers\component_injector.dm"
+#include "code\modules\mapping\map_helpers\electrochromatic_linker.dm"
 #include "code\modules\mapping\map_helpers\engine_loader.dm"
 #include "code\modules\mapping\map_helpers\gear_marker.dm"
 #include "code\modules\mapping\map_helpers\paint.dm"
diff --git a/code/modules/mapping/map_helpers/electrochromatic_linker.dm b/code/modules/mapping/map_helpers/electrochromatic_linker.dm
new file mode 100644
index 00000000000..0e6fa3ef7fa
--- /dev/null
+++ b/code/modules/mapping/map_helpers/electrochromatic_linker.dm
@@ -0,0 +1,17 @@
+/obj/map_helper/electrochromatic_linker
+	icon = 'icons/mapping/helpers/electrochromatic_helper.dmi'
+	icon_state = "electrochromatic"
+	early = FALSE
+	late = TRUE
+	/**
+	* the ID to bind electrochromatic objects on our tile to
+	*/
+	var/id
+
+/obj/map_helper/electrochromatic_linker/LateInitialize()
+	for(var/obj/structure/window/reinforced/polarized/chromatic_window in loc)
+		chromatic_window.id = id
+	/**
+	* Same behaviour needs to be applied to polarised airlocks, currently unable too
+	*/
+	qdel(src)
diff --git a/icons/mapping/helpers/electrochromatic_helper.dmi b/icons/mapping/helpers/electrochromatic_helper.dmi
new file mode 100644
index 00000000000..13963d33125
Binary files /dev/null and b/icons/mapping/helpers/electrochromatic_helper.dmi differ
diff --git a/maps/rift/levels/rift-02-underground2.dmm b/maps/rift/levels/rift-02-underground2.dmm
index 31c630ddd71..5f9d41e3c72 100644
--- a/maps/rift/levels/rift-02-underground2.dmm
+++ b/maps/rift/levels/rift-02-underground2.dmm
@@ -7891,6 +7891,9 @@
 "CH" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/sun,
+/obj/map_helper/electrochromatic_linker{
+	id = "ce_office"
+	},
 /turf/simulated/floor,
 /area/crew_quarters/heads/chief)
 "CI" = (
@@ -8485,6 +8488,9 @@
 "ET" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/palebottlegreen,
+/obj/map_helper/electrochromatic_linker{
+	id = "chapel_office"
+	},
 /turf/simulated/floor/plating,
 /area/chapel/office)
 "EU" = (
@@ -8963,6 +8969,9 @@
 "Ha" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/palebottlegreen,
+/obj/map_helper/electrochromatic_linker{
+	id = "chapel_hall"
+	},
 /turf/simulated/floor/plating,
 /area/chapel/main)
 "Hb" = (
diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm
index 3f2d4abc72c..42bf056e1e3 100644
--- a/maps/rift/levels/rift-04-surface1.dmm
+++ b/maps/rift/levels/rift-04-surface1.dmm
@@ -873,6 +873,9 @@
 "aFU" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "cmo_office"
+	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads/cmo)
 "aGd" = (
@@ -1702,7 +1705,8 @@
 	},
 /obj/machinery/conveyor_switch{
 	pixel_y = 12;
-	tag = "cargoshuttle"
+	tag = "cargoshuttle";
+	id = "CVLoad"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
@@ -2136,7 +2140,8 @@
 "bxV" = (
 /obj/machinery/conveyor{
 	dir = 4;
-	tag = "cargoshuttle"
+	tag = "cargoshuttle";
+	id = "CVLoad"
 	},
 /obj/structure/railing,
 /obj/structure/railing{
@@ -2258,7 +2263,8 @@
 	},
 /obj/machinery/conveyor{
 	dir = 4;
-	tag = "cargoshuttle"
+	tag = "cargoshuttle";
+	id = "CVLoad"
 	},
 /obj/structure/railing,
 /turf/simulated/floor/plating,
@@ -2381,7 +2387,8 @@
 "bFI" = (
 /obj/structure/plasticflaps,
 /obj/machinery/conveyor{
-	tag = "mailroom"
+	tag = "mailroom";
+	id = "DLBelt"
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/delivery)
@@ -3142,6 +3149,9 @@
 /area/hallway/primary/surfaceone)
 "cdW" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/map_helper/electrochromatic_linker{
+	id = "iaa"
+	},
 /turf/simulated/floor/plating,
 /area/lawoffice)
 "cec" = (
@@ -3286,6 +3296,9 @@
 "clK" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/beastybrown,
+/obj/map_helper/electrochromatic_linker{
+	id = "QM_office"
+	},
 /turf/simulated/floor/plating,
 /area/quartermaster/qm)
 "cmb" = (
@@ -3514,6 +3527,9 @@
 "ctO" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "patient_room_b"
+	},
 /turf/simulated/floor/plating,
 /area/medical/patient_a)
 "cuR" = (
@@ -3679,6 +3695,9 @@
 "czx" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "exam_room"
+	},
 /turf/simulated/floor/plating,
 /area/medical/exam_room)
 "czN" = (
@@ -6961,7 +6980,8 @@
 	pixel_x = -32
 	},
 /obj/machinery/conveyor{
-	tag = "mailroom"
+	tag = "mailroom";
+	id = "DLBelt"
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/delivery)
@@ -7936,6 +7956,9 @@
 "flS" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "psych_office"
+	},
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/medical/mentalhealth)
 "flT" = (
@@ -9100,7 +9123,8 @@
 "gbL" = (
 /obj/machinery/conveyor{
 	dir = 4;
-	tag = "cargoshuttle"
+	tag = "cargoshuttle";
+	id = "CVLoad"
 	},
 /obj/structure/railing,
 /obj/machinery/camera/network/cargo,
@@ -10301,7 +10325,8 @@
 	},
 /obj/structure/disposalpipe/trunk,
 /obj/machinery/conveyor{
-	tag = "mailroom"
+	tag = "mailroom";
+	id = "DLBelt"
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/delivery)
@@ -10543,7 +10568,8 @@
 	dir = 1
 	},
 /obj/machinery/conveyor{
-	tag = "mailroom"
+	tag = "mailroom";
+	id = "DLBelt"
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/delivery)
@@ -15997,6 +16023,9 @@
 "kko" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "patient_room_a"
+	},
 /turf/simulated/floor/plating,
 /area/medical/patient_b)
 "kku" = (
@@ -18431,7 +18460,8 @@
 "lJv" = (
 /obj/machinery/conveyor{
 	dir = 4;
-	tag = "cargoshuttle"
+	tag = "cargoshuttle";
+	id = "CVLoad"
 	},
 /obj/machinery/door/blast/shutters{
 	density = 0;
@@ -19447,10 +19477,6 @@
 	},
 /turf/simulated/floor/tiled/monowhite,
 /area/medical/psych_ward)
-"mpA" = (
-/obj/structure/undies_wardrobe,
-/turf/simulated/wall/r_wall/prepainted,
-/area/rift/surfacebase/outside/outside1)
 "mpD" = (
 /obj/machinery/atmospherics/component/unary/outlet_injector{
 	id = "violet_protocol";
@@ -23284,6 +23310,9 @@
 "oBN" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/darkred,
+/obj/map_helper/electrochromatic_linker{
+	id = "det_office"
+	},
 /turf/simulated/floor/plating,
 /area/security/forensics)
 "oBO" = (
@@ -23926,7 +23955,8 @@
 "oTu" = (
 /obj/machinery/conveyor_switch{
 	pixel_y = 12;
-	tag = "cargoshuttle"
+	tag = "cargoshuttle";
+	id = "CVLoad"
 	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 5
@@ -28591,7 +28621,8 @@
 "rEL" = (
 /obj/machinery/conveyor{
 	dir = 4;
-	tag = "cargoshuttle"
+	tag = "cargoshuttle";
+	id = "CVLoad"
 	},
 /obj/machinery/light{
 	dir = 8
@@ -30802,7 +30833,8 @@
 "sMB" = (
 /obj/machinery/conveyor{
 	dir = 4;
-	tag = "cargoshuttle"
+	tag = "cargoshuttle";
+	id = "CVLoad"
 	},
 /obj/machinery/door/firedoor/glass,
 /obj/structure/plasticflaps/mining,
@@ -31830,7 +31862,8 @@
 	dir = 4
 	},
 /obj/machinery/conveyor{
-	tag = "mailroom"
+	tag = "mailroom";
+	id = "DLBelt"
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/delivery)
@@ -32223,7 +32256,8 @@
 	},
 /obj/machinery/conveyor_switch/oneway{
 	convdir = -1;
-	tag = "mailroom"
+	tag = "mailroom";
+	id = "DLBelt"
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/quartermaster/delivery)
@@ -33143,7 +33177,8 @@
 "udl" = (
 /obj/machinery/conveyor{
 	dir = 4;
-	tag = "cargoshuttle"
+	tag = "cargoshuttle";
+	id = "CVLoad"
 	},
 /obj/structure/railing,
 /turf/simulated/floor/plating,
@@ -34887,7 +34922,8 @@
 "vaP" = (
 /obj/machinery/conveyor{
 	dir = 4;
-	tag = "cargoshuttle"
+	tag = "cargoshuttle";
+	id = "CVLoad"
 	},
 /obj/structure/railing,
 /turf/simulated/floor/plating,
@@ -36741,7 +36777,8 @@
 "wjJ" = (
 /obj/machinery/conveyor{
 	dir = 4;
-	tag = "cargoshuttle"
+	tag = "cargoshuttle";
+	id = "CVLoad"
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/hallway)
@@ -46117,7 +46154,7 @@ iFN
 iFN
 iFN
 iFN
-mpA
+vUA
 vUA
 vUA
 iFN
diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm
index a62116cdac9..16dac551e5b 100644
--- a/maps/rift/levels/rift-05-surface2.dmm
+++ b/maps/rift/levels/rift-05-surface2.dmm
@@ -2279,6 +2279,9 @@
 	spawn_grille = 0
 	},
 /obj/effect/paint/babyblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "operating_theatre_2"
+	},
 /turf/simulated/floor/plating,
 /area/medical/surgery2)
 "bmY" = (
@@ -2749,6 +2752,9 @@
 /obj/structure/window/reinforced/tinted/frosted{
 	dir = 8
 	},
+/obj/map_helper/electrochromatic_linker{
+	id = "sec_processing_r"
+	},
 /turf/simulated/floor/tiled/red,
 /area/security/security_processing)
 "bBF" = (
@@ -4236,6 +4242,9 @@
 /obj/structure/window/reinforced/tinted/frosted{
 	dir = 4
 	},
+/obj/map_helper/electrochromatic_linker{
+	id = "sec_processing_l"
+	},
 /turf/simulated/floor/tiled/red,
 /area/security/security_processing)
 "cDU" = (
@@ -5753,6 +5762,9 @@
 /obj/machinery/holosign/surgery{
 	id = "operating_theatre_2"
 	},
+/obj/map_helper/electrochromatic_linker{
+	id = "operating_theatre_2"
+	},
 /obj/machinery/door/airlock/glass/medical/polarized{
 	id_tint = "operating_theatre_2";
 	name = "Operating Theatre 2";
@@ -6990,6 +7002,9 @@
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/darkred,
 /obj/structure/cable/green,
+/obj/map_helper/electrochromatic_linker{
+	id = "Interr"
+	},
 /turf/simulated/floor/plating,
 /area/security/interrogation)
 "etT" = (
@@ -7261,6 +7276,14 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/security/hallway)
+"eCP" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/babyblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "resleeving-tint"
+	},
+/turf/simulated/floor/plating,
+/area/medical/resleeving)
 "eCU" = (
 /obj/effect/floor_decal/industrial/outline/grey,
 /obj/random/maintenance/research,
@@ -7636,6 +7659,9 @@
 	opacity = 0
 	},
 /obj/effect/paint/purplegray,
+/obj/map_helper/electrochromatic_linker{
+	id = "robotics_inner"
+	},
 /turf/simulated/floor/plating,
 /area/assembly/robotics)
 "eTD" = (
@@ -7677,6 +7703,9 @@
 /obj/structure/window/reinforced/tinted/frosted{
 	dir = 4
 	},
+/obj/map_helper/electrochromatic_linker{
+	id = "sec_processing_l"
+	},
 /turf/simulated/floor/tiled/red,
 /area/security/security_processing)
 "eUD" = (
@@ -9104,6 +9133,9 @@
 /obj/structure/window/reinforced/tinted/frosted{
 	dir = 8
 	},
+/obj/map_helper/electrochromatic_linker{
+	id = "sec_processing_r"
+	},
 /turf/simulated/floor/tiled/red,
 /area/security/security_processing)
 "fQU" = (
@@ -9162,6 +9194,9 @@
 	spawn_grille = 0
 	},
 /obj/effect/paint/babyblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "operating_theatre_1"
+	},
 /turf/simulated/floor/plating,
 /area/medical/surgery)
 "fTu" = (
@@ -11266,6 +11301,9 @@
 /obj/structure/disposalpipe/segment,
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "medbay_outer"
+	},
 /turf/simulated/floor/plating,
 /area/medical/reception)
 "hlW" = (
@@ -14386,6 +14424,9 @@
 	opacity = 0
 	},
 /obj/effect/paint/purplegray,
+/obj/map_helper/electrochromatic_linker{
+	id = "research_outer"
+	},
 /turf/simulated/floor/plating,
 /area/rnd/research)
 "jdp" = (
@@ -16801,6 +16842,9 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/map_helper/electrochromatic_linker{
+	id = "Interr"
+	},
 /turf/simulated/floor/plating,
 /area/security/interrogation)
 "kHg" = (
@@ -17651,6 +17695,14 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_3)
+"ldw" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/darkred,
+/obj/map_helper/electrochromatic_linker{
+	id = "sec_processing_r"
+	},
+/turf/simulated/floor/plating,
+/area/security/security_processing)
 "ldL" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 4
@@ -18544,6 +18596,9 @@
 /area/maintenance/dormitory)
 "lIZ" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/map_helper/electrochromatic_linker{
+	id = "research_inner"
+	},
 /turf/simulated/floor/plating,
 /area/rnd/research)
 "lJq" = (
@@ -19571,6 +19626,14 @@
 	},
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/reading_room)
+"moI" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/darkred,
+/obj/map_helper/electrochromatic_linker{
+	id = "sec_processing_l"
+	},
+/turf/simulated/floor/plating,
+/area/security/security_processing)
 "moS" = (
 /obj/structure/toilet{
 	pixel_y = 9
@@ -19693,6 +19756,9 @@
 /obj/structure/cable/green{
 	icon_state = "0-2"
 	},
+/obj/map_helper/electrochromatic_linker{
+	id = "Interr"
+	},
 /turf/simulated/floor/plating,
 /area/security/interrogation)
 "mqP" = (
@@ -22752,6 +22818,9 @@
 	opacity = 0
 	},
 /obj/effect/paint/purplegray,
+/obj/map_helper/electrochromatic_linker{
+	id = "rd_office"
+	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads/hor)
 "ofP" = (
@@ -25336,6 +25405,9 @@
 /obj/machinery/holosign/surgery{
 	id = "operating_theatre_1"
 	},
+/obj/map_helper/electrochromatic_linker{
+	id = "operating_theatre_1"
+	},
 /obj/map_helper/access_helper/airlock/station/medical/surgery,
 /obj/machinery/door/airlock/glass/medical/polarized{
 	id_tint = "operating_theatre_1";
@@ -28985,6 +29057,9 @@
 /area/crew_quarters/pool)
 "sdE" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/map_helper/electrochromatic_linker{
+	id = "sauna"
+	},
 /turf/simulated/floor/plating,
 /area/triumph/surfacebase/sauna)
 "sen" = (
@@ -31443,6 +31518,9 @@
 	opacity = 0
 	},
 /obj/effect/paint/purplegray,
+/obj/map_helper/electrochromatic_linker{
+	id = "robotics_outer"
+	},
 /turf/simulated/floor/plating,
 /area/assembly/robotics)
 "tUr" = (
@@ -31631,6 +31709,9 @@
 	opacity = 0
 	},
 /obj/effect/paint/darkred,
+/obj/map_helper/electrochromatic_linker{
+	id = "hos_office"
+	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads/hos)
 "tZW" = (
@@ -34470,6 +34551,9 @@
 "vPP" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/babyblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "medbay_outer"
+	},
 /turf/simulated/floor/plating,
 /area/medical/reception)
 "vQg" = (
@@ -35298,6 +35382,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/map_helper/electrochromatic_linker{
+	id = "sauna"
+	},
 /turf/simulated/floor/plating,
 /area/triumph/surfacebase/sauna)
 "wtF" = (
@@ -48633,8 +48720,8 @@ oLJ
 oLJ
 kid
 kid
-oFb
-oFb
+eCP
+eCP
 kid
 kid
 kid
@@ -49218,7 +49305,7 @@ eYx
 gHr
 ixy
 odu
-oFb
+eCP
 jvX
 vjt
 wnW
@@ -49412,7 +49499,7 @@ eYx
 iKu
 kRa
 lto
-oFb
+eCP
 eUN
 dyj
 wBH
@@ -49606,7 +49693,7 @@ oUw
 dTk
 bor
 lto
-oFb
+eCP
 epz
 tQp
 xkt
@@ -57752,7 +57839,7 @@ yga
 xNm
 bhS
 nuH
-keC
+moI
 pUO
 xQz
 owT
@@ -57946,7 +58033,7 @@ myF
 pwT
 bhS
 nuH
-keC
+moI
 hGI
 ijR
 oZw
@@ -58140,7 +58227,7 @@ mJx
 wXp
 bhS
 nuH
-keC
+moI
 eUi
 cCa
 fEm
@@ -58722,7 +58809,7 @@ tZG
 tiu
 bhS
 nuH
-keC
+ldw
 fQG
 bBy
 bVn
@@ -58916,7 +59003,7 @@ tZG
 mve
 bhS
 nuH
-keC
+ldw
 hGI
 ijR
 eTG
@@ -59110,7 +59197,7 @@ iFX
 eCN
 ohv
 oQS
-keC
+ldw
 pUO
 mzx
 yaJ
diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm
index 7806faa9b5e..496bc980a80 100644
--- a/maps/rift/levels/rift-06-surface3.dmm
+++ b/maps/rift/levels/rift-06-surface3.dmm
@@ -2066,6 +2066,11 @@
 "agL" = (
 /obj/item/folder/blue,
 /obj/structure/table/wooden_reinforced,
+/obj/machinery/button/windowtint/multitint{
+	pixel_x = -8;
+	pixel_y = 7;
+	id = "pathfinder_office"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/exploration/pathfinder_office)
 "agN" = (
@@ -19893,6 +19898,9 @@
 	opacity = 0
 	},
 /obj/effect/paint/commandblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "hop_office"
+	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads/hop)
 "fUe" = (
@@ -21063,6 +21071,9 @@
 "igJ" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/violet,
+/obj/map_helper/electrochromatic_linker{
+	id = "pathfinder_office"
+	},
 /turf/simulated/floor/plating,
 /area/exploration/pathfinder_office)
 "iio" = (
@@ -21188,6 +21199,9 @@
 	id = "hop_office"
 	},
 /obj/effect/paint/commandblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "hop_office"
+	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads/hop)
 "iCv" = (
@@ -22196,6 +22210,9 @@
 	req_one_access = null
 	},
 /obj/map_helper/access_helper/airlock/station/command/bridge,
+/obj/map_helper/electrochromatic_linker{
+	id = "bridge_tint"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
 "khK" = (
@@ -22509,6 +22526,9 @@
 	},
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/commandblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "bridge_tint"
+	},
 /turf/simulated/floor/plating,
 /area/bridge)
 "kQV" = (
@@ -23441,6 +23461,9 @@
 	req_one_access = null
 	},
 /obj/map_helper/access_helper/airlock/station/command/bridge,
+/obj/map_helper/electrochromatic_linker{
+	id = "bridge_tint"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
 "mCH" = (
@@ -24438,6 +24461,9 @@
 "oJN" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/commandblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "blueshieldoffice"
+	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads/blueshield)
 "oLI" = (
@@ -24666,6 +24692,9 @@
 	req_one_access = null
 	},
 /obj/map_helper/access_helper/airlock/station/command/bridge,
+/obj/map_helper/electrochromatic_linker{
+	id = "bridge_tint"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge)
 "pis" = (
@@ -25454,6 +25483,9 @@
 	opacity = 0
 	},
 /obj/effect/paint/commandblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "bridge_tint"
+	},
 /turf/simulated/floor/plating,
 /area/bridge)
 "qKs" = (
@@ -26545,6 +26577,11 @@
 /obj/structure/flora/pottedplant/smallcactus{
 	pixel_y = 12
 	},
+/obj/machinery/button/windowtint/multitint{
+	pixel_x = 9;
+	pixel_y = 8;
+	id = "blueshieldoffice"
+	},
 /turf/simulated/floor/carpet/blue,
 /area/crew_quarters/heads/blueshield)
 "toU" = (
@@ -27118,6 +27155,9 @@
 	opacity = 0
 	},
 /obj/effect/paint/commandblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "bridge_tint"
+	},
 /turf/simulated/floor/plating,
 /area/bridge)
 "uyX" = (
@@ -28302,6 +28342,9 @@
 "wns" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/commandblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "meeting_tint"
+	},
 /turf/simulated/floor/plating,
 /area/bridge/bridge_hallway)
 "wnH" = (
@@ -28553,6 +28596,9 @@
 "wTS" = (
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
 /obj/effect/paint/commandblue,
+/obj/map_helper/electrochromatic_linker{
+	id = "meeting_tint"
+	},
 /turf/simulated/floor/plating,
 /area/bridge/meeting_room)
 "wUC" = (