Fixes some runtimes and removes a holodeck exploit

and a cleanup >.>;
This commit is contained in:
Poojawa
2019-08-08 21:33:42 -05:00
parent ce064522fe
commit f76bb27127
10 changed files with 82 additions and 30 deletions
@@ -133,3 +133,51 @@
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
@@ -152,11 +152,13 @@
SSbellies.belly_list += src
/obj/belly/Destroy()
SSbellies.belly_list -= src
if(owner)
owner.vore_organs -= src
owner = null
. = ..()
Remove(owner)
return ..()
/obj/belly/proc/Remove(mob/living/owner)
owner.vore_organs -= src
owner = null
// Called whenever an atom enters this belly
/obj/belly/Entered(var/atom/movable/thing,var/atom/OldLoc)
@@ -4,10 +4,16 @@
recent_sound = FALSE
return SSBELLIES_IGNORED
if(!owner)
qdel(src)
SSbellies.belly_list -= src
return SSBELLIES_PROCESSED
if(loc != owner)
if(istype(owner))
loc = owner
if(isliving(owner)) //we don't have machine based bellies. (yet :honk:)
forceMove(owner)
else
SSbellies.belly_list -= src
qdel(src)
return SSBELLIES_PROCESSED