From 04378e159ea4e611aa5da3be63a20c2a2ee8a0be Mon Sep 17 00:00:00 2001
From: KasparoVy <12377767+KasparoVy@users.noreply.github.com>
Date: Fri, 3 Apr 2020 23:14:42 -0400
Subject: [PATCH] Abstract Eating of Ore to Fix Unintentional Prompt

Using the verb with nothing in your hand brings up a prompt to select an object due to the argument in the verb.

This resolves the issue, instead just showing the "nothing in your hand" message as intended.
---
 code/modules/mining/ore.dm            | 2 +-
 code/modules/vore/eating/living_vr.dm | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm
index ada80def82..315202016f 100644
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -128,7 +128,7 @@
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		if(H.species.eat_ore == 1)
-			H.eat_ore(src)
+			H.handle_eat_ore(src)
 			return
 	..()
 //VOREStation Add End
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index dc22534786..6ec6814275 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -689,11 +689,14 @@
 	to_chat(src, "<span class='notice'>This item is not appropriate for ethical consumption.</span>")
 	return
 
-/mob/living/proc/eat_ore(var/obj/item/snack)
+/mob/living/proc/eat_ore() //Actual eating abstracted so the user isn't given a prompt due to an argument in this verb.
 	set name = "Eat Ore"
 	set category = "Abilities"
 	set desc = "Consume held ore and gems. Snack time!"
 
+	handle_eat_ore()
+
+/mob/living/proc/handle_eat_ore(obj/item/snack)
 	if(!vore_selected)
 		to_chat(src, "<span class='warning'>You either don't have a belly selected, or don't have a belly!</span>")
 		return