cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict fix

Browse Source
This commit is contained in:
Firecage
2016-01-17 19:15:30 +02:00
parent 332bde0f4f 9fdbc32512
commit 0cb6814c18
318 changed files with 4760 additions and 4221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+1 -1
View File
@@ -2174,7 +2174,7 @@
else if(href_list["check_antagonist"])
if(!check_rights(R_ADMIN))
return
check_antagonists()
usr.client.check_antagonists()
else if(href_list["kick_all_from_lobby"])
if(!check_rights(R_ADMIN))