diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
index 6a98af7ba17..781ce2aace0 100644
--- a/_maps/_basemap.dm
+++ b/_maps/_basemap.dm
@@ -18,7 +18,7 @@
 		#include "map_files\NSVBlueshift\Blueshift.dmm"
 		#include "map_files\KiloStation\KiloStation.dmm"
 		// SKYRAT EDIT END
-
+		#include "map_files\wawastation\wawastation.dmm"
 		#ifdef CIBUILDING
 			#include "templates.dm"
 		#endif
diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm
index 041f9046760..637da6f7c06 100644
--- a/_maps/map_files/wawastation/wawastation.dmm
+++ b/_maps/map_files/wawastation/wawastation.dmm
@@ -2096,12 +2096,16 @@
 /turf/open/floor/iron,
 /area/station/cargo/storage)
 "aIX" = (
-/obj/structure/chair/office/light{
-	dir = 1
-	},
-/obj/effect/landmark/start/scientist,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/ammo_casing/spent,
+/obj/item/ammo_casing/spent,
+/obj/item/ammo_casing/spent,
+/obj/item/ammo_casing/spent,
+/obj/item/ammo_casing/spent,
+/obj/item/ammo_casing/spent,
+/turf/open/floor/plating,
+/area/station/science/auxlab)
 "aJa" = (
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 4
@@ -4910,13 +4914,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
-"bKL" = (
-/obj/item/flashlight/glowstick/cyan{
-	start_on = 1;
-	pixel_y = 7
-	},
-/turf/open/misc/asteroid,
-/area/station/asteroid)
 "bKQ" = (
 /obj/structure/cable,
 /turf/open/floor/iron/dark/textured_large,
@@ -5819,11 +5816,6 @@
 "cdk" = (
 /turf/open/floor/iron/kitchen,
 /area/station/service/kitchen)
-"cdl" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/duct,
-/turf/open/floor/plating,
-/area/station/science/cytology)
 "cdo" = (
 /obj/machinery/elevator_control_panel/directional/south{
 	linked_elevator_id = "aisat";
@@ -5999,10 +5991,6 @@
 	},
 /turf/open/floor/iron/herringbone,
 /area/station/commons/fitness/recreation)
-"cgu" = (
-/obj/machinery/duct,
-/turf/open/misc/asteroid,
-/area/station/asteroid)
 "cgw" = (
 /obj/machinery/disposal/bin{
 	desc = "A pneumatic waste disposal unit. This one leads into space!";
@@ -8732,21 +8720,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
-"dhR" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/rack,
-/obj/item/wrench,
-/obj/item/knife/kitchen{
-	pixel_x = 6;
-	pixel_y = 2
-	},
-/obj/item/soap{
-	pixel_y = -2
-	},
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
 "dic" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
@@ -10600,17 +10573,12 @@
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/qm)
 "dOg" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
-/obj/item/petri_dish{
-	pixel_x = -5;
-	pixel_y = 2
-	},
-/obj/item/food/pizzaslice/moldy/bacteria{
-	pixel_y = 15;
-	pixel_x = 3
-	},
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/obj/effect/spawner/random/maintenance/two,
+/obj/structure/sign/poster/random/directional/south,
+/turf/open/floor/plating,
+/area/station/science/auxlab)
 "dOv" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -10783,9 +10751,11 @@
 /turf/open/floor/plating,
 /area/station/service/lawoffice)
 "dRh" = (
-/obj/structure/closet/secure_closet/cytology,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/obj/structure/door_assembly/door_assembly_science,
+/turf/open/floor/iron/white,
+/area/station/science/auxlab)
 "dRi" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -11056,16 +11026,17 @@
 /area/station/medical/storage)
 "dVp" = (
 /turf/closed/wall,
-/area/station/science/cytology)
+/area/station/science/auxlab)
 "dVs" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/security/prison)
 "dVt" = (
+/obj/structure/barricade/wooden/crude,
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
-/area/station/science/cytology)
+/area/station/science/auxlab)
 "dVu" = (
 /obj/structure/railing{
 	dir = 8
@@ -14115,9 +14086,10 @@
 /turf/open/floor/engine/n2,
 /area/station/engineering/atmos)
 "fdN" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/turf/open/floor/iron/white,
+/area/station/science/auxlab)
 "fdQ" = (
 /obj/structure/table,
 /obj/effect/spawner/random/entertainment/cigarette,
@@ -15650,11 +15622,12 @@
 /turf/open/floor/iron,
 /area/station/engineering/main)
 "fFg" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/turf/open/floor/plating,
