From eed04a1de3430acfd192b0c922ceeb7a00ef1e48 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 08:45:04 +0100
Subject: [PATCH 01/18] Making Metroids inedible

---
 code/modules/vore/eating/belly_obj_vr.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index d5c6987d65..03f4e06f95 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -256,7 +256,7 @@
 // The purpose of this method is to avoid duplicate code, and ensure that all necessary
 // steps are taken.
 /obj/belly/proc/nom_mob(var/mob/prey, var/mob/user)
-	if(owner.stat == DEAD)
+	if(owner.stat == DEAD || if(istype(prey,/mob/living/simple_animal/hostile/metroid)))
 		return
 	if (prey.buckled)
 		prey.buckled.unbuckle_mob()

From 3efe80da63d63a054744b03455392e009c51e11f Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 08:52:40 +0100
Subject: [PATCH 02/18] Update mob_defines.dm

---
 code/modules/mob/mob_defines.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 7600387ee5..2533a653d6 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -8,6 +8,7 @@
 
 	var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak
 	var/location = null //CHOMPEDIT the variable that death() stores the place the mob died in
+	var/isEdible = 1 //CHOMPEDIT switch to enable/disable mob vore for mobs, RESPECT THEIR PREFS
 
 	//Not in use yet
 	var/obj/effect/organstructure/organStructure = null

From 6589917a44b77a8f539a982475598ab6a2a7dced Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 08:53:38 +0100
Subject: [PATCH 03/18] Update belly_obj_vr.dm

---
 code/modules/vore/eating/belly_obj_vr.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index 03f4e06f95..fe4ea78c08 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -256,7 +256,7 @@
 // The purpose of this method is to avoid duplicate code, and ensure that all necessary
 // steps are taken.
 /obj/belly/proc/nom_mob(var/mob/prey, var/mob/user)
-	if(owner.stat == DEAD || if(istype(prey,/mob/living/simple_animal/hostile/metroid)))
+	if(owner.stat == DEAD || !isEdible)
 		return
 	if (prey.buckled)
 		prey.buckled.unbuckle_mob()

From f527564c4d0cc128146c3eed29880a1b1ebc67f9 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 08:56:07 +0100
Subject: [PATCH 04/18] Update metroidsSimple.dm

---
 code/modules/mob/living/simple_animal/vore/metroidsSimple.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/vore/metroidsSimple.dm b/code/modules/mob/living/simple_animal/vore/metroidsSimple.dm
index 408b2df0f1..7802175aac 100644
--- a/code/modules/mob/living/simple_animal/vore/metroidsSimple.dm
+++ b/code/modules/mob/living/simple_animal/vore/metroidsSimple.dm
@@ -6,7 +6,8 @@
 	icon_dead = "metroid_dead"
 	icon_living = "metroidbaby"
 	icon_state = "metroidbaby"
-
+	isEdible = 0
+	
 	faction = "metroids"
 	maxHealth = 50
 	health = 50
@@ -330,4 +331,4 @@
 	vore_pounce_chance = 75 //Pro Tip: Don't let them touch you.
 	vore_icons = SA_ICON_LIVING
 	swallowTime = 10 SECONDS //Hungry little bastards.
-*/
\ No newline at end of file
+*/

From f8011b6cb31094ee7b77c07ab9939998fa4bcbee Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:01:24 +0100
Subject: [PATCH 05/18] Update belly_obj_vr.dm

---
 code/modules/vore/eating/belly_obj_vr.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index fe4ea78c08..99b97ac700 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -256,7 +256,7 @@
 // The purpose of this method is to avoid duplicate code, and ensure that all necessary
 // steps are taken.
 /obj/belly/proc/nom_mob(var/mob/prey, var/mob/user)
-	if(owner.stat == DEAD || !isEdible)
+	if(owner.stat == DEAD || !prey.isEdible)
 		return
 	if (prey.buckled)
 		prey.buckled.unbuckle_mob()

From 69542dd4dbe990e095dcd838ec887c50aa960990 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:02:43 +0100
Subject: [PATCH 06/18] Update deathclaw.dm

---
 code/modules/mob/living/simple_animal/vore/deathclaw.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/mob/living/simple_animal/vore/deathclaw.dm b/code/modules/mob/living/simple_animal/vore/deathclaw.dm
index c0e6e85df3..4ce60a2bc8 100644
--- a/code/modules/mob/living/simple_animal/vore/deathclaw.dm
+++ b/code/modules/mob/living/simple_animal/vore/deathclaw.dm
@@ -5,6 +5,7 @@
 	icon_dead = "deathclaw-dead"
 	icon_living = "deathclaw"
 	icon_state = "deathclaw"
+	isEdible = 0
 
 	attacktext = list("mauled")
 

From bde213c744da5a7c48e769b32a9bd9fe412b27f6 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:05:32 +0100
Subject: [PATCH 07/18] Update snake.dm

---
 code/modules/mob/living/simple_animal/vore/snake.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/mob/living/simple_animal/vore/snake.dm b/code/modules/mob/living/simple_animal/vore/snake.dm
