diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index b006808a1e..4b20be5ee4 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -124,15 +124,6 @@ turf/simulated/mineral/floor/light_corner
if(air_master)
air_master.mark_for_update(src)
-/turf/simulated/mineral/Entered(atom/movable/M as mob|obj)
- . = ..()
- if(istype(M,/mob/living/silicon/robot))
- var/mob/living/silicon/robot/R = M
- if(R.module)
- for(var/obj/item/weapon/storage/bag/ore/O in list(R.module_state_1, R.module_state_2, R.module_state_3))
- attackby(O, R)
- return
-
/turf/simulated/mineral/proc/get_cached_border(var/cache_id, var/direction, var/icon_file, var/icon_state, var/offset = 32)
//Cache miss
if(!mining_overlay_cache["[cache_id]_[direction]"])
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/ore_box.dm
similarity index 68%
rename from code/modules/mining/satchel_ore_boxdm.dm
rename to code/modules/mining/ore_box.dm
index ea62778ec9..90696abfac 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/ore_box.dm
@@ -1,6 +1,5 @@
/**********************Ore box**************************/
-//Why the hell is this file called satchel_ore_boxdm.dm? -CK
/obj/structure/ore_box
icon = 'icons/obj/mining.dmi'
icon_state = "orebox0"
@@ -41,11 +40,15 @@
/obj/structure/ore_box/examine(mob/user)
to_chat(user, "That's an [src].")
+<<<<<<< HEAD:code/modules/mining/satchel_ore_boxdm.dm
to_chat(user,desc)
// Borgs can now check contents too.
if((!istype(user, /mob/living/carbon/human)) && (!istype(user, /mob/living/silicon/robot)))
return
+=======
+ to_chat(user, desc)
+>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693):code/modules/mining/ore_box.dm
if(!Adjacent(user)) //Can only check the contents of ore boxes if you can physically reach them.
return
@@ -70,11 +73,16 @@
set category = "Object"
set src in view(1)
+<<<<<<< HEAD:code/modules/mining/satchel_ore_boxdm.dm
if(!istype(usr, /mob/living/carbon/human) && !istype(usr, /mob/living/silicon/robot)) //Only living, intelligent creatures with gripping aparatti can empty ore boxes.
to_chat(usr, "You are physically incapable of emptying the ore box.")
+=======
+ if(!ishuman(usr) && !isrobot(usr)) //Only living, intelligent creatures with gripping aparatti can empty ore boxes.
+ to_chat(usr, "You are physically incapable of emptying the ore box.")
+>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693):code/modules/mining/ore_box.dm
return
- if( usr.stat || usr.restrained() )
+ if(usr.stat || usr.restrained())
return
if(!Adjacent(usr)) //You can only empty the box if you can physically reach it
@@ -84,13 +92,21 @@
add_fingerprint(usr)
if(contents.len < 1)
+<<<<<<< HEAD:code/modules/mining/satchel_ore_boxdm.dm
to_chat(usr, "The ore box is empty.")
+=======
+ to_chat(usr, "The ore box is empty.")
+>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693):code/modules/mining/ore_box.dm
return
for (var/obj/item/weapon/ore/O in contents)
contents -= O
O.loc = src.loc
+<<<<<<< HEAD:code/modules/mining/satchel_ore_boxdm.dm
to_chat(usr, "You empty the ore box.")
+=======
+ to_chat(usr, "You empty the ore box.")
+>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693):code/modules/mining/ore_box.dm
return
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 49a96c6394..51b95579e5 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -903,6 +903,7 @@
/mob/living/silicon/robot/proc/radio_menu()
radio.interact(src)//Just use the radio's Topic() instead of bullshit special-snowflake code
+<<<<<<< HEAD
/mob/living/silicon/robot/Move(a, b, flag)
@@ -954,6 +955,8 @@
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!
return
+=======
+>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693)
/mob/living/silicon/robot/proc/self_destruct()
gib()
return
diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm
index f03a51651a..6d08417a6e 100644
--- a/code/modules/mob/living/silicon/robot/robot_movement.dm
+++ b/code/modules/mob/living/silicon/robot/robot_movement.dm
@@ -32,3 +32,56 @@
var/datum/robot_component/actuator/A = get_component("actuator")
if (cell_use_power(A.active_usage))
return ..()
+<<<<<<< HEAD
+=======
+
+/mob/living/silicon/robot/Move(a, b, flag)
+
+ . = ..()
+
+ if(module)
+ if(module.type == /obj/item/weapon/robot_module/robot/janitor)
+ var/turf/tile = loc
+ if(isturf(tile))
+ tile.clean_blood()
+ if (istype(tile, /turf/simulated))
+ var/turf/simulated/S = tile
+ S.dirt = 0
+ for(var/A in tile)
+ if(istype(A, /obj/effect))
+ if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay))
+ qdel(A)
+ else if(istype(A, /obj/item))
+ var/obj/item/cleaned_item = A
+ cleaned_item.clean_blood()
+ 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)
+ cleaned_human << "[src] cleans your face!"
+
+ if((module_state_1 && istype(module_state_1, /obj/item/weapon/storage/bag/ore)) || (module_state_2 && istype(module_state_2, /obj/item/weapon/storage/bag/ore)) || (module_state_3 && istype(module_state_3, /obj/item/weapon/storage/bag/ore))) //Borgs and drones can use their mining bags ~automagically~ if they're deployed in a slot. Only mining bags, as they're optimized for mass use.
+ var/obj/item/weapon/storage/bag/ore/B = null
+ if(istype(module_state_1, /obj/item/weapon/storage/bag/ore)) //First orebag has priority, if they for some reason have multiple.
+ B = module_state_1
+ else if(istype(module_state_2, /obj/item/weapon/storage/bag/ore))
+ B = module_state_2
+ else if(istype(module_state_3, /obj/item/weapon/storage/bag/ore))
+ B = module_state_3
+ var/turf/tile = loc
+ 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!
+ return
+>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693)
diff --git a/vorestation.dme b/vorestation.dme
index e0e0c6b9b9..ed2c75ac15 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2161,12 +2161,16 @@
#include "code\modules\mining\mint.dm"
#include "code\modules\mining\money_bag.dm"
#include "code\modules\mining\ore.dm"
+#include "code\modules\mining\ore_box.dm"
#include "code\modules\mining\ore_datum.dm"
+<<<<<<< HEAD:vorestation.dme
#include "code\modules\mining\ore_datum_vr.dm"
#include "code\modules\mining\resonator_vr.dm"
#include "code\modules\mining\satchel_ore_boxdm.dm"
#include "code\modules\mining\shelter_atoms.dm"
#include "code\modules\mining\shelters.dm"
+=======
+>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693):polaris.dme
#include "code\modules\mining\drilling\drill.dm"
#include "code\modules\mining\drilling\scanner.dm"
#include "code\modules\mining\ore_redemption_machine\construction.dm"