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 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." 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") 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" 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 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 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 +*/ 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 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 diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index d5c6987d65..7fd0eedfe1 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -258,6 +258,16 @@ /obj/belly/proc/nom_mob(var/mob/prey, var/mob/user) 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.visible_message("\the [user] promptly gets tackled by \the [prey] for trying to break their prefs! !!") + user.Weaken(5) + if (preydator.will_eat(user)) + 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()