mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-28 22:48:38 +01:00
Fixes devourable vore pref check placement
Now it's no longer limited to only affect reinforced grab type voring, but any type in general.
This commit is contained in:
@@ -105,11 +105,6 @@
|
||||
|
||||
///// If user clicked on themselves
|
||||
if(src == G.assailant && is_vore_predator(src))
|
||||
if(!G.affecting.devourable)
|
||||
to_chat(user, "<span class='notice'>They aren't able to be devoured.</span>")
|
||||
log_and_message_admins("[key_name_admin(src)] attempted to devour [key_name_admin(G.affecting)] against their prefs ([G.affecting ? ADMIN_JMP(G.affecting) : "null"])")
|
||||
return FALSE
|
||||
|
||||
if(feed_grabbed_to_self(src, G.affecting))
|
||||
qdel(G)
|
||||
return TRUE
|
||||
@@ -489,6 +484,11 @@
|
||||
if(user_to_pred > 1 || user_to_prey > 1)
|
||||
return FALSE
|
||||
|
||||
if(!prey.devourable)
|
||||
to_chat(user, "<span class='notice'>They aren't able to be devoured.</span>")
|
||||
log_and_message_admins("[key_name_admin(src)] attempted to devour [key_name_admin(prey)] against their prefs ([prey ? ADMIN_JMP(prey) : "null"])")
|
||||
return FALSE
|
||||
|
||||
// Prepare messages
|
||||
if(user == pred) //Feeding someone to yourself
|
||||
attempt_msg = "<span class='warning'>[pred] is attempting to [lowertext(belly.vore_verb)] [prey] into their [lowertext(belly.name)]!</span>"
|
||||
|
||||
Reference in New Issue
Block a user