Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE

I JUST CONFLICTED EVERYTHING
This commit is contained in:
variableundefined
2019-01-31 11:03:33 +08:00
committed by GitHub
271 changed files with 347 additions and 347 deletions
+2 -2
View File
@@ -55,7 +55,7 @@
message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ONE! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
log_admin("[key_name(usr)] used there can be only one.")
nologevent = 1
world << sound('sound/music/THUNDERDOME.ogg')
world << sound('sound/music/thunderdome.ogg')
/client/proc/only_me()
if(!ticker)
@@ -101,4 +101,4 @@
message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ME! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
log_admin("[key_name(usr)] used there can be only me.")
nologevent = 1
world << sound('sound/music/THUNDERDOME.ogg')
world << sound('sound/music/thunderdome.ogg')