Re-enable xenomorph jobbans.

code/game/gamemodes/events.dm

@@ -195,7 +195,9 @@
 				vents += temp_vent
 
 	var/list/candidates = get_active_candidates(ROLE_ALIEN,buffer=ALIEN_SELECT_AFK_BUFFER, poll=1)
-
+	for(var/mob/M in candidates)
+		if(jobban_isbanned(M, "xenomorph"))
+			candidates -= M
 	if(prob(40)) spawncount++ //sometimes, have two larvae spawn instead of one
 	while((spawncount >= 1) && vents.len && candidates.len)
 

code/modules/admin/DB ban/functions.dm

@@ -332,7 +332,7 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
 		output += "<option value='[j]'>[j]</option>"
 	for(var/j in nonhuman_positions)
 		output += "<option value='[j]'>[j]</option>"
-	for(var/j in list("traitor","changeling","operative","revolutionary","cultist","wizard"))
+	for(var/j in list("traitor","changeling","operative","revolutionary","cultist","wizard", "Dionaea", "Xenomorph"))
 		output += "<option value='[j]'>[j]</option>"
 
 	// AUTOFIXED BY fix_string_idiocy.py

code/modules/admin/topic.dm

@@ -757,13 +757,13 @@
 			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>"
 		else
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=malf AI;jobban4=\ref[M]'>[replacetext("Malf AI", " ", "&nbsp")]</a></td>"
-
+*/
 		//Alien
-		if(jobban_isbanned(M, "alien candidate") || isbanned_dept)
-			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=alien candidate;jobban4=\ref[M]'><font color=red>[replacetext("Alien", " ", "&nbsp")]</font></a></td>"
+		if(jobban_isbanned(M, "Xenomorph") || isbanned_dept)
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Xenomorph;jobban4=\ref[M]'><font color=red>[replacetext("Alien", " ", "&nbsp")]</font></a></td>"
 		else
-			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=alien candidate;jobban4=\ref[M]'>[replacetext("Alien", " ", "&nbsp")]</a></td>"
-
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Xenomorph;jobban4=\ref[M]'>[replacetext("Alien", " ", "&nbsp")]</a></td>"
+/*
 		//Infested Monkey
 		if(jobban_isbanned(M, "infested monkey") || isbanned_dept)
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=infested monkey;jobban4=\ref[M]'><font color=red>[replacetext("Infested Monkey", " ", "&nbsp")]</font></a></td>"

code/modules/admin/verbs/randomverbs.dm

@@ -233,6 +233,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
 		for(var/mob/M in get_active_candidates(ROLE_ALIEN))
 			if(M.stat != DEAD)		continue	//we are not dead!
 			if(M.client.is_afk())	continue	//we are afk
+			if(jobban_isbanned(M, "xenomorph")) continue
 			candidates += M.ckey
 		if(candidates.len)
 			ckey = input("Pick the player you want to respawn as a xeno.", "Suitable Candidates") as null|anything in candidates

code/modules/events/alien_infestation.dm

@@ -28,7 +28,9 @@
 				vents += temp_vent
 
 	var/list/candidates = get_active_candidates(ROLE_ALIEN, buffer=ALIEN_SELECT_AFK_BUFFER, poll=1)
-
+	for(var/mob/M in candidates)
+		if(jobban_isbanned(M, "xenomorph"))
+			candidates -= M
 	while(spawncount > 0 && vents.len && candidates.len)
 		var/obj/vent = pick(vents)
 		var/mob/candidate = pick(candidates)

code/modules/mob/living/carbon/alien/special/alien_embryo.dm

@@ -17,7 +17,7 @@
 		processing_objects.Add(src)
 
 		for(var/mob/dead/observer/O in get_active_candidates(ROLE_ALIEN,poll="[affected_mob] has been infected by \a [src]!"))
-			if(O.client && O.client.desires_role(ROLE_ALIEN))
+			if(O.client && O.client.desires_role(ROLE_ALIEN) && !jobban_isbanned(O, "xenomorph"))
 				if(check_observer(O))
 					O << "<span class=\"recruit\">You have automatically been signed up for \a [src]. (<a href='?src=\ref[O];jump=\ref[src]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Retract</a>)</span>"
 					ghost_volunteers += O
@@ -127,7 +127,10 @@
 		break
 	if(!ghostpicked || !istype(ghostpicked))
 		var/list/candidates = get_active_candidates(ROLE_ALIEN, buffer=ALIEN_SELECT_AFK_BUFFER, poll=1)
-		if(!candidates.len)
+		for(var/mob/M in candidates)
+			if(jobban_isbanned(M, "xenomorph"))
+				candidates -= M
+		if(!candidates.len && !jobban_isbanned(affected_mob, "xenomorph"))
 			picked = affected_mob.key //Pick the person who was infected
 		else
 			for(var/mob/dead/observer/O in candidates)
@@ -138,6 +141,9 @@
 	if(!picked)
 		stage = 4 // Let's try again later.
 		var/list/candidates = get_active_candidates(ROLE_ALIEN, buffer=ALIEN_SELECT_AFK_BUFFER, poll=1)
+		for(var/mob/M in candidates)
+			if(jobban_isbanned(M, "xenomorph"))
+				candidates -= M
 		for(var/mob/dead/observer/O in candidates) //Shiggy
 			O << "<span class=\"recruit\">[affected_mob] is about to burst from \a [src]!. (<a href='?src=\ref[O];jump=\ref[src]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Sign Up</a>)</span>"
 		return
@@ -155,7 +161,7 @@
 		qdel(src)
 
 /*----------------------------------------
-Proc: RefreshInfectionImage()
+Proc: RefreshInfectionImage()
 	//writepanic("[__FILE__].[__LINE__] \\/proc: RefreshInfectionImage() called tick#: [world.time]")
 Des: Removes all infection images from aliens and places an infection image on all infected mobs for aliens.
 ----------------------------------------*/
@@ -173,7 +179,7 @@ Des: Removes all infection images from aliens and places an infection image on a
 						alien.client.images += I
 
 /*----------------------------------------
-Proc: AddInfectionImages(C)
+Proc: AddInfectionImages(C)
 	//writepanic("[__FILE__].[__LINE__] \\/proc: AddInfectionImages() called tick#: [world.time]")
 Des: Checks if the passed mob (C) is infected with the alien egg, then gives each alien client an infected image at C.
 ----------------------------------------*/
@@ -187,7 +193,7 @@ Des: Checks if the passed mob (C) is infected with the alien egg, then gives eac
 					alien.client.images += I
 
 /*----------------------------------------
-Proc: RemoveInfectionImage(C)
+Proc: RemoveInfectionImage(C)
 	//writepanic("[__FILE__].[__LINE__] \\/proc: RemoveInfectionImage() called tick#: [world.time]")
 Des: Removes the alien infection image from all aliens in the world located in passed mob (C).
 ----------------------------------------*/