From 31543fc0d3fe82de2adb90e949daa88051ecf1f6 Mon Sep 17 00:00:00 2001 From: MASMC <9438930+the-og-gear@users.noreply.github.com> Date: Sun, 7 Jul 2019 13:50:21 -0400 Subject: [PATCH] Oops, only did smacking with a rock, not satchels too --- code/modules/mining/satchel_ore_boxdm.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 99ad0568a8..e7a248ecf9 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -24,7 +24,10 @@ return S.hide_from(usr) for(var/obj/item/weapon/ore/O in S.contents) - S.remove_from_storage(O, src) //This will move the item to this item's contents + if (O.name != "strange rock") + S.remove_from_storage(O, src) //This will move the item to this item's contents + else + to_chat(user,"The [O] bounces out of the [src]!") to_chat(user,"You empty the satchel into the [src].") update_ore_count()