diff --git a/code/modules/mob/living/simple_animal/vore/awoo.dm b/code/modules/mob/living/simple_animal/vore/awoo.dm
index fbd6d8dac5..d71d9ba97b 100644
--- a/code/modules/mob/living/simple_animal/vore/awoo.dm
+++ b/code/modules/mob/living/simple_animal/vore/awoo.dm
@@ -57,5 +57,7 @@
 // Activate Noms!
 /mob/living/simple_animal/retaliate/awoo
 	vore_active = 1
+	vore_capacity = 2
 	vore_pounce_chance = 40
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING
diff --git a/code/modules/mob/living/simple_animal/vore/bee.dm b/code/modules/mob/living/simple_animal/vore/bee.dm
index 3d93b14471..7026b00ee7 100644
--- a/code/modules/mob/living/simple_animal/vore/bee.dm
+++ b/code/modules/mob/living/simple_animal/vore/bee.dm
@@ -42,6 +42,8 @@
 // Activate Noms!
 /mob/living/simple_animal/retaliate/bee
 	vore_active = 1
+	vore_capacity = 2
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING
 
 
diff --git a/code/modules/mob/living/simple_animal/vore/carp.dm b/code/modules/mob/living/simple_animal/vore/carp.dm
index e4bcc95d4e..8d8ad9eca2 100644
--- a/code/modules/mob/living/simple_animal/vore/carp.dm
+++ b/code/modules/mob/living/simple_animal/vore/carp.dm
@@ -21,12 +21,14 @@
 	pixel_x = -16
 	pixel_y = -16
 	vore_capacity = 2
+	vore_ignores_undigestable = 0
 
 // Activate Noms!
 /mob/living/simple_animal/hostile/carp/large
 	icon = 'icons/mob/vore64x64.dmi'
 	vore_active = 1
 	vore_pounce_chance = 50
-	vore_capacity = 1
+	vore_capacity = 2
+	vore_ignores_undigestable = 0
 	vore_max_size = RESIZE_HUGE
 	vore_icons = SA_ICON_LIVING
diff --git a/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm b/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm
index 83244887b0..46f360c571 100644
--- a/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm
+++ b/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm
@@ -52,8 +52,9 @@
 
 
 	vore_active = TRUE
-	vore_capacity = 1
+	vore_capacity = 2
 	vore_pounce_chance = 15
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING | SA_ICON_REST
 	vore_stomach_name = "fuel processor"
 	vore_stomach_flavor = "You have ended up in the fuel processor of this corrupted machine. This place was definitely not designed with safety and comfort in mind. The heated and cramped surroundings oozing potent fluids all over your form, eager to do nothing less than breaking you apart to fuel its rampage for the next few days... hours... minutes? Oh dear..."
diff --git a/code/modules/mob/living/simple_animal/vore/deathclaw.dm b/code/modules/mob/living/simple_animal/vore/deathclaw.dm
index 4ce60a2bc8..37f2e4ec0d 100644
--- a/code/modules/mob/living/simple_animal/vore/deathclaw.dm
+++ b/code/modules/mob/living/simple_animal/vore/deathclaw.dm
@@ -41,6 +41,7 @@
 	vore_max_size = RESIZE_HUGE
 	vore_min_size = RESIZE_SMALL
 	vore_pounce_chance = 0 // Beat them into crit before eating.
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING
 
 //CHOMPEDIT Adding mining friendly dedclaws
diff --git a/code/modules/mob/living/simple_animal/vore/dino.dm b/code/modules/mob/living/simple_animal/vore/dino.dm
index 483ccf765b..50c7a9e80b 100644
--- a/code/modules/mob/living/simple_animal/vore/dino.dm
+++ b/code/modules/mob/living/simple_animal/vore/dino.dm
@@ -36,6 +36,7 @@
 // Activate Noms!
 /mob/living/simple_animal/hostile/dino
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	swallowTime = 1 SECOND // Hungry little bastards.
 	vore_icons = SA_ICON_LIVING
 
