diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index eec87cdd538..fa41d938d70 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -123,8 +123,8 @@
 
 //Janitor tank
 /obj/item/watertank/janitor
-	name = "backpack water tank"
-	desc = "A janitorial watertank backpack with nozzle to clean dirt and graffiti."
+	name = "backpack cleaner tank"
+	desc = "A janitorial cleaner tank that is worn on the back, with a nozzle to clean dirt and graffiti."
 	icon_state = "waterpackjani"
 	item_state = "waterpackjani"
 	reagents_to_add = list(/decl/reagent/spacecleaner = 500)
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 3a7622e2665..dbe15778ed1 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -262,6 +262,13 @@
 	amount_per_transfer_from_this = 50
 	reagents_to_add = list(/decl/reagent/luminol = 1000)
 
+/obj/structure/reagent_dispensers/peppertank/spacecleaner
+	name = "cleaner dispenser"
+	desc = "A wall-mounted dispenser filled with cleaner. Used to refill cleaner bottles and cleaner tanks."
+	icon_state = "cleanertank"
+	amount_per_transfer_from_this = 250
+	reagents_to_add = list(/decl/reagent/spacecleaner = 1000)
+
 //Water Cooler
 
 /obj/structure/reagent_dispensers/water_cooler
diff --git a/html/changelogs/FlamingLily-Cleaner.yml b/html/changelogs/FlamingLily-Cleaner.yml
new file mode 100644
index 00000000000..2bb318202f3
--- /dev/null
+++ b/html/changelogs/FlamingLily-Cleaner.yml
@@ -0,0 +1,44 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: FlamingLily
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Added a space cleaner refiller tank to the janitor's closet."
+  - imageadd: "Added a sprite for the aforementioned space cleaner refiller."
+  - maptweak: "Moved the air alarm in the janitor's closet slightly."
+  - tweak: "Changed the name and description of the janitor's backpack water tank to reflect the fact that it spawns with space cleaner, not water."
diff --git a/icons/obj/reagent_dispensers.dmi b/icons/obj/reagent_dispensers.dmi
index 1ccd8cdfab7..ef9daee0f49 100644
Binary files a/icons/obj/reagent_dispensers.dmi and b/icons/obj/reagent_dispensers.dmi differ
diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
index 9e26a806506..1a15b348386 100644
--- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
+++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
@@ -890,12 +890,12 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/alarm{
-	pixel_y = 28
-	},
 /obj/effect/floor_decal/corner/purple{
 	dir = 5
 	},
+/obj/structure/reagent_dispensers/peppertank/spacecleaner{
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled,
 /area/janitor)
 "aNO" = (
@@ -1967,12 +1967,12 @@
 	dir = 1
 	},
 /obj/machinery/button/remote/blast_door{
+	dir = 4;
 	id = "shutters_custodialgarage";
 	name = "Custodial Garage Shutters";
 	pixel_x = -25;
-	req_access = list(26);
 	pixel_y = 7;
-	dir = 4
+	req_access = list(26)
 	},
 /obj/machinery/ringer_button{
 	id = "ringers_custodial";
@@ -2630,9 +2630,9 @@
 	dir = 1
 	},
 /obj/structure/sign/drop{
-	pixel_y = -32;
+	desc = "A danger sign which reads 'DANGER: DISPOSAL TO REFINERY'.";
 	name = "\improper DANGER: DISPOSAL TO REFINERY sign";
-	desc = "A danger sign which reads 'DANGER: DISPOSAL TO REFINERY'."
+	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/airless,
 /area/hangar/operations)