index 8d60989478..a4ef00590a 100644
--- a/code/modules/mob/living/simple_animal/vore/snake.dm
+++ b/code/modules/mob/living/simple_animal/vore/snake.dm
@@ -5,6 +5,7 @@
 	icon_dead = "snake-dead"
 	icon_living = "snake"
 	icon_state = "snake"
+	isEdible = 0
 
 	faction = "snake"
 	maxHealth = 200

From 13a0c18b86046ed3dd511171de6bb1032396e847 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:05:56 +0100
Subject: [PATCH 08/18] Update lizardman.dm

---
 code/modules/mob/living/simple_animal/vore/lizardman.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/vore/lizardman.dm b/code/modules/mob/living/simple_animal/vore/lizardman.dm
index 77e63cdb95..66a58d6687 100644
--- a/code/modules/mob/living/simple_animal/vore/lizardman.dm
+++ b/code/modules/mob/living/simple_animal/vore/lizardman.dm
@@ -7,6 +7,7 @@
 	icon_living = "lizardman"
 	icon_dead = "lizardman-dead"
 	faction = "lizard"
+	isEdible = 0
 
 	maxHealth = 50
 	health = 50
@@ -33,4 +34,4 @@
 	vore_active = TRUE
 	vore_capacity = 1
 	vore_pounce_chance = 1
-	vore_icons = SA_ICON_LIVING
\ No newline at end of file
+	vore_icons = SA_ICON_LIVING

From c1a0558792db65199d286dda3b55cbd9638541b5 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:06:21 +0100
Subject: [PATCH 09/18] Update dragon.dm

---
 code/modules/mob/living/simple_animal/vore/dragon.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/mob/living/simple_animal/vore/dragon.dm b/code/modules/mob/living/simple_animal/vore/dragon.dm
index 97418ae941..2d0da3eb54 100644
--- a/code/modules/mob/living/simple_animal/vore/dragon.dm
+++ b/code/modules/mob/living/simple_animal/vore/dragon.dm
@@ -5,6 +5,7 @@
 	icon_dead = "reddragon-dead"
 	icon_living = "reddragon"
 	icon_state = "reddragon"
+	isEdible = 0
 
 	faction = "dragon"
 	maxHealth = 500 // Boss

From c09ef1af4f0c4736b906eaf07d7de35202b688f4 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:06:38 +0100
Subject: [PATCH 10/18] Update dino.dm

---
 code/modules/mob/living/simple_animal/vore/dino.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/vore/dino.dm b/code/modules/mob/living/simple_animal/vore/dino.dm
index 18af3d28e1..483ccf765b 100644
--- a/code/modules/mob/living/simple_animal/vore/dino.dm
+++ b/code/modules/mob/living/simple_animal/vore/dino.dm
@@ -5,6 +5,7 @@
 	icon_dead = "dino-dead"
 	icon_living = "dino"
 	icon_state = "dino"
+	isEdible = 0
 
 	// By default, this is what most vore mobs are capable of.
 	response_help = "pets"
@@ -39,4 +40,4 @@
 	vore_icons = SA_ICON_LIVING
 
 /mob/living/simple_animal/hostile/dino/virgo3b
-	faction = "virgo3b"
\ No newline at end of file
+	faction = "virgo3b"

From d589ea105e5c99a7a493bbcc7d8806a06a5dfd49 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:07:21 +0100
Subject: [PATCH 11/18] Update alphachocobo.dm

---
 code/modules/mob/living/simple_animal/vore/alphachocobo.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/vore/alphachocobo.dm b/code/modules/mob/living/simple_animal/vore/alphachocobo.dm
index 1f0f042515..e36e418464 100644
--- a/code/modules/mob/living/simple_animal/vore/alphachocobo.dm
+++ b/code/modules/mob/living/simple_animal/vore/alphachocobo.dm
@@ -5,6 +5,7 @@
 	icon_state = "alpha_chocobo"
 	icon_living = "alpha_chocobo"
 	icon_dead = "alpha_chocobo_dead"
+	isEdible = 0
 
 	faction = "chocobo"
 	maxHealth = 350
@@ -45,4 +46,4 @@
 	..()	
 	var/obj/belly/B = vore_selected
 	B.name = "Stomach"
-	B.desc = "With a quick gulp youre squeezed down into the large roc's spacious belly, though the stomach seems to be able to stretch a lot it still hugs you tightly in an almost possesive way and its owner lets out a satisfied squak."
\ No newline at end of file
+	B.desc = "With a quick gulp youre squeezed down into the large roc's spacious belly, though the stomach seems to be able to stretch a lot it still hugs you tightly in an almost possesive way and its owner lets out a satisfied squak."

From 0b56925446566aab97d574e46a8b3dc906ffbe83 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:09:18 +0100
Subject: [PATCH 12/18] Update corgi.dm

---
 code/modules/mob/living/simple_animal/animals/corgi.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/mob/living/simple_animal/animals/corgi.dm b/code/modules/mob/living/simple_animal/animals/corgi.dm
