diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 217689140c1..ba6a9931845 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -55,7 +55,7 @@
 	)
 	var/list/forced_ambience = null
 	var/sound_env = STANDARD_STATION
-	var/turf/base_turf//The base turf type of the area, which can be used to override the z-level's base turf
+	var/turf/base_turf //The base turf type of the area, which can be used to override the z-level's base turf
 	var/no_light_control = 0		// if 1, lights in area cannot be toggled with light controller
 	var/allow_nightmode = 0	// if 1, lights in area will be darkened by the night mode controller
 	var/station_area = 0
@@ -205,7 +205,7 @@
 #define DO_PARTY(COLOR) animate(color = COLOR, time = 0.5 SECONDS, easing = QUAD_EASING)
 
 /area/update_icon()
-	if ((fire || eject || party) && (!requires_power||power_environ) && !istype(src, /area/space))//If it doesn't require power, can still activate this proc.
+	if ((fire || eject || party) && (!requires_power||power_environ) && !istype(src, /area/space)) //If it doesn't require power, can still activate this proc.
 		if(fire && !eject && !party)		// FIRE
 			color = "#ff9292"
 			animate(src)	// stop any current animations.
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 29f5be3407c..0f8cf71e96d 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -135,6 +135,7 @@
 	idle_power_usage = 2
 	active_power_usage = 20
 	power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list
