Add Sierra age restictions and recommendations (#1245)

SierraBay · Oct 28, 2023 · 04976fd · 04976fd
1 parent a4ff7b7
commit 04976fd
Show file tree

Hide file tree

Showing 11 changed files with 114 additions and 100 deletions.
diff --git a/maps/sierra/job/jobs.dm b/maps/sierra/job/jobs.dm
@@ -9,6 +9,7 @@
 	species_to_job_blacklist = list(
 		/datum/species/unathi = list(HUMAN_ONLY_JOBS),
 		/datum/species/unathi/yeosa = list(HUMAN_ONLY_JOBS),
+		/datum/species/tajaran = list(HUMAN_ONLY_JOBS),
 		/datum/species/skrell = list(SKRELL_BLACKLISTED_JOBS),
 		/datum/species/machine = list(MACHINE_BLACKLISTED_JOBS),
 		/datum/species/diona = list(

diff --git a/maps/sierra/job/jobs_cargo.dm b/maps/sierra/job/jobs_cargo.dm
@@ -7,7 +7,8 @@
 	supervisors = "Главе Персонала"
 	economic_power = 8
 	minimal_player_age = 7
-	ideal_character_age = 35
+	minimum_character_age = list(SPECIES_HUMAN = 23)
+	ideal_character_age = 25
 	outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/supply/quartermaster
 	allowed_branches = list(/datum/mil_branch/employee)
 	allowed_ranks = list(/datum/mil_rank/civ/nt)
@@ -43,6 +44,7 @@
 	total_positions = 2
 	spawn_positions = 2
 	supervisors = "Квартирмейстеру и Главе Персонала"
+	minimum_character_age = list(SPECIES_HUMAN = 22)
 	ideal_character_age = 24
 	outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/supply/tech
 	allowed_branches = list(/datum/mil_branch/employee, /datum/mil_branch/contractor)
@@ -77,7 +79,8 @@
 	supervisors = "Квартирмейстеру и Главе Персонала"
 	selection_color = "#515151"
 	economic_power = 7
-	ideal_character_age = 25
+	minimum_character_age = list(SPECIES_HUMAN = 22)
+	ideal_character_age = 24
 	alt_titles = list(
 		"Drill Technician",
 		"Shaft Miner",
@@ -110,6 +113,7 @@
 	total_positions = 1
 	spawn_positions = 1
 	supervisors = "Квартирмейстеру и Главе Персонала"
+	minimum_character_age = list(SPECIES_HUMAN = 18)
 	ideal_character_age = 20
 	selection_color = "#515151"
 	outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/supply/assistant

diff --git a/maps/sierra/job/jobs_command.dm b/maps/sierra/job/jobs_command.dm
@@ -6,7 +6,9 @@
 	head_position = 1
 
 	minimal_player_age = 21
-	ideal_character_age = 50
+
+	minimum_character_age = list(SPECIES_HUMAN = 38)
+	ideal_character_age = 42
 	economic_power = 20
 	skill_points = 25
 
@@ -39,53 +41,6 @@
 	Его обязанность заключается в том, чтобы убедиться, что ИКН Сьерра выполняет свою миссию и вернется обратно в порт СолПрава в целостности и сохранности.\
 	От капитана ожидают проявления эффективных управленческих навыков, чтобы обеспечить бесперебойную работу всех отделов. Он является высшим авторитетом на Сьерре и имеет доступ к любому отсеку на борту, а также возможность выносить приказы практически без ограничений."
 
-/datum/job/hop
-	title = "Head of Personnel"
-	supervisors = "Капитану"
-	department = "Командный"
-	department_flag = COM|SRV
-
-	minimal_player_age = 21
-	ideal_character_age = 45
-	economic_power = 12
-	skill_points = 20
-
-	outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/command/hop
-	allowed_branches = list(
-		/datum/mil_branch/employee
-	)
-	allowed_ranks = list(
-		/datum/mil_rank/civ/nt
-	)
-	min_skill = list(
-		SKILL_BUREAUCRACY	=	SKILL_TRAINED,
-		SKILL_PILOT			=	SKILL_BASIC
-
-	)
-	max_skill = list(SKILL_PILOT = SKILL_MAX)
-	access = list(
-		access_seceva, access_guard, access_security, access_brig, access_armory,
-		access_forensics_lockers, access_heads, access_medical, access_morgue,
-		access_engine, access_engine_equip, access_maint_tunnels, access_external_airlocks,
-		access_emergency_storage, access_change_ids, access_ai_upload, access_teleporter,
-		access_eva, access_bridge, access_all_personal_lockers, access_chapel_office,
-		access_tech_storage, access_atmospherics, access_janitor, access_crematorium,
-		access_robotics, access_kitchen, access_cargo, access_construction, access_chemistry,
-		access_cargo_bot, access_hydroponics, access_library, access_virology, access_cmo,
-		access_qm, access_network, access_surgery, access_mailsorting, access_heads_vault,
-		access_ce, access_hop, access_hos, access_RC_announce, access_keycard_auth, access_tcomsat,
-		access_gateway, access_sec_doors, access_psychiatrist, access_medical_equip, access_gun,
-		access_expedition_shuttle, access_guppy, access_seneng, access_senmed, access_hangar,
-		access_guppy_helm, access_expedition_shuttle_helm, access_explorer, access_el, access_tox,
-		access_tox_storage, access_research, access_mining, access_mining_office, access_mining_station,
-		access_xenobiology, access_xenoarch, access_petrov, access_petrov_helm, access_actor
-	)
-	software_on_spawn = list(
-		/datum/computer_file/program/comm,
-		/datum/computer_file/program/card_mod,
-		/datum/computer_file/program/camera_monitor,
-		/datum/computer_file/program/reports
-	)
 
 /datum/job/hop
 	title = "Head of Personnel"
@@ -98,7 +53,8 @@
 	economic_power = 14
 	skill_points = 30
 
-	minimum_character_age = list(SPECIES_HUMAN = 35)
+	minimum_character_age = list(SPECIES_HUMAN = 28)
+	ideal_character_age = 45
 	head_position = 1
 	total_positions = 1
 	spawn_positions = 1
@@ -165,7 +121,9 @@
 	req_admin_notify = 1
 
 	minimal_player_age = 14
-	ideal_character_age = 60
+
+	minimum_character_age = list(SPECIES_HUMAN = 37)
+	ideal_character_age = 42
 	economic_power = 20
 	skill_points = 36
 
@@ -229,8 +187,11 @@
 	spawn_positions = 1
 	req_admin_notify = 1
 	economic_power = 10
+
 	minimal_player_age = 21
-	ideal_character_age = 48
+
+	minimum_character_age = list(SPECIES_HUMAN = 34)
+	ideal_character_age = 36
 	outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/command/cmo
 	allowed_branches = list(
 		/datum/mil_branch/employee
@@ -294,8 +255,11 @@
 	spawn_positions = 1
 	req_admin_notify = 1
 	economic_power = 10
-	ideal_character_age = 40
+
 	minimal_player_age = 21
+
+	minimum_character_age = list(SPECIES_HUMAN = 30)
+	ideal_character_age = 32
 	outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/command/chief_engineer
 	allowed_branches = list(
 		/datum/mil_branch/employee
@@ -369,8 +333,11 @@
 	spawn_positions = 1
 	req_admin_notify = 1
 	economic_power = 10
+
 	minimal_player_age = 21
-	ideal_character_age = 35
+
+	minimum_character_age = list(SPECIES_HUMAN = 34)
+	ideal_character_age = 40
 	outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/command/hos
 	allowed_branches = list(/datum/mil_branch/employee)
 	allowed_ranks = list(/datum/mil_rank/civ/nt)
@@ -430,7 +397,11 @@
 	supervisors = "Центральному Командованию"
 	selection_color = "#2f2f7f"
 	economic_power = 15
+
 	minimal_player_age = 10
+
+	minimum_character_age = list(SPECIES_HUMAN = 30)
+	ideal_character_age = 40
 	outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/research/iaa
 	allowed_branches = list(
 		/datum/mil_branch/employee
@@ -478,7 +449,9 @@
 	selection_color = "#2f2f7f"
 
 	minimal_player_age = 18
-	ideal_character_age = 24
+
+	minimum_character_age = list(SPECIES_HUMAN = 24)
+	ideal_character_age = 26
 	economic_power = 7
 	skill_points = 20
 

diff --git a/maps/sierra/job/jobs_engineering.dm b/maps/sierra/job/jobs_engineering.dm
@@ -9,7 +9,8 @@
 	spawn_positions = 1
 	economic_power = 7
 	minimal_player_age = 14
-	ideal_character_age = 34
+	minimum_character_age = list(SPECIES_HUMAN = 26)
+	ideal_character_age = 28
 
 	outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/engineering/senior_engineer
 	allowed_branches = list(/datum/mil_branch/employee)
@@ -60,7 +61,8 @@
 	total_positions = 4
 	spawn_positions = 4
 	minimal_player_age = 7
-	ideal_character_age = 25
+	minimum_character_age = list(SPECIES_HUMAN = 22)
+	ideal_character_age = 24
 	economic_power = 6
 
 	alt_titles = list(
@@ -116,7 +118,8 @@
 
 	total_positions = 2
 	spawn_positions = 2
-	ideal_character_age = 20
+	minimum_character_age = list(SPECIES_HUMAN = 20)
+	ideal_character_age = 21
 	economic_power = 3
 
 	outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/engineering/engineer/trainee
@@ -165,6 +168,7 @@
 	total_positions = 1
 	spawn_positions = 1
 	minimal_player_age = 7
+	minimum_character_age = list(SPECIES_HUMAN = 22)
 	ideal_character_age = 24
 	economic_power = 6
 

diff --git a/maps/sierra/job/jobs_exploration.dm b/maps/sierra/job/jobs_exploration.dm
@@ -9,7 +9,9 @@
 	selection_color = "#68099e"
 
 	minimal_player_age = 14
-	ideal_character_age = 35
+
+	minimum_character_age = list(SPECIES_HUMAN = 26)
+	ideal_character_age = 29
 	economic_power = 9
 	skill_points = 22
 
@@ -67,7 +69,9 @@
 	selection_color = "#68099e"
 
 	minimal_player_age = 4
-	ideal_character_age = 20
+
+	minimum_character_age = list(SPECIES_HUMAN = 22)
+	ideal_character_age = 24
 	economic_power = 6
 
 	outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/exploration/explorer
@@ -120,7 +124,9 @@
 	selection_color = "#68099e"
 
 	minimal_player_age = 14
-	ideal_character_age = 24
+
+	minimum_character_age = list(SPECIES_HUMAN = 24)
+	ideal_character_age = 26
 	economic_power = 7
 
 	outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/exploration/pilot
@@ -177,7 +183,9 @@
 	allowed_ranks = list(/datum/mil_rank/civ/nt, /datum/mil_rank/civ/contractor)
 
 	minimal_player_age = 8
-	ideal_character_age = 34
+
+	minimum_character_age = list(SPECIES_HUMAN = 24)
+	ideal_character_age = 26
 	economic_power = 8
 	skill_points = 26
 
@@ -226,7 +234,9 @@
 	selection_color = "#68099e"
 
 	minimal_player_age = 8
-	ideal_character_age = 28
+
+	minimum_character_age = list(SPECIES_HUMAN = 24)
+	ideal_character_age = 26
 	economic_power = 7
 	skill_points = 20
 

diff --git a/maps/sierra/job/jobs_medical.dm b/maps/sierra/job/jobs_medical.dm
@@ -5,6 +5,7 @@
 	department_flag = MED
 
 	minimal_player_age = 14
+	minimum_character_age = list(SPECIES_HUMAN = 28)
 	ideal_character_age = 45
 	economic_power = 8
 	skill_points = 26
@@ -61,7 +62,8 @@
 	total_positions = 3
 	spawn_positions = 3
 
-	ideal_character_age = 40
+	minimum_character_age = list(SPECIES_HUMAN = 24)
+	ideal_character_age = 26
 	economic_power = 7
 	skill_points = 22
 
@@ -107,7 +109,8 @@
 	department = "Медицинский"
 	department_flag = MED
 
-	ideal_character_age = 30
+	minimum_character_age = list(SPECIES_HUMAN = 20)
+	ideal_character_age = 21
 	economic_power = 3
 	skill_points = 18
 
@@ -154,7 +157,8 @@
 	department = "Медицинский"
 	department_flag = MED
 
-	ideal_character_age = 30
+	minimum_character_age = list(SPECIES_HUMAN = 24)
+	ideal_character_age = 26
 	economic_power = 5
 	skill_points = 18
 
@@ -188,7 +192,8 @@
 	department = "Медицинский"
 	department_flag = MED
 
-	ideal_character_age = 40
+	minimum_character_age = list(SPECIES_HUMAN = 24)
+	ideal_character_age = 30
 	economic_power = 8
 
 	total_positions = 1

diff --git a/maps/sierra/job/jobs_research.dm b/maps/sierra/job/jobs_research.dm
@@ -8,8 +8,10 @@
 	supervisors = "Директору Исследований"
 	selection_color = "#633d63"
 	economic_power = 12
+
 	minimal_player_age = 10
-	ideal_character_age = 50
+	minimum_character_age = list(SPECIES_HUMAN = 27)
+	ideal_character_age = 30
 	alt_titles = list(
 			"Research Supervisor"
 		)
@@ -58,7 +60,8 @@
 	spawn_positions = 6
 	supervisors = "Директору Исследований и Старшему Исследователю"
 	economic_power = 10
-	ideal_character_age = 45
+	minimum_character_age = list(SPECIES_HUMAN = 25)
+	ideal_character_age = 27
 	alt_titles = list(
 			"Xenoarcheologist",
 			"Anomalist",
@@ -114,6 +117,8 @@
 	supervisors = "Директору Исследований и Старшему Исследователю"
 	selection_color = "#633d63"
 	economic_power = 6
+	minimum_character_age = list(SPECIES_HUMAN = 25)
+	ideal_character_age = 27
 	alt_titles = list(
 			"Biomechanical Engineer",
 			"Exosuit Technician",
@@ -170,6 +175,8 @@
 	supervisors = "Директору Исследований и остальному научному персоналу"
 	selection_color = "#633d63"
 	economic_power = 3
+	minimum_character_age = list(SPECIES_HUMAN = 18)
+	ideal_character_age = 24
 	ideal_character_age = 30
 	alt_titles = list(
 			"Testing Assistant" = /singleton/hierarchy/outfit/job/sierra/crew/research/assist/testsubject,

diff --git a/maps/sierra/job/jobs_security.dm b/maps/sierra/job/jobs_security.dm
@@ -7,7 +7,8 @@
 	supervisors = "Главе Службы безопасности"
 	economic_power = 8
 	minimal_player_age = 14
-	ideal_character_age = 35
+	minimum_character_age = list(SPECIES_HUMAN = 26)
+	ideal_character_age = 28
 	alt_titles = list(
 		"Security Sergeant",
 		)