merge from master

This commit is contained in:
silicons
2020-07-20 10:18:44 -07:00
1206 changed files with 35732 additions and 41410 deletions
+1 -1
View File
@@ -76,7 +76,7 @@
play_sound = pick(pred_digest)
//Pref protection!
if (!M.vore_flags & DIGESTABLE || M.vore_flags & ABSORBED)
if (!CHECK_BITFIELD(M.vore_flags, DIGESTABLE) || M.vore_flags & ABSORBED)
continue
//Person just died in guts!
+1 -1
View File
@@ -116,7 +116,7 @@
testing("[user] attempted to feed [prey] to [pred], via [lowertext(belly.name)] but it went wrong.")
return
if (!prey.vore_flags & DEVOURABLE)
if (!CHECK_BITFIELD(prey.vore_flags, DEVOURABLE))
to_chat(user, "This can't be eaten!")
return FALSE