diff --git a/code/datums/uplink/hardsuit_modules.dm b/code/datums/uplink/hardsuit_modules.dm
index 3eaf66aa04d..74c8f4457d7 100644
--- a/code/datums/uplink/hardsuit_modules.dm
+++ b/code/datums/uplink/hardsuit_modules.dm
@@ -14,7 +14,7 @@
 	item_cost = 5
 	path = /obj/item/rig_module/fabricator/energy_net
 
-/datum/uplink_item/item/ewar_voice
+/datum/uplink_item/item/hardsuit_modules/ewar_voice
 	name = "Electrowarfare Suite and Voice Synthesiser"
 	item_cost = 6
 	path = /obj/item/weapon/storage/box/syndie_kit/ewar_voice
diff --git a/code/game/objects/items/devices/uplink_random_lists.dm b/code/game/objects/items/devices/uplink_random_lists.dm
index d764a36003b..01334abbb27 100644
--- a/code/game/objects/items/devices/uplink_random_lists.dm
+++ b/code/game/objects/items/devices/uplink_random_lists.dm
@@ -83,7 +83,7 @@ var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_ra
 
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/hardsuit_modules/thermal, reselect_propbability = 15)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/hardsuit_modules/energy_net, reselect_propbability = 15)
-	items += new/datum/uplink_random_item(/datum/uplink_item/item/ewar_voice, reselect_propbability = 15)
+	items += new/datum/uplink_random_item(/datum/uplink_item/item/hardsuit_modules/ewar_voice, reselect_propbability = 15)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/hardsuit_modules/maneuvering_jets, reselect_propbability = 15)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/hardsuit_modules/egun, reselect_propbability = 15)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/hardsuit_modules/power_sink, reselect_propbability = 15)
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 81029539156..61b71202c80 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -837,6 +837,15 @@ datum/design/item/experimental_welder
 	build_path = /obj/item/weapon/storage/backpack/holding
 	sort_string = "VAEAA"
 
+/datum/design/item/bluespace_crystal
+	name = "Artificial Bluespace Crystal"
+	desc = "An artificially made bluespace crystal."
+	id = "bluespace_crystal"
+	req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6)
+	materials = list("gold" = 1500, "diamond" = 1500, "phoron" = 1500)
+	build_path = /obj/item/bluespace_crystal/artificial
+	sort_string = "VAFAA"
+
 /datum/design/item/binaryencrypt
 	name = "Binary encryption key"
 	desc = "Allows for deciphering the binary channel on-the-fly."
diff --git a/maps/aurora/aurora-2_under-station.dmm b/maps/aurora/aurora-2_under-station.dmm
index a9f88e26b55..183a940d0cb 100644
--- a/maps/aurora/aurora-2_under-station.dmm
+++ b/maps/aurora/aurora-2_under-station.dmm
@@ -164,6 +164,7 @@
 	icon_state = "intact";
 	dir = 9
 	},
+/obj/random/junk,
 /turf/simulated/floor/plating,
 /area/engineering/cooling)
 "s" = (
@@ -285,6 +286,16 @@
 /obj/structure/lattice/catwalk,
 /turf/space,
 /area/space)
