diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 5e0ffbc0d8..e304c96fe1 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -796,11 +796,11 @@ to_chat(src, "You are not holding anything.") return - if(is_type_in_list(I,item_vore_blacklist)) + if(is_type_in_list(I,item_vore_blacklist) && !adminbus_trash) //If someone has adminbus, they can eat whatever they want. to_chat(src, "You are not allowed to eat this.") return - if(!I.trash_eatable) + if(!I.trash_eatable) //OOC pref. This /IS/ respected, even if adminbus_trash is enabled to_chat(src, "You can't eat that so casually!") return @@ -886,16 +886,11 @@ to_chat(src, "You can taste the flavor of pain. This can't possibly be healthy for your guts.") else to_chat(src, "You can taste the flavor of really bad ideas.") - else if(istype(I,/obj/item/toy)) - visible_message("[src] demonstrates the voracious capabilities of their [lowertext(vore_selected.name)] by making [I] disappear!") //CHOMPEdit else if(istype(I,/obj/item/weapon/bikehorn/tinytether)) to_chat(src, "You feel a rush of power swallowing such a large, err, tiny structure.") - visible_message("[src] demonstrates the voracious capabilities of their [lowertext(vore_selected.name)] by making [I] disappear!") //CHOMPEdit else if(istype(I,/obj/item/device/mmi/digital/posibrain) || istype(I,/obj/item/device/aicard)) - visible_message("[src] demonstrates the voracious capabilities of their [lowertext(vore_selected.name)] by making [I] disappear!") //CHOMPEdit to_chat(src, "You can taste the sweet flavor of digital friendship. Or maybe it is something else.") else if(istype(I,/obj/item/device/paicard)) - visible_message("[src] demonstrates the voracious capabilities of their [lowertext(vore_selected.name)] by making [I] disappear!") //CHOMPEdit to_chat(src, "You can taste the sweet flavor of digital friendship.") var/obj/item/device/paicard/ourcard = I if(ourcard.pai && ourcard.pai.client && isbelly(ourcard.loc)) @@ -908,7 +903,6 @@ else to_chat(src, "You can taste the flavor of gluttonous waste of food.") else if (istype(I,/obj/item/clothing/accessory/collar)) - visible_message("[src] demonstrates the voracious capabilities of their [lowertext(vore_selected.name)] by making [I] disappear!") //CHOMPEdit to_chat(src, "You can taste the submissiveness in the wearer of [I]!") else if(iscapturecrystal(I)) var/obj/item/capture_crystal/C = I @@ -947,6 +941,7 @@ else to_chat(src, "You can taste the flavor of garbage. Delicious.") + visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") return to_chat(src, "This snack is too powerful to go down that easily.") //CHOMPEdit return