diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 00d6651b2a2b..dca84086e244 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -371,7 +371,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 			GLOB.data_core.general -= G
 			qdel(G)
 
-	icon_state = "body_scanner_open"
+	icon_state = initial(icon_state)
 	set_light(0)
 
 	if(occupant.key)
@@ -541,7 +541,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 	occupant.forceMove(get_turf(src))
 	occupant = null
 	stop_processing()
-	icon_state = "body_scanner_open"
+	icon_state = initial(icon_state)
 	set_light(0)
 	playsound(src, 'sound/machines/pod_open.ogg', 30)
 	SEND_SIGNAL(src, COMSIG_CRYOPOD_GO_OUT)
@@ -765,7 +765,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 		var/mob/living/carbon/human/man = occupant
 		man.species.handle_cryo(man)
 
-	icon_state = "body_scanner_open"
+	icon_state = initial(icon_state)
 	set_light(0)
 
 
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 405e77dcfbdf..03a5d5c10e72 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -26,6 +26,9 @@
 	///stun time upon exiting, if at all
 	var/exit_stun = 2
 
+/obj/structure/machinery/recharge_station/alt
+	icon = 'icons/obj/structures/machinery/synth_repair_station.dmi'
+
 
 /obj/structure/machinery/recharge_station/Initialize(mapload, ...)
 	. = ..()
diff --git a/icons/obj/structures/machinery/synth_repair_station.dmi b/icons/obj/structures/machinery/synth_repair_station.dmi
new file mode 100644
index 000000000000..f5e9f4f3e2f1
Binary files /dev/null and b/icons/obj/structures/machinery/synth_repair_station.dmi differ
diff --git a/icons/obj/structures/machinery/working_joe_storage.dmi b/icons/obj/structures/machinery/working_joe_storage.dmi
index 4535650f468a..e95c9cd66feb 100644
Binary files a/icons/obj/structures/machinery/working_joe_storage.dmi and b/icons/obj/structures/machinery/working_joe_storage.dmi differ
diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
index 73e2b795785f..3aa6b73134fe 100644
--- a/maps/map_files/BigRed/BigRed.dmm
+++ b/maps/map_files/BigRed/BigRed.dmm
@@ -114,7 +114,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 32
 	},
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/dark,
 /area/bigredv2/outside/space_port)
 "aaB" = (
@@ -1954,7 +1954,10 @@
 /turf/open/floor,
 /area/bigredv2/outside/marshal_office)
 "aho" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 8;
+	layer = 3.1
+	},
 /turf/open/floor/plating,
 /area/bigredv2/outside/filtration_plant)
 "ahp" = (
@@ -2120,6 +2123,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/mars,
 /area/bigredv2/outside/nw)
+"ahY" = (
+/obj/structure/machinery/recharge_station/alt{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/bigredv2/outside/filtration_plant)
 "aia" = (
 /obj/structure/machinery/door_control{
 	id = "Marshal Offices";
@@ -15637,7 +15646,9 @@
 /turf/open/floor/darkblue2/west,
 /area/bigredv2/caves/eta/storage)
 "bxw" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 8
+	},
 /turf/open/floor/dark,
 /area/bigredv2/caves/eta/storage)
 "bxx" = (
@@ -20676,7 +20687,9 @@
 /area/bigredv2/caves/mining)
 "eWB" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 1
