cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

more merge fixes

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-26 20:31:13 +10:00
parent 640ce4fd5c
commit 0fbf610ffb
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/admin/admin.dm
View File

@@ -17,6 +17,15 @@ var/global/floorIsLava = 0
C << msg C << msg
/proc/msg_admin_attack(var/text) //Toggleable Attack Messages
var/rendered = "<span class=\"admin\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[text]</span></span>"
log_adminwarn(rendered)
for (var/client/C in admin_list)
if (C)
if(!C.STFU_atklog)
var/msg = rendered
C << msg
///////////////////////////////////////////////////////////////////////////////////////////////Panels ///////////////////////////////////////////////////////////////////////////////////////////////Panels
/datum/admins/proc/show_player_panel(var/mob/M in mob_list) /datum/admins/proc/show_player_panel(var/mob/M in mob_list)

1
code/modules/client/client defines.dm
View File

@@ -29,6 +29,7 @@
var/activeslot = 1 //Default active slot! var/activeslot = 1 //Default active slot!
var/STFU_ghosts //80+ people rounds are fun to admin when text flies faster than airport security var/STFU_ghosts //80+ people rounds are fun to admin when text flies faster than airport security
var/STFU_radio //80+ people rounds are fun to admin when text flies faster than airport security var/STFU_radio //80+ people rounds are fun to admin when text flies faster than airport security
var/STFU_atklog = 0
/////////////// ///////////////
//SOUND STUFF// //SOUND STUFF//