Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

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
 
@@ -57,6 +91,7 @@ datum/preferences
 	var/be_random_name = 0				//whether we are a random name every round
 	var/gender = MALE					//gender of character (well duh)
 	var/age = 30						//age of character
+	var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2).
 	var/b_type = "A+"					//blood type (not-chooseable)
 	var/underwear = 1					//underwear type
 	var/undershirt = 1					//undershirt type
@@ -183,6 +218,7 @@ datum/preferences
 				dat += "<br>"
 				dat += "<b>Gender:</b> <a href='?_src_=prefs;preference=gender'><b>[gender == MALE ? "Male" : "Female"]</b></a><br>"
 				dat += "<b>Age:</b> <a href='?_src_=prefs;preference=age;task=input'>[age]</a>"
+				//dat += "<b>Spawn Point</b>: <a href='byond://?src=\ref[user];preference=spawnpoint;task=input'>[spawnpoint]</a>"
 				dat += "<br><table><tr><td><b>Body</b> "
 				dat += "(<a href='?_src_=prefs;preference=all;task=random'>&reg;</A>)"
 				dat += "<br>"
@@ -335,20 +371,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++
@@ -1276,6 +1313,17 @@ datum/preferences
 						var/skin_style_name = input(user, "Select a new skin style") as null|anything in list("default1", "default2", "default3")
 						if(!skin_style_name) return
 */
+
+/*					if("spawnpoint")
+						var/list/spawnkeys = list()
+						for(var/S in spawntypes)
+							spawnkeys += S
+						var/choice = input(user, "Where would you like to spawn when latejoining?") as null|anything in spawnkeys
+						if(!choice || !spawntypes[choice])
+							spawnpoint = "Arrivals Shuttle"
+							return
+						spawnpoint = choice */
+
 			else
 				switch(href_list["preference"])
 					if("gender")

code/modules/client/preferences_savefile.dm

@@ -121,6 +121,7 @@
 	S["age"]				>> age
 	S["species"]			>> species
 	S["language"]			>> language
+	S["spawnpoint"]			>> spawnpoint
 
 	//colors to be consolidated into hex strings (requires some work with dna code)
 	S["hair_red"]			>> r_hair
@@ -323,6 +324,7 @@
 	real_name		= reject_bad_name(real_name)
 	if(isnull(species)) species = "Human"
 	if(isnull(language)) language = "None"
+	if(isnull(spawnpoint)) spawnpoint = "Arrivals Shuttle"
 	if(isnull(nanotrasen_relation)) nanotrasen_relation = initial(nanotrasen_relation)
 	if(!real_name) real_name = random_name(gender)
 	be_random_name	= sanitize_integer(be_random_name, 0, 1, initial(be_random_name))

code/modules/client/preferences_spawnpoints.dm

@@ -0,0 +1,57 @@
+var/list/spawntypes = list()
+
+/proc/populate_spawn_points()
+	spawntypes = list()
+	for(var/type in typesof(/datum/spawnpoint)-/datum/spawnpoint)
+		var/datum/spawnpoint/S = new type()
+		spawntypes[S.display_name] = S
+
+/datum/spawnpoint
+	var/msg          //Message to display on the arrivals computer.
+	var/list/turfs   //List of turfs to spawn on.
+	var/display_name //Name used in preference setup.
+	var/list/restrict_job = null
+	var/list/disallow_job = null
+
+	proc/check_job_spawning(job)
+		if(restrict_job && !(job in restrict_job))
+			return 0
+
+		if(disallow_job && (job in disallow_job))
+			return 0
+
+		return 1
+
+/datum/spawnpoint/arrivals
+	display_name = "Arrivals Shuttle"
+	msg = "has arrived on the station"
+
+/datum/spawnpoint/arrivals/New()
+	..()
+	turfs = latejoin
+
+/datum/spawnpoint/gateway
+	display_name = "Gateway"
+	msg = "has completed translation from offsite gateway"
+
+/datum/spawnpoint/gateway/New()
+	..()
+	turfs = latejoin_gateway
+
+/datum/spawnpoint/cryo
+	display_name = "Cryogenic Storage"
+	msg = "has completed cryogenic revival"
+	disallow_job = list("Cyborg")
+
+/datum/spawnpoint/cryo/New()
+	..()
+	turfs = latejoin_cryo
+
+/datum/spawnpoint/cyborg
+	display_name = "Cyborg Storage"
+	msg = "has been activated from storage"
+	restrict_job = list("Cyborg")
+
+/datum/spawnpoint/cyborg/New()
+	..()
+	turfs = latejoin_cyborg

code/modules/client/preferences_toggles.dm

@@ -131,6 +131,10 @@
 	set desc = "Toggles which special roles you would like to be a candidate for, during events."
 	var/role_flag = be_special_flags[role]
 	if(!role_flag)	return
+	if(!player_old_enough_antag(src,be_special_flags[role]))
+		var/available_in_days_antag = available_in_days_antag(src,be_special_flags[role])
+		src << "<span class='warning'>This role is not yet available to you. You need to wait another [available_in_days_antag] days.</span>"
+		return
 	prefs.be_special ^= role_flag
 	prefs.save_preferences(src)
 	src << "You will [(prefs.be_special & role_flag) ? "now" : "no longer"] be considered for [role] events (where possible)."