From 4f75f68a5db4de27ffd908ef7a8ccd490ec3a9d4 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 17 May 2019 05:13:30 -0500 Subject: [PATCH 1/2] make hostile mobs gurgle people --- .../mob/living/simple_animal/simple_animal_vr.dm | 5 +---- .../living/simple_animal/simplemob_vore_values.dm | 14 +++++++------- 2 files changed, 8 insertions(+), 11 deletions(-) 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 afb1b88d3b..095b1ab70c 100644 --- a/code/modules/mob/living/simple_animal/simple_animal_vr.dm +++ b/code/modules/mob/living/simple_animal/simple_animal_vr.dm @@ -103,14 +103,11 @@ set src in oview(1) var/datum/belly/B = vore_organs[vore_selected] - if(faction != usr.faction) - to_chat(usr,"This predator isn't friendly, and doesn't give a shit about your opinions of it digesting you.") - return if(B.digest_mode == "Hold") var/confirm = alert(usr, "Enabling digestion on [name] will cause it to digest all stomach contents. Using this to break OOC prefs is against the rules. Digestion will disable itself after 20 minutes.", "Enabling [name]'s Digestion", "Enable", "Cancel") if(confirm == "Enable") B.digest_mode = "Digest" - sleep(20 MINUTES) //12000=20 minutes + sleep(20 MINUTES) B.digest_mode = "Hold" else var/confirm = alert(usr, "This mob is currently set to digest all stomach contents. Do you want to disable this?", "Disabling [name]'s Digestion", "Disable", "Cancel") 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 0daf68f6c1..2bfd63a25d 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 @@ -91,7 +91,7 @@ feeding = TRUE vore_active = TRUE isPredator = TRUE - vore_default_mode = DM_HOLD + vore_default_mode = DM_DIGEST /mob/living/simple_animal/hostile/bear devourable = TRUE @@ -99,14 +99,14 @@ feeding = TRUE vore_active = TRUE isPredator = TRUE - vore_default_mode = DM_HOLD + vore_default_mode = DM_DIGEST /mob/living/simple_animal/hostile/poison/giant_spider devourable = TRUE digestable = TRUE feeding = TRUE vore_active = TRUE - vore_default_mode = DM_HOLD + vore_default_mode = DM_DIGEST /mob/living/simple_animal/hostile/retaliate/poison/snake devourable = TRUE @@ -114,7 +114,7 @@ feeding = TRUE vore_active = TRUE isPredator = TRUE - vore_default_mode = DM_HOLD + vore_default_mode = DM_DIGEST /mob/living/simple_animal/hostile/gorilla devourable = TRUE @@ -122,7 +122,7 @@ feeding = TRUE vore_active = TRUE isPredator = TRUE - vore_default_mode = DM_HOLD + vore_default_mode = DM_DIGEST /mob/living/simple_animal/hostile/asteroid/goliath devourable = TRUE @@ -130,7 +130,7 @@ feeding = TRUE vore_active = TRUE isPredator = TRUE - vore_default_mode = DM_HOLD + vore_default_mode = DM_DIGEST /mob/living/simple_animal/hostile/carp devourable = TRUE @@ -138,4 +138,4 @@ feeding = TRUE vore_active = TRUE isPredator = TRUE - vore_default_mode = DM_HOLD + vore_default_mode = DM_DIGEST From 0d02956144cbf2d781d3ab84e7daae6e0d405cfe Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 17 May 2019 05:28:54 -0500 Subject: [PATCH 2/2] Fixes simple mob vore toggle --- .../mob/living/simple_animal/simple_animal_vr.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 095b1ab70c..4d808a11a9 100644 --- a/code/modules/mob/living/simple_animal/simple_animal_vr.dm +++ b/code/modules/mob/living/simple_animal/simple_animal_vr.dm @@ -102,17 +102,19 @@ set category = "Object" set src in oview(1) - var/datum/belly/B = vore_organs[vore_selected] - if(B.digest_mode == "Hold") + var/mob/living/carbon/human/user = usr + if(!istype(user) || user.stat) return + + if(vore_selected.digest_mode == DM_HOLD) var/confirm = alert(usr, "Enabling digestion on [name] will cause it to digest all stomach contents. Using this to break OOC prefs is against the rules. Digestion will disable itself after 20 minutes.", "Enabling [name]'s Digestion", "Enable", "Cancel") if(confirm == "Enable") - B.digest_mode = "Digest" + vore_selected.digest_mode = DM_DIGEST sleep(20 MINUTES) - B.digest_mode = "Hold" + vore_selected.digest_mode = vore_default_mode else var/confirm = alert(usr, "This mob is currently set to digest all stomach contents. Do you want to disable this?", "Disabling [name]'s Digestion", "Disable", "Cancel") if(confirm == "Disable") - B.digest_mode = "Hold" + vore_selected.digest_mode = DM_HOLD // // Simple nom proc for if you get ckey'd into a simple_animal mob! Avoids grabs.