+"H" = (
+/obj/structure/lattice,
+/obj/random/loot,
+/turf/space,
+/area/space)
+"I" = (
+/obj/structure/lattice/catwalk,
+/obj/random/loot,
+/turf/space,
+/area/space)
 
 (1,1,1) = {"
 a
@@ -9955,17 +9966,17 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -10176,7 +10187,7 @@ f
 a
 a
 a
-f
+H
 a
 a
 a
@@ -10205,24 +10216,24 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -10462,24 +10473,24 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -10719,24 +10730,24 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -10968,32 +10979,32 @@ a
 a
 a
 a
+b
+b
+b
+b
+b
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -11224,30 +11235,30 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -11481,32 +11492,32 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -11738,32 +11749,32 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -11995,32 +12006,32 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -12252,32 +12263,32 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -12509,32 +12520,32 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -12766,30 +12777,30 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -13024,32 +13035,32 @@ a
 a
 a
 a
+b
+b
+b
+b
+b
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -13289,24 +13300,24 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -13546,24 +13557,24 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -13783,7 +13794,7 @@ h
 h
 h
 h
-h
+I
 h
 h
 h
@@ -13803,24 +13814,24 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -14067,17 +14078,17 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
 a
 a
 a
@@ -16080,8 +16091,8 @@ a
 a
 a
 a
-a
-a
+c
+c
 a
 a
 a
@@ -16327,19 +16338,19 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
 a
 a
 a
@@ -16585,18 +16596,18 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
 a
 a
 a
@@ -16790,18 +16801,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-a
 a
 a
 a
@@ -16854,6 +16853,18 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
 a
 a
 a
@@ -17040,24 +17051,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -17116,6 +17109,24 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
 a
 a
 a
@@ -17297,24 +17308,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -17377,6 +17370,24 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
 a
 a
 a
@@ -17554,24 +17565,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -17634,6 +17627,24 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
 a
 a
 a
@@ -17803,32 +17814,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-a
-a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -17897,6 +17882,32 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -18059,30 +18070,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -18150,6 +18137,30 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
 a
 a
 a
@@ -18316,32 +18327,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -18410,6 +18395,32 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -18573,32 +18584,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -18667,6 +18652,32 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -18830,32 +18841,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -18924,6 +18909,32 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -19087,32 +19098,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -19181,6 +19166,32 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -19344,32 +19355,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -19438,6 +19423,32 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -19601,30 +19612,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -19692,6 +19679,30 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
 a
 a
 a
@@ -19859,32 +19870,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-a
-a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -19953,6 +19938,32 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -20124,24 +20135,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -20204,6 +20197,24 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
 a
 a
 a
@@ -20381,24 +20392,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -20461,6 +20454,24 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
 a
 a
 a
@@ -20638,24 +20649,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
 a
 a
 a
@@ -20714,6 +20707,24 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+a
+a
+a
+a
 a
 a
 a
@@ -20902,18 +20913,6 @@ a
 a
 a
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-a
 a
 a
 a
@@ -20966,6 +20965,18 @@ a
 a
 a
 a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
 a
 a
 a
@@ -21211,18 +21222,18 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
 a
 a
 a
@@ -21467,19 +21478,19 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
 a
 a
 a
@@ -21734,8 +21745,8 @@ a
 a
 a
 a
-a
-a
+c
+c
 a
 a
 a
@@ -57141,8 +57152,8 @@ a
 a
 a
 a
-c
-c
+a
+a
 a
 a
 a
@@ -57388,19 +57399,19 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -57646,18 +57657,18 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -57903,18 +57914,18 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -58159,19 +58170,19 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -58420,19 +58431,19 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -58677,19 +58688,19 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -58932,22 +58943,22 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -59187,25 +59198,25 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -59445,24 +59456,24 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -59702,24 +59713,24 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -59959,24 +59970,24 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -60216,24 +60227,24 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -60473,24 +60484,24 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -60729,25 +60740,25 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -60988,22 +60999,22 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -61247,19 +61258,19 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -61504,19 +61515,19 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -61757,19 +61768,19 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -62015,18 +62026,18 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -62272,18 +62283,18 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -62528,19 +62539,19 @@ a
 a
 a
 a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -62795,8 +62806,8 @@ a
 a
 a
 a
-c
-c
+a
+a
 a
 a
 a
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index 01b4cfab4ba..eb2a7a602cb 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -4194,6 +4194,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/airlock_sensor/airlock_exterior{
+	frequency = 1380;
+	id_tag = "ai_core_sensor_exterior";
+	master_tag = null;
+	pixel_x = 35;
+	pixel_y = 25
+	},
 /turf/simulated/floor/tiled/dark{
 	name = "cooled dark floor";
 	temperature = 278
@@ -4229,7 +4236,9 @@
 	tag_airpump = "ai_core_pump";
 	tag_chamber_sensor = "ai_core_sensor";
 	tag_exterior_door = "ai_core_outer";
-	tag_interior_door = "ai_core_inner"
+	tag_exterior_sensor = "ai_core_sensor_exterior";
+	tag_interior_door = "ai_core_inner";
+	tag_interior_sensor = "ai_core_sensor_interior"
 	},
 /obj/machinery/airlock_sensor{
 	frequency = 1380;
@@ -4316,6 +4325,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/airlock_sensor/airlock_interior{
+	frequency = 1380;
+	id_tag = "ai_core_sensor_interior";
+	master_tag = null;
+	pixel_x = -35;
+	pixel_y = -25
+	},
 /turf/simulated/floor/tiled/dark{
 	name = "cooled dark floor";
 	temperature = 278
@@ -16000,7 +16016,7 @@
 /area/medical/virology)
 "Bn" = (
 /obj/machinery/camera/network/medbay{
-	c_tag = "Virology Starboard";
+	c_tag = "Medical - Virology Starboard";
 	dir = 8
 	},
 /obj/machinery/door/firedoor,
@@ -40573,7 +40589,7 @@ aa
 aa
 ab
 ab
-bP
+gH
 ab
 ab
 ab
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index cb69cd82e0c..6c4f407e62c 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -6241,11 +6241,6 @@
 	req_access = null;
 	req_one_access = list(11,24)
 	},
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -6253,6 +6248,12 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	pixel_x = 0
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/atmos_control)
 "amP" = (
@@ -62751,7 +62752,6 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/telesci)
 "cfV" = (
-/obj/structure/table/reinforced,
 /obj/machinery/button/remote/blast_door{
 	id = "telescience";
 	name = "Containment Blast Doors";
@@ -62769,6 +62769,7 @@
 	name = "Station Intercom (General)";
 	pixel_x = -27
 	},
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled/white,
 /area/rnd/telesci)
 "cfW" = (