syncs TGS, tgui, and build tools to latest tgstation (#3039)

lol said the crab, lmao
This commit is contained in:
silicons
2021-04-29 15:08:52 -05:00
committed by GitHub
parent 58d131466c
commit a2a56a6790
133 changed files with 3245 additions and 2371 deletions
+2 -2
View File
@@ -5,7 +5,7 @@ var/global/floorIsLava = 0
////////////////////////////////
/proc/message_admins(var/msg)
msg = "<span class='log_message'><span class='prefix'>ADMIN LOG:</span> <span class='message'>[msg]</span></span>"
msg = "<span class='admin log_message'><span class='prefix'>ADMIN LOG:</span> <span class='message'>[msg]</span></span>"
//log_adminwarn(msg) //log_and_message_admins is for this
for(var/client/C in admins)
@@ -13,7 +13,7 @@ var/global/floorIsLava = 0
to_chat(C, msg)
/proc/msg_admin_attack(var/text) //Toggleable Attack Messages
var/rendered = "<span class='log_message><span class='prefix'>ATTACK:</span> <span class='message'>[text]</span></span>"
var/rendered = "<span class='admin log_message><span class='prefix'>ATTACK:</span> <span class='message'>[text]</span></span>"
for(var/client/C in admins)
if((R_ADMIN|R_MOD) & C.holder.rights)
if(C.is_preference_enabled(/datum/client_preference/mod/show_attack_logs))