From 45b8889562c3c6ec915c62f5bd653ed49c6d33bc Mon Sep 17 00:00:00 2001 From: Poojawa Date: Thu, 11 Apr 2019 07:13:19 -0500 Subject: [PATCH] Devourable mobs are digestible again --- .../hostile/megafauna/dragon_vore.dm | 2 -- .../simple_animal/simplemob_vore_values.dm | 23 ++++++++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm index 7e69298b69..71c393b592 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm @@ -8,8 +8,6 @@ var/obj/belly/megafauna/dragon/maw/maw = new(src) var/obj/belly/megafauna/dragon/gullet/gullet = new(src) var/obj/belly/megafauna/dragon/gut/gut = new(src) -// for(var/obj/belly/X in list(maw, gullet, gut)) -// vore_organs[X.name] = X // Connect 'stomachs' together maw.transferlocation = gullet gullet.transferlocation = gut 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 ed1268a354..c958d690eb 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 @@ -1,65 +1,80 @@ /mob/living/simple_animal/pet/cat devourable = TRUE + digestible = TRUE no_vore = FALSE /mob/living/simple_animal/crab devourable = TRUE + digestible = TRUE /mob/living/simple_animal/pet/dog devourable = TRUE + digestible = TRUE no_vore = FALSE /mob/living/simple_animal/hostile/retaliate/goat devourable = TRUE + digestible = TRUE no_vore = FALSE /mob/living/simple_animal/cow devourable = TRUE + digestible = TRUE no_vore = FALSE /mob/living/simple_animal/chick devourable = TRUE + digestible = TRUE /mob/living/simple_animal/chicken devourable = TRUE + digestible = TRUE no_vore = FALSE /mob/living/simple_animal/pet/fox - devourable = TRUE no_vore = FALSE /mob/living/simple_animal/hostile/lizard devourable = TRUE + digestible = TRUE /mob/living/simple_animal/mouse devourable = TRUE + digestible = TRUE /mob/living/simple_animal/pet/penguin no_vore = TRUE /mob/living/simple_animal/pet devourable = TRUE + digestible = TRUE /mob/living/simple_animal/sloth devourable = TRUE + digestible = TRUE /mob/living/simple_animal/hostile/alien devourable = TRUE + digestible = TRUE no_vore = FALSE /mob/living/simple_animal/hostile/bear devourable = TRUE + digestible = TRUE no_vore = FALSE /mob/living/simple_animal/hostile/poison/giant_spider devourable = TRUE + digestible = TRUE /mob/living/simple_animal/hostile/retaliate/poison/snake devourable = TRUE + digestible = TRUE no_vore = FALSE //oh yes my pretty. - + /mob/living/simple_animal/hostile/gorilla devourable = TRUE + digestible = TRUE no_vore = FALSE /mob/living/simple_animal/hostile/megafauna/dragon @@ -80,6 +95,8 @@ /mob/living/carbon/monkey devourable = TRUE - + digestible = TRUE + /mob/living/simple_animal/hostile/carp devourable = TRUE + digestible = TRUE