+	gfi_layer_rotation = GFI_ROTATION_DEFDIR
 	var/on = 0					// 1 if on, 0 if off
 	var/on_gs = 0
 	var/brightness_range = 8	// luminosity when on, also used in power calculation
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index 65124bb1c04..d1f2a84442d 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index 63dcfee43d3..92647cb255a 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -18596,6 +18596,7 @@
 /area/centcom/spawning)
 "aPf" = (
 /obj/machinery/door/blast/regular/open{
+	dir = 4;
 	id = "odinaslockdown"
 	},
 /obj/structure/sign/directions/dock{
@@ -18622,6 +18623,7 @@
 /area/centcom/spawning)
 "aPh" = (
 /obj/machinery/door/blast/regular/open{
+	dir = 4;
 	id = "odinaslockdown"
 	},
 /turf/unsimulated/floor{
@@ -18712,6 +18714,7 @@
 /area/centcom/holding)
 "aPs" = (
 /obj/machinery/door/blast/regular/open{
+	dir = 4;
 	id = "odinaslockdown"
 	},
 /turf/unsimulated/floor{
@@ -19493,6 +19496,7 @@
 /area/centcom/spawning)
 "aQV" = (
 /obj/machinery/door/blast/regular/open{
+	dir = 4;
 	id = "odinaslockdown"
 	},
 /obj/structure/sign/directions/dock{
@@ -19515,6 +19519,7 @@
 /area/centcom/spawning)
 "aQX" = (
 /obj/machinery/door/blast/regular/open{
+	dir = 4;
 	id = "odinaslockdown"
 	},
 /turf/unsimulated/floor{
@@ -29703,7 +29708,7 @@ aaS
 aaZ
 aaV
 aaU
-adD
+ahg
 adK
 acN
 aeo
@@ -83834,36 +83839,36 @@ aaN
 aaQ
 aif
 aWq
-aWL
-aXg
-aXB
-aXW
-aYr
-aYM
-aZh
-aZC
-aZX
-bas
-baN
-bbi
-bbD
-bbY
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
 bct
 bcO
-bdj
-bdE
-bdZ
-beu
-beP
-bfk
-bfF
-bga
-bgv
-bgQ
-bhl
-bhG
-bib
-biw
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
 aif
 aaQ
 aaN
@@ -84090,37 +84095,37 @@ aaN
 aaN
 aaQ
 aif
-aWr
+aWq
 aWM
 aXh
-aXC
-aXX
-aYs
-aYN
-aZi
-aZD
-aZY
-bat
-baO
-bbj
-bbE
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
 bbZ
 bcu
 bcP
-bdk
-bdF
-bea
-bev
-beQ
-bfl
-bfG
-bgb
-bgw
-bgR
-bhm
-bhH
-bic
-bix
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -84347,37 +84352,37 @@ aaN
 aaN
 aaQ
 aif
-aWs
-aWN
-aXi
-aXD
-aXY
-aYt
-aYO
-aZj
-aZE
-aZZ
-bau
-baP
-bbk
-bbF
-bca
-bcv
-bcQ
-bdl
-bdG
-beb
-bew
-beR
-bfm
-bfH
-bgc
-bgx
-bgS
-bhn
-bhI
-bid
-biy
+aWq
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -84604,37 +84609,37 @@ aaN
 aaN
 aaQ
 aif
-aWt
+aWq
 aWO
-aXj
-aXE
-aXZ
-aYu
-aYP
-aZk
-aZF
-baa
-bav
-baQ
-bbl
-bbG
-bcb
-bcw
-bcR
-bdm
-bdH
-bec
-bex
-beS
-bfn
-bfI
-bgd
-bgy
-bgT
-bho
-bhJ
-bie
-biz
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aXP
+aYw
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -84861,37 +84866,37 @@ aaN
 aaN
 aaQ
 aif
-aWu
-aWP
-aXk
-aXF
-aYa
-aYv
-aYQ
-aZl
-aZG
-bab
-baw
-baR
-bbm
+aWq
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aXP
+aWM
 bbH
-bcc
-bcx
-bcS
-bdn
-bdI
-bed
-bey
-beT
-bfo
-bfJ
-bge
-bgz
-bgU
-bhp
-bhK
-bif
-biA
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -85118,37 +85123,37 @@ aaN
 aaN
 aaQ
 aif
-aWv
-aWQ
-aXl
-aXG
-aYb
+aWq
+aWM
+aWM
+aWM
+aWM
 aYw
-aYR
-aZm
-aZH
-bac
-bax
-baS
-bbn
-bbI
-bcd
-bcy
-bcT
-bdo
-bdJ
-bee
-bez
-beU
-bfp
-bfK
-bgf
-bgA
-bgV
-bhq
-bhL
-big
-biB
+aWM
+aYS
+aYS
+aWM
+aWM
+aWM
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -85375,37 +85380,37 @@ aaN
 aaN
 aaQ
 aif
-aWw
-aWR
-aXm
-aXH
-aYc
-aYx
+aWq
+aWM
+aWM
+aWM
+aWM
+aXP
 aYS
 aZn
 aZI
-bad
-bay
-baT
-bbo
-bbJ
-bce
-bcz
-bcU
-bdp
-bdK
-bef
-beA
-beV
-bfq
-bfL
-bgg
-bgB
-bgW
-bhr
-bhM
-bih
-biC
+aYS
+aWM
+aWM
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -85632,37 +85637,37 @@ aaN
 aaN
 aaQ
 aif
-aWx
+aWq
 aWS
-aXn
-aXI
-aYd
-aYy
-aYT
+aWM
+aWM
+aWM
+aWM
+aYS
 aZo
 aZJ
-bae
-baz
-baU
-bbp
-bbK
-bcf
-bcA
-bcV
-bdq
-bdL
-beg
-beB
-beW
-bfr
-bfM
-bgh
-bgC
-bgX
-bhs
-bhN
-bii
-biD
+aYS
+aWM
+aWM
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -85889,37 +85894,37 @@ aaN
 aaN
 aaQ
 aif
-aWy
-aWT
-aXo
-aXJ
-aYe
-aYz
-aYU
-aZp
-aZK
-baf
-baA
-baV
+aWq
+aWS
+aWM
+aWM
+aWM
+aWM
+aWM
+aYS
+aYS
+aWM
+aWM
+aWM
 bbq
-bbL
-bcg
-bcB
-bcW
-bdr
-bdM
-beh
-beC
-beX
-bfs
-bfN
-bgi
-bgD
-bgY
-bht
-bhO
-bij
-biE
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -86146,37 +86151,37 @@ aaN
 aaN
 aaQ
 aif
-aWz
-aWU
-aXp
-aXK
-aYf
-aYA
-aYV
-aZq
-aZL
-bag
-baB
-baW
-bbr
-bbM
-bch
-bcC
-bcX
-bds
-bdN
-bei
-beD
-beY
-bft
-bfO
-bgj
-bgE
-bgZ
-bhu
-bhP
-bik
-biF
+aWq
+aWS
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -86403,37 +86408,37 @@ aaN
 aaN
 aaQ
 aif
-aWA
-aWV
-aXq
-aXL
-aYg
-aYB
-aYW
-aZr
-aZM
-bah
-baC
-baX
-bbs
-bbN
-bci
-bcD
-bcY
-bdt
-bdO
-bej
-beE
-beZ
-bfu
-bfP
-bgk
-bgF
-bha
-bhv
-bhQ
-bil
-biG
+aWq
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+bbq
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -86660,37 +86665,37 @@ aaN
 aaN
 aaQ
 aif
-aWB
-aWW
-aXr
-aXM
-aYh
-aYC
-aYX
-aZs
-aZN
-bai
-baD
-baY
-bbt
-bbO
-bcj
-bcE
-bcZ
-bdu
-bdP
-bek
-beF
-bfa
-bfv
-bfQ
-bgl
-bgG
-bhb
-bhw
-bhR
-bim
-biH
+aWq
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aYw
+aWM
+aWM
+aWM
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -86917,37 +86922,37 @@ aaN
 aaN
 aaQ
 aif
-aWC
-aWX
-aXs
-aXN
-aYi
-aYD
-aYY
-aZt
-aZO
-baj
-baE
-baZ
-bbu
-bbP
-bck
-bcF
-bda
-bdv
-bdQ
-bel
-beG
-bfb
-bfw
-bfR
-bgm
-bgH
-bhc
-bhx
-bhS
-bin
-biI
+aWq
+aWS
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+bbq
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -87174,37 +87179,37 @@ aaN
 aaN
 aaQ
 aif
-aWD
-aWY
-aXt
-aXO
-aYj
-aYE
-aYZ
-aZu
+aWq
+aWS
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
 aZP
-bak
-baF
-bba
-bbv
-bbQ
-bcl
-bcG
-bdb
-bdw
-bdR
-bem
-beH
-bfc
-bfx
-bfS
-bgn
-bgI
-bhd
-bhy
-bhT
-bio
-biJ
+aWM
+aWM
+aWM
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -87431,37 +87436,37 @@ aaN
 aaN
 aaQ
 aif
-aWE
-aWZ
-aXu
+aWq
+aWS
+aWM
 aXP
-aYk
-aYF
-aZa
-aZv
-aZQ
-bal
-baG
-bbb
+aXh
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
 bbw
-bbR
-bcm
-bcH
-bdc
-bdx
-bdS
-ben
-beI
-bfd
-bfy
-bfT
-bgo
-bgJ
-bhe
-bhz
-bhU
-bip
-biK
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -87688,37 +87693,37 @@ aaN
 aaN
 aaQ
 aif
-aWF
-aXa
-aXv
-aXQ
-aYl
-aYG
-aZb
-aZw
-aZR
-bam
-baH
-bbc
-bbx
-bbS
-bcn
-bcI
-bdd
-bdy
-bdT
-beo
-beJ
-bfe
-bfz
-bfU
-bgp
-bgK
-bhf
-bhA
-bhV
-biq
-biL
+aWq
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -87945,37 +87950,37 @@ aaN
 aaN
 aaQ
 aif
-aWG
-aXb
-aXw
-aXR
-aYm
-aYH
-aZc
-aZx
-aZS
-ban
-baI
-bbd
-bby
-bbT
-bco
-bcJ
-bde
-bdz
-bdU
-bep
-beK
-bff
-bfA
-bfV
-bgq
-bgL
-bhg
-bhB
-bhW
-bir
-biM
+aWq
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -88202,37 +88207,37 @@ aaN
 aaN
 aaQ
 aif
-aWH
-aXc
-aXx
-aXS
-aYn
-aYI
-aZd
-aZy
-aZT
-bao
-baJ
-bbe
-bbz
-bbU
-bcp
-bcK
-bdf
-bdA
-bdV
-beq
-beL
-bfg
-bfB
-bfW
-bgr
-bgM
-bhh
-bhC
-bhX
-bis
-biN
+aWq
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aXh
+aXP
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -88459,37 +88464,37 @@ aaN
 aaN
 aaQ
 aif
-aWI
-aXd
-aXy
-aXT
-aYo
-aYJ
-aZe
-aZz
-aZU
-bap
-baK
-bbf
-bbA
-bbV
-bcq
-bcL
-bdg
-bdB
-bdW
-ber
-beM
-bfh
-bfC
-bfX
-bgs
-bgN
-bhi
-bhD
-bhY
-bit
-biO
+aWq
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -88716,37 +88721,37 @@ aaN
 aaN
 aaQ
 aif
-aWJ
-aXe
+aWq
+aWM
 aXz
-aXU
-aYp
-aYK
-aZf
-aZA
-aZV
-baq
-baL
-bbg
-bbB
-bbW
-bcr
-bcM
-bdh
-bdC
-bdX
-bes
-beN
-bfi
-bfD
-bfY
-bgt
-bgO
-bhj
-bhE
-bhZ
-biu
-biP
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+aWM
+bbZ
+bcu
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcP
+bcO
 aif
 aaQ
 aaN
@@ -88973,37 +88978,37 @@ aaN
 aaN
 aaQ
 aif
-aWK
-aXf
-aXA
-aXV
-aYq
-aYL
-aZg
-aZB
-aZW
-bar
-baM
-bbh
-bbC
-bbX
-bcs
-bcN
-bdi
-bdD
-bdY
-bet
-beO
-bfj
-bfE
-bfZ
-bgu
-bgP
-bhk
-bhF
-bia
-biv
-biQ
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+aWq
+bct
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
+bcO
 aif
 aaQ
 aaN
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index 80d2096bec3..e9d12cf57fc 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -2308,8 +2308,8 @@
 /obj/random/tech_supply,
 /obj/random/tech_supply,
 /obj/item/weapon/pickaxe,
-/obj/machinery/firealarm/north,
 /obj/effect/floor_decal/corner/yellow/full,
+/obj/machinery/firealarm/south,
 /turf/simulated/floor/tiled,
 /area/outpost/engineering/meeting)
 "eT" = (
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 276438eb482..514086623d9 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -686,13 +686,6 @@
 "abx" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Security Lockdown";
-	name = "Security Blast Door";
-	opacity = 0
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
@@ -702,18 +695,19 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/security_starboard)
 "aby" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Security Lockdown";
-	name = "Security Blast Door";
-	opacity = 0
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
@@ -723,6 +717,14 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/security/vacantoffice2)
 "abz" = (
@@ -880,37 +882,39 @@
 "abU" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Security Lockdown";
-	name = "Security Blast Door";
-	opacity = 0
-	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/security_starboard)
 "abV" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Security Lockdown";
-	name = "Security Blast Door";
-	opacity = 0
-	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/security/vacantoffice2)
 "abW" = (
@@ -1436,13 +1440,6 @@
 "add" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Security Lockdown";
-	name = "Security Blast Door";
-	opacity = 0
-	},
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
 	dir = 8
@@ -1450,18 +1447,19 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/security_starboard)
 "ade" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Security Lockdown";
-	name = "Security Blast Door";
-	opacity = 0
-	},
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
 	dir = 8
@@ -1469,6 +1467,14 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/security/vacantoffice2)
 "adf" = (
@@ -7135,21 +7141,21 @@
 "aos" = (
 /obj/machinery/atmospherics/pipe/simple/visible/black,
 /obj/machinery/door/blast/regular{
-	name = "Engine Waste Handling Access";
+	dir = 1;
 	icon_state = "pdoor1";
-	dir = 8;
+	id = "EngineEmitterPortWest";
 	layer = 3.3;
-	id = "EngineEmitterPortWest"
+	name = "Engine Waste Handling Access"
 	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_waste)
 "aot" = (
 /obj/machinery/door/blast/regular{
-	name = "Engine Waste Handling Access";
+	dir = 1;
 	icon_state = "pdoor1";
-	dir = 8;
+	id = "EngineEmitterPortWest";
 	layer = 3.3;
-	id = "EngineEmitterPortWest"
+	name = "Engine Waste Handling Access"
 	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_waste)
@@ -9023,9 +9029,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	icon_state = "intact-scrubbers";
-	dir = 9
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/storage)
@@ -9321,17 +9326,18 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor,
+/obj/structure/cable/green{
+	d2 = 2;
+	icon_state = "0-2"
+	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
 	opacity = 0
 	},
-/obj/structure/cable/green{
-	d2 = 2;
-	icon_state = "0-2"
-	},
 /turf/simulated/floor/plating,
 /area/bridge)
 "ast" = (
@@ -9401,6 +9407,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -9702,9 +9709,10 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/item/device/gps/engineering,
 /obj/item/weapon/storage/belt/utility,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/storage)
 "atb" = (
@@ -10108,13 +10116,6 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "bridge blast";
-	name = "Bridge Blast Doors";
-	opacity = 0
-	},
 /obj/structure/cable/green{
 	d2 = 2;
 	icon_state = "0-2"
@@ -10124,6 +10125,14 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "bridge blast";
+	name = "Bridge Blast Doors";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/bridge)
 "atF" = (
@@ -10215,6 +10224,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -10393,6 +10403,7 @@
 	dir = 2
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/engineering/locker_room)
 "auf" = (
@@ -10859,13 +10870,6 @@
 	},
 /obj/structure/window/reinforced,
 /obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "bridge blast";
-	name = "Bridge Blast Doors";
-	opacity = 0
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 4;
@@ -10875,6 +10879,14 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "bridge blast";
+	name = "Bridge Blast Doors";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/bridge)
 "auL" = (
@@ -11011,13 +11023,6 @@
 	},
 /obj/structure/window/reinforced,
 /obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "bridge blast";
