From 713e85c4e959e719f2f75ad2fda18f90b6349208 Mon Sep 17 00:00:00 2001 From: TimLV Date: Mon, 3 Jul 2023 21:35:22 +0200 Subject: [PATCH] =?UTF-8?q?=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=BF=D1=80=D0=BE=D1=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maps/castelnau/job/jobs_cargo.dm | 3 +-- maps/castelnau/job/jobs_command.dm | 8 +++++--- maps/castelnau/job/jobs_engineering.dm | 7 +++---- maps/castelnau/job/jobs_evaguys.dm | 6 ++++-- maps/castelnau/job/jobs_medical.dm | 2 +- maps/castelnau/job/jobs_merchants.dm | 5 ++--- maps/castelnau/job/jobs_security.dm | 6 +++--- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/maps/castelnau/job/jobs_cargo.dm b/maps/castelnau/job/jobs_cargo.dm index ed739088ddacb..af31630d483a4 100644 --- a/maps/castelnau/job/jobs_cargo.dm +++ b/maps/castelnau/job/jobs_cargo.dm @@ -6,7 +6,6 @@ spawn_positions = 2 supervisors = "the Chief Merchant" economic_power = 8 - minimal_player_age = 7 ideal_character_age = 35 selection_color = "#755c48" outfit_type = /decl/hierarchy/outfit/job/cheapskate/cargo @@ -60,4 +59,4 @@ access_castelnau_bixie, access_castelnau_bixie_helm, - access_castelnau_hangar) \ No newline at end of file + access_castelnau_hangar) diff --git a/maps/castelnau/job/jobs_command.dm b/maps/castelnau/job/jobs_command.dm index eeb7d45581936..6ad4aa0a58c01 100644 --- a/maps/castelnau/job/jobs_command.dm +++ b/maps/castelnau/job/jobs_command.dm @@ -4,7 +4,7 @@ supervisors = "the Regulator High Command and the God (He didn't answer last time)" department_flag = COM head_position = 1 - minimal_player_age = 21 + minimal_player_age = 14 economic_power = 15 ideal_character_age = 50 outfit_type = /decl/hierarchy/outfit/job/castelnau/reg/com/captain @@ -73,7 +73,7 @@ total_positions = 1 spawn_positions = 1 req_admin_notify = 1 - minimal_player_age = 21 + minimal_player_age = 14 economic_power = 8 ideal_character_age = 45 outfit_type = /decl/hierarchy/outfit/job/castelnau/reg/com/hop @@ -185,6 +185,7 @@ head_position = 1 total_positions = 1 spawn_positions = 1 + minimal_player_age = 21 economic_power = 8 outfit_type = /decl/hierarchy/outfit/job/castelnau/gov/com/emissary selection_color = "#304582" @@ -229,6 +230,7 @@ supervisors = "the Galactic Security Corps" selection_color = "#304582" economic_power = 8 + minimal_player_age = 21 minimum_character_age = list(SPECIES_HUMAN = 35) outfit_type = /decl/hierarchy/outfit/job/castelnau/gov/com/commissary allowed_branches = list( @@ -281,4 +283,4 @@ /datum/computer_file/program/reports) /datum/job/sea/get_description_blurb() - return "-" \ No newline at end of file + return "-" diff --git a/maps/castelnau/job/jobs_engineering.dm b/maps/castelnau/job/jobs_engineering.dm index fcc8f87d8debb..6072dbb72665f 100644 --- a/maps/castelnau/job/jobs_engineering.dm +++ b/maps/castelnau/job/jobs_engineering.dm @@ -8,7 +8,7 @@ total_positions = 1 spawn_positions = 1 economic_power = 6 - minimal_player_age = 14 + minimal_player_age = 7 ideal_character_age = 34 allowed_branches = list(/datum/mil_branch/reg, /datum/mil_branch/mil) @@ -66,7 +66,6 @@ total_positions = 2 spawn_positions = 2 - minimal_player_age = 7 ideal_character_age = 25 economic_power = 4 @@ -129,7 +128,6 @@ total_positions = 1 spawn_positions = 1 - minimal_player_age = 7 ideal_character_age = 25 economic_power = 4 give_psionic_implant_on_join = FALSE @@ -187,6 +185,7 @@ department_flag = ENG total_positions = 2 spawn_positions = 2 + minimal_player_age = 7 supervisors = "the Senior Engineer" alt_titles = list( "Biomechanical Engineer") @@ -222,4 +221,4 @@ access_castelnau_external_airlocks ) - skill_points = 25 \ No newline at end of file + skill_points = 25 diff --git a/maps/castelnau/job/jobs_evaguys.dm b/maps/castelnau/job/jobs_evaguys.dm index 6fabd1e2d04ae..524b5488ba6b8 100644 --- a/maps/castelnau/job/jobs_evaguys.dm +++ b/maps/castelnau/job/jobs_evaguys.dm @@ -6,7 +6,7 @@ total_positions = 1 spawn_positions = 1 economic_power = 6 - minimal_player_age = 0 + minimal_player_age = 7 selection_color = "#4f3230" minimum_character_age = list(SPECIES_HUMAN = 24) allowed_branches = list( @@ -46,6 +46,7 @@ department_flag = COM total_positions = 1 spawn_positions = 1 + minimal_player_age = 14 supervisors = "the Captain and the Coordinator" selection_color = "#2f2f7f" economic_power = 9 @@ -228,6 +229,7 @@ department_flag = SEC total_positions = 1 spawn_positions = 1 + minimal_player_age = 14 supervisors = "the Coordinator" selection_color = "#c63939" skill_points = 20 @@ -298,4 +300,4 @@ access_castelnau_external_airlocks, access_castelnau_perseus, - access_castelnau_perseus_helm) \ No newline at end of file + access_castelnau_perseus_helm) diff --git a/maps/castelnau/job/jobs_medical.dm b/maps/castelnau/job/jobs_medical.dm index 9717ef7c9d200..daee7d0cbf199 100644 --- a/maps/castelnau/job/jobs_medical.dm +++ b/maps/castelnau/job/jobs_medical.dm @@ -3,7 +3,7 @@ department = "Medical" department_flag = MED - minimal_player_age = 14 + minimal_player_age = 7 ideal_character_age = 45 total_positions = 1 spawn_positions = 1 diff --git a/maps/castelnau/job/jobs_merchants.dm b/maps/castelnau/job/jobs_merchants.dm index db3266e6847f9..d78e12b58c069 100644 --- a/maps/castelnau/job/jobs_merchants.dm +++ b/maps/castelnau/job/jobs_merchants.dm @@ -5,7 +5,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the invisible hand of the market" - minimal_player_age = 21 + minimal_player_age = 14 economic_power = 18 selection_color = "#4f3e30" allowed_branches = list( @@ -48,7 +48,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the Chief Merchant" - minimal_player_age = 21 + minimal_player_age = 7 economic_power = 10 selection_color = "#755c48" outfit_type = /decl/hierarchy/outfit/job/cheapskate/merchant @@ -81,7 +81,6 @@ total_positions = 1 spawn_positions = 1 supervisors = "the FTU merchants" - minimal_player_age = 22 economic_power = 6 selection_color = "#755c48" outfit_type = /decl/hierarchy/outfit/job/cheapskate/security diff --git a/maps/castelnau/job/jobs_security.dm b/maps/castelnau/job/jobs_security.dm index 102c421e9f982..cc321c4848f75 100644 --- a/maps/castelnau/job/jobs_security.dm +++ b/maps/castelnau/job/jobs_security.dm @@ -6,7 +6,7 @@ spawn_positions = 1 supervisors = "the Captain, the First Mate and the Coordinator" economic_power = 8 - minimal_player_age = 22 + minimal_player_age = 14 ideal_character_age = 35 outfit_type = /decl/hierarchy/outfit/job/castelnau/reg/com/sheriff allowed_branches = list(/datum/mil_branch/reg) @@ -54,7 +54,7 @@ supervisors = "the Sheriff" selection_color = "#9e2e2e" economic_power = 6 - minimal_player_age = 20 + minimal_player_age = 7 ideal_character_age = 25 skill_points = 20 @@ -96,7 +96,7 @@ supervisors = "the Sheriff" selection_color = "#9e2e2e" economic_power = 6 - minimal_player_age = 20 + minimal_player_age = 7 ideal_character_age = 25 give_psionic_implant_on_join = FALSE skill_points = 20