Merge remote-tracking branch 'upstream/master' into kk-rings

This commit is contained in:
Killian
2024-11-10 15:12:24 +00:00
32 changed files with 444 additions and 137 deletions
@@ -108,12 +108,12 @@
if(M == user)
if(!M.can_eat(loaded))
return
M.visible_message(span_bold("\The [user]") + "eats some of [loaded] with \the [src].")
M.visible_message(span_bold("\The [user]") + " eats some of [loaded] with \the [src].")
else
user.visible_message(span_warning("\The [user] begins to feed \the [M]!"))
if(!(M.can_force_feed(user, loaded) && do_mob(user, M, 5 SECONDS)))
return
M.visible_message(span_bold("\The [user]") + "feeds some of [loaded] to \the [M] with \the [src].")
M.visible_message(span_bold("\The [user]") + " feeds some of [loaded] to \the [M] with \the [src].")
playsound(src,'sound/items/eatfood.ogg', rand(10,40), 1)
loaded = null
update_icon()