diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index a1559c4fb3a..e7a235b5db6 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -227,6 +227,9 @@
 						var/i = 1
 						for(1, i <= coeff, i++)
 							LR.Charge(occupant)
+					if(istype(O,/obj/item/weapon/mop/advanced))
+						if(O.reagents.get_reagent_amount("water") < 40)
+							O.reagents.add_reagent("water", 0.5 * coeff)
 				if(R)
 					if(R.module)
 						R.module.respawn_consumable(R)
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 7fad9cbbe5f..69d04cd4c29 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -16,7 +16,6 @@
 	var/mopcap = 5
 	var/mopspeed = 30
 
-
 /obj/item/weapon/mop/New()
 	create_reagents(mopcap)
 	janitorial_equipment += src
@@ -34,7 +33,6 @@
 	reagents.reaction(A, TOUCH, 10)	//10 is the multiplier for the reaction effect. probably needed to wet the floor properly.
 	reagents.remove_any(1)			//reaction() doesn't use up the reagents
 
-
 /obj/item/weapon/mop/afterattack(atom/A, mob/user, proximity)
 	if(!proximity) return
 
@@ -80,4 +78,15 @@
 	force = 6
 	throwforce = 8
 	throw_range = 4
-	mopspeed = 20
\ No newline at end of file
+	mopspeed = 20
+
+/obj/item/weapon/mop/advanced/cyborg
+	mopcap = 40
+
+/obj/item/weapon/mop/advanced/cyborg/New()
+	..()
+	reagents.add_reagent("water", mopcap)
+
+/obj/item/weapon/mop/advanced/cyborg/examine(mob/user)
+	..(user)
+	to_chat(user, "<span class='notice'>The mop's water tank has [round(reagents.get_reagent_amount("water"))] units of water left.</span>")
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 7fb1ba0a8aa..9944bf39b72 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -230,7 +230,7 @@
 	src.modules += new /obj/item/device/flash/cyborg(src)
 	src.modules += new /obj/item/weapon/soap/nanotrasen(src)
 	src.modules += new /obj/item/weapon/storage/bag/trash/cyborg(src)
-	src.modules += new /obj/item/weapon/mop(src)
+	src.modules += new /obj/item/weapon/mop/advanced/cyborg(src)
 	src.modules += new /obj/item/device/lightreplacer(src)
 	src.modules += new /obj/item/weapon/holosign_creator(src)
 	src.emag = new /obj/item/weapon/reagent_containers/spray(src)