Merge remote-tracking branch 'upstream/master'

This commit is contained in:
BongaTheProto
2022-02-27 14:38:06 -05:00
246 changed files with 1442 additions and 1072 deletions
+4 -6
View File
@@ -25,10 +25,9 @@
to_chat(usr, "<span class='warning'>You seem to be selecting a mob that doesn't exist anymore.</span>", confidential = TRUE)
return
//SKYRAT CHANGES BEGIN
//ambition start
var/list/body = list("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Options for [M.key]</title></head>")
//SKYRAT CHANGES END
//ambition end
body += "<body>Options panel for <b>[M]</b>"
if(M.client)
body += " played by <b>[M.client]</b> "
@@ -218,12 +217,11 @@
body += "<br>"
body += "</body></html>"
//SKYRAT CHANGES BEGIN
//ambition start
var/datum/browser/popup = new(usr, "adminplayeropts-[REF(M)]", "Player Panel", nwidth = 550, nheight = 515)
popup.set_content(body.Join())
popup.open()
//SKYRAT CHANGES END
//ambition end
SSblackbox.record_feedback("tally", "admin_verb", 1, "Player Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!