diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm index 933e63f7fd..c2b7132494 100644 --- a/code/modules/admin/view_variables/topic.dm +++ b/code/modules/admin/view_variables/topic.dm @@ -366,7 +366,7 @@ if(istype(H,/mob/living/silicon/ai)) possibleverbs += typesof(/mob/living/silicon/proc,/mob/living/silicon/ai/proc,/mob/living/silicon/ai/verb) if(istype(H,/mob/living/simple_mob)) - possibleverbs += typesof(/mob/living/simple_mob/proc,/mob/living/simple_mob/verb) //VOREStation edit, Apparently polaris simplemobs have no verbs at all. + possibleverbs += typesof(/mob/living/simple_mob/proc) possibleverbs -= H.verbs possibleverbs += "Cancel" // ...And one for the bottom diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index 127bad2295..257aaff7f2 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -198,6 +198,10 @@ if(LAZYLEN(vore_organs)) return + // Since they have bellies, add verbs to toggle settings on them. + verbs |= /mob/living/simple_mob/proc/toggle_digestion + verbs |= /mob/living/simple_mob/proc/toggle_fancygurgle + //A much more detailed version of the default /living implementation var/obj/belly/B = new /obj/belly(src) vore_selected = B diff --git a/code/modules/vore/eating/simple_animal_vr.dm b/code/modules/vore/eating/simple_animal_vr.dm index a7aa7c7acd..05e8e84601 100644 --- a/code/modules/vore/eating/simple_animal_vr.dm +++ b/code/modules/vore/eating/simple_animal_vr.dm @@ -24,9 +24,9 @@ // // Simple proc for animals to have their digestion toggled on/off externally +// Added as a verb in /mob/living/simple_mob/init_vore() if vore is enabled for this mob. // - -/mob/living/simple_mob/verb/toggle_digestion() +/mob/living/simple_mob/proc/toggle_digestion() set name = "Toggle Animal's Digestion" set desc = "Enables digestion on this mob for 20 minutes." set category = "OOC" @@ -35,6 +35,9 @@ var/mob/living/carbon/human/user = usr if(!istype(user) || user.stat) return + if(!vore_selected) + to_chat(user, "[src] isn't planning on eating anything much less digesting it.") + return if(ai_holder.retaliate || (ai_holder.hostile && faction != user.faction)) to_chat(user, "This predator isn't friendly, and doesn't give a shit about your opinions of it digesting you.") return @@ -49,7 +52,8 @@ if(confirm == "Disable") vore_selected.digest_mode = DM_HOLD -/mob/living/simple_mob/verb/toggle_fancygurgle() +// Added as a verb in /mob/living/simple_mob/init_vore() if vore is enabled for this mob. +/mob/living/simple_mob/proc/toggle_fancygurgle() set name = "Toggle Animal's Gurgle sounds" set desc = "Switches between Fancy and Classic sounds on this mob." set category = "OOC" @@ -57,6 +61,9 @@ var/mob/living/user = usr //I mean, At least ghosts won't use it. if(!istype(user) || user.stat) return + if(!vore_selected) + to_chat(user, "[src] isn't vore capable.") + return vore_selected.fancy_vore = !vore_selected.fancy_vore to_chat(user, "[src] is now using [vore_selected.fancy_vore ? "Fancy" : "Classic"] vore sounds.")