-	name = "Bridge Blast Doors";
-	opacity = 0
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 8;
@@ -11027,6 +11032,14 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "bridge blast";
+	name = "Bridge Blast Doors";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/bridge)
 "auX" = (
@@ -11048,7 +11061,6 @@
 /obj/structure/grille,
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
 	icon_state = "pdoor0";
 	id = "SupermatterPort";
 	layer = 2.7;
@@ -11066,7 +11078,6 @@
 /obj/structure/grille,
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
 	icon_state = "pdoor0";
 	id = "SupermatterPort";
 	layer = 2.7;
@@ -11088,7 +11099,6 @@
 /obj/structure/grille,
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
 	icon_state = "pdoor0";
 	id = "SupermatterPort";
 	layer = 2.7;
@@ -11139,12 +11149,12 @@
 	dir = 1
 	},
 /obj/machinery/door/blast/regular{
-	name = "Engine Monitoring Room Blast Doors";
-	icon_state = "pdoor0";
-	dir = 2;
-	opacity = 0;
 	density = 0;
-	id = "EngineBlast"
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "EngineBlast";
+	name = "Engine Monitoring Room Blast Doors";
+	opacity = 0
 	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_monitoring)
@@ -11392,8 +11402,8 @@
 /obj/item/device/gps/engineering,
 /obj/item/weapon/storage/belt/utility,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/locker_room)