diff --git a/code/modules/mob/living/simple_animal/vore/dragon.dm b/code/modules/mob/living/simple_animal/vore/dragon.dm
index 2d0da3eb54..0e968b00b8 100644
--- a/code/modules/mob/living/simple_animal/vore/dragon.dm
+++ b/code/modules/mob/living/simple_animal/vore/dragon.dm
@@ -39,7 +39,7 @@
 		desc = "A fierce dragon, well this one seems a bit more lazy. http://www.joshuawright.net/slack-wyrm-001.html" //
 		//Thanks to Josh Wright, the maker of slackwyrm for allowing this easteregg to exist.
 
-		
+
 /mob/living/simple_animal/hostile/dragon/Process_Spacemove(var/check_drift = 0)
 	return 1 //No drifting in space for space dragons!
 
@@ -53,6 +53,7 @@
 	vore_active = 1
 	vore_capacity = 2
 	vore_pounce_chance = 0 // Beat them into crit before eating.
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING
 
 // Why a weaker subtype?
diff --git a/code/modules/mob/living/simple_animal/vore/fennec.dm b/code/modules/mob/living/simple_animal/vore/fennec.dm
index 1f7a869a4a..49a3e3161b 100644
--- a/code/modules/mob/living/simple_animal/vore/fennec.dm
+++ b/code/modules/mob/living/simple_animal/vore/fennec.dm
@@ -34,5 +34,6 @@
 	vore_bump_chance = 10
 	vore_bump_emote	= "playfully lunges at"
 	vore_pounce_chance = 40
+	vore_ignores_undigestable = 0
 	vore_default_mode = DM_HOLD
 	vore_icons = SA_ICON_LIVING
diff --git a/code/modules/mob/living/simple_animal/vore/frog.dm b/code/modules/mob/living/simple_animal/vore/frog.dm
index ae4389914b..017dd02954 100644
--- a/code/modules/mob/living/simple_animal/vore/frog.dm
+++ b/code/modules/mob/living/simple_animal/vore/frog.dm
@@ -24,6 +24,8 @@
 /mob/living/simple_animal/hostile/frog
 	vore_active = 1
 	vore_pounce_chance = 50
+	vore_capacity = 2
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING
 
 /mob/living/simple_animal/hostile/frog/space
diff --git a/code/modules/mob/living/simple_animal/vore/horse.dm b/code/modules/mob/living/simple_animal/vore/horse.dm
index 59bbfa4550..8eab675c69 100644
--- a/code/modules/mob/living/simple_animal/vore/horse.dm
+++ b/code/modules/mob/living/simple_animal/vore/horse.dm
@@ -34,4 +34,5 @@
 // Activate Noms!
 /mob/living/simple_animal/horse
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING
diff --git a/code/modules/mob/living/simple_animal/vore/jelly.dm b/code/modules/mob/living/simple_animal/vore/jelly.dm
index 472c52edc0..bcf809888b 100644
--- a/code/modules/mob/living/simple_animal/vore/jelly.dm
+++ b/code/modules/mob/living/simple_animal/vore/jelly.dm
@@ -48,5 +48,7 @@
 /mob/living/simple_animal/hostile/jelly
 	vore_active = 1
 	vore_pounce_chance = 20 //Should be a percentage
+	vore_capacity = 2
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING
 	swallowTime = 10 SECONDS //Hungry little bastards.
