diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 35f1a57a7a5..2533a1c3f9f 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -17417,7 +17417,7 @@
 /obj/machinery/computer/med_data/laptop{
 	dir = 8;
 	pixel_y = 1;
-	
+
 	},
 /obj/structure/extinguisher_cabinet/directional/east,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index 476b8d701c2..b3bb2acf232 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -661,6 +661,10 @@
 	dir = 1
 	},
 /area/station/medical/medbay)
+"cv" = (
+/mob/living/circuit_drone,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "cw" = (
 /obj/machinery/door/airlock,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
@@ -1971,6 +1975,9 @@
 /obj/machinery/light_switch/directional/west,
 /turf/open/floor/iron,
 /area/station/construction)
+"iW" = (
+/turf/closed/wall/r_wall,
+/area/station/science/explab)
 "jb" = (
 /obj/machinery/door/airlock,
 /obj/structure/cable,
@@ -1996,10 +2003,6 @@
 /obj/machinery/light/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
-"kp" = (
-/obj/structure/server,
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "kQ" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 8
@@ -2029,12 +2032,6 @@
 /obj/machinery/chem_mass_spec,
 /turf/open/floor/iron,
 /area/station/medical/chemistry)
-"nn" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "nq" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
@@ -2099,6 +2096,13 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
+"sd" = (
+/obj/machinery/light/directional/east,
+/obj/item/integrated_circuit/loaded/hello_world,
+/obj/item/integrated_circuit/loaded/speech_relay,
+/obj/structure/rack,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "sr" = (
 /obj/machinery/door/airlock/shell,
 /turf/open/floor/iron/dark,
@@ -2119,10 +2123,6 @@
 	},
 /turf/open/space/basic,
 /area/space)
-"tV" = (
-/obj/structure/bot,
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "uf" = (
 /obj/structure/fans/tiny/invisible,
 /obj/effect/turf_decal/stripes/line{
@@ -2149,26 +2149,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
-"uQ" = (
-/obj/machinery/light/directional/west,
-/obj/structure/table,
-/obj/item/compact_remote,
-/obj/item/compact_remote,
-/obj/item/compact_remote{
-	pixel_x = -5
-	},
-/obj/item/controller{
-	pixel_x = 5
-	},
-/obj/item/controller{
-	pixel_x = 5
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
-"vm" = (
-/mob/living/circuit_drone,
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "vv" = (
 /obj/machinery/door/airlock,
 /turf/open/floor/plating,
@@ -2220,9 +2200,21 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
-"wU" = (
-/turf/closed/wall/r_wall,
-/area/station/science/misc_lab)
+"wV" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/science/explab)
+"xe" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical,
+/obj/item/multitool/circuit{
+	pixel_x = -4
+	},
+/obj/item/multitool{
+	pixel_x = 4
+	},
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "yK" = (
 /obj/structure/fans/tiny/invisible,
 /obj/effect/turf_decal/stripes/line{
@@ -2240,19 +2232,18 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
-"AE" = (
-/obj/machinery/airalarm/unlocked{
-	dir = 1;
-	pixel_y = 23
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "AP" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 8
 	},
 /turf/open/floor/iron,
 /area/station/science)
+"Bu" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "BD" = (
 /obj/structure/closet/secure_closet/chief_medical{
 	locked = 0
@@ -2283,22 +2274,11 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
-"CT" = (
-/obj/machinery/component_printer,
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "CV" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/medical/chemistry)
-"Df" = (
-/obj/machinery/light/directional/east,
-/obj/item/integrated_circuit/loaded/hello_world,
-/obj/item/integrated_circuit/loaded/speech_relay,
-/obj/structure/rack,
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "DW" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
@@ -2352,10 +2332,6 @@
 /obj/machinery/rnd/production/techfab/department,
 /turf/open/floor/iron,
 /area/station/science)
-"Ir" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/science/misc_lab)
 "Iy" = (
 /obj/structure/closet/secure_closet/research_director{
 	locked = 0
@@ -2402,18 +2378,27 @@
 /obj/machinery/light/directional/south,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
+"KH" = (
+/obj/structure/table,
+/obj/item/organ/cyberimp/bci{
+	pixel_y = 5
+	},
+/obj/item/organ/cyberimp/bci{
+	pixel_y = 5
+	},
+/obj/item/organ/cyberimp/bci{
+	pixel_y = 5
+	},
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
+"Lb" = (
+/obj/structure/bot,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "Ly" = (
 /obj/machinery/chem_dispenser/chem_synthesizer,
 /turf/open/floor/iron/dark,
 /area/station/medical/chemistry)
-"LH" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/door/airlock/research,
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "LW" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron,
@@ -2437,35 +2422,54 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
-"Nb" = (
-/obj/machinery/bci_implanter,
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "Nc" = (
 /obj/machinery/chem_recipe_debug,
 /turf/open/floor/iron,
 /area/station/medical/chemistry)
+"Ne" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/door/airlock/research,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "Ns" = (
 /obj/machinery/door/airlock/public/glass,
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/medical/medbay)
+"NE" = (
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "NZ" = (
 /obj/machinery/rnd/production/protolathe/department,
 /turf/open/floor/iron,
 /area/station/science)
-"Ov" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/bluespace,
-/obj/item/stock_parts/cell/bluespace,
-/obj/item/stock_parts/cell/bluespace,
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "OU" = (
 /obj/item/disk/tech_disk/debug,
 /turf/open/floor/iron,
 /area/station/science)
+"Pe" = (
+/obj/machinery/component_printer,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
+"Qa" = (
+/obj/machinery/light/directional/west,
+/obj/structure/table,
+/obj/item/compact_remote,
+/obj/item/compact_remote,
+/obj/item/compact_remote{
+	pixel_x = -5
+	},
+/obj/item/controller{
+	pixel_x = 5
+	},
+/obj/item/controller{
+	pixel_x = 5
+	},
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "Qi" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -2480,6 +2484,10 @@
 /obj/machinery/door/airlock/external/glass/ruin,
 /turf/open/floor/plating,
 /area/station/medical/medbay)
+"QD" = (
+/obj/structure/server,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "Rb" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -2490,6 +2498,14 @@
 	},
 /turf/open/floor/plating,
 /area/station/hallway/secondary/entry)
+"Rn" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/bluespace,
+/obj/item/stock_parts/cell/bluespace,
+/obj/item/stock_parts/cell/bluespace,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "RM" = (
 /obj/effect/turf_decal/tile/blue,
 /obj/effect/turf_decal/tile/blue{
@@ -2521,6 +2537,10 @@
 "Tt" = (
 /turf/open/floor/plating,
 /area/station/maintenance/aft)
+"TC" = (
+/obj/structure/money_bot,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "TV" = (
 /obj/machinery/door/airlock,
 /obj/structure/cable,
@@ -2538,14 +2558,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
-"Vr" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "Vy" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
@@ -2555,6 +2567,13 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/main)
+"VW" = (
+/obj/machinery/airalarm/unlocked{
+	dir = 1;
+	pixel_y = 23
+	},
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "We" = (
 /obj/machinery/newscaster/directional/west,
 /turf/open/floor/iron,
@@ -2580,10 +2599,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
-"WK" = (
-/obj/structure/money_bot,
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "WT" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
@@ -2607,23 +2622,18 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"XB" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "XC" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/science)
-"XN" = (
-/obj/structure/table,
-/obj/item/organ/cyberimp/bci{
-	pixel_y = 5
-	},
-/obj/item/organ/cyberimp/bci{
-	pixel_y = 5
-	},
-/obj/item/organ/cyberimp/bci{
-	pixel_y = 5
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "XR" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 9
@@ -2639,17 +2649,6 @@
 /obj/effect/landmark/blobstart,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
-"Ym" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/electrical,
-/obj/item/multitool/circuit{
-	pixel_x = -4
-	},
-/obj/item/multitool{
-	pixel_x = 4
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 "Yy" = (
 /obj/machinery/light/directional/north,
 /obj/machinery/rnd/production/circuit_imprinter/department,
@@ -2657,13 +2656,14 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/science)
+"YP" = (
+/obj/machinery/bci_implanter,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "ZD" = (
 /obj/machinery/suit_storage_unit/ce,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
-"ZP" = (
-/turf/open/floor/iron/dark,
-/area/station/science/misc_lab)
 
 (1,1,1) = {"
 aa
@@ -5928,7 +5928,7 @@ cN
 cN
 cN
 cN
-LH
+Ne
 en
 dY
 dY
@@ -6020,11 +6020,11 @@ dy
 dm
 dM
 cN
-Vr
-vm
-uQ
-Ov
-Ir
+XB
+cv
+Qa
+Rn
+wV
 aa
 aa
 aa
@@ -6112,11 +6112,11 @@ dn
 dn
 dL
 sr
-nn
-ZP
-ZP
-WK
-Ir
+Bu
+NE
+NE
+TC
+wV
 aa
 aa
 aa
@@ -6204,11 +6204,11 @@ dn
 dn
 dL
 cN
-AE
-kp
-XN
-Ym
-Ir
+VW
+QD
+KH
+xe
+wV
 aa
 aa
 aa
@@ -6296,11 +6296,11 @@ dn
 dn
 dL
 tE
-ZP
-ZP
-ZP
-tV
-Ir
+NE
+NE
+NE
+Lb
+wV
 aa
 aa
 aa
@@ -6388,11 +6388,11 @@ dn
 dn
 dL
 cN
-ZP
-Df
-Nb
-CT
-Ir
+NE
+sd
+YP
+Pe
+wV
 aa
 aa
 aa
@@ -6481,10 +6481,10 @@ dn
 dL
 cN
 fI
-wU
-wU
-wU
-wU
+iW
+iW
+iW
+iW
 aa
 aa
 aa
diff --git a/_maps/map_files/generic/CentCom_skyrat.dmm b/_maps/map_files/generic/CentCom_skyrat.dmm
index 88612b12740..a56accd1368 100644
--- a/_maps/map_files/generic/CentCom_skyrat.dmm
+++ b/_maps/map_files/generic/CentCom_skyrat.dmm
@@ -2195,9 +2195,6 @@
 /turf/open/floor/wood,
 /area/centcom/central_command_areas/courtroom)
 "hc" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_mixing_input{
-	dir = 1
-	},
 /turf/open/floor/engine,
 /area/centcom/syndicate_mothership/expansion_bombthreat)
 "he" = (
diff --git a/code/controllers/subsystem/traitor.dm b/code/controllers/subsystem/traitor.dm
index cbbba49d086..57190c51cba 100644
--- a/code/controllers/subsystem/traitor.dm
+++ b/code/controllers/subsystem/traitor.dm
@@ -66,7 +66,6 @@ SUBSYSTEM_DEF(traitor)
 		/area/station/engineering/lobby,
 		/area/station/engineering/storage,
 		/area/station/science/lobby,
-		/area/station/science/test_area,
 		/area/station/security/prison,
 	))
 
diff --git a/code/game/area/areas/station.dm b/code/game/area/areas/station.dm
index 76f56e0fbce..3ae23bfb262 100644
--- a/code/game/area/areas/station.dm
+++ b/code/game/area/areas/station.dm
@@ -1301,44 +1301,43 @@
 	name = "\improper Cytology Lab"
 	icon_state = "cytology"
 
-/area/station/science/storage
-	name = "Ordnance Storage"
+// Use this for the main lab. If test equipment, storage, etc is also present use this one too.
+/area/station/science/ordnance
+	name = "\improper Ordnance Lab"
+	icon_state = "ord_main"
+
+/area/station/science/ordnance/office
+	name = "\improper Ordnance Office"
+	icon_state = "ord_office"
+
+/area/station/science/ordnance/storage
+	name = "\improper Ordnance Storage"
 	icon_state = "ord_storage"
 
-/area/station/science/test_area
-	name = "\improper Ordnance Test Area"
+/area/station/science/ordnance/burnchamber
+	name = "\improper Ordnance Burn Chamber"
+	icon_state = "ord_burn"
+	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+
+/area/station/science/ordnance/freezerchamber
+	name = "\improper Ordnance Freezer Chamber"
+	icon_state = "ord_freeze"
+	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+
+// Room for equipments and such
+/area/station/science/ordnance/testlab
+	name = "\improper Ordnance Testing Lab"
 	icon_state = "ord_test"
 	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
 
-/area/station/science/mixing
-	name = "\improper Ordnance Mixing Lab"
-	icon_state = "ord_mix"
-
-/area/station/science/mixing/chamber
-	name = "\improper Ordnance Mixing Chamber"
-	icon_state = "ord_mix_chamber"
-	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
-
-/area/station/science/mixing/hallway
-	name = "\improper Ordnance Mixing Hallway"
-	icon_state = "ord_mix_hallway"
-
-/area/station/science/mixing/launch
-	name = "\improper Ordnance Mixing Launch Site"
-	icon_state = "ord_mix_launch"
+/area/station/science/ordnance/bomb
+	name = "\improper Ordnance Bomb Site"
+	icon_state = "ord_boom"
 
 /area/station/science/genetics
 	name = "\improper Genetics Lab"
 	icon_state = "geneticssci"
 
-/area/station/science/misc_lab
-	name = "\improper Testing Lab"
-	icon_state = "ord_misc"
-
-/area/station/science/misc_lab/range
-	name = "\improper Research Testing Range"
-	icon_state = "ord_range"
-
 /area/station/science/server
 	name = "\improper Research Division Server Room"
 	icon_state = "server"
@@ -1347,6 +1346,11 @@
 	name = "\improper Experimentation Lab"
 	icon_state = "exp_lab"
 
+// Useless room
+/area/station/science/auxlab
+	name = "\improper Auxillary Lab"
+	icon_state = "aux_lab"
+
 /area/station/science/robotics
 	name = "Robotics"
 	icon_state = "robotics"
diff --git a/code/game/machinery/computer/atmos_computers/__identifiers.dm b/code/game/machinery/computer/atmos_computers/__identifiers.dm
index 3a8bfa5322c..c8096472b8e 100644
--- a/code/game/machinery/computer/atmos_computers/__identifiers.dm
+++ b/code/game/machinery/computer/atmos_computers/__identifiers.dm
@@ -26,7 +26,8 @@
 #define ATMOS_GAS_MONITOR_HELIUM "helium"
 #define ATMOS_GAS_MONITOR_ANTINOBLIUM "antinoblium"
 #define ATMOS_GAS_MONITOR_INCINERATOR "incinerator"
-#define ATMOS_GAS_MONITOR_ORDNANCE_LAB "ordnancelab"
+#define ATMOS_GAS_MONITOR_ORDNANCE_BURN "ordnanceburn"
+#define ATMOS_GAS_MONITOR_ORDNANCE_FREEZER "ordnancefreezer"
 #define ATMOS_GAS_MONITOR_DISTRO "distro"
 #define ATMOS_GAS_MONITOR_WASTE "waste"
 
@@ -55,7 +56,8 @@ GLOBAL_LIST_INIT(station_gas_chambers, list(
 	ATMOS_GAS_MONITOR_ANTINOBLIUM = "Antinoblium Supply",
 	ATMOS_GAS_MONITOR_MIX = "Mix Chamber",
 	ATMOS_GAS_MONITOR_INCINERATOR = "Incinerator Chamber",
-	ATMOS_GAS_MONITOR_ORDNANCE_LAB = "Ordnance Chamber",
+	ATMOS_GAS_MONITOR_ORDNANCE_BURN = "Ordnance Burn Chamber",
+	ATMOS_GAS_MONITOR_ORDNANCE_FREEZER = "Ordnance Freezer Chamber",
 	ATMOS_GAS_MONITOR_DISTRO = "Distribution Loop",
 	ATMOS_GAS_MONITOR_WASTE = "Waste Loop",
 ))
diff --git a/code/game/machinery/computer/atmos_computers/air_sensors.dm b/code/game/machinery/computer/atmos_computers/air_sensors.dm
index 429389473ee..bd28bcbae3a 100644
--- a/code/game/machinery/computer/atmos_computers/air_sensors.dm
+++ b/code/game/machinery/computer/atmos_computers/air_sensors.dm
@@ -2,10 +2,6 @@
 	name = "plasma tank gas sensor"
 	chamber_id = ATMOS_GAS_MONITOR_PLAS
 
-/obj/machinery/air_sensor/ordnance_mixing_tank
-	name = "ordnance mixing gas sensor"
-	chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_LAB
-
 /obj/machinery/air_sensor/oxygen_tank
 	name = "oxygen tank gas sensor"
 	chamber_id = ATMOS_GAS_MONITOR_O2
@@ -93,3 +89,11 @@
 /obj/machinery/air_sensor/incinerator_tank
 	name = "incinerator chamber gas sensor"
 	chamber_id = ATMOS_GAS_MONITOR_INCINERATOR
+
+/obj/machinery/air_sensor/ordnance_burn_chamber
+	name = "ordnance burn chamber gas sensor"
+	chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_BURN
+
+/obj/machinery/air_sensor/ordnance_freezer_chamber
+	name = "ordnance freezer chamber gas sensor"
+	chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_FREEZER
diff --git a/code/game/machinery/computer/atmos_computers/atmos_controls.dm b/code/game/machinery/computer/atmos_computers/atmos_controls.dm
index 6aa45f7c234..bf386c83a1c 100644
--- a/code/game/machinery/computer/atmos_computers/atmos_controls.dm
+++ b/code/game/machinery/computer/atmos_computers/atmos_controls.dm
@@ -118,7 +118,10 @@
 	circuit = /obj/item/circuitboard/computer/atmos_control/nocontrol/incinerator
 	atmos_chambers = list(ATMOS_GAS_MONITOR_INCINERATOR = "Incinerator Chamber")
 
-/obj/machinery/computer/atmos_control/nocontrol/ordnancemix
-	name = "Ordnance Chamber Monitor"
-	circuit = /obj/item/circuitboard/computer/atmos_control/nocontrol/ordnancemix
-	atmos_chambers = list(ATMOS_GAS_MONITOR_ORDNANCE_LAB = "Ordnance Chamber")
+/obj/machinery/computer/atmos_control/ordnancemix
+	name = "Ordnance Chamber Control"
+	circuit = /obj/item/circuitboard/computer/atmos_control/ordnancemix
+	atmos_chambers = list(
+		ATMOS_GAS_MONITOR_ORDNANCE_BURN = "Ordnance Burn Chamber",
+		ATMOS_GAS_MONITOR_ORDNANCE_FREEZER = "Ordnance Freezer Chamber",
+	)
diff --git a/code/game/machinery/computer/atmos_computers/inlets.dm b/code/game/machinery/computer/atmos_computers/inlets.dm
index 934d128f1aa..4df5a9185f8 100644
--- a/code/game/machinery/computer/atmos_computers/inlets.dm
+++ b/code/game/machinery/computer/atmos_computers/inlets.dm
@@ -161,6 +161,12 @@
 	name = "incinerator chamber input injector"
 	chamber_id = ATMOS_GAS_MONITOR_INCINERATOR
 
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_mixing_input
-	name = "ordnance mixing input injector"
-	chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_LAB
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input
+	on = FALSE
+	name = "ordnance burn chamber input injector"
+	chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_BURN
+
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input
+	on = FALSE
+	name = "ordnance freezer chamber input injector"
+	chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_FREEZER
diff --git a/code/game/machinery/computer/atmos_computers/outlets.dm b/code/game/machinery/computer/atmos_computers/outlets.dm
index 5b7dac9a176..c20a431dacc 100644
--- a/code/game/machinery/computer/atmos_computers/outlets.dm
+++ b/code/game/machinery/computer/atmos_computers/outlets.dm
@@ -120,9 +120,13 @@
 	name = "incinerator chamber output inlet"
 	chamber_id = ATMOS_GAS_MONITOR_INCINERATOR
 
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/ordnance_mixing_output
-	name = "ordnance mixing output inlet"
-	chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_LAB
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/ordnance_burn_chamber_output
+	name = "ordnance burn chamber output inlet"
+	chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_BURN
+
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/ordnance_freezer_chamber_output
+	name = "ordnance freezer chamber output inlet"
+	chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_FREEZER
 
 /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored
 	frequency = FREQ_ATMOS_STORAGE
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index b5c42240abc..e92fc690b87 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -56,9 +56,9 @@
 	name = "Incinerator Chamber Monitor (Computer Board)"
 	build_path = /obj/machinery/computer/atmos_control/nocontrol/incinerator
 
-/obj/item/circuitboard/computer/atmos_control/nocontrol/ordnancemix
-	name = "Ordnance Chamber Monitor (Computer Board)"
-	build_path = /obj/machinery/computer/atmos_control/nocontrol/ordnancemix
+/obj/item/circuitboard/computer/atmos_control/ordnancemix
+	name = "Ordnance Chamber Control (Computer Board)"
+	build_path = /obj/machinery/computer/atmos_control/ordnancemix
 
 /obj/item/circuitboard/computer/atmos_control/oxygen_tank
 	name = "Oxygen Supply Control (Computer Board)"
diff --git a/code/game/turfs/open/dirtystation.dm b/code/game/turfs/open/dirtystation.dm
index c0094837405..63d25fefb87 100644
--- a/code/game/turfs/open/dirtystation.dm
+++ b/code/game/turfs/open/dirtystation.dm
@@ -25,7 +25,6 @@
 
 				//high dirt - 1/3 chance.
 	var/static/list/high_dirt_areas = typecacheof(list(
-		/area/station/science/test_area,
 		/area/mine/production,
 		/area/mine/living_quarters,
 		/area/station/commons/vacant_room/office,
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index f5421213f55..c4f3cbc202e 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -284,7 +284,7 @@
 	var/list/areas_with_intercom = list()
 	var/list/areas_with_camera = list()
 	var/static/list/station_areas_blacklist = typecacheof(list(/area/station/holodeck/rec_center, /area/shuttle, /area/station/engineering/supermatter,
-					/area/station/science/test_area, /area/space, /area/station/solars, /area/mine, /area/ruin, /area/centcom/asteroid))
+					/area/space, /area/station/solars, /area/mine, /area/ruin, /area/centcom/asteroid))
 
 	if(SSticker.current_state == GAME_STATE_STARTUP)
 		to_chat(usr, "Game still loading, please hold!", confidential = TRUE)
diff --git a/code/modules/events/anomaly.dm b/code/modules/events/anomaly.dm
index 0d18709e9e0..e695fa4f177 100644
--- a/code/modules/events/anomaly.dm
+++ b/code/modules/events/anomaly.dm
@@ -24,7 +24,6 @@
 		/area/station/holodeck,
 		/area/shuttle,
 		/area/station/maintenance,
-		/area/station/science/test_area,
 	))
 
 		//Subtypes from the above that actually should explode.
diff --git a/code/modules/modular_computers/hardware/program_disks.dm b/code/modules/modular_computers/hardware/program_disks.dm
index bc7776af9d0..63f10a9d2ca 100644
--- a/code/modules/modular_computers/hardware/program_disks.dm
+++ b/code/modules/modular_computers/hardware/program_disks.dm
@@ -128,6 +128,15 @@
 	. = ..()
 	store_file(new /datum/computer_file/program/signal_commander(src))
 
+/obj/item/computer_hardware/hard_drive/portable/scipaper_program
+	name = "NT Frontier data disk"
+	desc = "Data disk containing NT Frontier. Simply insert to a computer and open File Manager!"
+	icon_state = "datadisk5"
+
+/obj/item/computer_hardware/hard_drive/portable/scipaper_program/install_default_programs()
+	. = ..()
+	store_file(new /datum/computer_file/program/scipaper_program(src))
+
 /**
  * Engineering
  */
diff --git a/icons/area/areas_station.dmi b/icons/area/areas_station.dmi
index add0f78c80b..cfabe97ec82 100644
Binary files a/icons/area/areas_station.dmi and b/icons/area/areas_station.dmi differ