Merge pull request #483 from Sharkmare/patch-17

Making Metroids inedible

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

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

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")
 

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"
+	faction = "virgo3b"

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

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
+	vore_icons = SA_ICON_LIVING

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.
-*/
+*/

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

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

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("<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
+			preydator.animal_nom(user)
+			preydator.update_icon()
+			preydator.stop_automated_movement = 0
+		return
 	if (prey.buckled)
 		prey.buckled.unbuckle_mob()