cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-25 13:46:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #140 from NullFag/khajitness

Browse Source 
adds pacification bans
This commit is contained in:
BongaTheProto
2022-01-19 02:50:16 -05:00
committed by GitHub
parent 0723e9b2f7 ff54af25b6
commit a09909aa13
11 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/DB_ban/functions.dm
+13
View File
@@ -51,6 +51,9 @@
announceinirc = 1
blockselfban = 1
kickbannedckey = 1
if(BANTYPE_PACIFIST)
bantype_str = "PACIFICATION_BAN"
bantype_pass = 1
if( !bantype_pass )
return
if( !istext(reason) )
@@ -167,6 +170,10 @@
if(announceinirc)
send2adminchat("BAN ALERT","[a_key] applied a [bantype_str] on [bankey]")
//splurt edit
if(((bantype_str == "PACIFICATION_BAN") || (job == "pacifist")) && banned_client.mob)
ADD_TRAIT(banned_client.mob, TRAIT_PACIFISM, "pacification ban")
//
if(kickbannedckey)
if(AH)
@@ -208,6 +215,9 @@
if(BANTYPE_ANY_JOB)
bantype_str = "ANYJOB"
bantype_pass = 1
if(BANTYPE_PACIFIST)
bantype_str = "PACIFICATION_BAN"
bantype_pass = 1
if( !bantype_pass )
return
@@ -411,6 +421,7 @@
output += "<option value='[BANTYPE_JOB_TEMP]'>JOB TEMPBAN</option>"
output += "<option value='[BANTYPE_ADMIN_PERMA]'>ADMIN PERMABAN</option>"
output += "<option value='[BANTYPE_ADMIN_TEMP]'>ADMIN TEMPBAN</option>"
output += "<option value='[BANTYPE_PACIFIST]'>PACIFICATION BAN</option>"
output += "</select></td>"
output += "<td><b>Key:</b> <input type='text' name='dbbanaddkey'></td></tr>"
output += "<tr><td><b>IP:</b> <input type='text' name='dbbanaddip'></td>"
@@ -546,6 +557,8 @@
typedesc = "<b>ADMIN PERMABAN</b>"
if("ADMIN_TEMPBAN")
typedesc = "<b>ADMIN TEMPBAN</b><br><font size='2'>([duration] minutes [(unbanned) ? "" : "(<a href=\"byond://?src=[REF(src)];[HrefToken()];dbbanedit=duration;dbbanid=[banid]\">Edit</a>))"]<br>Expires [expiration]</font>"
if("PACIFICATION_BAN")
typedesc = "<b>PACIFICATION BAN</b><br><font size='2'>([duration] minutes [(unbanned) ? "" : "(<a href=\"byond://?src=[REF(src)];[HrefToken()];dbbanedit=duration;dbbanid=[banid]\">Edit</a>))"]<br>Expires [expiration]</font>"
output += "<tr bgcolor='[dcolor]'>"
output += "<td align='center'>[typedesc]</td>"
code/modules/admin/admin.dm
+5
View File
@@ -103,6 +103,11 @@
body+= "<A href='?_src_=holder;[HrefToken()];jobban3=emote;jobban4=[rm]'>Emoteban</A> | "
if(QDELETED(M) || QDELETED(usr))
return
if(jobban_isbanned(M, "pacifist"))
body+= "<A href='?_src_=holder;[HrefToken()];jobban3=pacifist;jobban4=[rm]'><font color=red>PacifistBan</font></A> | "
else
body+= "<A href='?_src_=holder;[HrefToken()];jobban3=pacifist;jobban4=[rm]'>PacifistBan</A> | "
body += "<A href='?_src_=holder;[HrefToken()];showmessageckey=[M.ckey]'>Notes | Messages | Watchlist</A> "
if(M.client)
code/modules/admin/topic.dm
+7 -2
View File
@@ -260,6 +260,11 @@
to_chat(usr, "Not enough parameters (Requires ckey, severity, reason and duration).")
return
banjob = null
if(BANTYPE_PACIFIST)
if(!banckey || !banreason || !banduration || !banseverity)
to_chat(usr, "Not enough parameters (Requires ckey, severity, reason and duration).")
return
banjob = null
var/mob/playermob
@@ -1060,7 +1065,7 @@
msg += ", [job]"
create_message("note", M.key, null, "Banned from [msg] - [reason]", null, null, 0, 0, null, 0, severity)
message_admins("<span class='adminnotice'>[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes.</span>")
to_chat(M, "<span class='boldannounce'><BIG>You have been [(msg == ("ooc" || "appearance")) ? "banned" : "jobbanned"] by [usr.client.key] from: [msg].</BIG></span>")
to_chat(M, "<span class='boldannounce'><BIG>You have been [((msg == "ooc") || (msg == "appearance") || (msg == "pacifist")) ? "banned" : "jobbanned"] by [usr.client.key] from: [msg == "pacifist" ? "using violence" : msg].</BIG></span>")
to_chat(M, "<span class='boldannounce'>The reason is: [reason]</span>")
to_chat(M, "<span class='danger'>This jobban will be lifted in [mins] minutes.</span>")
href_list["jobban2"] = 1 // lets it fall through and refresh
@@ -1086,7 +1091,7 @@
msg += ", [job]"
create_message("note", M.key, null, "Banned from [msg] - [reason]", null, null, 0, 0, null, 0, severity)
message_admins("<span class='adminnotice'>[key_name_admin(usr)] banned [key_name_admin(M)] from [msg].</span>")
to_chat(M, "<span class='boldannounce'><BIG>You have been [(msg == ("ooc" || "appearance")) ? "banned" : "jobbanned"] by [usr.client.key] from: [msg].</BIG></span>")
to_chat(M, "<span class='boldannounce'><BIG>You have been [((msg == "ooc") || (msg == "appearance") || (msg == "pacifist")) ? "banned" : "jobbanned"] by [usr.client.key] from: [msg == "pacifist" ? "using violence" : msg].</BIG></span>")
to_chat(M, "<span class='boldannounce'>The reason is: [reason]</span>")
to_chat(M, "<span class='danger'>Jobban can be lifted only upon request.</span>")
href_list["jobban2"] = 1 // lets it fall through and refresh