Additional jobban options, minimum account age for antags

code/modules/admin/topic.dm

@@ -583,7 +583,7 @@
 	//Non-Human (Green)
 		counter = 0
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='ccffcc'><th colspan='[length(nonhuman_positions)+1]'><a href='?src=\ref[src];jobban3=nonhumandept;jobban4=\ref[M]'>Non-human Positions</a></th></tr><tr align='center'>"
+		jobs += "<tr bgcolor='ccffcc'><th colspan='[length(nonhuman_positions)+2]'><a href='?src=\ref[src];jobban3=nonhumandept;jobban4=\ref[M]'>Non-human Positions</a></th></tr><tr align='center'>"
 		for(var/jobPos in nonhuman_positions)
 			if(!jobPos)	continue
 			var/datum/job/job = job_master.GetJob(jobPos)
@@ -600,7 +600,11 @@
 				jobs += "</tr><tr align='center'>"
 				counter = 0
 
-		//pAI isn't technically a job, but it goes in here.
+		if(jobban_isbanned(M, "Drone"))
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Drone;jobban4=\ref[M]'><font color=red>Drone</font></a></td>"
+		else
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Drone;jobban4=\ref[M]'>Drone</a></td>"
+			
 		if(jobban_isbanned(M, "pAI"))
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=pAI;jobban4=\ref[M]'><font color=red>pAI</font></a></td>"
 		else
@@ -630,11 +634,11 @@
 		else
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=changeling;jobban4=\ref[M]'>[replacetext("Changeling", " ", "&nbsp")]</a></td>"
 
-		//Nuke Operative
+		//Nuclear Operative
 		if(jobban_isbanned(M, "operative") || isbanned_dept)
-			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=operative;jobban4=\ref[M]'><font color=red>[replacetext("Nuke Operative", " ", "&nbsp")]</font></a></td>"
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=operative;jobban4=\ref[M]'><font color=red>[replacetext("Nuclear Operative", " ", "&nbsp")]</font></a></td>"
 		else
-			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=operative;jobban4=\ref[M]'>[replacetext("Nuke Operative", " ", "&nbsp")]</a></td>"
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=operative;jobban4=\ref[M]'>[replacetext("Nuclear Operative", " ", "&nbsp")]</a></td>"
 
 		//Revolutionary
 		if(jobban_isbanned(M, "revolutionary") || isbanned_dept)
@@ -642,8 +646,6 @@
 		else
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=revolutionary;jobban4=\ref[M]'>[replacetext("Revolutionary", " ", "&nbsp")]</a></td>"
 
-		jobs += "</tr><tr align='center'>" //Breaking it up so it fits nicer on the screen every 5 entries
-
 		//Cultist
 		if(jobban_isbanned(M, "cultist") || isbanned_dept)
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=cultist;jobban4=\ref[M]'><font color=red>[replacetext("Cultist", " ", "&nbsp")]</font></a></td>"
@@ -656,39 +658,63 @@
 		else
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=wizard;jobban4=\ref[M]'>[replacetext("Wizard", " ", "&nbsp")]</a></td>"
 
