diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 7fad9cbbe5f..a968acd35a3 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -15,14 +15,18 @@
 	var/mopcount = 0
 	var/mopcap = 5
 	var/mopspeed = 30
-
+	var/cyborg = 0
 
 /obj/item/weapon/mop/New()
 	create_reagents(mopcap)
-	janitorial_equipment += src
+	if(cyborg)
+		reagents.add_reagent("water", mopcap)
+	else
+		janitorial_equipment += src
 
 /obj/item/weapon/mop/Destroy()
-	janitorial_equipment -= src
+	if(!cyborg)
+		janitorial_equipment -= src
 	return ..()
 
 /obj/item/weapon/mop/proc/clean(turf/simulated/A)
@@ -32,8 +36,8 @@
 			if(is_cleanable(O))
 				qdel(O)
 	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
-
+	if(!cyborg)
+		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 +84,7 @@
 	force = 6
 	throwforce = 8
 	throw_range = 4
-	mopspeed = 20
\ No newline at end of file
+	mopspeed = 20
+/obj/item/weapon/mop/advanced/cyborg/
+	cyborg = 1
+	mopcap = 1
\ 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)