From 78cccddffc6d47b0e7a1e57ae470fccf6564e916 Mon Sep 17 00:00:00 2001
From: E <flameghoster@gmail.com>
Date: Sun, 16 Jan 2022 17:07:58 +0100
Subject: [PATCH] grounds

---
 code/__DEFINES/admin.dm                | 1 +
 code/modules/admin/DB_ban/functions.dm | 3 +++
 code/modules/admin/admin.dm            | 5 +++++
 code/modules/admin/topic.dm            | 5 +++++
 4 files changed, 14 insertions(+)

diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm
index 54c4c1de95..59f69ecf13 100644
--- a/code/__DEFINES/admin.dm
+++ b/code/__DEFINES/admin.dm
@@ -18,6 +18,7 @@
 #define BANTYPE_ADMIN_PERMA	7
 #define BANTYPE_ADMIN_TEMP	8
 #define BANTYPE_ANY_JOB		9 //used to remove jobbans
+#define BANTYPE_PACIFIST    10 //makes a person spawn with pacifist. splurt change.
 
 //Admin Permissions
 #define R_BUILDMODE		(1<<0)
diff --git a/code/modules/admin/DB_ban/functions.dm b/code/modules/admin/DB_ban/functions.dm
index b8d2452874..ac589c026a 100644
--- a/code/modules/admin/DB_ban/functions.dm
+++ b/code/modules/admin/DB_ban/functions.dm
@@ -411,6 +411,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 +547,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>"
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 08b62ef2f3..8c6acb6509 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -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=emote;jobban4=[rm]'><font color=red>PacifistBan</font></A> | "
+	else
+		body+= "<A href='?_src_=holder;[HrefToken()];jobban3=emote;jobban4=[rm]'>PacifistBan</A> | "
+	
 
 	body += "<A href='?_src_=holder;[HrefToken()];showmessageckey=[M.ckey]'>Notes | Messages | Watchlist</A> "
 	if(M.client)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index dd5ae3f4e6..b610db9c8e 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -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