-
+		jobs += "</tr><tr align='center'>" //Breaking it up so it fits nicer on the screen every 5 entries
 
 /*		//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>"
 		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, "alien") || isbanned_dept)
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=alien;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=alien;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>"
+		//Ninja
+		if(jobban_isbanned(M, "ninja") || isbanned_dept)
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=ninja;jobban4=\ref[M]'><font color=red>[replacetext("Ninja", " ", "&nbsp")]</font></a></td>"
 		else
-			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=infested monkey;jobban4=\ref[M]'>[replacetext("Infested Monkey", " ", "&nbsp")]</a></td>"
-*/
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=ninja;jobban4=\ref[M]'>[replacetext("Ninja", " ", "&nbsp")]</a></td>"
+			
+		//Raider
+		if(jobban_isbanned(M, "raider") || isbanned_dept)
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=raider;jobban4=\ref[M]'><font color=red>[replacetext("Raider", " ", "&nbsp")]</font></a></td>"
+		else
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=raider;jobban4=\ref[M]'>[replacetext("Raider", " ", "&nbsp")]</a></td>"
+			
+		//Mutineer
+		if(jobban_isbanned(M, "mutineer") || isbanned_dept)
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=mutineer;jobban4=\ref[M]'><font color=red>[replacetext("Mutineer", " ", "&nbsp")]</font></a></td>"
+		else
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=mutineer;jobban4=\ref[M]'>[replacetext("Mutineer", " ", "&nbsp")]</a></td>"
+			
+		//Blob
+		if(jobban_isbanned(M, "blob") || isbanned_dept)
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=blob;jobban4=\ref[M]'><font color=red>[replacetext("Blob", " ", "&nbsp")]</font></a></td>"
+		else
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=blob;jobban4=\ref[M]'>[replacetext("Blob", " ", "&nbsp")]</a></td>"
 
 		jobs += "</tr></table>"
 
 
 		//Other races  (BLUE, because I have no idea what other color to make this)
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='ccccff'><th colspan='1'>Other</th></tr><tr align='center'>"
+		jobs += "<tr bgcolor='ccccff'><th colspan='3'>Other</th></tr><tr align='center'>"
 
 		//NYMPH
 		if(jobban_isbanned(M, "Dionaea"))
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Dionaea;jobban4=\ref[M]'><font color=red>Dionaea Nymph</font></a></td>"
 		else
-			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Dionaea;jobban4=\ref[M]'>Dionaea</a></td>"
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Dionaea;jobban4=\ref[M]'>Dionaea Nymph</a></td>"
+			
+		//NPC
+		if(jobban_isbanned(M, "NPC"))
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=NPC;jobban4=\ref[M]'><font color=red>NPC</font></a></td>"
+		else
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=NPC;jobban4=\ref[M]'>NPC</a></td>"			
 
 		//ERT
 		if(jobban_isbanned(M, "Emergency Response Team") || isbanned_dept)

code/modules/admin/verbs/randomverbs.dm

@@ -223,6 +223,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
 		for(var/mob/M in player_list)
 			if(M.stat != DEAD)		continue	//we are not dead!
 			if(!M.client.prefs.be_special & BE_ALIEN)	continue	//we don't want to be an alium
+			if(jobban_isbanned(M, "alien")) continue //we are jobbanned
 			if(M.client.is_afk())	continue	//we are afk
 			if(M.mind && M.mind.current && M.mind.current.stat != DEAD)	continue	//we have a live body we are tied to
 			candidates += M.ckey

code/modules/client/preferences.dm

@@ -2,25 +2,59 @@
 
 var/list/preferences_datums = list()
 