+	},
 /turf/open/floor/freezerfloor,
 /area/bigredv2/outside/dorms)
 "eWE" = (
@@ -25220,7 +25233,7 @@
 /turf/open/mars_cave/mars_cave_2,
 /area/bigredv2/caves/mining)
 "jYF" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/almayer/test_floor4,
 /area/bigredv2/outside/engineering)
 "jYL" = (
@@ -32681,7 +32694,9 @@
 /obj/structure/machinery/light{
 	dir = 8
 	},
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 1
+	},
 /turf/open/floor/freezerfloor,
 /area/bigredv2/outside/dorms)
 "rKP" = (
@@ -65567,7 +65582,7 @@ bpX
 awp
 bkT
 blG
-aho
+ahY
 aho
 bkT
 bkU
diff --git a/maps/map_files/BigRed/standalone/landingzone_solaris_upp_lz1.dmm b/maps/map_files/BigRed/standalone/landingzone_solaris_upp_lz1.dmm
index e5eb32fa3e2c..2d54b8757a34 100644
--- a/maps/map_files/BigRed/standalone/landingzone_solaris_upp_lz1.dmm
+++ b/maps/map_files/BigRed/standalone/landingzone_solaris_upp_lz1.dmm
@@ -66,7 +66,7 @@
 /turf/open/asphalt/cement_sunbleached/cement_sunbleached1,
 /area/event/metal/dynamic/lit)
 "bQ" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/almayer/tcomms,
 /area/event/metal/dynamic/lit)
 "bX" = (
diff --git a/maps/map_files/BigRed/standalone/landingzone_solaris_uscm_lz1.dmm b/maps/map_files/BigRed/standalone/landingzone_solaris_uscm_lz1.dmm
index 8bc20e0c5153..00f5d5ebd00e 100644
--- a/maps/map_files/BigRed/standalone/landingzone_solaris_uscm_lz1.dmm
+++ b/maps/map_files/BigRed/standalone/landingzone_solaris_uscm_lz1.dmm
@@ -155,7 +155,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 32
 	},
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/dark,
 /area/bigredv2/outside/space_port)
 "cF" = (
diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm
index 6c08f74f826e..1fb1d4a245a4 100644
--- a/maps/map_files/DesertDam/Desert_Dam.dmm
+++ b/maps/map_files/DesertDam/Desert_Dam.dmm
@@ -35723,7 +35723,9 @@
 /obj/structure/machinery/light{
 	dir = 4
 	},
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 8
+	},
 /turf/open/floor/prison/darkbrown2/east,
 /area/desert_dam/interior/dam_interior/auxilary_tool_storage)
 "gav" = (
@@ -48535,7 +48537,7 @@
 /turf/open/desert/dirt,
 /area/desert_dam/interior/caves/central_caves)
 "lbi" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/prison/darkyellow2/north,
 /area/desert_dam/interior/lab_northeast/east_lab_workshop)
 "lbo" = (
@@ -48843,7 +48845,7 @@
 /turf/open/asphalt/cement/cement2,
 /area/desert_dam/interior/dam_interior/east_tunnel_entrance)
 "lhQ" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/darkyellow2/northeast,
 /area/desert_dam/building/substation/northwest)
 "lhU" = (
@@ -50541,7 +50543,7 @@
 /turf/open/floor/prison/whitegreen/west,
 /area/desert_dam/building/medical/lobby)
 "lPp" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/prison,
 /area/desert_dam/building/substation/west)
 "lPB" = (
@@ -62079,7 +62081,7 @@
 /turf/open/floor/prison/sterile_white/west,
 /area/desert_dam/building/hydroponics/hydroponics_breakroom)
 "qof" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/prison/darkyellow2/north,
 /area/desert_dam/interior/dam_interior/engine_west_wing)
 "qol" = (
@@ -73062,10 +73064,10 @@
 /turf/open/asphalt,
 /area/desert_dam/exterior/valley/valley_labs)
 "uxi" = (
-/obj/structure/machinery/recharge_station,
 /obj/structure/sign/poster/safety{
 	pixel_y = 32
 	},
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/prison/southwest,
 /area/desert_dam/interior/dam_interior/hangar_storage)
 "uxu" = (
@@ -73676,7 +73678,7 @@
 /turf/open/asphalt/cement_sunbleached/cement_sunbleached17,
 /area/desert_dam/exterior/valley/valley_medical)
 "uJZ" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/prison/darkpurple2/northwest,
 /area/desert_dam/interior/lab_northeast/east_lab_excavation)
 "uKb" = (
diff --git a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
index 098c45f31b8b..384bf5f01cf6 100644
--- a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
+++ b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
@@ -2518,6 +2518,12 @@
 	},
 /turf/open/auto_turf/hybrisa_auto_turf/layer2,
 /area/lv759/indoors/caves/south_west_caves)
+"agG" = (
+/obj/structure/machinery/recharge_station/alt{
+	dir = 8
+	},
+/turf/open/floor/corsat,
+/area/lv759/indoors/wy_research_complex/hallwaysoutheast)
 "agH" = (
 /obj/effect/decal/hybrisa/road/road_edge{
 	icon_state = "road_edge_decal2"
@@ -2604,6 +2610,12 @@
 	},
 /turf/open/floor/hybrisa/engineership/engineer_floor9,
 /area/lv759/indoors/derelict_ship)