diff --git a/code/modules/mob/living/simple_animal/vore/panther.dm b/code/modules/mob/living/simple_animal/vore/panther.dm
index 454ef4d927..064da54c9b 100644
--- a/code/modules/mob/living/simple_animal/vore/panther.dm
+++ b/code/modules/mob/living/simple_animal/vore/panther.dm
@@ -32,4 +32,5 @@
 	vore_active = 1
 	vore_capacity = 2
 	vore_pounce_chance = 10
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING | SA_ICON_REST
diff --git a/code/modules/mob/living/simple_animal/vore/rat.dm b/code/modules/mob/living/simple_animal/vore/rat.dm
index fa56ab4fe8..53b2e73c12 100644
--- a/code/modules/mob/living/simple_animal/vore/rat.dm
+++ b/code/modules/mob/living/simple_animal/vore/rat.dm
@@ -38,8 +38,9 @@
 	pixel_y = 0
 
 	vore_active = TRUE
-	vore_capacity = 1
+	vore_capacity = 2
 	vore_pounce_chance = 45
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING | SA_ICON_REST
 
 	var/life_since_foodscan = 0
diff --git a/code/modules/mob/living/simple_animal/vore/redpanda.dm b/code/modules/mob/living/simple_animal/vore/redpanda.dm
index 6047425f18..ab034b1724 100644
--- a/code/modules/mob/living/simple_animal/vore/redpanda.dm
+++ b/code/modules/mob/living/simple_animal/vore/redpanda.dm
@@ -34,6 +34,7 @@
 	vore_bump_chance = 10
 	vore_bump_emote	= "playfully lunges at"
 	vore_pounce_chance = 40
+	vore_ignores_undigestable = 0
 	vore_default_mode = DM_HOLD // above will only matter if someone toggles it anyway
 	vore_icons = SA_ICON_LIVING
 
diff --git a/code/modules/mob/living/simple_animal/vore/snake.dm b/code/modules/mob/living/simple_animal/vore/snake.dm
index a4ef00590a..e901bfee16 100644
--- a/code/modules/mob/living/simple_animal/vore/snake.dm
+++ b/code/modules/mob/living/simple_animal/vore/snake.dm
@@ -25,5 +25,7 @@
 /mob/living/simple_animal/hostile/giant_snake
 	vore_active = 1
 	vore_pounce_chance = 25
+	vore_capacity = 3 //Giant snake, high capacity
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING
 	swallowTime = 2 SECONDS // Hungry little bastards.
diff --git a/code/modules/mob/living/simple_animal/vore/solargrub.dm b/code/modules/mob/living/simple_animal/vore/solargrub.dm
index 2e3c36862d..c09042d1f0 100644
--- a/code/modules/mob/living/simple_animal/vore/solargrub.dm
+++ b/code/modules/mob/living/simple_animal/vore/solargrub.dm
@@ -114,7 +114,8 @@ List of things solar grubs should be able to do:
 	vore_bump_chance = 50
 	vore_bump_emote = "applies minimal effort to try and slurp up"
 	vore_active = 1
-	vore_capacity = 1
+	vore_capacity = 3 //Raising to three rather than two only due to how common they are
+	vore_ignores_undigestable = 0
 	vore_pounce_chance = 0 //grubs only eat incapacitated targets
 	vore_default_mode = DM_DIGEST
 
diff --git a/code/modules/mob/living/simple_animal/vore/wolf.dm b/code/modules/mob/living/simple_animal/vore/wolf.dm
index fe3a970ac0..f17942285d 100644
--- a/code/modules/mob/living/simple_animal/vore/wolf.dm
+++ b/code/modules/mob/living/simple_animal/vore/wolf.dm
@@ -24,4 +24,5 @@
 // Activate Noms!
 /mob/living/simple_animal/hostile/wolf
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING
diff --git a/code/modules/mob/living/simple_animal/vore/zz_vore_overrides.dm b/code/modules/mob/living/simple_animal/vore/zz_vore_overrides.dm
index faa47fe8d7..1c414495e2 100644
--- a/code/modules/mob/living/simple_animal/vore/zz_vore_overrides.dm
+++ b/code/modules/mob/living/simple_animal/vore/zz_vore_overrides.dm
@@ -25,6 +25,7 @@
 
 /mob/living/simple_animal/hostile/alien
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	icon = 'icons/mob/vore.dmi'
 	icon_state = "xenohunter"
 	icon_living = "xenohunter"