index 28d4ac689b..909c81ca52 100644
--- a/code/modules/mob/living/simple_animal/animals/corgi.dm
+++ b/code/modules/mob/living/simple_animal/animals/corgi.dm
@@ -8,6 +8,7 @@
 	icon_state = "corgi"
 	icon_living = "corgi"
 	icon_dead = "corgi_dead"
+	isEdible = 0
 
 	run_at_them = 0
 	turns_per_move = 10

From 75f0a234a99c813f3ec1706e165f222a758f0387 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:19:55 +0100
Subject: [PATCH 13/18] Update belly_obj_vr.dm

---
 code/modules/vore/eating/belly_obj_vr.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index 99b97ac700..4ca5e997e5 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -256,8 +256,10 @@
 // The purpose of this method is to avoid duplicate code, and ensure that all necessary
 // steps are taken.
 /obj/belly/proc/nom_mob(var/mob/prey, var/mob/user)
-	if(owner.stat == DEAD || !prey.isEdible)
+	if(owner.stat == DEAD)
 		return
+	if(!prey.isEdible) //CHOMPEDIT: Trying to make pred mobs prey? N O U
+		prey.animal_nom(user)
 	if (prey.buckled)
 		prey.buckled.unbuckle_mob()
 

From 74631a1ea9a1a371b40ca0ee8c5a3a01edbfb3ea Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:21:47 +0100
Subject: [PATCH 14/18] Update belly_obj_vr.dm

---
 code/modules/vore/eating/belly_obj_vr.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index 4ca5e997e5..bd28e11559 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -260,6 +260,7 @@
 		return
 	if(!prey.isEdible) //CHOMPEDIT: Trying to make pred mobs prey? N O U
 		prey.animal_nom(user)
+		return
 	if (prey.buckled)
 		prey.buckled.unbuckle_mob()
 

From 2b906a8d5387dc311f1f117bf690a66b91b0de4c Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:29:24 +0100
Subject: [PATCH 15/18] Update belly_obj_vr.dm

---
 code/modules/vore/eating/belly_obj_vr.dm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index bd28e11559..02307ae196 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -259,7 +259,12 @@
 	if(owner.stat == DEAD)
 		return
 	if(!prey.isEdible) //CHOMPEDIT: Trying to make pred mobs prey? N O U
-		prey.animal_nom(user)
+		user.Weaken(5)
+		var/mob/living/simple_animal/preydator = prey
+		preydator.stop_automated_movement = 1
+		preydator.animal_nom(user)
+		preydator.update_icon()
+		preydator.stop_automated_movement = 0
 		return
 	if (prey.buckled)
 		prey.buckled.unbuckle_mob()

From 9f546045b9049d5d7af05c96bb0a9c55366b644a Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:32:56 +0100
Subject: [PATCH 16/18] Update belly_obj_vr.dm

---
 code/modules/vore/eating/belly_obj_vr.dm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index 02307ae196..fbcbe38556 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -260,11 +260,12 @@
 		return
 	if(!prey.isEdible) //CHOMPEDIT: Trying to make pred mobs prey? N O U
 		user.Weaken(5)
-		var/mob/living/simple_animal/preydator = prey
-		preydator.stop_automated_movement = 1
-		preydator.animal_nom(user)
-		preydator.update_icon()
-		preydator.stop_automated_movement = 0
+		if (will_eat(user))
+			var/mob/living/simple_animal/preydator = prey
+			preydator.stop_automated_movement = 1
+			preydator.animal_nom(user)
+			preydator.update_icon()
+			preydator.stop_automated_movement = 0
 		return
 	if (prey.buckled)
 		prey.buckled.unbuckle_mob()

From 4d1f08e70d8c80c63f8e339d153e551390b3e208 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:49:20 +0100
Subject: [PATCH 17/18] Update belly_obj_vr.dm

---
 code/modules/vore/eating/belly_obj_vr.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index fbcbe38556..16e1bd48d0 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -259,9 +259,9 @@
 	if(owner.stat == DEAD)
 		return
 	if(!prey.isEdible) //CHOMPEDIT: Trying to make pred mobs prey? N O U
+		var/mob/living/simple_animal/preydator = prey
 		user.Weaken(5)
-		if (will_eat(user))
-			var/mob/living/simple_animal/preydator = prey
+		if (preydator.will_eat(user))
 			preydator.stop_automated_movement = 1
 			preydator.animal_nom(user)
 			preydator.update_icon()

From 29eeed5069f4f309f7253ac67c3d9bae2b2044e8 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Tue, 5 Mar 2019 09:54:08 +0100
Subject: [PATCH 18/18] Update belly_obj_vr.dm

---
 code/modules/vore/eating/belly_obj_vr.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index 16e1bd48d0..7fd0eedfe1 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -260,6 +260,7 @@
 		return
 	if(!prey.isEdible) //CHOMPEDIT: Trying to make pred mobs prey? N O U
 		var/mob/living/simple_animal/preydator = prey
+		user.visible_message("<span class='danger'>\the [user] promptly gets tackled by \the [prey] for trying to break their prefs! !</span>!")
 		user.Weaken(5)
 		if (preydator.will_eat(user))
 			preydator.stop_automated_movement = 1