+"agT" = (
+/obj/structure/machinery/recharge_station/alt{
+	dir = 8
+	},
+/turf/open/floor/prison/floor_plate/southwest,
+/area/lv759/indoors/meridian/meridian_foyer)
 "agU" = (
 /obj/structure/prop/hybrisa/cavedecor/stalagmite4{
 	pixel_x = -4;
@@ -41075,8 +41087,9 @@
 /turf/open/hybrisa/street/sidewalkfull,
 /area/lv759/outdoors/colony_streets/central_streets)
 "ffH" = (
-/obj/structure/machinery/recharge_station{
-	layer = 2.9
+/obj/structure/machinery/recharge_station/alt{
+	dir = 8;
+	layer = 3.1
 	},
 /turf/open/floor/prison/floor_plate/southwest,
 /area/lv759/indoors/meridian/meridian_foyer)
@@ -45742,7 +45755,6 @@
 /turf/closed/wall/hybrisa/colony,
 /area/lv759/indoors/apartment/northapartments)
 "fRe" = (
-/obj/structure/machinery/recharge_station,
 /obj/structure/catwalk/prison,
 /obj/structure/barricade/handrail{
 	dir = 8
@@ -45751,6 +45763,7 @@
 	pixel_y = 32;
 	color = "#b96a37"
 	},
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/corsat/officetiles,
 /area/lv759/indoors/weymart/backrooms)
 "fRh" = (
@@ -53459,7 +53472,7 @@
 /turf/open/floor/prison,
 /area/lv759/outdoors/colony_streets/south_west_street)
 "haK" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/corsat,
 /area/lv759/indoors/spaceport/docking_bay_2)
 "haN" = (
@@ -62233,7 +62246,9 @@
 /turf/open/floor/plating/plating_catwalk/prison,
 /area/lv759/indoors/caves/north_west_caves)
 "ipT" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 8
+	},
 /turf/open/floor/almayer/plate,
 /area/lv759/indoors/landing_zone_2/kmcc_hub_cargo)
 "iqa" = (
@@ -66822,13 +66837,15 @@
 /turf/open/hybrisa/street/asphalt,
 /area/lv759/outdoors/colony_streets/north_street)
 "iZh" = (
-/obj/structure/machinery/recharge_station,
 /obj/structure/cable/white{
 	color = "#9f8700";
 	icon_state = "4-8";
 	layer = 5;
 	level = 2
 	},
+/obj/structure/machinery/recharge_station/alt{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/lv759/indoors/landing_zone_2/kmcc_hub_maintenance)
 "iZi" = (
@@ -67157,8 +67174,8 @@
 /turf/open/floor/corsat/officetiles,
 /area/lv759/indoors/casino/casino_vault)
 "jbL" = (
-/obj/structure/machinery/recharge_station,
 /obj/effect/decal/cleanable/cobweb2,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/plating,
 /area/lv759/indoors/colonial_marshals/southwest_maintenance)
 "jbM" = (
@@ -75834,7 +75851,6 @@
 /turf/open/floor/plating/plating_catwalk/aicore/white,
 /area/lv759/indoors/apartment/westbedrooms)
 "krP" = (
-/obj/structure/machinery/recharge_station,
 /obj/structure/prop/hybrisa/misc/buildinggreebliessmall/smallvent3{
 	pixel_y = 28
 	},
@@ -75846,6 +75862,9 @@
 	icon_state = "N";
 	pixel_y = 1
 	},
+/obj/structure/machinery/recharge_station/alt{
+	dir = 8
+	},
 /turf/open/floor/prison/darkbrown2/north,
 /area/lv759/indoors/recycling_plant/synthetic_storage)
 "krS" = (
@@ -81138,7 +81157,10 @@
 /turf/open/floor/plating,
 /area/lv759/indoors/mining_outpost/south)
 "lgi" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	layer = 3.1;
