Merge branch 'master' of https://github.com/VOREStation/VOREStation into tgui-input-conversions

This commit is contained in:
ItsSelis
2022-06-19 03:05:08 +02:00
22 changed files with 223 additions and 77 deletions
+4 -2
View File
@@ -124,7 +124,8 @@
formatted_message = replacetext(formatted_message, "%pred", owner)
formatted_message = replacetext(formatted_message, "%prey", M)
formatted_message = replacetext(formatted_message, "%countprey", absorbed_count)
to_chat(M, "<span class='notice'>[formatted_message]</span>")
if(formatted_message)
to_chat(M, "<span class='notice'>[formatted_message]</span>")
else
if(digest_mode == DM_DIGEST && !M.digestable)
EL = emote_lists[DM_HOLD] // Use Hold's emote list if we're indigestible
@@ -136,7 +137,8 @@
formatted_message = replacetext(formatted_message, "%prey", M)
formatted_message = replacetext(formatted_message, "%countprey", living_count)
formatted_message = replacetext(formatted_message, "%count", contents.len)
to_chat(M, "<span class='notice'>[formatted_message]</span>")
if(formatted_message)
to_chat(M, "<span class='notice'>[formatted_message]</span>")
if(to_update)
updateVRPanels()