-var/global/list/special_roles = list( //keep synced with the defines BE_* in setup.dm --rastaf
+var/global/list/special_roles = list( //keep synced with the defines BE_* in setup.dm
 //some autodetection here.
-	"traitor" = IS_MODE_COMPILED("traitor"),             // 0
-	"operative" = IS_MODE_COMPILED("nuclear"),           // 1
+	"pAI" = 1,                   						 // 0	
+	"traitor" = IS_MODE_COMPILED("traitor"),             // 1
 	"changeling" = IS_MODE_COMPILED("changeling"),       // 2
-	"wizard" = IS_MODE_COMPILED("wizard"),               // 3
-	"malf AI" = IS_MODE_COMPILED("malfunction"),         // 4
-	"revolutionary" = IS_MODE_COMPILED("revolution"),    // 5
-	"alien candidate" = 1, //always show                 // 6
-	"pAI candidate" = 1, // -- TLE                       // 7
-	"cultist" = IS_MODE_COMPILED("cult"),                // 8
-	"plant" = 1,										 // 9
-	"ninja" = "true",									 // 10
-	"raider" = IS_MODE_COMPILED("heist"),				 // 11
-	"slime" = 1,                                         // 12
-	"vampire" = IS_MODE_COMPILED("vampire"),			 // 13
-	"mutineer" = IS_MODE_COMPILED("mutiny"),             // 14
-	"blob" = IS_MODE_COMPILED("blob")          		     // 15
+	"vampire" = IS_MODE_COMPILED("vampire"),			 // 3	
+	"revolutionary" = IS_MODE_COMPILED("revolution"),    // 4
+	"blob" = IS_MODE_COMPILED("blob"),          	     // 5	
+	"operative" = IS_MODE_COMPILED("nuclear"),           // 6
+	"cultist" = IS_MODE_COMPILED("cult"),                // 7
+	"wizard" = IS_MODE_COMPILED("wizard"),               // 8
+	"raider" = IS_MODE_COMPILED("heist"),				 // 9
+	"alien" = 1,           							     // 10
+	"ninja" = 1,										 // 11	
+	"mutineer" = IS_MODE_COMPILED("mutiny"),             // 12
+	"malf AI" = IS_MODE_COMPILED("malfunction")	         // 13
 )
+var/global/list/special_role_times = list( //minimum age (in days) for accounts to play these roles
+	num2text(BE_TRAITOR) = 14, 
+	num2text(BE_OPERATIVE) = 21,
+	num2text(BE_CHANGELING) = 14, 
+	num2text(BE_WIZARD) = 21,
+	num2text(BE_MALF) = 30,
+	num2text(BE_REV) = 14,
+	num2text(BE_ALIEN) = 21,        							     
+	num2text(BE_PAI) = 0,                   						 
+	num2text(BE_CULTIST) = 21,
+	num2text(BE_NINJA) = 21,									 
+	num2text(BE_RAIDER) = 21,
+	num2text(BE_VAMPIRE) = 14,
+	num2text(BE_MUTINEER) = 21,
+	num2text(BE_BLOB) = 14
+)
+
+/proc/player_old_enough_antag(client/C, role)
+	if(available_in_days_antag(C, role) == 0)
+		return 1	//Available in 0 days = available right now = player is old enough to play.
+	return 0
+
+/proc/available_in_days_antag(client/C, role)
+	if(!C)
+		return 0
+	if(!role)
+		return 0
+	if(!config.use_age_restriction_for_antags)
+		return 0
+	if(!isnum(C.player_age))
+		return 0 //This is only a number if the db connection is established, otherwise it is text: "Requires database", meaning these restrictions cannot be enforced
+	var/minimal_player_age_antag = special_role_times[num2text(role)]
+	if(!isnum(minimal_player_age_antag))
+		return 0
+		
+	return max(0, minimal_player_age_antag - C.player_age)
 
 var/const/MAX_SAVE_SLOTS = 10
 
@@ -327,20 +361,21 @@ datum/preferences
 					dat += "<b>OOC Notes:</b> <a href='?_src_=prefs;preference=metadata;task=input'> Edit </a><br>"
 
 				dat += "</td><td width='300px' height='300px' valign='top'>"
-				dat += "<h2>Antagonist Settings</h2>"
+				dat += "<h2>Special Role Settings</h2>"
 //				dat += "<br><br>"
 				if(jobban_isbanned(user, "Syndicate"))
-					dat += "<b>You are banned from antagonist roles.</b>"
+					dat += "<b>You are banned from special roles.</b>"
 					src.be_special = 0
 				else
 					var/n = 0
 					for (var/i in special_roles)
 						if(special_roles[i]) //if mode is available on the server
+							var/special_role_flag = be_special_flags[i]
 							if(jobban_isbanned(user, i))
 								dat += "<b>Be [i]:</b> <font color=red><b> \[BANNED]</b></font><br>"
-							else if(i == "pai candidate")
-								if(jobban_isbanned(user, "pAI"))
-									dat += "<b>Be [i]:</b> <font color=red><b> \[BANNED]</b></font><br>"
+							else if(!player_old_enough_antag(user.client,special_role_flag))
+								var/available_in_days_antag = available_in_days_antag(user.client,special_role_flag)
+								dat += "<b>Be [i]:</b> <font color=red><b> \[IN [(available_in_days_antag)] DAYS]</b></font><br>"
 							else
 								dat += "<b>Be [i]:</b> <a href='?_src_=prefs;preference=be_special;num=[n]'><b>[src.be_special&(1<<n) ? "Yes" : "No"]</b></a><br>"
 						n++

code/modules/events/alien_infestation.dm

@@ -26,7 +26,7 @@
 			if(temp_vent.network.normal_members.len > 50)	//Stops Aliens getting stuck in small networks. See: Security, Virology
 				vents += temp_vent
 
-	var/list/candidates = get_candidates(BE_ALIEN)
+	var/list/candidates = get_candidates(BE_ALIEN,ALIEN_AFK_BRACKET,"alien")
 
 	while(spawncount > 0 && vents.len && candidates.len)
 		var/obj/vent = pick_n_take(vents)

code/modules/events/borers.dm

@@ -23,7 +23,7 @@
 			if(temp_vent.network.normal_members.len > 50)
 				vents += temp_vent
 
-	var/list/candidates = get_candidates(BE_ALIEN)
+	var/list/candidates = get_candidates(BE_ALIEN,ALIEN_AFK_BRACKET,"alien")
 	while(spawncount > 0 && vents.len && candidates.len)
 		var/obj/vent = pick_n_take(vents)
 		var/client/C = pick_n_take(candidates)

code/modules/events/tgevents/alien_infestation.dm

@@ -26,7 +26,7 @@
 			if(temp_vent.network.normal_members.len > 50)	//Stops Aliens getting stuck in small networks. See: Security, Virology
 				vents += temp_vent
 
-	var/list/candidates = get_candidates(BE_ALIEN)
+	var/list/candidates = get_candidates(BE_ALIEN,,"alien")
 
 	while(spawncount > 0 && vents.len && candidates.len)
 		var/obj/vent = pick_n_take(vents)

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

@@ -74,7 +74,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 				AttemptGrow()
 
 /obj/item/alien_embryo/proc/AttemptGrow(var/gib_on_success = 1)
-	var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET)
+	var/list/candidates = get_candidates(BE_ALIEN,ALIEN_AFK_BRACKET,"alien")
 	var/client/C = null
 
 	// To stop clientless larva, we will check that our host has a client

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

