cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 17:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged master to dev, manually fixed merge issues in map, may be some left.

Browse Source
This commit is contained in:
Zuhayr
2014-06-11 18:11:41 +09:30
parent ba9095eb6d d8f17d2f1e
commit 4ee8f56c29
45 changed files with 458 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ var/global/floorIsLava = 0
<A href='?src=\ref[src];getmob=\ref[M]'>Get</A> |
<A href='?src=\ref[src];sendmob=\ref[M]'>Send To</A>
<br><br>
<A href='?src=\ref[src];traitor=\ref[M]'>Traitor panel</A> |
[check_rights(R_ADMIN|R_MOD,0) ? "<A href='?src=\ref[src];traitor=\ref[M]'>Traitor panel</A> | " : "" ]
<A href='?src=\ref[src];narrateto=\ref[M]'>Narrate to</A> |
<A href='?src=\ref[src];subtlemessage=\ref[M]'>Subtle message</A>
"}
@@ -1124,4 +1124,4 @@ proc/get_options_bar(whom, detail = 2, name = 0, link = 1)
//
//ALL DONE
//*********************************************************************************************************
//
//