@@ -34,6 +35,7 @@
 
 /mob/living/simple_animal/hostile/alien/drone
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	icon = 'icons/mob/vore.dmi'
 	icon_state = "xenodrone"
 	icon_living = "xenodrone"
@@ -43,6 +45,7 @@
 
 /mob/living/simple_animal/hostile/alien/sentinel
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	icon = 'icons/mob/vore.dmi'
 	icon_state = "xenosentinel"
 	icon_living = "xenosentinel"
@@ -52,6 +55,7 @@
 
 /mob/living/simple_animal/hostile/alien/queen
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	icon = 'icons/mob/vore.dmi'
 	icon_state = "xenoqueen"
 	icon_living = "xenoqueen"
@@ -61,6 +65,7 @@
 
 /mob/living/simple_animal/hostile/alien/queen/empress
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	icon = 'icons/mob/vore64x64.dmi'
 	icon_state = "queen_s"
 	icon_living = "queen_s"
@@ -76,14 +81,17 @@
 	vore_pounce_chance = 75
 
 /mob/living/simple_animal/hostile/alien/sentinel/praetorian
+	vore_ignores_undigestable = 0
 	icon = 'icons/mob/vore64x64.dmi'
 	vore_icons = SA_ICON_LIVING | SA_ICON_REST
 
 /mob/living/simple_animal/hostile/alien/queen/empress/mother
+	vore_ignores_undigestable = 0
 	vore_icons = 0 // NO VORE SPRITES
 
 /mob/living/simple_animal/hostile/bear
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	icon = 'icons/mob/vore.dmi'
 	icon_state = "spacebear"
 	icon_living = "spacebear"
@@ -93,9 +101,11 @@
 
 /mob/living/simple_animal/hostile/bear/hudson
 	name = "Hudson"
+	vore_ignores_undigestable = 0
 
 /mob/living/simple_animal/hostile/bear/brown
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	icon = 'icons/mob/vore.dmi'
 	name = "brown bear"
 	icon_state = "brownbear"
@@ -107,12 +117,15 @@
 /mob/living/simple_animal/hostile/carp
 	icon = 'icons/mob/vore.dmi'
 	vore_active = 1
+	vore_capacity = 2
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING
 
 /mob/living/simple_animal/hostile/creature/vore
 	vore_active = 1
 	// NO VORE SPRITES
 	vore_capacity = 0
+	vore_ignores_undigestable = 0
 	vore_pounce_chance = 0	// Only pounces if you're crit.
 	vore_escape_chance = 0	// As such, if you're a dibshit who feeds yourself to it, you're staying down.
 	// Overrides to non-vore version
@@ -122,6 +135,7 @@
 
 /mob/living/simple_animal/hostile/mimic
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	// NO VORE SPRITES
 	vore_capacity = 0
 	vore_pounce_chance = 33
@@ -223,6 +237,8 @@
 
 /mob/living/simple_animal/hostile/carp/pike
 	vore_active = 1
+	vore_capacity = 2
+	vore_ignores_undigestable = 0
 	// NO VORE SPRITES
 
 /mob/living/simple_animal/hostile/carp/holodeck
diff --git a/icons/mob/vore.dmi b/icons/mob/vore.dmi
index cfc149e7f7..6fdde5f24b 100644
Binary files a/icons/mob/vore.dmi and b/icons/mob/vore.dmi differ
diff --git a/icons/mob/vore64x32.dmi b/icons/mob/vore64x32.dmi
index 87d672bb03..485bc0fdf7 100644
Binary files a/icons/mob/vore64x32.dmi and b/icons/mob/vore64x32.dmi differ
diff --git a/icons/mob/vore64x64.dmi b/icons/mob/vore64x64.dmi
index f099a9be41..73ab63fe0b 100644
Binary files a/icons/mob/vore64x64.dmi and b/icons/mob/vore64x64.dmi differ