From 7a55ad3d943ea6bcd1d87a7dde175d70de68b7d9 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Sun, 8 Jan 2023 15:17:04 +1000
Subject: [PATCH] Merge pull request #14307 from Heroman3003/janiborg

Adjusts janiborg auto-cleaning feature
---
 .../silicon/robot/robot_modules/station.dm    |  1 +
 .../living/silicon/robot/robot_movement.dm    |  2 +-
 .../mob/living/silicon/robot/robot_vr.dm      | 30 -------------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
index 9d7f2a0d81..3b4fdadfe9 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
@@ -591,6 +591,7 @@ var/global/list/robot_modules = list(
 	src.modules += new /obj/item/weapon/soap/nanotrasen(src)
 	src.modules += new /obj/item/weapon/storage/bag/trash(src)
 	src.modules += new /obj/item/weapon/mop(src)
+	src.modules += new /obj/item/pupscrubber(src)
 	src.modules += new /obj/item/device/lightreplacer(src)
 	src.emag = new /obj/item/weapon/reagent_containers/spray(src)
 	src.emag.reagents.add_reagent("lube", 250)
diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm
index 7a733f002b..f9f0aed303 100644
--- a/code/modules/mob/living/silicon/robot/robot_movement.dm
+++ b/code/modules/mob/living/silicon/robot/robot_movement.dm
@@ -67,7 +67,7 @@
 		if(isturf(tile))
 			B.gather_all(tile, src, 1) //Shhh, unless the bag fills, don't spam the borg's chat with stuff that's going on every time they move!
 
-	if(istype(module, /obj/item/weapon/robot_module/robot/janitor) && isturf(loc))
+	if(scrubbing && isturf(loc))
 		var/turf/tile = loc
 		tile.clean_blood()
 		if (istype(tile, /turf/simulated))
diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm
index dd0d900db4..bc0905b4a4 100644
--- a/code/modules/mob/living/silicon/robot/robot_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_vr.dm
@@ -156,36 +156,6 @@
 		icon_state = "[module_sprites[icontype]]-wreck"
 		add_overlay("wreck-overlay")
 
-/mob/living/silicon/robot/Moved(atom/old_loc, direction, forced = FALSE)
-	. = ..()
-	if(scrubbing && isturf(loc) && water_res?.energy >= 1)
-		var/turf/tile = loc
-		water_res.use_charge(1)
-		tile.clean_blood()
-		if(istype(tile, /turf/simulated))
-			var/turf/simulated/T = tile
-			T.dirt = 0
-		for(var/A in tile)
-			if(istype(A,/obj/effect/rune) || istype(A,/obj/effect/decal/cleanable) || istype(A,/obj/effect/overlay))
-				qdel(A)
-			else if(istype(A, /mob/living/carbon/human))
-				var/mob/living/carbon/human/cleaned_human = A
-				if(cleaned_human.lying)
-					if(cleaned_human.head)
-						cleaned_human.head.clean_blood()
-						cleaned_human.update_inv_head(0)
-					if(cleaned_human.wear_suit)
-						cleaned_human.wear_suit.clean_blood()
-						cleaned_human.update_inv_wear_suit(0)
-					else if(cleaned_human.w_uniform)
-						cleaned_human.w_uniform.clean_blood()
-						cleaned_human.update_inv_w_uniform(0)
-					if(cleaned_human.shoes)
-						cleaned_human.shoes.clean_blood()
-						cleaned_human.update_inv_shoes(0)
-					cleaned_human.clean_blood(1)
-					to_chat(cleaned_human, "<span class='warning'>[src] cleans your face!</span>")
-
 /mob/living/silicon/robot/proc/vr_sprite_check()
 	if(custom_sprite == TRUE)
 		return