Merge remote-tracking branch 'upstream/master' into releaseupdate

This commit is contained in:
Hawk_v3
2020-03-02 17:55:11 +00:00
31 changed files with 107 additions and 322 deletions
+6 -2
View File
@@ -106,7 +106,9 @@
if (!holder)
return
var/msg = sanitize(input("Message:", text("Enter the text you wish to appear to everyone:")) as text)
var/msg = input("Message:", text("Enter the text you wish to appear to everyone:")) as text
if(!(msg[1] == "<" && msg[length(msg)] == ">")) //You can use HTML but only if the whole thing is HTML. Tries to prevent admin 'accidents'.
msg = sanitize(msg)
if (!msg)
return
@@ -128,7 +130,9 @@
if(!M)
return
var/msg = sanitize(input("Message:", text("Enter the text you wish to appear to your target:")) as text)
var/msg = input("Message:", text("Enter the text you wish to appear to your target:")) as text
if(!(msg[1] == "<" && msg[length(msg)] == ">")) //You can use HTML but only if the whole thing is HTML. Tries to prevent admin 'accidents'.
msg = sanitize(msg)
if( !msg )
return
+1 -1
View File
@@ -449,7 +449,7 @@
to_chat(usr, "This can only be done on mobs with clients")
return
SSnanoui.send_resources(H.client)
H.client.send_resources()
to_chat(usr, "Resource files sent")
to_chat(H, "Your NanoUI Resource files have been refreshed")