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 += ""
output += ""
output += ""
+ output += ""
output += ""
output += "
Key: | "
output += "| IP: | "
@@ -546,6 +547,8 @@
typedesc = "ADMIN PERMABAN"
if("ADMIN_TEMPBAN")
typedesc = "ADMIN TEMPBAN
([duration] minutes [(unbanned) ? "" : "(Edit))"]
Expires [expiration]"
+ if("PACIFICATION BAN")
+ typedesc = "PACIFICATION BAN
([duration] minutes [(unbanned) ? "" : "(Edit))"]
Expires [expiration]"
output += "
"
output += "| [typedesc] | "
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+= "Emoteban | "
if(QDELETED(M) || QDELETED(usr))
return
+ if(jobban_isbanned(M, "pacifist"))
+ body+= "PacifistBan | "
+ else
+ body+= "PacifistBan | "
+
body += "Notes | Messages | Watchlist "
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