Skip to content
This repository has been archived by the owner on Jul 14, 2023. It is now read-only.

Commit

Permalink
Merge pull request #195 from TimThe4th/jobs
Browse files Browse the repository at this point in the history
время для проф
  • Loading branch information
johncoder0 committed Jul 3, 2023
2 parents 0705ce6 + 713e85c commit 0d84eba
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 18 deletions.
3 changes: 1 addition & 2 deletions maps/castelnau/job/jobs_cargo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -60,4 +59,4 @@

access_castelnau_bixie,
access_castelnau_bixie_helm,
access_castelnau_hangar)
access_castelnau_hangar)
8 changes: 5 additions & 3 deletions maps/castelnau/job/jobs_command.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -194,6 +194,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"
Expand Down Expand Up @@ -238,6 +239,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(
Expand Down Expand Up @@ -290,4 +292,4 @@
/datum/computer_file/program/reports)

/datum/job/sea/get_description_blurb()
return "-"
return "-"
7 changes: 3 additions & 4 deletions maps/castelnau/job/jobs_engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -66,7 +66,6 @@

total_positions = 2
spawn_positions = 2
minimal_player_age = 7
ideal_character_age = 25
economic_power = 4

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -222,4 +221,4 @@
access_castelnau_external_airlocks
)

skill_points = 25
skill_points = 25
6 changes: 4 additions & 2 deletions maps/castelnau/job/jobs_evaguys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -298,4 +300,4 @@
access_castelnau_external_airlocks,

access_castelnau_perseus,
access_castelnau_perseus_helm)
access_castelnau_perseus_helm)
2 changes: 1 addition & 1 deletion maps/castelnau/job/jobs_medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions maps/castelnau/job/jobs_merchants.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions maps/castelnau/job/jobs_security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0d84eba

Please sign in to comment.