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

Fixes Mods being able to use Subtle messages. Fixes mod panel. Prevents mods from seeing stealthed admins in various places. Fixes mods seeing gibbed messages. Changed colours to be more readable, mod say is now brown.

Browse Source
This commit is contained in:
Erthilo
2012-06-02 21:17:37 +01:00
parent ae316d58f8
commit aa7da6f36c
6 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/kitchen/gibber.dm
View File

@@ -181,7 +181,7 @@
allmeat += newmeat allmeat += newmeat
for (var/mob/M in world) for (var/mob/M in world)
if (M.client && M.client.holder && (M.client.holder.level != -3)) if (M.client && M.client.holder && (M.client.holder.level != -3) && (M.client.holder.level != 0))
M << "\red [user.name]/[user.ckey] has gibbed [src.occupant.name]/[src.occupant.ckey]" M << "\red [user.name]/[user.ckey] has gibbed [src.occupant.name]/[src.occupant.ckey]"
src.occupant.death(1) src.occupant.death(1)
src.occupant.ghostize() src.occupant.ghostize()

2
code/game/verbs/ooc.dm
View File

@@ -37,7 +37,7 @@
log_ooc("[src.name]/[src.key] : [msg]") log_ooc("[src.name]/[src.key] : [msg]")
for (var/client/C) for (var/client/C)
if (src.client.holder && (!src.client.stealth || C.holder)) if (src.client.holder && (!src.client.stealth || ( C.holder && C.holder.level != 0)))
if (src.client.holder.rank == "Admin Observer") if (src.client.holder.rank == "Admin Observer")
C << "<span class='adminobserverooc'><span class='prefix'>OOC:</span> <EM>[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span>" C << "<span class='adminobserverooc'><span class='prefix'>OOC:</span> <EM>[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></span>"
else if (src.client.holder.rank == "Retired Admin") else if (src.client.holder.rank == "Retired Admin")

2
code/game/verbs/who.dm
View File

@@ -30,7 +30,7 @@
for (var/mob/M in world) for (var/mob/M in world)
if(M && M.client && M.client.holder) if(M && M.client && M.client.holder)
if(usr.client.holder) if(usr.client.holder && (usr.client.holder.level != 0))
usr << "[M.key] is a [M.client.holder.rank][M.client.stealth ? " <i>(as [M.client.fakekey])</i>" : ""]" usr << "[M.key] is a [M.client.holder.rank][M.client.stealth ? " <i>(as [M.client.fakekey])</i>" : ""]"
else if(!M.client.stealth && (M.client.holder.level != -3)) else if(!M.client.stealth && (M.client.holder.level != -3))
usr << "\t[pick(nobles)] [M.client] is a [M.client.holder.rank]" usr << "\t[pick(nobles)] [M.client] is a [M.client.holder.rank]"

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

@@ -1376,6 +1376,7 @@ var/global/BSACooldown = 0
alert("You cannot perform this action. You must be of a higher administrative rank!") alert("You cannot perform this action. You must be of a higher administrative rank!")
if (href_list["adminplayersubtlemessage"]) if (href_list["adminplayersubtlemessage"])
if(rank in list("Admin Observer", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"))
var/mob/M = locate(href_list["adminplayersubtlemessage"]) var/mob/M = locate(href_list["adminplayersubtlemessage"])
if(src && src.owner) if(src && src.owner)
if(istype(src.owner,/client)) if(istype(src.owner,/client))
@@ -1386,6 +1387,8 @@ var/global/BSACooldown = 0
if(MO.client) if(MO.client)
var/client/cl = MO.client var/client/cl = MO.client
cl.cmd_admin_subtle_message(M) cl.cmd_admin_subtle_message(M)
else
alert("You cannot perform this action. You must be of a higher administrative rank!")
if (href_list["adminplayerobservejump"]) if (href_list["adminplayerobservejump"])
if(rank in list("Admin Observer", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master")) if(rank in list("Admin Observer", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"))

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

@@ -114,7 +114,7 @@
usr << browse(dat, "window=players;size=905x600") usr << browse(dat, "window=players;size=905x600")
/obj/admins/proc/mod_panel()//For moderators! /obj/admins/proc/mod_panel()//The new one
if (!usr.client.holder) if (!usr.client.holder)
return return
var/dat = "<html><head><title>Player Menu</title></head>" var/dat = "<html><head><title>Player Menu</title></head>"
@@ -205,7 +205,7 @@
"} "}
dat += {"<td><A HREF='?src=\ref[src];player_info=[M.ckey]'>[player_has_info(M.ckey) ? "Info" : "N/A"] </A></td> dat += {"<td><A HREF='?src=\ref[src];player_info=[M.ckey]'>[player_has_info(M.ckey) ? "Info" : "N/A"] </A></td>
<td><A href='?src=\ref[usr];priv_msg=\ref[M]'><b>PM</b></A> <td><A href='?src=\ref[usr];priv_msg=\ref[M]'><b>PM</b></A></td>
"} "}
/* switch(is_special_character(M)) /* switch(is_special_character(M))

4
code/stylesheet.dm
View File

@@ -20,9 +20,9 @@ em {font-style: normal; font-weight: bold;}
.adminobserver {color: #996600; font-weight: bold;} .adminobserver {color: #996600; font-weight: bold;}
.admin {color: #386aff; font-weight: bold;} .admin {color: #386aff; font-weight: bold;}
.mod {color: #799AFC; font-weight: bold;} .mod {color: #735638; font-weight: bold;}
.modooc {color: #184880; font-weight: bold;} .modooc {color: #184880; font-weight: bold;}
.adminmod {color: #3E5CB5; font-weight: bold;} .adminmod {color: #402A14; font-weight: bold;}
.name { font-weight: bold;} .name { font-weight: bold;}