Ban panel and preferences changes

- Deathsquad moved from Antagonist to Ghost Roles.
- pAI jobbans split into drone, pAI, and posibrains.
- Posibrains back under pAI preference flag (the byte is full)
- Fixed Posibrain sprite if it fails to get a ghost.

code/modules/admin/topic.dm

@@ -642,11 +642,38 @@
 				jobs += "</tr><tr align='center'>"
 				counter = 0
 
-		//Ghost Roles (pAI/Drone/Positronic Brains) are not technically jobs, but they go in here.
-		if(jobban_isbanned(M, "Ghost Roles"))
-			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Ghost Roles;jobban4=\ref[M]'><font color=red>Ghost Roles (pAI/Drone/Positronic Brains)</font></a></td>"
+		jobs += "</tr></table>"
+
+		//Ghost Roles (light light gray)
+		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
+		jobs += "<tr bgcolor='eeeeee'><th colspan='4'><a href='?src=\ref[src];jobban3=ghostroles;jobban4=\ref[M]'>Ghost Roles</a></th></tr><tr align='center'>"
+
+		//pAI
+		if(jobban_isbanned(M, "pAI"))
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=pAI;jobban4=\ref[M]'><font color=red>[replacetext("pAI", " ", "&nbsp")]</font></a></td>"
 		else
-			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Ghost Roles;jobban4=\ref[M]'>Ghost Roles (pAI/Drone/Positronic Brains)</a></td>"
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=pAI;jobban4=\ref[M]'>[replacetext("pAI", " ", "&nbsp")]</a></td>"
+
+
+		//Drones
+		if(jobban_isbanned(M, "drone"))
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=drone;jobban4=\ref[M]'><font color=red>[replacetext("Drone", " ", "&nbsp")]</font></a></td>"
+		else
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=drone;jobban4=\ref[M]'>[replacetext("Drone", " ", "&nbsp")]</a></td>"
+
+
+		//Positronic Brains
+		if(jobban_isbanned(M, "posibrain"))
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=posibrain;jobban4=\ref[M]'><font color=red>[replacetext("Posibrain", " ", "&nbsp")]</font></a></td>"
+		else
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=posibrain;jobban4=\ref[M]'>[replacetext("Posibrain", " ", "&nbsp")]</a></td>"
+
+
+		//Deathsquad
+		if(jobban_isbanned(M, "deathsquad"))
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=deathsquad;jobban4=\ref[M]'><font color=red>[replacetext("Deathsquad", " ", "&nbsp")]</font></a></td>"
+		else
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=deathsquad;jobban4=\ref[M]'>[replacetext("Deathsquad", " ", "&nbsp")]</a></td>"
 
 		jobs += "</tr></table>"
 
@@ -705,12 +732,6 @@
 		else
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=abductor;jobban4=\ref[M]'>[replacetext("Abductor", " ", "&nbsp")]</a></td>"
 
-		//Deathsquad
-		if(jobban_isbanned(M, "deathsquad") || isbanned_dept)
-			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=deathsquad;jobban4=\ref[M]'><font color=red>[replacetext("Deathsquad", " ", "&nbsp")]</font></a></td>"
-		else
-			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=deathsquad;jobban4=\ref[M]'>[replacetext("Deathsquad", " ", "&nbsp")]</a></td>"
-
 /*		//Malfunctioning AI	//Removed Malf-bans because they're a pain to impliment
 		if(jobban_isbanned(M, "malf AI") || isbanned_dept)
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=malf AI;jobban4=\ref[M]'><font color=red>[replacetext("Malf AI", " ", "&nbsp")]</font></a></td>"
@@ -800,6 +821,8 @@
 					var/datum/job/temp = SSjob.GetJob(jobPos)
 					if(!temp) continue
 					joblist += temp.title
+			if("ghostroles")
+				joblist += list("pAI", "posibrain", "drone", "deathsquad")
 			else
 				joblist += href_list["jobban3"]
 

code/modules/client/preferences.dm

@@ -11,7 +11,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 	"malf AI" = /datum/game_mode/malfunction,		//4
 	"revolutionary" = /datum/game_mode/revolution,	//5
 	"alien",										//6
-	"Ghost Roles",									//7
+	"pAI/posibrain",								//7
 	"cultist" = /datum/game_mode/cult,				//8
 	"blob" = /datum/game_mode/blob,					//9
 	"ninja",										//10

code/modules/mob/living/carbon/brain/posibrain.dm

@@ -26,10 +26,10 @@
 
 /obj/item/device/mmi/posibrain/proc/request_player()
 	for(var/mob/dead/observer/O in player_list)
-		if(jobban_isbanned(O, "Ghost Roles"))
+		if(jobban_isbanned(O, "posibrain"))
 			continue
 		if(O.client)
-			if(O.client.prefs.be_special & BE_GHOST_ROLE)
+			if(O.client.prefs.be_special & BE_PAI)
 				question(O.client)
 
 /obj/item/device/mmi/posibrain/proc/question(var/client/C)
@@ -41,7 +41,7 @@
 		if(response == "Yes")
 			transfer_personality(C.mob)
 		else if (response == "Never for this round")
-			C.prefs.be_special ^= BE_GHOST_ROLE
+			C.prefs.be_special ^= BE_PAI
 
 
 /obj/item/device/mmi/posibrain/transfer_identity(var/mob/living/carbon/H)
@@ -140,7 +140,7 @@
 	if(searching)
 		icon_state = "posibrain-searching"
 		return
-	if(brainmob)
+	if(brainmob && brainmob.key)
 		icon_state = "posibrain-occupied"
 	else
 		icon_state = "posibrain"

code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm

@@ -16,7 +16,7 @@
 	var/drone_type = /mob/living/simple_animal/drone //Type of drone that will be spawned
 
 /obj/item/drone_shell/attack_ghost(mob/user)
-	if(jobban_isbanned(user,"Ghost Roles"))
+	if(jobban_isbanned(user,"drone"))
 		return
 
 	var/be_drone = alert("Become a drone? (Warning, You can no longer be cloned!)",,"Yes","No")