@@ -7705,21 +7705,21 @@
 /area/engineering/storage/lower)
 "gcZ" = (
 /obj/machinery/button/remote/blast_door{
+	dir = 8;
 	id = "shutters_custodialdesk";
 	name = "Custodial Desk Shutter";
 	pixel_x = 25;
 	pixel_y = -7;
-	dir = 8;
 	req_access = list(26)
 	},
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/button/remote/blast_door{
+	dir = 8;
 	id = "shutters_custodialgarage";
 	name = "Custodial Garage Shutter";
-	req_access = list(26);
-	pixel_y = 7;
 	pixel_x = 25;
-	dir = 8
+	pixel_y = 7;
+	req_access = list(26)
 	},
 /obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/dark,
@@ -7802,8 +7802,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable,
 /obj/machinery/power/apc{
-	pixel_x = -24;
-	dir = 8
+	dir = 8;
+	pixel_x = -24
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/hangar/starboard)
@@ -7915,9 +7915,9 @@
 	dir = 4
 	},
 /obj/machinery/light_switch{
-	pixel_y = -24;
+	dir = 1;
 	pixel_x = 9;
-	dir = 1
+	pixel_y = -24
 	},
 /obj/effect/floor_decal/corner/purple/full{
 	dir = 4
@@ -10670,8 +10670,8 @@
 /obj/structure/disposalpipe/segment,
 /obj/structure/sign/fire{
 	desc = "A warning sign which reads 'DANGER: SHUTTLE THRUSTERS IN USE' and 'MIND THE DISTANCE'.";
-	name = "\improper DANGER: THRUSTERS sign";
-	layer = 2.1
+	layer = 2.1;
+	name = "\improper DANGER: THRUSTERS sign"
 	},
 /turf/simulated/floor/tiled/airless,
 /area/hangar/operations)
@@ -11261,9 +11261,9 @@
 	dir = 10
 	},
 /obj/structure/sign/securearea{
-	pixel_y = -32;
+	desc = "A danger sign which reads 'DANGER: THE MINING SHUTTLE HANGAR IS A DEPRESSURIZED AREA'.";
 	name = "\improper DANGER: DEPRESSURIZED AREA sign";
-	desc = "A danger sign which reads 'DANGER: THE MINING SHUTTLE HANGAR IS A DEPRESSURIZED AREA'."
+	pixel_y = -32
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -11398,9 +11398,9 @@
 /area/engineering/atmos/propulsion/starboard)
 "jiS" = (
 /obj/machinery/light_switch{
+	dir = 8;
 	pixel_x = 24;
-	pixel_y = -9;
-	dir = 8
+	pixel_y = -9
 	},
 /obj/structure/railing/mapped,
 /obj/structure/closet/secure_closet/custodial,
@@ -13425,9 +13425,9 @@
 /obj/machinery/button/remote/blast_door{
 	id = "miningbay";
 	name = "Mining Bay Entrance";
+	pixel_x = -7;
 	pixel_y = 25;
-	req_access = list(48);
-	pixel_x = -7
+	req_access = list(48)
 	},
 /turf/simulated/floor/tiled,
 /area/hangar/operations)
@@ -13883,6 +13883,10 @@
 /obj/effect/floor_decal/corner/purple{
 	dir = 9
 	},
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -28
+	},
 /turf/simulated/floor/tiled,
 /area/janitor)
 "leL" = (
@@ -14246,9 +14250,9 @@
 	dir = 1;
 	id = "miningbay";
 	name = "Mining Bay Entrance";
+	pixel_x = -7;
 	pixel_y = -25;
-	req_access = list(48);
-	pixel_x = -7
+	req_access = list(48)
 	},
 /turf/simulated/floor/tiled,
 /area/outpost/mining_main/refinery)
@@ -16556,8 +16560,8 @@
 	id = "ringers_custodial";
 	name = "\improper Custodial Ringer Terminal";
 	pixel_x = -32;
-	req_access = list(26);
-	pixel_y = 5
+	pixel_y = 5;
+	req_access = list(26)
 	},
 /obj/structure/coatrack{
 	pixel_x = -9
@@ -16611,9 +16615,9 @@
 /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{
 	frequency = 1380;
 	id_tag = "escape_pod_2";
+	pixel_x = -9;
 	pixel_y = 25;
-	tag_door = "escape_pod_2_hatch";
-	pixel_x = -9
+	tag_door = "escape_pod_2_hatch"
 	},
 /turf/simulated/floor/shuttle/dark_blue,
 /area/shuttle/escape_pod/pod2)