@@ -42,7 +42,7 @@
 /obj/item/device/mmi/posibrain/proc/check_observer(var/mob/dead/observer/O)
 	if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
 		return 0
-	if(jobban_isbanned(O, "pAI"))
+	if(jobban_isbanned(O, "pAI") || jobban_isbanned(O,"nonhumandept"))
 		return 0
 	if(O.client)
 		return 1
@@ -125,7 +125,7 @@
 	if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
 		O << "\red Upon using the antagHUD you forfeited the ability to join the round."
 		return
-	if(jobban_isbanned(O, "pAI"))
+	if(jobban_isbanned(O, "Cyborg") || jobban_isbanned(O,"nonhumandept"))
 		O << "\red You are job banned from this role."
 		return
 	O.<< "\blue You've been added to the list of ghosts that may become this [src].  Click again to unvolunteer."

code/modules/mob/living/silicon/pai/recruit.dm

@@ -353,7 +353,7 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 					O << "\blue <b>A pAI card is looking for personalities. (<a href='?src=\ref[src];signup=\ref[O]'>Sign Up</a>)</b>"
 					//question(O.client)
 	proc/check_recruit(var/mob/dead/observer/O)
-		if(jobban_isbanned(O, "pAI"))
+		if(jobban_isbanned(O, "pAI") || jobban_isbanned(O,"nonhumandept"))
 			return 0
 		if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
 			return 0

code/modules/mob/living/silicon/robot/drone/drone.dm

@@ -307,15 +307,15 @@
 
 /mob/living/silicon/robot/drone/proc/request_player()
 	for(var/mob/dead/observer/O in player_list)
-		if(jobban_isbanned(O, "Cyborg"))
+		if(jobban_isbanned(O,"nonhumandept") || jobban_isbanned(O,"Drone"))
 			continue
 		if(O.client)
 			if(O.client.prefs.be_special & BE_PAI)
-				question(O.client)
+				question(O.client,O)
 
-/mob/living/silicon/robot/drone/proc/question(var/client/C)
+/mob/living/silicon/robot/drone/proc/question(var/client/C,var/mob/M)
 	spawn(0)
-		if(!C || jobban_isbanned(C,"Cyborg"))	return
+		if(!C || !M || jobban_isbanned(M,"nonhumandept") || jobban_isbanned(M,"Drone"))	return
 		var/response = alert(C, "Someone is attempting to reboot a maintenance drone. Would you like to play as one?", "Maintenance drone reboot", "Yes", "No", "Never for this round.")
 		if(!C || ckey)
 			return

