From 8ca1b30f5a1bc3d3fc6a3d84625796924d418dc7 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Mon, 26 Sep 2022 01:19:14 -0400 Subject: [PATCH] Makes mechas able to suck ore into boxes. I forgot ripleys were even a thing for the 50th time. --- code/game/mecha/equipment/tools/drill.dm | 3 ++- code/game/mecha/working/ripley.dm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/mecha/equipment/tools/drill.dm b/code/game/mecha/equipment/tools/drill.dm index 2b64f93616b..a7038eaa628 100644 --- a/code/game/mecha/equipment/tools/drill.dm +++ b/code/game/mecha/equipment/tools/drill.dm @@ -48,7 +48,8 @@ if(ore_box) for(var/obj/item/weapon/ore/ore in range(chassis,1)) if(get_dir(chassis,ore)&chassis.dir) - ore.forceMove(ore_box) + ore_box.stored_ore[ore.material]++ + qdel(ore) else if(isliving(target)) drill_mob(target, chassis.occupant) return 1 diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index ce54008c451..61b4d90183d 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -38,7 +38,8 @@ if(ore_box) for(var/obj/item/weapon/ore/ore in range(1, src)) if(ore.Adjacent(src) && ((get_dir(src, ore) & dir) || ore.loc == loc)) //we can reach it and it's in front of us? grab it! - ore.forceMove(ore_box) + ore_box.stored_ore[ore.material]++ + qdel(ore) /obj/mecha/working/ripley/Destroy() for(var/atom/movable/A in src.cargo)