@@ -11863,6 +11873,7 @@
 /area/engineering/engine_waste)
 "awu" = (
 /obj/machinery/door/blast/regular{
+	dir = 1;
 	icon_state = "pdoor1";
 	id = "EngineVent";
 	name = "Reactor Vent";
@@ -11954,12 +11965,12 @@
 	},
 /obj/structure/grille,
 /obj/machinery/door/blast/regular{
-	name = "Engine Monitoring Room Blast Doors";
-	icon_state = "pdoor0";
-	dir = 2;
-	opacity = 0;
 	density = 0;
-	id = "EngineBlast"
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "EngineBlast";
+	name = "Engine Monitoring Room Blast Doors";
+	opacity = 0
 	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_monitoring)
@@ -12780,6 +12791,7 @@
 /area/engineering/engine_waste)
 "axX" = (
 /obj/machinery/door/blast/regular{
+	dir = 1;
 	icon_state = "pdoor1";
 	id = "EngineVent";
 	name = "Reactor Vent";
@@ -12829,6 +12841,7 @@
 /obj/structure/grille,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "SupermatterPort";
 	layer = 2.7;
@@ -12912,12 +12925,12 @@
 	},
 /obj/structure/grille,
 /obj/machinery/door/blast/regular{
-	name = "Engine Monitoring Room Blast Doors";
-	icon_state = "pdoor0";
-	dir = 2;
-	opacity = 0;
 	density = 0;
-	id = "EngineBlast"
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "EngineBlast";
+	name = "Engine Monitoring Room Blast Doors";
+	opacity = 0
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -13875,13 +13888,6 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "bridge blast";
-	name = "Bridge Blast Doors";
-	opacity = 0
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
@@ -13891,6 +13897,14 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "bridge blast";
+	name = "Bridge Blast Doors";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/bridge)
 "azE" = (
@@ -14888,12 +14902,12 @@
 /obj/structure/grille,
 /obj/structure/window/reinforced,
 /obj/machinery/door/blast/regular{
-	name = "Engine Monitoring Room Blast Doors";
-	icon_state = "pdoor0";
-	dir = 2;
-	opacity = 0;
 	density = 0;
-	id = "EngineBlast"
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "EngineBlast";
+	name = "Engine Monitoring Room Blast Doors";
+	opacity = 0
 	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_monitoring)
@@ -15499,6 +15513,7 @@
 /area/security/prison)
 "aCl" = (
 /obj/machinery/door/blast/regular{
+	dir = 4;
 	id = "Cell 1";
 	name = "Cell Door"
 	},
@@ -15508,6 +15523,7 @@
 /area/security/prison)
 "aCm" = (
 /obj/machinery/door/blast/regular{
+	dir = 4;
 	id = "Cell 2";
 	name = "Cell Door"
 	},
@@ -20309,17 +20325,18 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d2 = 4;
+	icon_state = "0-4"
+	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Security Lockdown";
 	name = "Security Blast Door";
 	opacity = 0
 	},
-/obj/structure/cable/green{
-	d2 = 4;
-	icon_state = "0-4"
-	},
 /turf/simulated/floor/plating,
 /area/security/brig)
 "aJW" = (
@@ -20567,19 +20584,20 @@
 /area/security/prison)
 "aKr" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Security Lockdown";