code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm

@@ -80,7 +80,6 @@
 
 
 /mob/dead/verb/join_as_drone()
-
 	set category = "Ghost"
 	set name = "Join As Drone"
 	set desc = "If there is a powered, enabled fabricator in the game world with a prepared chassis, join as a maintenance drone."
@@ -95,8 +94,8 @@
 	if (usr != src)
 		return 0 //something is terribly wrong
 
-	if(jobban_isbanned(src,"Cyborg"))
-		usr << "\red You are banned from playing synthetics and cannot spawn as a drone."
+	if(jobban_isbanned(src,"nonhumandept") || jobban_isbanned(src,"Drone"))
+		usr << "\red You are banned from playing drones and cannot spawn as a drone."
 		return
 
 	var/deathtime = world.time - src.timeofdeath

code/modules/mob/living/simple_animal/borer.dm

@@ -510,7 +510,7 @@ mob/living/simple_animal/borer/proc/request_player()
 		if(jobban_isbanned(O, "Syndicate"))
 			continue
 		if(O.client)
-			if(O.client.prefs.be_special & BE_ALIEN)
+			if(O.client.prefs.be_special & BE_ALIEN && !jobban_isbanned(O, "alien"))
 				question(O.client)
 
 mob/living/simple_animal/borer/proc/question(var/client/C)

code/modules/mob/living/simple_animal/friendly/spiderbot.dm

@@ -71,7 +71,7 @@
 			user << "\red [O] is dead. Sticking it into the frame would sort of defeat the purpose."
 			return
 
-		if(jobban_isbanned(B.brainmob, "Cyborg"))
+		if(jobban_isbanned(B.brainmob, "Cyborg") || jobban_isbanned(B.brainmob,"nonhumandept"))
 			user << "\red [O] does not seem to fit."
 			return
 

code/modules/mob/mob.dm

@@ -1223,6 +1223,10 @@ mob/proc/yank_out_object()
 	set name = "Respawn as NPC"
 	set category = "Ghost"
 
+	if(jobban_isbanned(usr, "NPC"))
+		usr << "<span class='warning'>You are banned from playing as NPC's.</span>"
+		return
+	
 	if((usr in respawnable_list) && (stat==2 || istype(usr,/mob/dead/observer)))
 		var/list/creatures = list("Mouse")
 		for(var/mob/living/L in living_mob_list)

code/modules/mob/transform_procs.dm

@@ -461,19 +461,19 @@
 		return 1 	
 
 //Antag Creatures!
-/*	if(ispath(MP, /mob/living/simple_animal/hostile/carp))
+/*	if(ispath(MP, /mob/living/simple_animal/hostile/carp) && !jobban_isbanned(src, "Syndicate"))
 		return 1
-	if(ispath(MP, /mob/living/simple_animal/hostile/giant_spider))
+	if(ispath(MP, /mob/living/simple_animal/hostile/giant_spider) && !jobban_isbanned(src, "Syndicate"))
 		return 1 */
-	if(ispath(MP, /mob/living/simple_animal/borer))
+	if(ispath(MP, /mob/living/simple_animal/borer) && !jobban_isbanned(src, "alien") && !jobban_isbanned(src, "Syndicate"))
 		return 1
-	if(ispath(MP, /mob/living/carbon/alien))
+	if(ispath(MP, /mob/living/carbon/alien) && !jobban_isbanned(src, "alien") && !jobban_isbanned(src, "Syndicate"))
 		return 1
-	if(ispath(MP, /mob/living/simple_animal/hostile/statue))
+	if(ispath(MP, /mob/living/simple_animal/hostile/statue) && !jobban_isbanned(src, "Syndicate"))
 		return 1
 
 //Friendly Creatures!
-	if(ispath(MP, /mob/living/carbon/monkey/diona))
+	if(ispath(MP, /mob/living/carbon/monkey/diona) && !jobban_isbanned(src, "Dionaea"))
 		return 1
 
 	//Not in here? Must be untested!