+	dir = 8
+	},
 /turf/open/floor/corsat,
 /area/lv759/indoors/wy_research_complex/hallwaysoutheast)
 "lgl" = (
@@ -108588,7 +108610,6 @@
 /turf/open/floor/hybrisa/tile/cuppajoesfloor,
 /area/lv759/indoors/spaceport/cuppajoes)
 "plg" = (
-/obj/structure/machinery/recharge_station,
 /obj/structure/catwalk/prison,
 /obj/structure/barricade/handrail{
 	dir = 8
@@ -108601,6 +108622,7 @@
 	pixel_x = -17;
 	pixel_y = 32
 	},
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/corsat/officetiles,
 /area/lv759/indoors/weymart/backrooms)
 "pll" = (
@@ -134775,7 +134797,6 @@
 /turf/open/hybrisa/street/asphalt,
 /area/lv759/outdoors/colony_streets/north_west_street)
 "tfr" = (
-/obj/structure/machinery/recharge_station,
 /obj/structure/catwalk/prison,
 /obj/structure/barricade/handrail{
 	dir = 8
@@ -134788,6 +134809,7 @@
 	pixel_x = -17;
 	pixel_y = 32
 	},
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/corsat/officetiles,
 /area/lv759/indoors/weymart/backrooms)
 "tfu" = (
@@ -136210,7 +136232,9 @@
 /turf/open/floor/kutjevo/grey,
 /area/lv759/indoors/meridian/meridian_maintenance_east)
 "toU" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 1
+	},
 /turf/open/floor/corsat,
 /area/lv759/indoors/power_plant/equipment_east)
 "toX" = (
@@ -159947,7 +159971,7 @@
 /turf/open/floor/prison/ramptop,
 /area/lv759/indoors/caves/wy_research_complex_entrance)
 "wSf" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/corsat,
 /area/lv759/indoors/wy_research_complex/hallwaysouthwest)
 "wSj" = (
@@ -166916,7 +166940,9 @@
 /turf/open/floor/plating,
 /area/lv759/indoors/colonial_marshals/holding_cells)
 "xSS" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 1
+	},
 /turf/open/floor/corsat/box,
 /area/lv759/indoors/wy_research_complex/researchanddevelopment)
 "xSU" = (
@@ -169193,7 +169219,9 @@
 /turf/open/floor/hybrisa/carpet/carpetgreendeco,
 /area/lv759/indoors/hospital/break_room)
 "yjV" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 1
+	},
 /turf/open/floor/plating/plating_catwalk/prison,
 /area/lv759/indoors/hospital/east_hallway)
 "yjW" = (
@@ -178812,7 +178840,7 @@ wHK
 mRp
 dNA
 mMH
-lgi
+agG
 lgi
 mMH
 lwP
@@ -199122,7 +199150,7 @@ iDz
 hfZ
 jxV
 avI
-ffH
+agT
 ffH
 uAb
 gax
diff --git a/maps/map_files/Tyrargo_Rift/standalone/uss_heyst.dmm b/maps/map_files/Tyrargo_Rift/standalone/uss_heyst.dmm
index d682090e5c31..4eb92da0ed2e 100644
--- a/maps/map_files/Tyrargo_Rift/standalone/uss_heyst.dmm
+++ b/maps/map_files/Tyrargo_Rift/standalone/uss_heyst.dmm
@@ -4476,7 +4476,7 @@
 /turf/open/auto_turf/tyrargo_grass/layer0_mud_alt,
 /area/tyrargo/outdoors/outskirts/north_east_usasf)
 "Jl" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/almayer,
 /area/tyrargo/indoors/heyst)
 "Jo" = (
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index f6aec5bdc33f..a239d4c3c79c 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -4343,6 +4343,10 @@
 /obj/structure/machinery/cryopod/joe/seegson/alt,
 /turf/open/floor/almayer/aicore/no_build/ai_cargo,
 /area/almayer/command/airoom)
+"akm" = (
+/obj/structure/machinery/recharge_station/alt,
+/turf/open/floor/almayer/cargo,
+/area/almayer/engineering/lower/engine_core)
 "akn" = (
 /turf/open/floor/almayer/flooredgesmooth2/west,
 /area/almayer/command/cicconference)