-	name = "Security Blast Door";
-	opacity = 0
-	},
 /obj/machinery/door/airlock/glass_security{
 	id_tag = "";
 	layer = 2.8;
 	name = "Security Starboard Entrance";
 	req_access = list(63)
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "aKs" = (
@@ -20653,6 +20671,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -21252,17 +21271,18 @@
 "aLL" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/door/firedoor,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/door/window/brigdoor/westright{
+	name = "Security Office"
+	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Security Lockdown";
 	name = "Security Blast Door";
 	opacity = 0
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/window/brigdoor/westright{
-	name = "Security Office"
-	},
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "aLM" = (
@@ -21395,18 +21415,19 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Security Lockdown";
-	name = "Security Blast Door";
-	opacity = 0
-	},
 /obj/machinery/door/firedoor,
 /obj/structure/cable/green{
 	d2 = 2;
 	icon_state = "0-2"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/security/brig)
 "aLX" = (
@@ -21663,6 +21684,7 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -22398,17 +22420,18 @@
 "aNz" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/door/firedoor,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/door/window/brigdoor/westleft{
+	name = "Security Office"
+	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Security Lockdown";
 	name = "Security Blast Door";
 	opacity = 0
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/window/brigdoor/westleft{
-	name = "Security Office"
-	},
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "aNA" = (
@@ -22585,13 +22608,6 @@
 /area/security/brig)
 "aNR" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Security Lockdown";
-	name = "Security Blast Door";
-	opacity = 0
-	},
 /obj/machinery/door/airlock/glass_security{
 	id_tag = "";
 	layer = 2.8;
@@ -22608,6 +22624,14 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "aNS" = (
@@ -22756,13 +22780,6 @@
 /area/bridge)
 "aOf" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "bridge blast";
-	name = "Bridge Blast Doors";
-	opacity = 0
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -22774,6 +22791,14 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "bridge blast";
+	name = "Bridge Blast Doors";
+	opacity = 0
+	},
 /turf/simulated/floor/tiled,
 /area/bridge)
 "aOg" = (
@@ -23668,6 +23693,11 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
+/obj/machinery/ringer_button{
+	id = "hop_ringer";
+	pixel_x = 26;
+	pixel_y = 8
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/starboard)
 "aPK" = (
@@ -24563,13 +24593,6 @@
 /obj/structure/noticeboard{
 	pixel_y = 27
 	},
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "bridge blast";
-	name = "Bridge Blast Doors";
-	opacity = 0
-	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/shutters{
 	density = 0;
@@ -24579,9 +24602,13 @@
 	name = "HoP Office Privacy Shutters";
 	opacity = 0
 	},
-/obj/machinery/ringer_button{
-	id = "hop_ringer";
-	pixel_y = 5
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "bridge blast";
+	name = "Bridge Blast Doors";
+	opacity = 0
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hop)
@@ -25265,19 +25292,20 @@
 "aSm" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Security Lockdown";
-	name = "Security Blast Door";
-	opacity = 0
-	},
 /obj/machinery/door/window/brigdoor{
 	dir = 8;
 	name = "Visitation Window";
 	req_access = list(2)
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
 /turf/simulated/floor/tiled,
 /area/security/prison)
 "aSn" = (
@@ -25499,18 +25527,19 @@
 	id = "hop"
 	},
 /obj/structure/grille,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "bridge blast";
-	name = "Bridge Blast Doors";
-	opacity = 0
-	},
 /obj/machinery/door/firedoor,
 /obj/structure/cable/green{
 	d2 = 2;
 	icon_state = "0-2"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "bridge blast";
+	name = "Bridge Blast Doors";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads/hop)
 "aSK" = (
@@ -26057,17 +26086,18 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d2 = 8;
+	icon_state = "0-8"
+	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Security Lockdown";
 	name = "Security Blast Door";
 	opacity = 0
 	},
-/obj/structure/cable/green{
-	d2 = 8;
-	icon_state = "0-8"
-	},
 /turf/simulated/floor/plating,
 /area/security/prison)
 "aTH" = (
@@ -26342,13 +26372,6 @@
 	id = "hop"
 	},
 /obj/structure/grille,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "bridge blast";
-	name = "Bridge Blast Doors";
-	opacity = 0
-	},
 /obj/machinery/door/firedoor,
 /obj/structure/cable/green{
 	d1 = 1;
@@ -26359,6 +26382,14 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "bridge blast";
+	name = "Bridge Blast Doors";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads/hop)
 "aUi" = (
@@ -26649,7 +26680,7 @@
 "aUH" = (
 /obj/machinery/recharge_station,
 /obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/unsimulated/chasm_mask,
+/turf/simulated/floor/tiled/dark,
 /area/bridge/ailobby)
 "aUI" = (
 /obj/structure/cable/green{
@@ -27746,13 +27777,6 @@
 	id = "hop"
 	},
 /obj/structure/grille,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "bridge blast";
-	name = "Bridge Blast Doors";
-	opacity = 0
-	},
 /obj/machinery/door/firedoor,
 /obj/structure/cable/green{
 	d1 = 1;
@@ -27766,6 +27790,14 @@
 /obj/structure/window/reinforced/polarized{
 	id = "hop"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "bridge blast";
+	name = "Bridge Blast Doors";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads/hop)
 "aWO" = (
@@ -39213,7 +39245,7 @@
 /obj/structure/table/woodentable,
 /obj/machinery/chemical_dispenser/bar_soft/full,
 /obj/machinery/camera/network/command{
-	c_tag = "Bridge - Bunker Airlock";
+	c_tag = "Bridge - Break Room";
 	dir = 1;
 	network = list("Command","Bunker")
 	},
@@ -41010,17 +41042,18 @@
 	icon_state = "corner_white";
 	dir = 9
 	},
+/obj/machinery/door/airlock/research{
+	name = "Research Division Access";
+	req_access = list(47)
+	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
 	opacity = 0
 	},
-/obj/machinery/door/airlock/research{
-	name = "Research Division Access";
-	req_access = list(47)
-	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "bsC" = (
@@ -41039,18 +41072,19 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Biohazard";
-	name = "Biohazard Shutter";
-	opacity = 0
-	},
 /obj/machinery/door/airlock/research{
 	id_tag = "researchdoor";
 	name = "Research Division Access";
 	req_access = list(47)
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Biohazard";
+	name = "Biohazard Shutter";
+	opacity = 0
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "bsE" = (
@@ -43164,6 +43198,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -43782,6 +43817,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -44486,6 +44522,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -45604,10 +45641,16 @@
 /turf/simulated/floor/plating,
 /area/medical/gen_treatment)
 "bzZ" = (
-/obj/machinery/atmospherics/portables_connector{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/visible{
+	dir = 10;
+	icon_state = "intact"
+	},
+/obj/machinery/alarm{
+	dir = 8;
+	icon_state = "alarm0";
+	pixel_x = 24;
+	req_one_access = list(24,11,55)
 	},
-/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor/plating,
 /area/medical/gen_treatment)
 "bAa" = (
@@ -46121,20 +46164,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/medbay)
 "bAX" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
-	icon_state = "intact";
-	dir = 5
-	},
 /obj/machinery/camera/network/medbay{
 	c_tag = "Medical - Cryogenics Maintenance";
 	dir = 1;
 	icon_state = "camera"
 	},
-/obj/machinery/alarm{
-	dir = 4;
-	icon_state = "alarm0";
-	pixel_x = -22
+/obj/machinery/atmospherics/portables_connector{
+	dir = 1
 	},
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor/plating,
 /area/medical/gen_treatment)
 "bAY" = (
@@ -46633,6 +46671,7 @@
 /obj/structure/window/reinforced,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -49505,13 +49544,14 @@
 /turf/simulated/floor/plating,
 /area/rnd/telesci)
 "bGu" = (
-/obj/machinery/atmospherics/portables_connector{
-	dir = 4
-	},
 /obj/effect/floor_decal/industrial/warning{
 	icon_state = "warning";
 	dir = 9
 	},
+/obj/machinery/computer/general_air_control{
+	name = "Chamber Gas Sensor";
+	sensors = list("misc_res_sensor" = "Chamber")
+	},
 /turf/simulated/floor/plating,
 /area/rnd/misc_lab)
 "bGv" = (
@@ -49989,15 +50029,14 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/telesci)
 "bHi" = (
-/obj/machinery/computer/general_air_control{
-	name = "Chamber Gas Sensor";
-	sensors = list("misc_res_sensor" = "Chamber")
+/obj/machinery/atmospherics/portables_connector{
+	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/rnd/misc_lab)
 "bHj" = (
 /obj/machinery/atmospherics/pipe/manifold/visible{
-	dir = 8
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/rnd/misc_lab)
@@ -63759,6 +63798,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -63967,6 +64007,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -64090,6 +64131,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -64614,6 +64656,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -65183,6 +65226,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/bar)
+"ckd" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/atmospherics/portables_connector{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/medical/gen_treatment)
 
 (1,1,1) = {"
 aaa
@@ -88468,7 +88518,7 @@ bDj
 bDW
 bET
 bFV
-bGv
+bIb
 bHj
 bIa
 bHk
@@ -98741,7 +98791,7 @@ bxr
 boW
 bzg
 bzZ
-bzZ
+ckd
 boW
 bCJ
 bDy
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index f65e1f56914..707c63fd18d 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -2886,6 +2886,7 @@
 	name = "KEEP CLEAR: DOCKING AREA";
 	pixel_y = 0
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/port)
 "fx" = (
@@ -3300,7 +3301,7 @@
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
 	icon_state = "door_locked";
-	id_tag = "admin_shuttle_bay_outer";
+	id_tag = "admin_shuttle_dock_airlock_outer";
 	locked = 1;
 	name = "Docking Port Airlock";
 	req_access = list(13)
@@ -3320,8 +3321,8 @@
 /obj/machinery/light/small,
 /obj/machinery/airlock_sensor{
 	frequency = 1380;
-	id_tag = "admin_shuttle_dock_sensor";
-	master_tag = "admin_shuttle_bay";
+	id_tag = "admin_shuttle_dock_airlock_sensor";
+	master_tag = "admin_shuttle_dock_airlock";
 	pixel_x = 0;
 	pixel_y = 26
 	},
@@ -3331,19 +3332,19 @@
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 4;
 	frequency = 1380;
-	id_tag = "admin_shuttle_bay_pump"
+	id_tag = "admin_shuttle_dock_airlock_pump"
 	},
 /obj/machinery/embedded_controller/radio/airlock/docking_port_multi{
 	frequency = 1380;
-	id_tag = "admin_shuttle_bay";
-	master_tag = "admin_shuttle_bay";
+	id_tag = "admin_shuttle_dock_airlock";
+	master_tag = "admin_shuttle_dock_airlock";
 	pixel_y = 30;
 	req_one_access = list(13);
 	tag_airlock_mech_sensor = null;
-	tag_airpump = "admin_shuttle_bay_sensor";
-	tag_chamber_sensor = "admin_shuttle_bay_sensor";
-	tag_exterior_door = "admin_shuttle_bay_outer";
-	tag_interior_door = "admin_shuttle_bay_inner";
+	tag_airpump = "admin_shuttle_dock_airlock_pump";
+	tag_chamber_sensor = "admin_shuttle_dock_airlock_sensor";
+	tag_exterior_door = "admin_shuttle_dock_airlock_outer";
+	tag_interior_door = "admin_shuttle_dock_airlock_inner";
 	tag_shuttle_mech_sensor = null
 	},
 /turf/simulated/floor/plating,
@@ -3356,7 +3357,7 @@
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
 	icon_state = "door_locked";
-	id_tag = "admin_shuttle_bay_inner";
+	id_tag = "admin_shuttle_dock_airlock_inner";
 	locked = 1;
 	name = "Docking Port Airlock";
 	req_access = list(13)
@@ -3675,11 +3676,11 @@
 	command = "cycle_interior";
 	frequency = 1379;
 	layer = 3.3;
-	master_tag = "brig_solar_inner";
+	master_tag = "brig_solar_airlock";
 	name = "interior access button";
 	pixel_x = -25;
 	pixel_y = -25;
-	req_access = list(13)
+	req_access = list(11,13)
 	},
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -3945,6 +3946,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/port)
 "hl" = (
@@ -3956,6 +3958,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/port)
 "hm" = (
@@ -4073,6 +4076,7 @@
 	dir = 8
 	},
 /obj/structure/window/reinforced,
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
 "hA" = (
@@ -5342,6 +5346,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
 "ka" = (
@@ -5392,8 +5397,8 @@
 	id_tag = "nuke_shuttle_dock_airlock";
 	pixel_x = 0;
 	pixel_y = 30;
-	req_access = list(13);
-	req_one_access = null;
+	req_access = null;
+	req_one_access = list(13);
 	tag_airpump = "nuke_shuttle_dock_pump";
 	tag_chamber_sensor = "nuke_shuttle_dock_sensor";
 	tag_exterior_door = "nuke_shuttle_dock_outer";
@@ -5835,6 +5840,7 @@
 	icon_state = "rwindow";
 	dir = 4
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/port)
 "kM" = (
@@ -6632,7 +6638,9 @@
 	req_access = list(61)
 	},
 /turf/simulated/floor/tiled,
-/area/turret_protected/tcomfoyer)
+/area/turret_protected/tcomfoyer{
+	name = "Telecoms Foyer"
+	})
 "md" = (
 /obj/structure/sign/electricshock,
 /turf/simulated/wall/r_wall,
@@ -8503,7 +8511,7 @@
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
 	icon_state = "door_locked";
-	id_tag = "solar_roof_inner";
+	id_tag = "solar_aft_inner";
 	locked = 1;
 	name = "Engineering External Access";
 	req_access = list(11,13)
@@ -8598,7 +8606,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 1;
 	frequency = 1379;
-	id_tag = "solar_roof_pump"
+	id_tag = "solar_aft_pump"
 	},
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -8683,7 +8691,7 @@
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
 	icon_state = "door_locked";
-	id_tag = "solar_roof_outer";
+	id_tag = "solar_aft_outer";
 	locked = 1;
 	name = "Engineering External Access";
 	req_access = list(11,13)
@@ -41364,7 +41372,7 @@ aw
 aw
 fw
 gl
-hj
+ex
 aw
 aw
 aw
@@ -41619,9 +41627,9 @@ aa
 aw
 aa
 aa
-fx
+jI
 gm
-fx
+jI
 aw
 aw
 aw
@@ -41876,12 +41884,12 @@ aa
 aa
 aa
 aa
-fx
+jI
 gn
 hk
-hW
-hW
-hW
+fG
+fG
+fG
 jJ
 ke
 jI