animal nom still don't work but runtimes are fixed

whatever
This commit is contained in:
Poojawa
2019-10-15 12:11:46 -05:00
parent 04b414f6b4
commit 1780f1addd
3 changed files with 14 additions and 16 deletions
@@ -42,7 +42,7 @@
autotransferwait = 200
/obj/belly/megafauna/dragon/gut
name = "stomach"
name = "gut"
vore_capacity = 5 //I doubt this many people will actually last in the gut, but...
vore_sound = "Tauric Swallow"
desc = "With a rush of burning ichor greeting you, you're introduced to the Drake's stomach. Wrinkled walls greedily grind against you, acidic slimes working into your body as you become fuel and nutriton for a superior predator. All that's left is your body's willingness to resist your destiny."
@@ -35,8 +35,8 @@
// Update fullness based on size & quantity of belly contents
/mob/living/simple_animal/proc/update_fullness(var/atom/movable/M)
var/new_fullness = 0
for(var/I in vore_organs)
var/obj/belly/B = vore_organs[I]
for(var/belly in vore_organs)
var/obj/belly/B = vore_organs[belly]
if (!(M in B.contents))
return FALSE // Nothing's inside
new_fullness += M
@@ -44,7 +44,7 @@
vore_fullness = new_fullness
/mob/living/simple_animal/death()
release_vore_contents(silent = TRUE)
release_vore_contents()
. = ..()
// Simple animals have only one belly. This creates it (if it isn't already set up)
@@ -52,16 +52,15 @@
vore_init = TRUE
if(CHECK_BITFIELD(flags_1, HOLOGRAM_1))
return
if(!vore_active)
return
if(vore_organs.len)
return
if(no_vore) //If it can't vore, let's not give it a stomach.
if(!vore_active || no_vore) //If it can't vore, let's not give it a stomach.
return
if(vore_active && !IsAdvancedToolUser()) //vore active, but doesn't have thumbs to grab people with.
verbs |= /mob/living/simple_animal/proc/animal_nom
var/obj/belly/B = new /obj/belly(src)
if(LAZYLEN(vore_organs))
return
var/obj/belly/B = new (src)
vore_selected = B
B.immutable = TRUE
B.name = vore_stomach_name ? vore_stomach_name : "stomach"
@@ -128,13 +127,12 @@
// Simple nom proc for if you get ckey'd into a simple_animal mob! Avoids grabs.
//
/mob/living/simple_animal/proc/animal_nom(var/mob/living/T in oview(1))
set name = "Animal Nom"
set name = "Animal Nom (pull target)"
set category = "Vore"
set desc = "Since you can't grab, you get a verb!"
if (stat != CONSCIOUS)
return
if (T.devourable == FALSE)
to_chat(usr, "<span class='warning'>You can't eat this!</span>")
if(!T.devourable)
return
return vore_attack(usr,T,usr)
return vore_attack(src,T,src)
+2 -2
View File
@@ -27,7 +27,7 @@
M.verbs += /mob/living/proc/insidePanel
//Tries to load prefs if a client is present otherwise gives freebie stomach
spawn(10 SECONDS) // long delay because the server delays in its startup. just on the safe side.
spawn(2 SECONDS) // long delay because the server delays in its startup. just on the safe side.
if(M)
M.init_vore()
@@ -84,7 +84,7 @@
return
feed_self_to_grabbed(user, pred)
if(pred == user) //you click yourself
else if(pred == user) //you click yourself
if(!is_vore_predator(src))
to_chat(user, "<span class='notice'>You aren't voracious enough.</span>")
return