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

Remove some unneeded error messages from DB_ban (they're built into check_rights()

Browse Source 
Made paths to sounds in robot/emote.dm more specific so the game doesn't have to find the files itself.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5039 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
2012-11-11 12:09:43 +00:00
parent a38b22fb70
commit 0d2898a023
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/admin/DB ban/functions.dm
View File

@@ -1,9 +1,7 @@
datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null)
if(!check_rights(R_BAN))
usr << "\red You do not have permission to do this!"
return
if(!check_rights(R_BAN)) return
establish_db_connection()
if(!dbcon.IsConnected())
@@ -87,9 +85,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
if(!check_rights(R_BAN))
usr << "\red You do not have permission to do this!"
return
if(!check_rights(R_BAN)) return
var/bantype_str
if(bantype)
@@ -153,9 +149,7 @@ datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
if(!check_rights(R_BAN))
usr << "\red You do not have permission to do this!"
return
if(!check_rights(R_BAN)) return
if(!isnum(banid) || !istext(param))
usr << "Cancelled"
@@ -215,9 +209,7 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
datum/admins/proc/DB_ban_unban_by_id(var/id)
if(!check_rights(R_BAN))
usr << "\red You do not have permission to do this!"
return
if(!check_rights(R_BAN)) return
var/sql = "SELECT ckey FROM erro_ban WHERE id = [id]"
@@ -271,9 +263,7 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
if(!usr.client)
return
if(!check_rights(R_BAN))
usr << "\red You do not have permission to do this!"
return
if(!check_rights(R_BAN)) return
establish_db_connection()
if(!dbcon.IsConnected())

14
code/modules/mob/living/silicon/robot/emote.dm
View File

@@ -143,7 +143,7 @@
else
message = "<B>[src]</B> looks."
m_type = 1
if("beep")
var/M = null
if(param)
@@ -158,9 +158,9 @@
message = "<B>[src]</B> beeps at [param]."
else
message = "<B>[src]</B> beeps."
playsound(src.loc, 'twobeep.ogg', 50, 0)
playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
m_type = 1
if("ping")
var/M = null
if(param)
@@ -175,9 +175,9 @@
message = "<B>[src]</B> pings at [param]."
else
message = "<B>[src]</B> pings."
playsound(src.loc, 'ping.ogg', 50, 0)
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
m_type = 1
if("buzz")
var/M = null
if(param)
@@ -192,9 +192,9 @@
message = "<B>[src]</B> buzzes at [param]."
else
message = "<B>[src]</B> buzzes."
playsound(src.loc, 'buzz-sigh.ogg', 50, 0)
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
m_type = 1
else
src << text("Invalid Emote: []", act)
if ((message && src.stat == 0))