From e8fb6cb031c624823ab35455fa59cf876fa52b93 Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Sat, 28 Oct 2023 21:40:54 +0300 Subject: [PATCH 01/44] Fix station levels --- maps/sierra/sierra_define.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maps/sierra/sierra_define.dm b/maps/sierra/sierra_define.dm index d75f40a67e430..f26692fd9cfe9 100644 --- a/maps/sierra/sierra_define.dm +++ b/maps/sierra/sierra_define.dm @@ -11,10 +11,10 @@ load_legacy_saves = TRUE - station_levels = list(1,2,3) - admin_levels = list(4,5) - empty_levels = list(6) - accessible_z_levels = list("1"=1,"2"=1,"3"=1,"6"=30) + station_levels = list(1,2,3,4,5) + admin_levels = list(6,7) + empty_levels = list(8) + accessible_z_levels = list("1"=1,"2"=1,"3"=1,"4"=1,"5"=1,"8"=25) overmap_size = 40 overmap_event_areas = 34 usable_email_tlds = list("freemail.net") From a4ff7b7b61f79960b290bcf74208ce621f9091b7 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Sat, 28 Oct 2023 21:44:47 +0300 Subject: [PATCH 02/44] =?UTF-8?q?=D0=A7=D0=B5=D0=B9=D0=BD=D0=B4=D0=B6?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3=20=D0=B4=D0=BB=D1=8F=20PR=20#1244=20[ci=20sk?= =?UTF-8?q?ip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/changelogs/AutoChangeLog-sierra-pr-1244.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1244.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1244.yml b/html/changelogs/AutoChangeLog-sierra-pr-1244.yml new file mode 100644 index 0000000000000..2edac6b7abe08 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1244.yml @@ -0,0 +1,5 @@ +author: SuhEugene +changes: + - {bugfix: 'Теперь уровни 4 и 5 сьерры не считаются админскими. Блокировка шлюзов + теперь будет работать нормально, темперы тоже начнут работать правильно.'} +delete-after: true From 04976fd73562298d087f2a2d607dfccbae41913c Mon Sep 17 00:00:00 2001 From: KandJX <83637364+YegorKandziuba@users.noreply.github.com> Date: Sat, 28 Oct 2023 21:59:35 +0300 Subject: [PATCH 03/44] Add Sierra age restictions and recommendations (#1245) --- maps/sierra/job/jobs.dm | 1 + maps/sierra/job/jobs_cargo.dm | 8 ++- maps/sierra/job/jobs_command.dm | 81 ++++++++--------------- maps/sierra/job/jobs_engineering.dm | 10 ++- maps/sierra/job/jobs_exploration.dm | 20 ++++-- maps/sierra/job/jobs_medical.dm | 13 ++-- maps/sierra/job/jobs_research.dm | 11 ++- maps/sierra/job/jobs_security.dm | 3 +- maps/sierra/job/jobs_service.dm | 4 ++ mods/_maps/farfleet/code/farfleet_crew.dm | 35 +++++----- mods/_maps/sentinel/code/sentinel_crew.dm | 28 ++++---- 11 files changed, 114 insertions(+), 100 deletions(-) diff --git a/maps/sierra/job/jobs.dm b/maps/sierra/job/jobs.dm index bd9be29e0c202..0a7df0ae398e8 100644 --- 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 index 76dfd6785dba1..e1d7dddd4cb65 100644 --- 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 index 7cee04696ba81..595a979aa3ea2 100644 --- 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 index 175814f340230..415f71345f7c1 100644 --- 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 index 601356748d815..dba13b66773af 100644 --- 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 index 00453153002ed..e89bf6e79e079 100644 --- 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 index e121e1b2f0250..05708fcc6f96d 100644 --- 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 index 83056314b5081..807e19aab33fc 100644 --- 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", ) diff --git a/maps/sierra/job/jobs_service.dm b/maps/sierra/job/jobs_service.dm index e36ce3aaeaf30..3312412d5cd97 100644 --- a/maps/sierra/job/jobs_service.dm +++ b/maps/sierra/job/jobs_service.dm @@ -51,6 +51,7 @@ total_positions = 1 spawn_positions = 1 + minimum_character_age = list(SPECIES_HUMAN = 28) ideal_character_age = 40 economic_power = 4 minimal_player_age = 0 @@ -79,6 +80,7 @@ total_positions = 2 spawn_positions = 2 + minimum_character_age = list(SPECIES_HUMAN = 18) ideal_character_age = 20 alt_titles = list("Sanitation Technician") supervisors = "Главному Стюарду и Главе Персонала" @@ -108,6 +110,7 @@ total_positions = 1 spawn_positions = 1 + ideal_character_age = 24 alt_titles = list("Culinary Specialist") supervisors = "Главному Стюарду и Главе Персонала" outfit_type = /singleton/hierarchy/outfit/job/sierra/crew/service/cook @@ -140,6 +143,7 @@ total_positions = 2 spawn_positions = 2 + ideal_character_age = 20 alt_titles = list( "Bar-Steward", "Waiter", diff --git a/mods/_maps/farfleet/code/farfleet_crew.dm b/mods/_maps/farfleet/code/farfleet_crew.dm index eb497b8f22092..ee14ecb898a8e 100644 --- a/mods/_maps/farfleet/code/farfleet_crew.dm +++ b/mods/_maps/farfleet/code/farfleet_crew.dm @@ -102,8 +102,6 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" title = "Pioneer Corps Trooper" total_positions = 2 outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_droptroops - branch = /datum/mil_rank/iccgn - rank = /datum/mil_rank/iccgn/or3 allowed_branches = list(/datum/mil_branch/iccgn) allowed_ranks = list(/datum/mil_rank/iccgn/or3) supervisors = "sergeant" @@ -130,8 +128,8 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_sergeant supervisors = "Recon captain, Command of the Pioneer Corps , ICCGN" - branch = /datum/mil_rank/iccgn - rank = /datum/mil_rank/iccgn/or5 + minimum_character_age = list(SPECIES_HUMAN = 23) + ideal_character_age = 25 allowed_branches = list(/datum/mil_rank/iccgn) allowed_ranks = list(/datum/mil_rank/iccgn/or5) loadout_allowed = TRUE @@ -158,10 +156,12 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" title = "Pioneer Corps Captain" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_captain - branch = /datum/mil_rank/iccgn - rank = /datum/mil_rank/iccgn/of5 + minimum_character_age = list(SPECIES_HUMAN = 36) + ideal_character_age = 40 allowed_branches = list(/datum/mil_rank/iccgn) - allowed_ranks = list(/datum/mil_rank/iccgn/of5) + allowed_ranks = list( + /datum/mil_rank/iccgn/of4, + /datum/mil_rank/iccgn/of5) supervisors = "command of the Pioneer Corps , ICCGN" loadout_allowed = TRUE is_semi_antagonist = TRUE @@ -187,13 +187,13 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" title = "Pioneer Corpsman" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_medic - branch = /datum/mil_rank/iccgn - rank = /datum/mil_rank/iccgn/of5 + minimum_character_age = list(SPECIES_HUMAN = 26) + ideal_character_age = 30 allowed_branches = list(/datum/mil_rank/iccgn) allowed_ranks = list( /datum/mil_rank/iccgn/of1, - /datum/mil_rank/iccgn/of3 - ) + /datum/mil_rank/iccgn/of2, + /datum/mil_rank/iccgn/of3) loadout_allowed = TRUE info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \ Являясь одним из членов экипажа разведывательного корабля Пионерского Корпуса ГКК, ваша задача состоит в медицинской поддержке экипажа. \ @@ -219,10 +219,13 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" title = "Pioneer Corps Technician" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_gunner - branch = /datum/mil_rank/iccgn - rank = /datum/mil_rank/iccgn/of3 allowed_branches = list(/datum/mil_rank/iccgn) - allowed_ranks = list(/datum/mil_rank/iccgn/of3) + allowed_ranks = list( + /datum/mil_rank/iccgn/of1, + /datum/mil_rank/iccgn/of2, + /datum/mil_rank/iccgn/of3) + minimum_character_age = list(SPECIES_HUMAN = 23) + ideal_character_age = 27 supervisors = "captain" loadout_allowed = TRUE info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \ @@ -251,8 +254,8 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" title = "CSS Field Operative" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_pawn - branch = /datum/mil_branch/css - rank = /datum/mil_rank/css/fa7 + minimum_character_age = list(SPECIES_HUMAN = 31) + ideal_character_age = 40 allowed_branches = list(/datum/mil_branch/css) allowed_ranks = list(/datum/mil_rank/css/fa7) supervisors = "chief of 'P' Department, Confederate Security Service" diff --git a/mods/_maps/sentinel/code/sentinel_crew.dm b/mods/_maps/sentinel/code/sentinel_crew.dm index 1b07fd4ce251c..c372cff9c8625 100644 --- a/mods/_maps/sentinel/code/sentinel_crew.dm +++ b/mods/_maps/sentinel/code/sentinel_crew.dm @@ -75,10 +75,12 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" title = "Army SCGSO Trooper" total_positions = 2 outfit_type = /singleton/hierarchy/outfit/job/patrol/army_ops - branch = /datum/mil_branch/scga - rank = /datum/mil_rank/scga/e5 + minimum_character_age = list(SPECIES_HUMAN = 23) + ideal_character_age = 25 allowed_branches = list(/datum/mil_branch/scga) - allowed_ranks = list(/datum/mil_rank/scga/e5) + allowed_ranks = list( + /datum/mil_rank/scga/e5 + ) supervisors = "Army Captain" loadout_allowed = TRUE is_semi_antagonist = TRUE @@ -101,8 +103,8 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" title = "Army SCGSO Leader" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/patrol/captain - branch = /datum/mil_branch/scga - rank = /datum/mil_rank/scga/o3 + minimum_character_age = list(SPECIES_HUMAN = 25) + ideal_character_age = 27 allowed_branches = list(/datum/mil_branch/scga) allowed_ranks = list(/datum/mil_rank/scga/o3) supervisors = "Lieutenant Commander, Command of the Battle Group Bravo of the 5th fleet, SCGDF" @@ -129,8 +131,8 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" title = "Fleet Commander" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/patrol/commander - branch = /datum/mil_branch/fleet - rank = /datum/mil_rank/fleet/o4 + minimum_character_age = list(SPECIES_HUMAN = 30) + ideal_character_age = 33 allowed_branches = list(/datum/mil_branch/fleet) allowed_ranks = list(/datum/mil_rank/fleet/o4) supervisors = "Command of the Battle Group Bravo of the 5th fleet, SCGDF" @@ -155,8 +157,8 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" title = "Fleet Pilot" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/patrol/pilot1 - branch = /datum/mil_branch/fleet - rank = /datum/mil_rank/fleet/o2 + minimum_character_age = list(SPECIES_HUMAN = 23) + ideal_character_age = 25 allowed_branches = list(/datum/mil_branch/fleet) allowed_ranks = list(/datum/mil_rank/fleet/o2) supervisors = "Lieutenant Commander" @@ -181,8 +183,8 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" title = "Fleet Corpsman" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/patrol/surgeon - branch = /datum/mil_branch/fleet - rank = /datum/mil_rank/fleet/o1 + minimum_character_age = list(SPECIES_HUMAN = 26) + ideal_character_age = 30 allowed_branches = list(/datum/mil_branch/fleet) allowed_ranks = list(/datum/mil_rank/fleet/o1) supervisors = "Sub-Lieutenant, Lieutenant Commander" @@ -209,8 +211,8 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" title = "Fleet Technician" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/patrol/engineer - branch = /datum/mil_branch/fleet - rank = /datum/mil_rank/fleet/e6 + minimum_character_age = list(SPECIES_HUMAN = 26) + ideal_character_age = 28 allowed_branches = list(/datum/mil_branch/fleet) allowed_ranks = list(/datum/mil_rank/fleet/e6) supervisors = "Sub-Lieutenant, Lieutenant Commander" From 3633fe5a5111fe97cedeba8d53492a3e5a49817a Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Sat, 28 Oct 2023 22:00:12 +0300 Subject: [PATCH 04/44] =?UTF-8?q?=D0=A7=D0=B5=D0=B9=D0=BD=D0=B4=D0=B6?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3=20=D0=B4=D0=BB=D1=8F=20PR=20#1245=20[ci=20sk?= =?UTF-8?q?ip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/changelogs/AutoChangeLog-sierra-pr-1245.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1245.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1245.yml b/html/changelogs/AutoChangeLog-sierra-pr-1245.yml new file mode 100644 index 0000000000000..388235f046cd7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1245.yml @@ -0,0 +1,8 @@ +author: KandJX +changes: + - {tweak: Запретил Таярам много ролей.} + - {tweak: Расставил большинству ролей (которым надо) минимальные и рекомендованные + возраста.} + - {maptweak: 'Расставил возраста для Патурльки ЦПСС и Пионерского корпуса. Прости + Лисико, в 28 лет рано на Командора.'} +delete-after: true From 98f697fd62f605dbd736de36dfe3d5ce6b9394c0 Mon Sep 17 00:00:00 2001 From: LordNest <77477080+LordNest@users.noreply.github.com> Date: Sun, 29 Oct 2023 01:32:02 +0400 Subject: [PATCH 05/44] Remove CMO/RD bedroom window, add flowers to the church (#1246) --- maps/sierra/z1-z5_sierra.dmm | 42 ++++++++++-------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 9d7375ff261b7..5977bb1c9ad38 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -5040,9 +5040,6 @@ /obj/structure/bed/chair/office/comfy/purple{ dir = 1 }, -/obj/structure/curtain/bed{ - pixel_y = 32 - }, /turf/simulated/floor/wood/mahogany, /area/crew_quarters/heads/office/rd/cobed) "aLi" = ( @@ -37688,6 +37685,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/reagent_containers/food/snacks/grown/poppy, /turf/simulated/floor/tiled/dark, /area/chapel/main) "fIJ" = ( @@ -46494,12 +46495,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/fore) -"hbp" = ( -/obj/wallframe_spawn/reinforced/polarized/full{ - id = "cmo_rd_dorms_windows" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/office/rd/cobed) "hbv" = ( /obj/structure/cable/green{ d2 = 8; @@ -46817,9 +46812,6 @@ /turf/simulated/floor/tiled/dark/monotile, /area/hallway/primary/bridgedeck/aft) "hdJ" = ( -/obj/structure/hygiene/toilet{ - dir = 8 - }, /obj/floor_decal/industrial/warning{ dir = 1 }, @@ -48686,7 +48678,6 @@ /area/maintenance/seconddeck/foreport) "hvd" = ( /obj/floor_decal/techfloor, -/obj/decal/cleanable/remains, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) "hvh" = ( @@ -58012,9 +58003,6 @@ /obj/floor_decal/corner/purple/border{ dir = 8 }, -/obj/structure/curtain/bed{ - pixel_y = 32 - }, /turf/simulated/floor/wood/mahogany, /area/crew_quarters/heads/office/rd/cobed) "iSd" = ( @@ -103467,9 +103455,6 @@ /obj/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/structure/curtain/bed{ - pixel_y = -32 - }, /turf/simulated/floor/wood/maple, /area/crew_quarters/heads/office/cmo/cobed) "pQe" = ( @@ -106815,9 +106800,6 @@ /area/exploration_shuttle/cargo_r) "qrt" = ( /obj/structure/bed/chair/office/comfy/teal, -/obj/structure/curtain/bed{ - pixel_y = -32 - }, /turf/simulated/floor/wood/maple, /area/crew_quarters/heads/office/cmo/cobed) "qrB" = ( @@ -109015,9 +108997,6 @@ /obj/floor_decal/carpet/purple{ dir = 9 }, -/obj/structure/curtain/bed{ - pixel_y = 32 - }, /turf/simulated/floor/carpet/purple, /area/crew_quarters/heads/office/rd/cobed) "qKw" = ( @@ -120193,6 +120172,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, /turf/simulated/floor/tiled/dark, /area/chapel/main) "ssT" = ( @@ -128179,9 +128162,6 @@ /obj/floor_decal/carpet/blue2{ dir = 10 }, -/obj/structure/curtain/bed{ - pixel_y = -32 - }, /turf/simulated/floor/carpet/blue3, /area/crew_quarters/heads/office/cmo/cobed) "tDf" = ( @@ -337345,7 +337325,7 @@ lsb alE tvm pQa -hbp +hdc iRR rJe xgE @@ -337547,7 +337527,7 @@ lsb via ibt qrt -hbp +hdc aLc dVH gip @@ -337749,7 +337729,7 @@ lsb rGX xBo tCS -hbp +hdc qKs xjd jWq From 519fa8eaf3d6006b81c2eb36725791122a5a918d Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Sun, 29 Oct 2023 00:32:38 +0300 Subject: [PATCH 06/44] =?UTF-8?q?=D0=A7=D0=B5=D0=B9=D0=BD=D0=B4=D0=B6?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3=20=D0=B4=D0=BB=D1=8F=20PR=20#1246=20[ci=20sk?= =?UTF-8?q?ip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/changelogs/AutoChangeLog-sierra-pr-1246.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1246.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1246.yml b/html/changelogs/AutoChangeLog-sierra-pr-1246.yml new file mode 100644 index 0000000000000..b8cb6a20f7032 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1246.yml @@ -0,0 +1,4 @@ +author: LordNest +changes: + - {maptweak: 'Убрал окно между РД и СМО, добавил цветы в церковь'} +delete-after: true From b160a603f35d51ae400d5c76034a507acb785ffb Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Sun, 29 Oct 2023 01:21:26 +0000 Subject: [PATCH 07/44] =?UTF-8?q?=D0=90=D0=B2=D1=82=D0=BE=D0=BC=D0=B0?= =?UTF-8?q?=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B0=D1=8F=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BC=D0=BF=D0=B8=D0=BB=D1=8F=D1=86=D0=B8=D1=8F=20=D1=87=D0=B5?= =?UTF-8?q?=D0=B9=D0=BD=D0=B4=D0=B6=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2=20[ci=20?= =?UTF-8?q?skip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/changelog.html | 16 +++++++++ html/changelogs/.all_changelog.yml | 33 +++++++++++++++++++ .../AutoChangeLog-sierra-pr-1244.yml | 5 --- .../AutoChangeLog-sierra-pr-1245.yml | 8 ----- .../AutoChangeLog-sierra-pr-1246.yml | 4 --- 5 files changed, 49 insertions(+), 17 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1244.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1245.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1246.yml diff --git a/html/changelog.html b/html/changelog.html index e86a3d6104a4b..51472c5ddec77 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -28,6 +28,22 @@