Merge pull request #567 from Darlantanis/DigestVoreMobChange

Various mobs now eat indigestible players with mob vore on
2026-08-26 13:36:48 +01:00 · 2019-03-22 04:08:43 -04:00
parent e41bfac6d1 cffc604bee
commit 5bcb6cf352
21 changed files with 44 additions and 5 deletions
@@ -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
@@ -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


@@ -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
@@ -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..."
@@ -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
@@ -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

@@ -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?
@@ -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
@@ -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
@@ -34,4 +34,5 @@
 // Activate Noms!
 /mob/living/simple_animal/horse
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING
@@ -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.
@@ -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
@@ -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
@@ -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

@@ -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.
@@ -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

@@ -24,4 +24,5 @@
 // Activate Noms!
 /mob/living/simple_animal/hostile/wolf
 	vore_active = 1
+	vore_ignores_undigestable = 0
 	vore_icons = SA_ICON_LIVING
@@ -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