Merge pull request #9860 from Ghommie/Ghommie-cit374

Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
This commit is contained in:
kevinz000
2020-01-29 20:15:22 -07:00
committed by GitHub
9 changed files with 87 additions and 20 deletions
@@ -421,7 +421,7 @@
"name" = "[customsender]",
"job" = "[customjob]",
"message" = custommessage,
"emoji_message" = emoji_parse(custommessage),
"emojis" = TRUE,
"targets" = list("[customrecepient.owner] ([customrecepient.ownjob])")
))
// this will log the signal and transmit it to the target
@@ -106,11 +106,10 @@
return "Everyone"
return data["targets"][1]
/datum/signal/subspace/pda/proc/format_message(emojify = FALSE)
var/message = emojify ? data["emoji_message"] : data["message"]
/datum/signal/subspace/pda/proc/format_message()
if (logged && data["photo"])
return "\"[message]\" (<a href='byond://?src=[REF(logged)];photo=1'>Photo</a>)"
return "\"[message]\""
return "\"[data["message"]]\" (<a href='byond://?src=[REF(logged)];photo=1'>Photo</a>)"
return "\"[data["message"]]\""
/datum/signal/subspace/pda/broadcast()
if (!logged) // Can only go through if a message server logs it