diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm
index 3385f89dbd..0404cede34 100644
--- a/_maps/shuttles/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship_box.dmm
@@ -14,8 +14,8 @@
 /area/shuttle/abandoned/crew)
 "ae" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/structure/fans/tiny,
 /obj/docking_port/mobile{
 	callTime = 250;
 	dheight = 0;
@@ -149,7 +149,7 @@
 /area/shuttle/abandoned/crew)
 "ap" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
 	},
@@ -957,7 +957,7 @@
 /area/shuttle/abandoned/engine)
 "bm" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/decal/cleanable/dirt{
 	desc = "A thin layer of dust coating the floor.";
 	name = "dust"
@@ -1134,7 +1134,7 @@
 /area/shuttle/abandoned/bridge)
 "by" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /turf/open/floor/plating,
 /area/shuttle/abandoned/engine)
@@ -2604,8 +2604,8 @@
 /area/shuttle/abandoned/medbay)
 "do" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/structure/fans/tiny,
 /obj/effect/decal/cleanable/dirt{
 	desc = "A thin layer of dust coating the floor.";
 	name = "dust"
@@ -2676,7 +2676,7 @@
 /area/shuttle/abandoned/medbay)
 "dt" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
 	},
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm
index 88027243fb..cc8eb19bab 100644
--- a/_maps/shuttles/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship_delta.dmm
@@ -19,7 +19,7 @@
 /area/shuttle/abandoned/crew)
 "ad" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/docking_port/mobile{
 	callTime = 250;
@@ -440,11 +440,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/structure/fans,
 /obj/machinery/door/airlock/external/glass{
 	name = "E.V.A Access"
 	},
 /turf/open/floor/plasteel,
+/obj/structure/fans/tiny,
 /area/shuttle/abandoned/crew)
 "aK" = (
 /obj/effect/decal/cleanable/dirt{
@@ -626,11 +626,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/structure/fans,
 /obj/machinery/door/airlock/external/glass{
 	name = "E.V.A Access"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel,
 /area/shuttle/abandoned/bar)
 "aX" = (
@@ -2531,10 +2531,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/structure/fans,
 /obj/machinery/door/airlock/external/glass{
 	name = "E.V.A Access"
 	},
+/obj/structure/fans/tiny,
 /obj/effect/decal/cleanable/dirt{
 	desc = "A thin layer of dust coating the floor.";
 	name = "dust"
@@ -2556,10 +2556,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/structure/fans,
 /obj/machinery/door/airlock/external/glass{
 	name = "E.V.A Access"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel,
 /area/shuttle/abandoned/cargo)
 "ds" = (
@@ -2787,7 +2787,7 @@
 /area/shuttle/abandoned/medbay)
 "dI" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/effect/decal/cleanable/dirt{
 	desc = "A thin layer of dust coating the floor.";
@@ -3109,7 +3109,7 @@
 /area/shuttle/abandoned/cargo)
 "eb" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
 	},
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
index 0a6a5d9b71..84fff43a44 100644
--- a/_maps/shuttles/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship_meta.dmm
@@ -34,7 +34,7 @@
 /area/shuttle/abandoned/crew)
 "ah" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/docking_port/mobile{
 	callTime = 250;
@@ -459,7 +459,7 @@
 /area/shuttle/abandoned/crew)
 "aI" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
 	},
@@ -585,7 +585,7 @@
 	name = "dust"
 	},
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
@@ -707,7 +707,7 @@
 	name = "dust"
 	},
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
@@ -1897,7 +1897,7 @@
 /area/shuttle/abandoned/bridge)
 "ch" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
@@ -1920,7 +1920,7 @@
 /area/shuttle/abandoned/engine)
 "cj" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
@@ -3100,7 +3100,7 @@
 	name = "dust"
 	},
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
@@ -3171,7 +3171,7 @@
 	name = "dust"
 	},
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
@@ -3523,7 +3523,7 @@
 /area/shuttle/abandoned/bar)
 "dP" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/effect/decal/cleanable/dirt{
 	desc = "A thin layer of dust coating the floor.";
@@ -3818,7 +3818,7 @@
 /area/shuttle/abandoned/cargo)
 "ej" = (
 /obj/machinery/door/airlock/external,
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
 	},
diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm
index 25c3250668..fef3918e1d 100644
--- a/_maps/shuttles/whiteship_pubby.dmm
+++ b/_maps/shuttles/whiteship_pubby.dmm
@@ -15,7 +15,7 @@
 /obj/machinery/door/airlock/public/glass{
 	name = "Shuttle Airlock"
 	},
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/abandoned)
 "e" = (
@@ -97,7 +97,7 @@
 	preferred_direction = 1;
 	width = 9
 	},
-/obj/structure/fans,
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/abandoned)
 "p" = (