@@ -18601,9 +18605,9 @@
 /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{
 	frequency = 1380;
 	id_tag = "escape_pod_1";
-	tag_door = "escape_pod_1_hatch";
+	pixel_x = -9;
 	pixel_y = 25;
-	pixel_x = -9
+	tag_door = "escape_pod_1_hatch"
 	},
 /obj/item/modular_computer/console/preset/civilian{
 	dir = 8;
@@ -20583,10 +20587,10 @@
 	frequency = 1380;
 	id_tag = "mining_shuttle_dock";
 	name = "mining shuttle hatch controller";
-	pixel_y = -25;
-	tag_door = "mining_shuttle_dock_doors";
 	pixel_x = 6;
-	req_one_access = list(31,48,67)
+	pixel_y = -25;
+	req_one_access = list(31,48,67);
+	tag_door = "mining_shuttle_dock_doors"
 	},
 /turf/simulated/floor/tiled,
 /area/hangar/operations)
@@ -20996,9 +21000,9 @@
 	dir = 4
 	},
 /obj/structure/sign/securearea{
-	pixel_y = -32;
+	desc = "A danger sign which reads 'DANGER: THE MINING SHUTTLE HANGAR IS A DEPRESSURIZED AREA'.";
 	name = "\improper DANGER: DEPRESSURIZED AREA sign";
-	desc = "A danger sign which reads 'DANGER: THE MINING SHUTTLE HANGAR IS A DEPRESSURIZED AREA'."
+	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
 /area/hangar/operations)
@@ -21412,9 +21416,9 @@
 	pixel_y = -8
 	},
 /obj/machinery/firealarm/west{
+	dir = 2;
 	pixel_x = 0;
-	pixel_y = -31;
-	dir = 2
+	pixel_y = -31
 	},
 /obj/machinery/cell_charger,
 /obj/random/powercell,
@@ -21710,8 +21714,8 @@
 "rKM" = (
 /obj/structure/sign/fire{
 	desc = "A warning sign which reads 'DANGER: SHUTTLE THRUSTERS IN USE' and 'MIND THE DISTANCE'.";
-	name = "\improper DANGER: THRUSTERS sign";
-	layer = 2.1
+	layer = 2.1;
+	name = "\improper DANGER: THRUSTERS sign"
 	},
 /obj/effect/floor_decal/corner/brown/diagonal,
 /obj/effect/floor_decal/industrial/hatch/yellow,
@@ -22098,8 +22102,8 @@
 	},
 /obj/structure/table/rack,
 /obj/structure/closet/walllocker/firecloset{
-	pixel_y = 32;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
@@ -22439,13 +22443,13 @@
 /obj/machinery/embedded_controller/radio/airlock/docking_port{
 	frequency = 1380;
 	id_tag = "mining_shuttle_controller";
+	pixel_x = 25;
 	pixel_y = 5;
+	req_one_access = list(31,48,67);
 	tag_airpump = "mining_shuttle_pump";
 	tag_chamber_sensor = "mining_shuttle_sensor";
 	tag_exterior_door = "mining_shuttle_external";
-	tag_interior_door = "mining_shuttle_internal";
-	pixel_x = 25;
-	req_one_access = list(31,48,67)
+	tag_interior_door = "mining_shuttle_internal"
 	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
@@ -22860,9 +22864,9 @@
 	dir = 1
 	},
 /obj/structure/sign/drop{
-	pixel_y = -32;
+	desc = "A danger sign which reads 'DANGER: DISPOSAL TO REFINERY'.";
 	name = "\improper DANGER: DISPOSAL TO REFINERY sign";
-	desc = "A danger sign which reads 'DANGER: DISPOSAL TO REFINERY'."
+	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/airless,
 /area/hangar/operations)
@@ -28358,8 +28362,8 @@
 	dir = 1
 	},
 /obj/machinery/power/apc/mining_shuttle{
-	pixel_x = 24;
-	dir = 4
+	dir = 4;
+	pixel_x = 24
 	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)