From f5e3ec2e623216e6593a32ecd2463df766d019ed Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 9 Mar 2020 15:44:01 -0400 Subject: [PATCH] Make protean blobs get vore prefs --- .../human/species/station/protean_vr/protean_blob.dm | 4 ++++ code/modules/vore/eating/living_vr.dm | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index 2a122f9281e..da27a9aacef 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -66,6 +66,10 @@ else update_icon() +/mob/living/simple_mob/protean_blob/Login() + . = ..() + copy_from_prefs_vr(bellies = FALSE) //Load vore prefs + /mob/living/simple_mob/protean_blob/Destroy() humanform = null refactory = null diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 298b1dd9265..3a100d212e2 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -243,7 +243,7 @@ // // Proc for applying vore preferences, given bellies // -/mob/living/proc/copy_from_prefs_vr() +/mob/living/proc/copy_from_prefs_vr(var/bellies = TRUE) if(!client || !client.prefs_vr) to_chat(src,"You attempted to apply your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.") return FALSE @@ -261,10 +261,11 @@ can_be_drop_prey = P.can_be_drop_prey can_be_drop_pred = P.can_be_drop_pred - release_vore_contents(silent = TRUE) - vore_organs.Cut() - for(var/entry in P.belly_prefs) - list_to_object(entry,src) + if(bellies) + release_vore_contents(silent = TRUE) + vore_organs.Cut() + for(var/entry in P.belly_prefs) + list_to_object(entry,src) return TRUE