From 017a3111ec2fdaa33273245a5f922ae42a00d1c7 Mon Sep 17 00:00:00 2001
From: Poojawa <Poojawamanthing@gmail.com>
Date: Thu, 15 Aug 2019 08:37:10 -0500
Subject: [PATCH] Yeah this is a much, much better way of doing it.

---
 code/modules/holodeck/holo_effect.dm          | 14 ++++--
 .../living/simple_animal/simple_animal_vr.dm  |  3 +-
 .../simple_animal/simplemob_vore_values.dm    | 48 -------------------
 3 files changed, 11 insertions(+), 54 deletions(-)

diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm
index 707d650608..308cec1cbd 100644
--- a/code/modules/holodeck/holo_effect.dm
+++ b/code/modules/holodeck/holo_effect.dm
@@ -78,6 +78,12 @@
 	// these vars are not really standardized but all would theoretically create stuff on death
 	for(var/v in list("butcher_results","corpse","weapon1","weapon2","blood_volume") & mob.vars)
 		mob.vars[v] = null
+	ENABLE_BITFIELD(mob.flags_1, HOLOGRAM_1)
+	if(isliving(mob))
+		var/mob/living/L = mob
+		L.feeding = FALSE
+		L.devourable = FALSE
+		L.digestable = FALSE
 	return mob
 
 /obj/effect/holodeck_effect/mobspawner/deactivate(var/obj/machinery/computer/holodeck/HC)
@@ -87,10 +93,10 @@
 
 /obj/effect/holodeck_effect/mobspawner/pet
 	mobtype = list(
-		/mob/living/simple_animal/butterfly/holo, /mob/living/simple_animal/chick/holo,
-		/mob/living/simple_animal/pet/cat/holo, /mob/living/simple_animal/pet/cat/kitten/holo,
-		/mob/living/simple_animal/pet/dog/corgi/holo, /mob/living/simple_animal/pet/dog/corgi/puppy/holo,
-		/mob/living/simple_animal/pet/dog/pug/holo, /mob/living/simple_animal/pet/fox/holo)
+		/mob/living/simple_animal/butterfly, /mob/living/simple_animal/chick/holo,
+		/mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/kitten,
+		/mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/dog/corgi/puppy,
+		/mob/living/simple_animal/pet/dog/pug, /mob/living/simple_animal/pet/fox)
 
 /obj/effect/holodeck_effect/mobspawner/bee
 	mobtype = /mob/living/simple_animal/hostile/poison/bees/toxin
diff --git a/code/modules/mob/living/simple_animal/simple_animal_vr.dm b/code/modules/mob/living/simple_animal/simple_animal_vr.dm
index 1e8f4c768f..666de9cef0 100644
--- a/code/modules/mob/living/simple_animal/simple_animal_vr.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal_vr.dm
@@ -9,7 +9,6 @@
 	var/list/prey_excludes = list()				//For excluding people from being eaten.
 	var/voracious_chance = VORACIOUS_CHANCE		//Mob AI Engagement probability when rolling between regular melee strike and a vore attempt, default 40%
 
-	var/holodeck = FALSE
 	// Vore belly interactions
 	// Most mobs are only going to have the one gut. Multi-gut set ups should refer to Ash Drake's dragon_vore.dm for set up.
 
@@ -50,7 +49,7 @@
 // Simple animals have only one belly.  This creates it (if it isn't already set up)
 /mob/living/simple_animal/init_vore()
 	vore_init = TRUE
-	if(holodeck)	//hacky dumbshit, but I can't get it to work right anyway
+	if(CHECK_BITFIELD(flags_1, HOLOGRAM_1))
 		return
 	if(vore_organs.len)
 		return
diff --git a/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm b/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm
index 78f11e0a41..78e18fdb5e 100644
--- a/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm
+++ b/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm
@@ -133,51 +133,3 @@
 	vore_active = TRUE
 	isPredator = TRUE
 	vore_default_mode = DM_DIGEST
-
-/mob/living/simple_animal/butterfly/holo
-	holodeck = TRUE
-	feeding = FALSE
-	devourable = FALSE
-	digestable = FALSE
-
-/mob/living/simple_animal/chick/holo
-	holodeck = TRUE
-	feeding = FALSE
-	devourable = FALSE
-	digestable = FALSE
-
-/mob/living/simple_animal/pet/cat/holo
-	holodeck = TRUE
-	feeding = FALSE
-	devourable = FALSE
-	digestable = FALSE
-
-/mob/living/simple_animal/pet/cat/kitten/holo
-	holodeck = TRUE
-	feeding = FALSE
-	devourable = FALSE
-	digestable = FALSE
-
-/mob/living/simple_animal/pet/dog/corgi/holo
-	holodeck = TRUE
-	feeding = FALSE
-	devourable = FALSE
-	digestable = FALSE
-
-/mob/living/simple_animal/pet/dog/corgi/puppy/holo
-	holodeck = TRUE
-	feeding = FALSE
-	devourable = FALSE
-	digestable = FALSE
-
-/mob/living/simple_animal/pet/dog/pug/holo
-	holodeck = TRUE
-	feeding = FALSE
-	devourable = FALSE
-	digestable = FALSE
-
-/mob/living/simple_animal/pet/fox/holo
-	holodeck = TRUE
-	feeding = FALSE
-	devourable = FALSE
-	digestable = FALSE