@@ -25456,7 +25460,7 @@
 /turf/open/floor/almayer,
 /area/almayer/living/gym)
 "bmG" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/almayer/no_build/plate,
 /area/almayer/middeck/engineer)
 "bmH" = (
@@ -26141,7 +26145,7 @@
 /area/almayer/middeck/engineer)
 "boh" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/almayer/plate,
 /area/almayer/medical/lower_medical_medbay)
 "boi" = (
@@ -54108,7 +54112,9 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/lower/port_fore_hallway)
 "fqW" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 1
+	},
 /turf/open/floor/almayer/cargo,
 /area/almayer/engineering/lower/engine_core)
 "fqX" = (
@@ -57305,7 +57311,7 @@
 /turf/open/floor/plating,
 /area/almayer/maint/lower/constr)
 "gOC" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/almayer/orange/northeast,
 /area/almayer/engineering/lower)
 "gOS" = (
@@ -59735,7 +59741,7 @@
 	name = "storage shutters";
 	pixel_y = 26
 	},
-/obj/structure/machinery/recharge_station{
+/obj/structure/machinery/recharge_station/alt{
 	desc = "Where the cargo department's Working Joe used to charge before it tragically fell into the ASRS elevator three years ago. The replacement still hasn't arrived.";
 	name = "Working Joe charging station"
 	},
@@ -83067,7 +83073,7 @@
 /area/almayer/squads/delta)
 "rNu" = (
 /obj/structure/platform/metal/almayer/west,
-/obj/structure/machinery/recharge_station{
+/obj/structure/machinery/recharge_station/alt{
 	layer = 2.9
 	},
 /obj/structure/sign/safety/high_voltage{
@@ -87580,7 +87586,7 @@
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
 "tId" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/almayer/aicore/no_build/ai_cargo,
 /area/almayer/command/airoom)
 "tIe" = (
@@ -97769,9 +97775,13 @@
 /obj/structure/platform{
 	layer = 2.9
 	},
-/obj/structure/machinery/recharge_station{
+/obj/structure/machinery/recharge_station/alt{
 	layer = 2.8
 	},
+/obj/structure/machinery/recharge_station/alt{
+	layer = 2.8;
+	dir = 4
+	},
 /turf/open/floor/almayer/cargo,
 /area/almayer/command/cic)
 "xLi" = (
@@ -157821,7 +157831,7 @@ nic
 ppM
 ppM
 hsy
-fqW
+akm
 qYq
 mQn
 anu
diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
index ccabcdb8d77f..d55e8db92767 100644
--- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
+++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
@@ -69,7 +69,9 @@
 /turf/closed/wall/r_wall,
 /area/whiskey_outpost/inside/cic)
 "al" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 1
+	},
 /turf/open/floor/prison,
 /area/whiskey_outpost/inside/cic)
 "am" = (
@@ -426,6 +428,10 @@
 	},
 /turf/open/floor/almayer/emeraldfull,
 /area/whiskey_outpost/inside/living)
+"bq" = (
+/obj/structure/machinery/recharge_station/alt,
+/turf/open/floor/prison,
+/area/whiskey_outpost/inside/cic)
 "bs" = (
 /turf/open/floor/carpet,
 /area/whiskey_outpost/inside/cic)
@@ -4568,7 +4574,7 @@
 /obj/structure/machinery/light/small{
 	dir = 1
 	},
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/prison/floor_plate/southwest,
 /area/whiskey_outpost/inside/engineering)
 "qz" = (
@@ -8285,7 +8291,9 @@
 /turf/open/floor/asteroidfloor/north,
 /area/whiskey_outpost/outside/north/northwest)
 "Iy" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 4
+	},
 /turf/open/floor/whitegreen/southwest,
 /area/whiskey_outpost/inside/hospital/triage)
 "IA" = (
@@ -10133,7 +10141,9 @@
 /turf/open/floor/whitegreen,
 /area/whiskey_outpost/inside/hospital/triage)
 "TC" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 8
+	},
 /turf/open/floor/whitegreen/southeast,
 /area/whiskey_outpost/inside/hospital/triage)
 "TD" = (
@@ -15537,7 +15547,7 @@ mT
 mT
 ak
 ak
-al
+bq
 fx
 aB
 al
diff --git a/maps/map_files/White_Antre_Research_Facility/White_Antre_Research_Facility.dmm b/maps/map_files/White_Antre_Research_Facility/White_Antre_Research_Facility.dmm
index 484bc426676a..7704c7b28f8f 100644
--- a/maps/map_files/White_Antre_Research_Facility/White_Antre_Research_Facility.dmm
+++ b/maps/map_files/White_Antre_Research_Facility/White_Antre_Research_Facility.dmm
@@ -13273,7 +13273,9 @@
 /turf/open/floor/almayer/silver/west,
 /area/white_antre/indoors/main_level/research)
 "aEC" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 4