+/area/station/science/auxlab)
 "fFj" = (
 /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
 /obj/effect/turf_decal/tile/yellow{
@@ -15942,14 +15915,6 @@
 /obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/plating,
 /area/station/engineering/storage)
-"fJs" = (
-/obj/item/stock_parts/cell/bluespace{
-	rigged = 1;
-	pixel_x = -5;
-	pixel_y = -8
-	},
-/turf/open/misc/asteroid,
-/area/station/asteroid)
 "fJz" = (
 /obj/item/reagent_containers/condiment/vegetable_oil,
 /obj/machinery/grill,
@@ -16414,16 +16379,9 @@
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/command/storage/eva)
 "fSi" = (
+/obj/structure/microscope,
+/obj/structure/table/glass,
 /obj/machinery/light/directional/north,
-/obj/structure/table,
-/obj/item/pen{
-	pixel_x = 9;
-	pixel_y = 4
-	},
-/obj/item/hand_labeler{
-	pixel_y = 10;
-	pixel_x = -13
-	},
 /turf/open/floor/glass/reinforced,
 /area/station/science/xenobiology)
 "fSk" = (
@@ -16613,8 +16571,9 @@
 /turf/open/floor/iron/dark,
 /area/station/command/bridge)
 "fVf" = (
-/obj/effect/mob_spawn/corpse/human/clown,
-/obj/effect/decal/cleanable/blood/old,
+/obj/item/stock_parts/cell/bluespace{
+	rigged = 1
+	},
 /turf/open/misc/asteroid,
 /area/station/asteroid)
 "fVs" = (
@@ -19172,16 +19131,11 @@
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "gTf" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
-/obj/machinery/reagentgrinder{
-	pixel_x = -1;
-	pixel_y = 8
-	},
-/obj/item/swab{
-	pixel_x = 15
-	},
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/obj/item/wirecutters,
+/turf/open/floor/plating,
+/area/station/science/auxlab)
 "gTh" = (
 /obj/structure/table/wood,
 /obj/item/gift,
@@ -21100,15 +21054,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/white,
 /area/station/medical/storage)
-"hyM" = (
-/obj/structure/closet,
-/obj/item/food/grown/banana,
-/obj/item/food/grown/banana,
-/obj/item/food/grown/banana,
-/obj/item/food/grown/banana,
-/obj/item/food/grown/banana,
-/turf/open/misc/asteroid,
-/area/station/asteroid)
 "hyS" = (
 /obj/effect/spawner/random/maintenance,
 /obj/effect/mapping_helpers/broken_floor,
@@ -23029,22 +22974,6 @@
 /obj/effect/spawner/random/maintenance,
 /turf/open/floor/plating,
 /area/station/maintenance/central/lesser)
-"ikp" = (
-/obj/structure/table,
-/obj/item/toy/plush/slimeplushie{
-	pixel_y = 12;
-	pixel_x = 3
-	},
-/obj/item/stamp{
-	pixel_x = -6;
-	pixel_y = 4
-	},
-/obj/item/stamp/denied{
-	pixel_x = 4;
-	pixel_y = 1
-	},
-/turf/open/floor/glass/reinforced,
-/area/station/science/xenobiology)
 "ikD" = (
 /obj/structure/grille/broken,
 /obj/effect/decal/cleanable/glass,
@@ -23336,8 +23265,12 @@
 /turf/open/floor/iron/white,
 /area/station/science/lobby)
 "ipx" = (
-/turf/closed/wall/r_wall,
-/area/station/science/cytology)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/science/auxlab)
 "ipJ" = (
 /obj/effect/turf_decal/tile/red{
 	dir = 8
@@ -24448,11 +24381,8 @@
 /turf/open/floor/iron/white,
 /area/station/science/research)
 "iJT" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/turf/closed/wall/r_wall,
+/area/station/science/auxlab)
 "iKb" = (
 /obj/machinery/door/poddoor/shutters/window/preopen{
 	id = "ordstorage"
@@ -24983,11 +24913,15 @@
 /turf/open/floor/glass/reinforced,
 /area/station/command/meeting_room)
 "iXn" = (
+/obj/structure/closet/secure_closet/cytology,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/stripes{
+	dir = 6
+	},
 /obj/item/radio/intercom/directional/north,
 /obj/effect/turf_decal/siding/purple{
 	dir = 4
 	},
-/obj/structure/closet/emcloset,
 /turf/open/floor/iron/white/textured_corner{
 	dir = 8
 	},
@@ -29180,13 +29114,6 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/iron,
 /area/station/maintenance/department/cargo)
-"kqf" = (
-/obj/machinery/plumbing/input{
-	dir = 8
-	},
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
 "kqj" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/disposalpipe/segment{
@@ -35292,7 +35219,6 @@
 "mzB" = (
 /obj/machinery/firealarm/directional/west,
 /obj/structure/closet/firecloset/full,
-/obj/structure/sign/departments/science/alt/directional/south,
 /turf/open/floor/iron/white,
 /area/station/science/research)
 "mzI" = (
@@ -36457,10 +36383,14 @@
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
 "mWS" = (
-/obj/machinery/light/small/directional/north,
-/obj/structure/flora/rock/pile/style_random,
-/turf/open/misc/asteroid,
-/area/station/asteroid)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/decal/cleanable/glass,
+/obj/item/stack/rods/two,
+/obj/item/shard,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white,
+/area/station/science/auxlab)
 "mWX" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -36496,11 +36426,14 @@
 /turf/open/floor/carpet,
 /area/station/commons/dorms)
 "mXJ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/broken/directional/south,
+/obj/item/ammo_casing/spent,
+/obj/item/ammo_casing/spent,
+/obj/item/ammo_casing/spent,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/turf/open/floor/iron/white,
+/area/station/science/auxlab)
 "mXK" = (
 /obj/item/clothing/mask/gas/clown_hat,
 /obj/effect/decal/remains/human,
@@ -40914,14 +40847,12 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "oGQ" = (
-/obj/structure/table,
-/obj/structure/microscope,
-/obj/item/storage/box/beakers{
-	pixel_y = 18;
-	pixel_x = -14
-	},
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/north,
+/obj/structure/chair,
+/obj/item/restraints/handcuffs/cable/zipties/used,
+/turf/open/floor/iron/white,
+/area/station/science/auxlab)
 "oGX" = (
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
@@ -41571,11 +41502,14 @@
 /turf/open/floor/iron,
 /area/station/security/brig/entrance)
 "oSG" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/south,
+/obj/structure/fluff/broken_canister_frame,
+/obj/machinery/camera/autoname/directional/west{
+	network = list("ss13","rd")
 	},
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/turf/open/floor/plating,
+/area/station/science/auxlab)
 "oSJ" = (
 /obj/structure/stairs/east,
 /turf/open/floor/iron/white/smooth_large,
@@ -41792,6 +41726,7 @@
 "oWg" = (
 /obj/machinery/door/airlock/maintenance/external,
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/unres,
 /turf/open/floor/plating,
 /area/station/science/lobby)
 "oWr" = (
@@ -42549,11 +42484,15 @@
 	},
 /area/station/service/theater)
 "pjL" = (
-/obj/structure/table,
-/obj/item/paper_bin{
-	pixel_x = -5;
-	pixel_y = 6
+/obj/item/book/manual/wiki/cytology{
+	pixel_x = -4;
+	pixel_y = 4
 	},
+/obj/item/biopsy_tool{
+	pixel_x = 8;
+	pixel_y = 2
+	},
+/obj/structure/table/glass,
 /turf/open/floor/glass/reinforced,
 /area/station/science/xenobiology)
 "pjN" = (
@@ -43082,10 +43021,6 @@
 	},
 /turf/open/space/basic,
 /area/space/nearstation)
-"pti" = (
-/obj/machinery/plumbing/growing_vat,
-/turf/open/misc/asteroid,
-/area/station/asteroid)
 "ptq" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -50832,10 +50767,6 @@
 "rZc" = (
 /turf/open/floor/cult,
 /area/station/service/chapel/office)
-"rZg" = (
-/mob/living/carbon/human/species/monkey,
-/turf/open/misc/asteroid,
-/area/station/asteroid)
 "rZz" = (
 /obj/machinery/door/airlock{
 	name = "Maintenance Bathroom"
@@ -52006,8 +51937,9 @@
 /obj/effect/mapping_helpers/airlock/autoname,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/obj/effect/mapping_helpers/airlock/welded,
+/turf/open/floor/iron/white,
+/area/station/science/auxlab)
 "stj" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/effect/turf_decal/siding/purple{
@@ -52124,9 +52056,10 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "suw" = (
-/obj/machinery/chem_master,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/plating,
+/area/station/science/auxlab)
 "suB" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/cup/bottle/syrup_bottle/liqueur{
@@ -55114,13 +55047,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/maintenance/department/engine)
-"tzy" = (
-/obj/machinery/camera/autoname/directional/west{
-	network = list("ss13","rd")
-	},
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
 "tzT" = (
 /obj/machinery/door/airlock/maintenance_hatch,
 /obj/structure/cable,
@@ -56202,9 +56128,11 @@
 /turf/open/floor/plating,
 /area/station/maintenance/central/lesser)
 "tQI" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/obj/effect/turf_decal/sand/plating,
+/obj/machinery/door/airlock/maintenance_hatch,
+/obj/effect/mapping_helpers/airlock/access/any/science/general,
+/turf/open/floor/plating,
+/area/station/science/auxlab)
 "tQM" = (
 /obj/effect/mapping_helpers/airlock/access/all/supply/general,
 /obj/machinery/door/airlock/mining{
@@ -58286,10 +58214,10 @@
 	},
 /area/station/command/emergency_closet)
 "uCr" = (
-/obj/structure/table,
-/obj/machinery/fax{
-	fax_name = "Xenobiology Desk";
-	name = "Xenobiology's Fax Machine"
+/obj/structure/table/glass,
+/obj/machinery/reagentgrinder{
+	pixel_x = -1;
+	pixel_y = 8
 	},
 /turf/open/floor/glass/reinforced,
 /area/station/science/xenobiology)
@@ -60433,8 +60361,13 @@
 /turf/open/floor/iron,
 /area/station/engineering/lobby)
 "vqN" = (
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/station/science/auxlab)
 "vqY" = (
 /obj/structure/table,
 /obj/item/clipboard,
@@ -65600,16 +65533,6 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
-"xje" = (
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
 "xjh" = (
 /obj/effect/landmark/start/hangover,
 /turf/open/floor/iron/white,
@@ -66285,13 +66208,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white/smooth_half,
 /area/station/medical/pharmacy)
-"xwe" = (
-/obj/effect/turf_decal/sand/plating,
-/obj/effect/turf_decal/stripes/full,
-/obj/effect/mapping_helpers/airlock/access/any/science/general,
-/obj/machinery/door/airlock/maintenance/external/glass,
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
 "xwf" = (
 /obj/structure/chair/plastic{
 	dir = 8
@@ -66695,12 +66611,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/carpet/purple,
 /area/station/service/library)
-"xCX" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/misc/asteroid,
-/area/station/asteroid)
 "xDf" = (
 /obj/machinery/door/poddoor/shutters/window/preopen{
 	name = "Security Shutters";
@@ -67192,27 +67102,10 @@
 /turf/open/floor/iron,
 /area/station/security/office)
 "xNo" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/machinery/light_switch/directional/east,
-/obj/structure/table,
-/obj/machinery/light/small/directional/east,
-/obj/item/reagent_containers/cup/beaker/large{
-	pixel_y = 14;
-	pixel_x = 6
-	},
-/obj/item/reagent_containers/cup/beaker{
-	pixel_y = 7;
-	pixel_x = 10
-	},
-/obj/item/book/manual/wiki/cytology{
-	pixel_x = -3;
-	pixel_y = 2
-	},
-/obj/item/biopsy_tool{
-	pixel_x = -14;
-	pixel_y = 4
-	},
-/turf/open/floor/iron/dark/small,
-/area/station/science/cytology)
+/turf/open/floor/plating,
+/area/station/science/auxlab)
 "xNp" = (
 /obj/effect/turf_decal/stripes{
 	dir = 1
@@ -68342,14 +68235,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/security/checkpoint/supply)
-"yjm" = (
-/obj/item/flashlight/glowstick/orange{
-	start_on = 1;
-	pixel_x = -5;
-	pixel_y = -6
-	},
-/turf/open/misc/asteroid,
-/area/station/asteroid)
 "yjw" = (
 /obj/effect/turf_decal/tile/neutral,
 /obj/structure/chair/sofa/bench{
@@ -167344,7 +167229,7 @@ vxX
 vxX
 vxX
 vxX
-xUx
+gMk
 uet
 vxX
 vxX
@@ -167598,13 +167483,13 @@ tqD
 gQu
 gvF
 vxX
-bKL
 gMk
 gMk
-rZg
 gMk
 gMk
-vxX
+gMk
+gMk
+gMk
 vxX
 vxX
 vxX
@@ -167858,10 +167743,10 @@ gMk
 fXf
 gMk
 gMk
+vxX
+vxX
 gMk
 gMk
-gMk
-fVf
 vxX
 vxX
 vxX
@@ -168112,11 +167997,11 @@ gOc
 gOc
 gvF
 vxX
-xUx
-gMk
-gMk
-gMk
-gMk
+vxX
+vxX
+vxX
+vxX
+vxX
 gMk
 gMk
 vxX
@@ -168370,9 +168255,9 @@ gOc
 gvF
 vxX
 vxX
-uet
+vxX
+vxX
 gMk
-pti
 gMk
 gMk
 gMk
@@ -168627,9 +168512,9 @@ gOc
 gvF
 vxX
 vxX
-hyM
-gMk
-cgu
+vxX
+vxX
+vxX
 gMk
 gMk
 gMk
@@ -168885,9 +168770,9 @@ gvF
 vxX
 vxX
 vxX
-gMk
-cgu
-yjm
+vxX
+vxX
+vxX
 vxX
 vxX
 gMk
@@ -169142,8 +169027,8 @@ cMZ
 cMZ
 cMZ
 vxX
-uet
-cgu
+vxX
+vxX
 vxX
 vxX
 uet
@@ -169398,16 +169283,16 @@ nas
 bbe
 ycq
 cMZ
-ipx
-dVt
-cdl
-ipx
+iJT
+iJT
+iJT
+vxX
 vxX
 vxX
 gMk
 gMk
 gMk
-gMk
+fVf
 vxX
 vxX
 kTV
@@ -169657,9 +169542,9 @@ jnw
 gKt
 gTf
 dOg
-kqf
-ipx
-ipx
+iJT
+iJT
+vxX
 vxX
 gMk
 vxX
@@ -169915,9 +169800,9 @@ gKt
 oGQ
 aIX
 oSG
-tzy
-dVt
-xCX
+iJT
+vxX
+gMk
 gMk
 xUx
 uet
@@ -170173,8 +170058,8 @@ xNo
 suw
 fdN
 tQI
-xwe
-xCX
+gMk
+gMk
 gMk
 gMk
 gMk
@@ -170428,9 +170313,9 @@ dpp
 gKt
 dVp
 dRh
-fdN
-xje
-ipx
+mWS
+iJT
+vxX
 vxX
 gMk
 gMk
@@ -170447,7 +170332,7 @@ vxX
 vxX
 vxX
 gMk
-fJs
+gMk
 vxX
 dtQ
 vxX
@@ -170687,9 +170572,9 @@ dVp
 vqN
 mXJ
 iJT
-ipx
+vxX
 uKm
-mWS
+aXH
 gMk
 ent
 vxX
@@ -170941,12 +170826,12 @@ bNp
 iHH
 iHH
 sti
-fFg
-fFg
-dhR
 ipx
+fFg
+iJT
 vxX
-uet
+vxX
+gMk
 gMk
 vxX
 vxX
@@ -171200,8 +171085,8 @@ frG
 dVp
 dVt
 dVt
-ipx
-ipx
+iJT
+vxX
 vxX
 vxX
 vxX
@@ -187400,7 +187285,7 @@ hhX
 fZF
 jQS
 uCr
-ikp
+jEt
 hLP
 cWc
 wnA
diff --git a/_maps/wawastation.json b/_maps/wawastation.json
new file mode 100644
index 00000000000..cce65601baf
--- /dev/null
+++ b/_maps/wawastation.json
@@ -0,0 +1,32 @@
+{
+	"version": 1,
+	"map_name": "Wawastation",
+	"map_path": "map_files/wawastation",
+	"map_file": "wawastation.dmm",
+	"shuttles": {
+		"cargo": "cargo_box",
+		"ferry": "ferry_fancy",
+		"whiteship": "whiteship_meta",
+		"emergency": "emergency_tram"
+	},
+	"traits": [
+		{
+			"Up": true,
+			"Baseturf": "/turf/open/misc/asteroid/airless",
+			"Linkage": "Cross"
+		},
+		{
+			"Down": true,
+			"Baseturf": "/turf/open/openspace",
+			"Linkage": "Cross"
+		}
+	],
+	"job_changes": {
+		"Cook": {
+			"additional_cqc_areas": ["/area/station/service/bar", "/area/station/commons/lounge"]
+		},
+		"Captain": {
+			"special_charter": "asteroid"
+		}
+	}
+}
diff --git a/code/game/area/areas/ai_monitored.dm b/code/game/area/areas/ai_monitored.dm
index 0fc34c96abb..a6964d70f6a 100644
--- a/code/game/area/areas/ai_monitored.dm
+++ b/code/game/area/areas/ai_monitored.dm
@@ -81,6 +81,14 @@
 	name = "\improper AI Satellite Maintenance"
 	icon_state = "ai_maint"
 
+/area/station/ai_monitored/turret_protected/aisat/uppernorth
+	name = "\improper AI Satellite Upper Fore"
+	icon_state = "ai"
+
+/area/station/ai_monitored/turret_protected/aisat/uppersouth
+	name = "\improper AI Satellite Upper Aft"
+	icon_state = "ai"
+
 /area/station/ai_monitored/turret_protected/aisat_interior
 	name = "\improper AI Satellite Antechamber"
 	icon_state = "ai_interior"
diff --git a/code/game/area/areas/station/command.dm b/code/game/area/areas/station/command.dm
index a1a521e77a8..23f2c7c61c0 100644
--- a/code/game/area/areas/station/command.dm
+++ b/code/game/area/areas/station/command.dm
@@ -31,6 +31,11 @@
 	icon_state = "command"
 	sound_environment = SOUND_AREA_WOODFLOOR
 
+/area/station/command/emergency_closet
+	name = "\improper Corporate Emergency Closet"
+	icon_state = "command"
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
+
 /*
 * Command Head Areas
 */
diff --git a/code/game/area/areas/station/medical.dm b/code/game/area/areas/station/medical.dm
index 33d4973f623..fc6c6ff3a75 100644
--- a/code/game/area/areas/station/medical.dm
+++ b/code/game/area/areas/station/medical.dm
@@ -79,6 +79,9 @@
 	name = "Chemistry"
 	icon_state = "chem"
 
+/area/station/medical/chemistry/minisat
+	name = "Chemistry Mini-Satellite"
+
 /area/station/medical/pharmacy
 	name = "\improper Pharmacy"
 	icon_state = "pharmacy"
diff --git a/code/game/area/areas/station/science.dm b/code/game/area/areas/station/science.dm
index f63798aca62..2787a4ff87f 100644
--- a/code/game/area/areas/station/science.dm
+++ b/code/game/area/areas/station/science.dm
@@ -72,6 +72,10 @@
 	name = "\improper Robotics Lab"
 	icon_state = "ass_line"
 
+/area/station/science/robotics/storage
+	name = "\improper Robotics Storage"
+	icon_state = "ass_line"
+
 /area/station/science/robotics/augments
 	name = "\improper Augmentation Theater"
 	icon_state = "robotics"
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index ca6562635ee..6f21e9303fc 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -90,6 +90,7 @@
 
 MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera, 0)
 MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/autoname, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/autoname/motion, 0)
 MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/emp_proof, 0)
 MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/motion, 0)
 MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
@@ -119,10 +120,14 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
 	if(camera_enabled)
 		GLOB.cameranet.addCamera(src)
 		LAZYADD(myarea.cameras, src)
+#ifdef MAP_TEST
+		update_appearance()
+#else
 		if(mapload && !start_active && is_station_level(z) && prob(3))
 			toggle_cam()
 		else //this is handled by toggle_camera, so no need to update it twice.
 			update_appearance()
+#endif
 
 	alarm_manager = new(src)
 	find_and_hang_on_wall(directional = TRUE, \
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index 2cd0506cbfd..a8e20505387 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -84,6 +84,13 @@
 	autonames_in_areas[camera_area] = number
 	c_tag = "[format_text(camera_area.name)] #[number]"
 
+/obj/machinery/camera/autoname/motion
+	start_active = TRUE
+	name = "motion-sensitive security camera"
+
+/obj/machinery/camera/autoname/motion/Initialize(mapload)
+	. = ..()
+	upgradeMotion()
 
 /**
  * Bomb preset
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index adbf99aa40e..8c5e1d9e811 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -92,7 +92,7 @@
 			elevator_status = LIFT_PLATFORM_LOCKED
 			GLOB.elevator_doors += src
 		else
-			stack_trace("Elevator door [src] has no linked elevator ID!")
+			stack_trace("Elevator door [src] ([x],[y],[z]) has no linked elevator ID!")
 	spark_system = new /datum/effect_system/spark_spread
 	spark_system.set_up(2, 1, src)
 	if(density)
diff --git a/code/game/objects/effects/spawners/random/contraband.dm b/code/game/objects/effects/spawners/random/contraband.dm
index 8f61525128f..f17656c6119 100644
--- a/code/game/objects/effects/spawners/random/contraband.dm
+++ b/code/game/objects/effects/spawners/random/contraband.dm
@@ -141,6 +141,13 @@
 		/obj/effect/mine/shrapnel = 5,
 	)
 
+/obj/effect/spawner/random/contraband/qm_rocket
+	name = "QMs dud rocket spawner"
+	loot = list(
+		/obj/item/ammo_casing/rocket/reverse = 85,
+		/obj/item/ammo_casing/rocket = 15,
+	)
+
 /obj/effect/spawner/random/contraband/grenades
 	name = "grenades spawner"
 	loot = list(
diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm
index 1e6c2b35ede..d4508710a85 100644
--- a/code/game/objects/items/cardboard_cutouts.dm
+++ b/code/game/objects/items/cardboard_cutouts.dm
@@ -166,6 +166,12 @@
 /obj/item/cardboard_cutout/adaptive //Purchased by Syndicate agents, these cutouts are indistinguishable from normal cutouts but aren't discolored when their appearance is changed
 	deceptive = TRUE
 
+/obj/item/cardboard_cutout/nuclear_operative
+	starting_cutout = "Nuclear Operative"
+
+/obj/item/cardboard_cutout/xenomorph
+	starting_cutout = "Xenomorph"
+
 /datum/cardboard_cutout
 	/// Name of the cutout, used for radial selection and the global list.
 	var/name = "Boardjak"
diff --git a/code/game/objects/structures/plaques/static_plaques.dm b/code/game/objects/structures/plaques/static_plaques.dm
index 642a7ac125e..3ae3b66b71b 100644
--- a/code/game/objects/structures/plaques/static_plaques.dm
+++ b/code/game/objects/structures/plaques/static_plaques.dm
@@ -125,6 +125,10 @@
 /obj/structure/plaque/static_plaque/golden/commission/tram
 	desc = "Spinward Sector Station SS-13\n'Tram' Class Outpost\nCommissioned 11/03/2561\n'Making Moves'"
 
+// Wawastation: added add date here
+/obj/structure/plaque/static_plaque/golden/commission/wawa
+	desc = "Spinward Sector Station SS-13\n'Wawa' Class Outpost\nCommissioned 11/03/add here\n'Forever Vertical'"
+
 // North Star: added Apr 13, 2023 (#74371)
 /obj/structure/plaque/static_plaque/golden/commission/northstar
 	desc = "Spinward Sector Ship SS-13\n'North Star' Class Vessel\nCommissioned 13/04/2563\n'New Opportunities'"
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 736cc7951a0..b9dcf5b2ea6 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -91,11 +91,11 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
 		. = "Exit gateway unpowered."
 
 /datum/gateway_destination/gateway/get_target_turf()
-	return get_step(target_gateway.portal,SOUTH)
+	return get_step(target_gateway.portal, target_gateway.dir)
 
 /datum/gateway_destination/gateway/post_transfer(atom/movable/AM)
 	. = ..()
-	addtimer(CALLBACK(AM, TYPE_PROC_REF(/atom/movable, setDir),SOUTH),0)
+	addtimer(CALLBACK(AM, TYPE_PROC_REF(/atom/movable, setDir), target_gateway.dir),0)
 
 /* Special home destination, so we can check exile implants */
 /datum/gateway_destination/gateway/home
@@ -152,7 +152,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
 		to_chat(AM, span_warning("[content_item] seems to be blocking you from entering the gateway!"))
 		return
 	//SKYRAT EDIT END
-	if(get_dir(src,AM) == SOUTH)
+	if(get_dir(src,AM) == gateway?.dir)
 		playsound(src, 'sound/effects/gateway_travel.ogg', 70, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
 		gateway.Transfer(AM)
 
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index 05626cb6617..f30074326fd 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -1072,7 +1072,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_atoms_ontop)
 
 /obj/effect/mapping_helpers/airlock_note_placer/LateInitialize()
 	var/turf/turf = get_turf(src)
-	if(note_path && !istype(note_path, /obj/item/paper)) //don't put non-paper in the paper slot thank you
+	if(note_path && !ispath(note_path, /obj/item/paper)) //don't put non-paper in the paper slot thank you
 		log_mapping("[src] at [x],[y] had an improper note_path path, could not place paper note.")
 		qdel(src)
 		return
diff --git a/code/modules/projectiles/ammunition/ballistic/rocket.dm b/code/modules/projectiles/ammunition/ballistic/rocket.dm
index cf88fd02313..25f0bee11a6 100644
--- a/code/modules/projectiles/ammunition/ballistic/rocket.dm
+++ b/code/modules/projectiles/ammunition/ballistic/rocket.dm
@@ -28,6 +28,9 @@
 	base_icon_state = "low_yield_rocket"
 	projectile_type = /obj/projectile/bullet/rocket/weak
 
+/obj/item/ammo_casing/rocket/reverse
+	projectile_type = /obj/projectile/bullet/rocket/reverse
+
 /obj/item/ammo_casing/a75
 	desc = "A .75 bullet casing."
 	caliber = CALIBER_75
diff --git a/code/modules/projectiles/boxes_magazines/internal/grenade.dm b/code/modules/projectiles/boxes_magazines/internal/grenade.dm
index aacd64383b0..42d019b0dc0 100644
--- a/code/modules/projectiles/boxes_magazines/internal/grenade.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/grenade.dm
@@ -15,3 +15,6 @@
 	ammo_type = /obj/item/ammo_casing/rocket
 	caliber = CALIBER_84MM
 	max_ammo = 1
+
+/obj/item/ammo_box/magazine/internal/rocketlauncher/empty
+	start_empty = TRUE
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index a0bbea54f97..d3b74e21728 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -125,3 +125,8 @@
 			span_userdanger("You look around after realizing you're still here, then proceed to choke yourself to death with [src]!"))
 		sleep(2 SECONDS)
 		return OXYLOSS
+
+/obj/item/gun/ballistic/rocketlauncher/unrestricted/nanotrasen
+	desc = "A reusable rocket propelled grenade launcher. The words \"Syndicate this way\" and an arrow have been written near the barrel. \
+	A sticker near the cheek rest reads, \"ENSURE AREA BEHIND IS CLEAR BEFORE FIRING\""
+	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/rocketlauncher/empty
diff --git a/code/modules/projectiles/projectile/special/rocket.dm b/code/modules/projectiles/projectile/special/rocket.dm
index dd9f18a114a..db452385c98 100644
--- a/code/modules/projectiles/projectile/special/rocket.dm
+++ b/code/modules/projectiles/projectile/special/rocket.dm
@@ -127,3 +127,13 @@ among other potential differences. This granularity is helpful for things like t
 	icon = 'icons/obj/weapons/guns/projectiles.dmi'
 	icon_state = "missile_broken"
 	w_class = WEIGHT_CLASS_TINY
+
+//immediately hits firer
+/obj/projectile/bullet/rocket/reverse
+	name = "faulty rocket"
+
+/obj/projectile/bullet/rocket/reverse/fire(angle, atom/direct_target)
+	..()
+	if(firer) //troll
+		firer.visible_message(span_danger("[src] blows up as soon as [firer] fires it!"))
+		on_hit(firer)
diff --git a/code/modules/transport/transport_module.dm b/code/modules/transport/transport_module.dm
index 9c6ff254cc4..268452743e7 100644
--- a/code/modules/transport/transport_module.dm
+++ b/code/modules/transport/transport_module.dm
@@ -760,6 +760,23 @@
 	if(direction == DOWN)
 		user.visible_message(span_notice("[user] moves the lift downwards."), span_notice("You move the lift downwards."))
 
+/obj/machinery/door/poddoor/lift
+	name = "elevator door"
+	desc = "Keeps idiots like you from walking into an open elevator shaft."
+	icon = 'icons/obj/doors/liftdoor.dmi'
+	opacity = FALSE
+	glass = TRUE
+
+/obj/machinery/door/poddoor/lift/Initialize(mapload)
+	if(!isnull(transport_linked_id)) //linter and stuff
+		elevator_mode = TRUE
+	return ..()
+
+/obj/machinery/door/poddoor/lift/preopen
+	icon_state = "open"
+	density = FALSE
+	opacity = FALSE
+
 // A subtype intended for "public use"
 /obj/structure/transport/linear/public
 	icon = 'icons/turf/floors.dmi'
diff --git a/code/modules/unit_tests/cardboard_cutouts.dm b/code/modules/unit_tests/cardboard_cutouts.dm
index d18c7f0eb8a..94b7dd974e6 100644
--- a/code/modules/unit_tests/cardboard_cutouts.dm
+++ b/code/modules/unit_tests/cardboard_cutouts.dm
@@ -25,9 +25,3 @@
 
 	var/obj/item/cardboard_cutout/xenomorph/xenomorph_cutout = new
 	test_screenshot("xenomorph_cutout", getFlatIcon(xenomorph_cutout))
-
-/obj/item/cardboard_cutout/nuclear_operative
-	starting_cutout = "Nuclear Operative"
-
-/obj/item/cardboard_cutout/xenomorph
-	starting_cutout = "Xenomorph"
diff --git a/config/maps.txt b/config/maps.txt
index d6508851e44..3bb36ceaa17 100644
--- a/config/maps.txt
+++ b/config/maps.txt
@@ -47,6 +47,11 @@ map tramstation
 	votable
 endmap
 
+map wawastation
+	votable
+	minplayers 40
+endmap
+
 # Debug-only maps.
 
 map gateway_test