diff --git a/code/datums/crew_objective.dm b/code/datums/crew_objective.dm index 0cf685db7..4859408c9 100644 --- a/code/datums/crew_objective.dm +++ b/code/datums/crew_objective.dm @@ -20,6 +20,9 @@ if (!crewMind.current || !crewMind.objectives || crewMind.objectives.len || crewMind.special_role || (crewMind.assigned_role == "MODE")) return + if(jobban_isbanned(crewMind.current, "Miscreant")) + return + var/rolePathString = ckey(crewMind.assigned_role) if (!rolePathString) return diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index d9f5d5902..a5f761833 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -561,6 +561,11 @@ var/global/noir = 0 else jobs += "
Ghostdrone " + if(jobban_isbanned(M, "Miscreant")) + jobs += "Miscreant " + else + jobs += "Miscreant " + if(jobban_isbanned(M, "Custom Names")) jobs += "
[replacetext("Having a Custom Name", " ", " ")] " else diff --git a/code/modules/admin/bans.dm b/code/modules/admin/bans.dm index 8b5e3cb3e..7ebb4a3b5 100644 --- a/code/modules/admin/bans.dm +++ b/code/modules/admin/bans.dm @@ -293,7 +293,7 @@ var/global/list/playersSeen = list() return data["reason"] = reason - var/server_nice = input(usr, "What server does the ban apply to?", "Ban") as null|anything in list("All", "Roleplay", "Main", "Roleplay Overflow", "Main Overflow") + /*var/server_nice = input(usr, "What server does the ban apply to?", "Ban") as null|anything in list("All", "Roleplay", "Main", "Roleplay Overflow", "Main Overflow") var/server = null switch (server_nice) if ("Roleplay") @@ -304,7 +304,8 @@ var/global/list/playersSeen = list() server = "main2" if ("Main Overflow") server = "main3" - data["server"] = server + data["server"] = server*/ + data["server"] = "main" var/ban_time = input(usr,"How long will the ban be?","Ban") as null|anything in list("Half-hour","One Hour","Six Hours","One Day","Half a Week","One Week","One Month","Permanent","Custom") var/mins = 0 @@ -434,7 +435,7 @@ var/global/list/playersSeen = list() return data["reason"] = reason - var/server_nice = input(usr, "What server does the ban apply to?", "Ban") as null|anything in list("All", "Roleplay", "Main") + /*var/server_nice = input(usr, "What server does the ban apply to?", "Ban") as null|anything in list("All", "Roleplay", "Main") var/server = null switch (server_nice) if ("Roleplay") @@ -445,7 +446,8 @@ var/global/list/playersSeen = list() server = "main2" if ("Main Overflow") server = "main3" - data["server"] = server + data["server"] = server*/ + data["server"] = "main" var/ban_time = input(usr,"How long will the ban be? (select Custom to alter existing duration)","Ban") as null|anything in list("Half-hour","One Hour","Six Hours","One Day","Half a Week","One Week","One Month","Permanent","Custom") var/mins = 0 diff --git a/code/modules/admin/jobban.dm b/code/modules/admin/jobban.dm index 530609e1f..da9de2190 100644 --- a/code/modules/admin/jobban.dm +++ b/code/modules/admin/jobban.dm @@ -5,7 +5,7 @@ if(ismob(M)) var/mob/keysource = M M = keysource.ckey - var/server_nice = input(usr, "What server does the ban apply to?", "Ban") as null|anything in list("All", "Roleplay", "Main", "Roleplay Overflow", "Main Overflow") + /*var/server_nice = input(usr, "What server does the ban apply to?", "Ban") as null|anything in list("All", "Roleplay", "Main", "Roleplay Overflow", "Main Overflow") var/server = null //heehoo copy pasta switch (server_nice) if ("Roleplay") @@ -15,7 +15,9 @@ if ("Roleplay Overflow") server = "main2" if ("Main Overflow") - server = "main3" + server = "main3"*/ + var/server = "main" + if(apiHandler.queryAPI("jobbans/add", list("ckey"=M,"rank"=rank, "akey"=akey, "applicable_server"=server))) var/datum/player/player = make_player(M) //Recache the player. if(player)