+	},
 /turf/open/floor/almayer/emeraldfull2,
 /area/white_antre/indoors/main_level/research)
 "aED" = (
@@ -24369,7 +24371,9 @@
 	color = "#5d524b";
 	alpha = 155
 	},
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 1
+	},
 /turf/open/floor/prison/darkyellowfull2,
 /area/white_antre/indoors/exterior/prefab_3)
 "bjC" = (
@@ -32632,8 +32636,8 @@
 /turf/open/floor/corsat/squares,
 /area/white_antre/indoors/upper_level/south_overwatch)
 "bEx" = (
-/obj/structure/machinery/recharge_station,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/corsat/plate,
 /area/white_antre/indoors/upper_level/south_overwatch)
 "bEy" = (
@@ -34999,8 +35003,10 @@
 /turf/open/floor/corsat/squares,
 /area/white_antre/indoors/upper_level/north_overwatch)
 "bJy" = (
-/obj/structure/machinery/recharge_station,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 1
+	},
 /turf/open/floor/corsat/plate,
 /area/white_antre/indoors/upper_level/north_overwatch)
 "bJz" = (
@@ -55809,7 +55815,9 @@
 /turf/open/floor/prison/floor_plate/southwest,
 /area/white_antre/indoors/main_level/east_containment_hive)
 "wPy" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 1
+	},
 /turf/open/floor/prison/darkyellow2/east,
 /area/white_antre/indoors/main_level/engineering)
 "wQD" = (
diff --git a/maps/templates/Chinook.dmm b/maps/templates/Chinook.dmm
index c5bc17fb20d3..c1af7e62ce73 100644
--- a/maps/templates/Chinook.dmm
+++ b/maps/templates/Chinook.dmm
@@ -127,6 +127,12 @@
 /obj/effect/decal/floor_symbol/uscm_3x3/northface/northwest,
 /turf/open/floor/carpet,
 /area/adminlevel/chinook/event)
+"az" = (
+/obj/structure/machinery/recharge_station/alt{
+	dir = 8
+	},
+/turf/open/floor/almayer/cargo,
+/area/adminlevel/chinook)
 "aA" = (
 /obj/structure/machinery/vending/coffee,
 /turf/open/floor/almayer,
@@ -9362,7 +9368,10 @@
 /turf/open/floor/almayer,
 /area/adminlevel/chinook/engineering)
 "MO" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt{
+	dir = 8;
+	layer = 3.1
+	},
 /turf/open/floor/almayer/cargo,
 /area/adminlevel/chinook)
 "MQ" = (
@@ -12233,7 +12242,7 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/adminlevel/chinook/cargo)
 "YN" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/almayer/test_floor5,
 /area/adminlevel/chinook/cryo)
 "YO" = (
@@ -21493,7 +21502,7 @@ qI
 OT
 gb
 JD
-MO
+az
 MO
 WF
 Wq
diff --git a/maps/templates/lazy_templates/uscm_ert_station.dmm b/maps/templates/lazy_templates/uscm_ert_station.dmm
index 6afac419f356..ad1cbea98ff0 100644
--- a/maps/templates/lazy_templates/uscm_ert_station.dmm
+++ b/maps/templates/lazy_templates/uscm_ert_station.dmm
@@ -709,7 +709,7 @@
 /turf/open/floor/almayer/dark_sterile,
 /area/adminlevel/ert_station/uscm_station)
 "if" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /turf/open/floor/almayer/plate,
 /area/adminlevel/ert_station/uscm_station)
 "im" = (
@@ -1034,7 +1034,7 @@
 /turf/open/floor/almayer_hull/outerhull_dir/east,
 /area/space)
 "md" = (
-/obj/structure/machinery/recharge_station,
+/obj/structure/machinery/recharge_station/alt,
 /obj/structure/sign/safety/synth_storage{
 	pixel_x = 32
 	},