From e7c69850a13051f4f82fe9fa90223ade47040a8f Mon Sep 17 00:00:00 2001 From: deathride58 Date: Thu, 26 Oct 2017 14:31:55 -0400 Subject: [PATCH] Wait shit what am i doing - fixes voreverbs proper --- code/modules/mob/mob.dm | 3 ++- code/modules/vore/eating/living_vr.dm | 10 +++++----- code/modules/vore/eating/vorepanel_vr.dm | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index beb64a9e6e..ddd1d3e2dc 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -31,6 +31,7 @@ continue var/datum/atom_hud/alternate_appearance/AA = v AA.onNewMob(src) + hook_vr("mob_new",list(src)) . = ..() /atom/proc/prepare_huds() @@ -389,7 +390,7 @@ pulling = null grab_state = 0 update_pull_hud_icon() - + if(isliving(ex_pulled)) var/mob/living/L = ex_pulled L.update_canmove()// mob gets up if it was lyng down in a chokehold diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 6c3b331126..b7ace801cd 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -13,12 +13,12 @@ // Hook for generic creation of stuff on new creatures // /hook/living_new/proc/vore_setup(mob/living/M) - M.verbs += /mob/living/verb/escapeOOC - M.verbs += /mob/living/verb/lick + M.verbs += /mob/living/proc/escapeOOC + M.verbs += /mob/living/proc/lick if(M.no_vore) //If the mob isn's supposed to have a stomach, let's not give it an insidepanel so it can make one for itself, or a stomach. M << "The creature that you are can not eat others." return TRUE - M.verbs += /mob/living/verb/insidePanel + M.verbs += /mob/living/proc/insidePanel //Tries to load prefs if a client is present otherwise gives freebie stomach if(!M.vore_organs || !M.vore_organs.len) @@ -289,7 +289,7 @@ // OOC Escape code for pref-breaking or AFK preds // -/mob/living/verb/escapeOOC() +/mob/living/proc/escapeOOC() set name = "Animal Escape" set category = "Vore" @@ -373,7 +373,7 @@ // // Clearly super important. Obviously. // -/mob/living/verb/lick(var/mob/living/tasted in oview(1)) +/mob/living/proc/lick(var/mob/living/tasted in oview(1)) set name = "Lick Someone" set category = "Vore" set desc = "Lick someone nearby!" diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index ac367e3aad..0f01a4c9e3 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -8,7 +8,7 @@ #define BELLIES_DESC_MAX 1024 #define FLAVOR_MAX 40 -/mob/living/verb/insidePanel() +/mob/living/proc/insidePanel() set name = "Vore Panel" set category = "Vore"