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 @@

Sierra SS13

-->
+

29.10 - 2023

+

Обновления KandJX:

+
+
Запретил Таярам много ролей.
+
Расставил большинству ролей (которым надо) минимальные и рекомендованные возраста.
+
Расставил возраста для Патурльки ЦПСС и Пионерского корпуса. Прости Лисико, в 28 лет рано на Командора.
+
+

Обновления LordNest:

+
+
Убрал окно между РД и СМО, добавил цветы в церковь
+
+

Обновления SuhEugene:

+
+
Теперь уровни 4 и 5 сьерры не считаются админскими. Блокировка шлюзов теперь будет работать нормально, темперы тоже начнут работать правильно.
+
+

28.10 - 2023

Обновления KandJX:

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 9c15ed67b257a..f204698edaa48 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -22099,3 +22099,36 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY sierra_genchangelog.p \u0441\u043E\u043B\u043E\u0433\u0438\u044E." - maptweak: "\u0417\u0430\u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043B\ \ \u0448\u043A\u0430\u0444 \u0448\u0430\u0445\u0442\u0451\u0440\u043E\u0432." +2023-10-29: + KandJX: + - tweak: "\u0417\u0430\u043F\u0440\u0435\u0442\u0438\u043B \u0422\u0430\u044F\u0440\ + \u0430\u043C \u043C\u043D\u043E\u0433\u043E \u0440\u043E\u043B\u0435\u0439." + - tweak: "\u0420\u0430\u0441\u0441\u0442\u0430\u0432\u0438\u043B \u0431\u043E\u043B\ + \u044C\u0448\u0438\u043D\u0441\u0442\u0432\u0443 \u0440\u043E\u043B\u0435\u0439\ + \ (\u043A\u043E\u0442\u043E\u0440\u044B\u043C \u043D\u0430\u0434\u043E) \u043C\ + \u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u0435 \u0438 \u0440\u0435\ + \u043A\u043E\u043C\u0435\u043D\u0434\u043E\u0432\u0430\u043D\u043D\u044B\u0435\ + \ \u0432\u043E\u0437\u0440\u0430\u0441\u0442\u0430." + - maptweak: "\u0420\u0430\u0441\u0441\u0442\u0430\u0432\u0438\u043B \u0432\u043E\ + \u0437\u0440\u0430\u0441\u0442\u0430 \u0434\u043B\u044F \u041F\u0430\u0442\u0443\ + \u0440\u043B\u044C\u043A\u0438 \u0426\u041F\u0421\u0421 \u0438 \u041F\u0438\u043E\ + \u043D\u0435\u0440\u0441\u043A\u043E\u0433\u043E \u043A\u043E\u0440\u043F\u0443\ + \u0441\u0430. \u041F\u0440\u043E\u0441\u0442\u0438 \u041B\u0438\u0441\u0438\u043A\ + \u043E, \u0432 28 \u043B\u0435\u0442 \u0440\u0430\u043D\u043E \u043D\u0430 \u041A\ + \u043E\u043C\u0430\u043D\u0434\u043E\u0440\u0430." + LordNest: + - maptweak: "\u0423\u0431\u0440\u0430\u043B \u043E\u043A\u043D\u043E \u043C\u0435\ + \u0436\u0434\u0443 \u0420\u0414 \u0438 \u0421\u041C\u041E, \u0434\u043E\u0431\ + \u0430\u0432\u0438\u043B \u0446\u0432\u0435\u0442\u044B \u0432 \u0446\u0435\u0440\ + \u043A\u043E\u0432\u044C" + SuhEugene: + - bugfix: "\u0422\u0435\u043F\u0435\u0440\u044C \u0443\u0440\u043E\u0432\u043D\u0438\ + \ 4 \u0438 5 \u0441\u044C\u0435\u0440\u0440\u044B \u043D\u0435 \u0441\u0447\u0438\ + \u0442\u0430\u044E\u0442\u0441\u044F \u0430\u0434\u043C\u0438\u043D\u0441\u043A\ + \u0438\u043C\u0438. \u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u043A\u0430\ + \ \u0448\u043B\u044E\u0437\u043E\u0432 \u0442\u0435\u043F\u0435\u0440\u044C\ + \ \u0431\u0443\u0434\u0435\u0442 \u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C\ + \ \u043D\u043E\u0440\u043C\u0430\u043B\u044C\u043D\u043E, \u0442\u0435\u043C\ + \u043F\u0435\u0440\u044B \u0442\u043E\u0436\u0435 \u043D\u0430\u0447\u043D\u0443\ + \u0442 \u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C \u043F\u0440\u0430\u0432\ + \u0438\u043B\u044C\u043D\u043E." diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1244.yml b/html/changelogs/AutoChangeLog-sierra-pr-1244.yml deleted file mode 100644 index 2edac6b7abe08..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1244.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: SuhEugene -changes: - - {bugfix: 'Теперь уровни 4 и 5 сьерры не считаются админскими. Блокировка шлюзов - теперь будет работать нормально, темперы тоже начнут работать правильно.'} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1245.yml b/html/changelogs/AutoChangeLog-sierra-pr-1245.yml deleted file mode 100644 index 388235f046cd7..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1245.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: KandJX -changes: - - {tweak: Запретил Таярам много ролей.} - - {tweak: Расставил большинству ролей (которым надо) минимальные и рекомендованные - возраста.} - - {maptweak: 'Расставил возраста для Патурльки ЦПСС и Пионерского корпуса. Прости - Лисико, в 28 лет рано на Командора.'} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1246.yml b/html/changelogs/AutoChangeLog-sierra-pr-1246.yml deleted file mode 100644 index b8cb6a20f7032..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1246.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: LordNest -changes: - - {maptweak: 'Убрал окно между РД и СМО, добавил цветы в церковь'} -delete-after: true From 38409960dace8769dedb676affa5d5e3105413ec Mon Sep 17 00:00:00 2001 From: emmanuelbassil <6874235+emmanuelbassil@users.noreply.github.com> Date: Sun, 29 Oct 2023 16:23:06 +0300 Subject: [PATCH 08/44] [MIRROR] Fixes pointing at closets --- .../objects/structures/crates_lockers/closets/__closet.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/__closet.dm b/code/game/objects/structures/crates_lockers/closets/__closet.dm index c7a7aaa2a7f81..23d1ad8bf50a7 100644 --- a/code/game/objects/structures/crates_lockers/closets/__closet.dm +++ b/code/game/objects/structures/crates_lockers/closets/__closet.dm @@ -555,10 +555,6 @@ return TRUE return ..() -/obj/structure/closet/CtrlAltClick(mob/user) - verb_toggleopen() - return TRUE - /obj/structure/closet/emp_act(severity) for (var/atom/A as anything in src) A.emp_act(severity) From 88e06fd46e46ab5b87b265de15599acba2ddd957 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Sun, 29 Oct 2023 16:32:43 +0300 Subject: [PATCH 09/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#1248=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-1248.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1248.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1248.yml b/html/changelogs/AutoChangeLog-sierra-pr-1248.yml new file mode 100644 index 0000000000000..b06e1d9aee184 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1248.yml @@ -0,0 +1,6 @@ +author: emmanuelbassil +changes: + - {bugfix: Can now point at closets/crates again} + - {tweak: Ctrl + Alt + Click no longer opens and closes closets. Alt + Click still + locks/unlocks as before.} +delete-after: true From ac32e2fb55a98b33e12ea2cdd9a2f3277b514feb Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Mon, 30 Oct 2023 01:17:36 +0000 Subject: [PATCH 10/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 | 198 +----------------- html/changelogs/.all_changelog.yml | 5 + .../AutoChangeLog-sierra-pr-1248.yml | 6 - 3 files changed, 12 insertions(+), 197 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1248.yml diff --git a/html/changelog.html b/html/changelog.html index 51472c5ddec77..947f1272fab95 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -28,6 +28,13 @@

Sierra SS13

-->
+

30.10 - 2023

+

Обновления emmanuelbassil:

+
+
Can now point at closets/crates again
+
Ctrl + Alt + Click no longer opens and closes closets. Alt + Click still locks/unlocks as before.
+
+

29.10 - 2023

Обновления KandJX:

@@ -574,197 +581,6 @@

Обновления emmanuelbassil:

You are now able to store guns in your inventory objects while on harm intent
- -

28.08 - 2023

-

Обновления Fre3bie, Spookerton:

-
-
Wheelchair now moves at walk speed instead of sprint speed.
-
You need your hands free to drive your own wheelchair.
-
You need gravity to move a wheelchair as the person in it.
-
-

Обновления Jux:

-
-
Individual mobs can now be made to waddle.
-
Energy machetes now do more damage.
-
Antagonist or Emagged borgs now have multiple new tools, and non-antagonist borgs lose their flashes.
-
pAIs can use their radios.
-
Handmade assemblies are now functional.
-
The automatic connections checker no longer fires on staff and gives a number for matches instead of listing every ckey and ban match in chat.
-
Adds xenofauna carbines, which are effective against simplemobs but not humanoids. Sec-Arm gets two by default, and more can be ordered. They can be emagged, which changes their beam to that of a compact smartgun lethal beam.
-
Supply packs for ammo have had their costs reduced and delivered items increased to make ordering ammo a competitive option, but they also require appropriate access to open beyond just normal security access. Sec SMGs can now be ordered on code blue.
-
Meatstation guards now use already emagged xenofauna carbines, increasing their lethality *significantly*. Their potential spawns have been reduced to account for this.
-
Airlocks don't crush mobs for twice the damage anymore
-
Autoshotgun no longer available in gun spawns.
-
Exoplanet atmospheres are more varied now, with a wider, but more grounded temperature range and less non-terraformed planets with ideal atmospheres.
-
All exoplanet types can now generate with all templates - volcanic cities, for example.
-
Thermal energy in gas mixtures is gained significantly slower the hotter the mixture is.
-
Exoplanet ruins with player_cost (colony, survival pod) now use that when being generated.
-
The oldlabs prevent each other from spawning.
-
Rogue drones, fleet tracker bots and space syndies can now move in space.
-
Fleet robots now miss more often, fire less rapidly, won't hesitate to break things and won't run away from targets unless they're a bit closer.
-
Hullbreakers are now less afraid to break hulls.
-
The prison break event now bolts open doors like it used to.
-
The prison break event will now always announce itself before it ends, and can target both the tac-arm and xenobio cells.
-
Airlocks no longer beep impatiently when they cannot close.
-
-

Обновления Jux, Ryan180602:

-
-
Remaps security armoury.
-
Adds stunshells to sec-armoury.
-
E-arm now contains 4 light bullpups and 2 UNSECURE laser carbines instead of SMGs and Shotguns.
-
Various ballistics balance adjustments, see github for details.
-
All Torch handguns, except those in E-Arm, are now the m19. Hopefully eliminates magazine confusion.
-
-

Обновления LordNest:

-
-
Подключил недостающие моды
-
Убрал переусложнённую систему покраски для исключения конфликтов. Поправил некоторые пути объектов. Вернул гравген.
-
-

Обновления Merlin1230:

-
-
Fixes intercoms so clicking on them with an empty hand when the wire panel is open will now allow to actually mess with the wires
-
stops hacker hardsuits (and maybe some others) from being unable to remove anything from them with a wrench
-
allows ghosts to perceive time in the status panel
-
-

Обновления Mucker:

-
-
Added an alert when trying to late-join as a role not set in your Occupation preferences.
-
Fixed the fall-down sound constantly triggering in some cases.
-
The email program no longer closes completely when exiting so notifications will be more often heard.
-
Fixed shortwaves having no 'power' button
-
Fixed automatic radio announcements (arrivals, SM warnings, etc) not working.
-
Observers can examine things again.
-
Changeling now requires 5 people to be readied to roll.
-
-

Обновления Petro1Ne1Koder:

-
-
Из шейкера нельзя вылить содержимае на пол
-
Face direction во вкладке IC не замедляет
-
-

Обновления Ryan180602:

-
-
E-Shields will now be damaged by EMP if active during blast, and be unable to be used, temporarily.
-
E-Swords/E-Melee weapons will now be damaged by EMP if active during blast, and be unable to be used temporarily.
-
E-Shields are now buyable for 24 TC on uplink.
-
Personal Belt Shield is now buyable for 40 TC.
-
E-Shields aren't available freely on the merc-base anymore.
-
Sensor panel has a mute button to mute ambient `woomb` sound.
-
Placeholder icons show up on scan panel.
-
Placeholder buildmode has a scan data option instead of sensor now.
-
Add the Dingo, Mantaray and Wombat.
-
Watches will now tell the time when examined.
-
You can examine your uniform with a watch, and check the watch.
-
Local Time/Date in Status does not show unless a watch is attached to your uniform.
-
Stasis cage now uses equipment channel (can power from APCs).
-
Sensor mute button works again.
-
People can now be thrown into railings (and thus over them).
-
Autoshotgun mags are no longer lathe printable.
-
Magazine icons depict ammo count accurately again.
-
-

Обновления Sbotkin:

-
-
Added the ability to write on any of the sheets on the clipboard.
-
Fixed red retractable pens not staying red.
-
The CSO now has an AI module in their hardsuit and can carry drills in the suit slot.
-
Removed duplicate items from the CSO office(s).
-
Added SFX to the telescopic cane.
-
-

Обновления SierraKomodo:

-
-
Fixed melee attacks ignoring selected target zones.
-
The crew manifest displayed to observers and ghosts now uses the IC manifest, reflecting the state of the `Status` field as displayed to people in game.
-
The OOC manifest (The one displayed in the player lobby) now hides the Activity column, masking the life and activity status of crew entries.
-
Crew manifest entries for crew members listed as `Stored` do not appear on the OOC manifest.
-
Fireaxe cabinets now use standardized health. Minimum damage threshold is set to 15 (Matching the previous force requirement to break the cabinet), and maximum health is set to 30.
-
Fireaxe cabinets can now be repaired using reinforced glass. A fully broken fireaxe cabinet will still be open and unlocked once repaired. The cost is 1 sheet regardless of damage - You're replacing the entire glass pane.
-
External bots no longer receive stored characters when requesting the manifest.
-
Clicking adjacent targets with a gun on harm intent now point-blank fires, if applicable, instead of pistol-whipping. Pistol whipping can still occur using disarm intent.
-
You can now interact with held mobs using tools, including stabbing that cat you're holding hostage when security tries to bang-rush you.
-
-

Обновления SingingSpock:

-
-
Minor D2 wiring fixes
-
Rewired the RUST, making both SMESes useful. Engineers should read the note in the antechamber before setting up.
-
Removed superfluous SMES in the shield bay area and rewired area for better useability
-
-

Обновления SomeAngryMiner:

-
-
Several sprite errors have been fixed.
-
Surgery steps now have sounds.
-
Airlocks, blinking toys, lockboxes, locators, vox helmets, mining drills, glowshrooms, merc smgs, nuclear reactors, bloodpacks and adherent wirecutters had their sprites fixed.
-
fixes airlock error icons.
-
fixes vine error icons.
-
fixes ore processor console error icons.
-
-

Обновления SomeAngryMiner, l3lb0t:

-
-
most machines now have emissive lights.
-
most machines also have maintenance panels, if they were missing them.
-
thermal regulators now have overlays when cooling.
-
-

Обновления Spookerton:

-
-
Fixed pAIs.
-
Emergency Management Bureau identifying gear is not available in loadout.
-
Mobs and objects glide at the same rate again.
-
-

Обновления SuhEugene:

-
-
Сделал чейнджлог в разы красивее и удалил из него Credits.
-
Fixed sensors I've broken.
-
Fixed the sensors not working when the shuttle is docked.
-
Made object spawn panel prettier.
-
Возвращены уникальные звуки окружения Сьерры.
-
Возвращена иконка овермапы Сьерры.
-
Fixed nonsensical Torch log in the helm console.
-
CuddleAndTea добавлен в описание мемориала Сьерры.
-
Added Try again button to the legacy chat that appears when goonchat load fails.
-
The rest verb changes standing/lying state instantly.
-
Починена (возвращена) система модов.
-
Куча файлов перемещено туда-сюда, изменены чтобы код был чище.
-
More sensors consoles no longer show more marks.
-
Sensors reconnect popup no longer stays open on success link.
-
Fixed sensors marks visual positioning.
-
Added selection of a specific lights fix or destruction zone.
-
Добавлен новый приветственный звук на Сьерру.
-
Возвращены мелодии лобби.
-
Fixed goonchat loading for players re-entering game outside the lobby.
-
-

Обновления drfarson, Pawnty:

-
-
Added fleet service sweaters to uniform dispensers.
-
-

Обновления emmanuelbassil:

-
-
Adds challenge coins in the traitor uplink. They unlock a secret compartment containing uplink items in any vendor on the ship. Item costs 50 TCs; comes with 5 coins making each worth 10 TCs.
-
Each compartment has an average worth of 16 TCs. They are usually related to the theme of the vendor. Higher cost items are not guaranteed to spawn, meaning you may get less TCs than your coin is worth. Or much more, depending on your luck.
-
Using a challenge coin or an emag on a vending machine makes it scream anti-Sol slogans for the benefit of all nearby non-traitors.
-
Makes vending machine icons turn back on after being anchored in a powered area.
-
Docilers now properly self-recharge
-
Can now properly disable safety on underslung grenade launcher.
-
Light bullpup can no longer be loaded with grenades it can't even fire. It also no longer insists it has a grenade launcher despite best attempts to convince it otherwise.
-
Grabbing someone that is weakly grabbed by someone else and walking away should now release the other person's grab. No more infinite range grabs.
-
Fixed not being able to put mobs into suit cyclers. You require a weak grab to put a mob into a suit cycler, suit storage, or gibber. Can click and drag self.
-
Vending machines now emit weak light when powered. Let capitalism be your guide in the darkness.
-
Antlions now properly burrow and appear near/on you to ruin your day.
-
King goats have re-learned the lost skill of explorer bowling, and have a chance of running you over.
-
Charbabys now have a 10% chance per attack of setting you on fire again.
-
Can now stab eyes with all tiny, small, and normal sized sharp items.
-
It is now possible to damage glass/mask items if eye-stabbing with sufficient force. This is affected by CQC skill, making it easier to break glasses with higher skill. It is not possible to break hats that cover eyes (e.g riot helmets) in this way however, no matter the force.
-
It is now possible to miss while trying to stab someone's eyes.
-
Adds 'rare items' to sovietsoda, fitness, and games vendor.
-
Fixes oversight allowing hacked vending machines to hurl traitor coin items at people.
-
-

Обновления emmanuelbassil, SierraKomodo:

-
-
Melee weapon cooldown has been tweaked to be less spammy.
-
You are now able to examine/jointlock/dislocate/and pin other mobs using grabs, depending on intent.
-
Grabs now leave fingerprints on uncovered body parts. If covered, chance of prints/fibers on clothing as previous behavior.
-
-

Обновления gy1ta23:

-
-
The showers make sound.
-
Icons by Icons8
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index f204698edaa48..21677e39d91c5 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -22132,3 +22132,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY sierra_genchangelog.p \u043F\u0435\u0440\u044B \u0442\u043E\u0436\u0435 \u043D\u0430\u0447\u043D\u0443\ \u0442 \u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C \u043F\u0440\u0430\u0432\ \u0438\u043B\u044C\u043D\u043E." +2023-10-30: + emmanuelbassil: + - bugfix: Can now point at closets/crates again + - tweak: Ctrl + Alt + Click no longer opens and closes closets. Alt + Click still + locks/unlocks as before. diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1248.yml b/html/changelogs/AutoChangeLog-sierra-pr-1248.yml deleted file mode 100644 index b06e1d9aee184..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1248.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: emmanuelbassil -changes: - - {bugfix: Can now point at closets/crates again} - - {tweak: Ctrl + Alt + Click no longer opens and closes closets. Alt + Click still - locks/unlocks as before.} -delete-after: true From f28ca719be95c1b29d5491c1c14858d799bb43ba Mon Sep 17 00:00:00 2001 From: aigamuxa <74877393+cosmoslego@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:38:17 +0300 Subject: [PATCH 11/44] Fix engineering storage lighting (#1257) --- maps/sierra/z1-z5_sierra.dmm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 5977bb1c9ad38..d157c48c4d810 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -53901,6 +53901,9 @@ /obj/floor_decal/corner/yellow/mono, /obj/floor_decal/industrial/outline/yellow, /obj/machinery/computer/modular/preset/civilian, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/storage/primary) "ilt" = ( From 975f7fb9920ec9e0a6d9684a18d75810ff83f4be Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:38:56 +0300 Subject: [PATCH 12/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#1257=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-1257.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1257.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1257.yml b/html/changelogs/AutoChangeLog-sierra-pr-1257.yml new file mode 100644 index 0000000000000..56be5b196893a --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1257.yml @@ -0,0 +1,4 @@ +author: Aigamuxa +changes: + - {tweak: Добавлена лампа в хранилище инструментов} +delete-after: true From 8834c2d9c68df9942c66209c9becd4a116a02e33 Mon Sep 17 00:00:00 2001 From: Spookerton <918997+Spookerton@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:38:06 +0300 Subject: [PATCH 13/44] [MIRROR] fix engine injector depowering itself in Initialize --- code/modules/atmospherics/components/unary/outlet_injector.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/atmospherics/components/unary/outlet_injector.dm b/code/modules/atmospherics/components/unary/outlet_injector.dm index 34ad5d6392c52..1b125b5a190fe 100644 --- a/code/modules/atmospherics/components/unary/outlet_injector.dm +++ b/code/modules/atmospherics/components/unary/outlet_injector.dm @@ -36,7 +36,7 @@ set_frequency(frequency) broadcast_status() - update_icon() + /obj/machinery/atmospherics/unary/outlet_injector/Destroy() unregister_radio(src, frequency) From d5cda26e5638ae871bfc4c38d3ef13a29b2e587c Mon Sep 17 00:00:00 2001 From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:38:20 +0300 Subject: [PATCH 14/44] [MIRROR] Damage organs when exploding limbs --- code/modules/organs/external/_external.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/organs/external/_external.dm b/code/modules/organs/external/_external.dm index 5e8a07033ac8d..f06a5f6bd7c71 100644 --- a/code/modules/organs/external/_external.dm +++ b/code/modules/organs/external/_external.dm @@ -831,7 +831,7 @@ Note that amputating the affected organ does in fact remove the infection from t "You hear a crackling sound[gore]." ) if(DROPLIMB_BLUNT) - var/gore = "[BP_IS_ROBOTIC(src) ? "": " in shower of gore"]" + var/gore = "[BP_IS_ROBOTIC(src) ? "": " in a shower of gore"]" var/gore_sound = "[BP_IS_ROBOTIC(src) ? "rending sound of tortured metal" : "sickening splatter of gore"]" return list( "\The [owner]'s [src.name] explodes[gore]!", @@ -870,6 +870,7 @@ Note that amputating the affected organ does in fact remove the infection from t I.removed() if(!QDELETED(I) && isturf(I.loc)) I.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5) + I.take_general_damage(I.max_damage * Frand(0.5, 1.0)) removed(null, ignore_children) if(QDELETED(src)) From cf150b9a72b857df8d9a5a0ff73899a09eaa0f08 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:47:19 +0300 Subject: [PATCH 15/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#1262=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-1262.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1262.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1262.yml b/html/changelogs/AutoChangeLog-sierra-pr-1262.yml new file mode 100644 index 0000000000000..0599e515ccdea --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1262.yml @@ -0,0 +1,4 @@ +author: Spookerton +changes: + - {bugfix: Mapped injectors don't turn themselves off during game setup.} +delete-after: true From 8ae2e1a1c82da3f1745235ad25dcd613d7cddc9b Mon Sep 17 00:00:00 2001 From: MuckerMayhem <1161516+MuckerMayhem@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:38:13 +0300 Subject: [PATCH 16/44] [MIRROR] fis space carp never making it to the ship --- code/modules/events/mob_spawning/_mob_spawning.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/mob_spawning/_mob_spawning.dm b/code/modules/events/mob_spawning/_mob_spawning.dm index fff27aa0bb949..66725e7c98878 100644 --- a/code/modules/events/mob_spawning/_mob_spawning.dm +++ b/code/modules/events/mob_spawning/_mob_spawning.dm @@ -68,7 +68,7 @@ if (MOB_SPAWNING_EVENT_SPACE) var/turf/T = get_random_edge_turf(dir, TRANSITIONEDGE + 2, Z) spawned_mob.forceMove(T) - spawned_mob.throw_at(get_random_edge_turf(GLOB.reverse_dir[dir], TRANSITIONEDGE + 2, Z), 5, speed) + spawned_mob.throw_at(get_random_edge_turf(GLOB.reverse_dir[dir], TRANSITIONEDGE + 2, Z), 65, speed) /** From 96a1b4f6ea6a3cb8efa67579b5a13010b33ba574 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:47:46 +0300 Subject: [PATCH 17/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#1264=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-1264.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1264.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1264.yml b/html/changelogs/AutoChangeLog-sierra-pr-1264.yml new file mode 100644 index 0000000000000..5472874bad4a7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1264.yml @@ -0,0 +1,6 @@ +author: SierraKomodo +changes: + - {rscadd: Organs now take 50-100% of their maximum damage when their holding body + part is gibbed. This primarily effects brain damage from exploding heads.} + - {spellcheck: Fixed a typo in the organic body part gibbing message.} +delete-after: true From 904cea8020f1288dd52d09e44b5b0fb92c4279ac Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:48:11 +0300 Subject: [PATCH 18/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#1263=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-1263.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1263.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1263.yml b/html/changelogs/AutoChangeLog-sierra-pr-1263.yml new file mode 100644 index 0000000000000..b6213cfe2af36 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1263.yml @@ -0,0 +1,4 @@ +author: Mucker +changes: + - {bugfix: Space carp will now actually make it to the ship during carp events again.} +delete-after: true From 0393e5e15b43fb88cc4a1d8eb05094eeb5588d01 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Tue, 31 Oct 2023 01:18:32 +0000 Subject: [PATCH 19/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 | 29 ++++++++++++------- html/changelogs/.all_changelog.yml | 13 +++++++++ .../AutoChangeLog-sierra-pr-1257.yml | 4 --- .../AutoChangeLog-sierra-pr-1262.yml | 4 --- .../AutoChangeLog-sierra-pr-1263.yml | 4 --- .../AutoChangeLog-sierra-pr-1264.yml | 6 ---- 6 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1257.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1262.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1263.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1264.yml diff --git a/html/changelog.html b/html/changelog.html index 947f1272fab95..ad5ed7f4fa085 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -28,6 +28,25 @@

Sierra SS13

-->
+

31.10 - 2023

+

Обновления Aigamuxa:

+
+
Добавлена лампа в хранилище инструментов
+
+

Обновления Mucker:

+
+
Space carp will now actually make it to the ship during carp events again.
+
+

Обновления SierraKomodo:

+
+
Organs now take 50-100% of their maximum damage when their holding body part is gibbed. This primarily effects brain damage from exploding heads.
+
Fixed a typo in the organic body part gibbing message.
+
+

Обновления Spookerton:

+
+
Mapped injectors don't turn themselves off during game setup.
+
+

30.10 - 2023

Обновления emmanuelbassil:

@@ -571,16 +590,6 @@

Обновления SierraKomodo:

Self-recharging guns such as the Advanced Energy Gun and energy based borg and mech weapons now delay recharging when they are fired. This is to prevent guns from self-charging in the middle of mag-dumping the gun and force more tactical consideration of when to fall back to "recharge" the weapon.
- -

29.08 - 2023

-

Обновления SuhEugene:

-
-
Переписал и включил адекватно мод лодаута.
-
-

Обновления emmanuelbassil:

-
-
You are now able to store guns in your inventory objects while on harm intent
-
Icons by Icons8
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 21677e39d91c5..f2fded8a15d01 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -22137,3 +22137,16 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY sierra_genchangelog.p - bugfix: Can now point at closets/crates again - tweak: Ctrl + Alt + Click no longer opens and closes closets. Alt + Click still locks/unlocks as before. +2023-10-31: + Aigamuxa: + - tweak: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043B\u0430\u043C\ + \u043F\u0430 \u0432 \u0445\u0440\u0430\u043D\u0438\u043B\u0438\u0449\u0435 \u0438\ + \u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432" + Mucker: + - bugfix: Space carp will now actually make it to the ship during carp events again. + SierraKomodo: + - rscadd: Organs now take 50-100% of their maximum damage when their holding body + part is gibbed. This primarily effects brain damage from exploding heads. + - spellcheck: Fixed a typo in the organic body part gibbing message. + Spookerton: + - bugfix: Mapped injectors don't turn themselves off during game setup. diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1257.yml b/html/changelogs/AutoChangeLog-sierra-pr-1257.yml deleted file mode 100644 index 56be5b196893a..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1257.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Aigamuxa -changes: - - {tweak: Добавлена лампа в хранилище инструментов} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1262.yml b/html/changelogs/AutoChangeLog-sierra-pr-1262.yml deleted file mode 100644 index 0599e515ccdea..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1262.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Spookerton -changes: - - {bugfix: Mapped injectors don't turn themselves off during game setup.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1263.yml b/html/changelogs/AutoChangeLog-sierra-pr-1263.yml deleted file mode 100644 index b6213cfe2af36..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1263.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Mucker -changes: - - {bugfix: Space carp will now actually make it to the ship during carp events again.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1264.yml b/html/changelogs/AutoChangeLog-sierra-pr-1264.yml deleted file mode 100644 index 5472874bad4a7..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1264.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: SierraKomodo -changes: - - {rscadd: Organs now take 50-100% of their maximum damage when their holding body - part is gibbed. This primarily effects brain damage from exploding heads.} - - {spellcheck: Fixed a typo in the organic body part gibbing message.} -delete-after: true From 46aab7a5dc6df5d626f2c9cf3f5f251e3fd7f4f4 Mon Sep 17 00:00:00 2001 From: KandJX <83637364+YegorKandziuba@users.noreply.github.com> Date: Tue, 31 Oct 2023 13:41:29 +0300 Subject: [PATCH 20/44] Fix bunch of map issues (#1265) --- maps/sierra/z1-z5_sierra.dmm | 1430 +++++++++++++++++++++++++++------- 1 file changed, 1155 insertions(+), 275 deletions(-) diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index d157c48c4d810..579018e35cfe5 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -297,6 +297,7 @@ pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/item/folder/nt, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/office/iaa) "ace" = ( @@ -1338,15 +1339,20 @@ }, /area/space) "akl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/floor_decal/corner/yellow{ + dir = 1 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/thirddeck/starboard) +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -29 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "akm" = ( /obj/structure/bed/chair/shuttle/white{ dir = 4 @@ -2197,6 +2203,9 @@ dir = 4 }, /obj/structure/flora/pottedplant/floorleaf, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "aqz" = ( @@ -2303,6 +2312,19 @@ /obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/ward) +"arq" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow, +/obj/machinery/status_display{ + pixel_y = 32; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "arC" = ( /obj/structure/hygiene/sink{ dir = 8; @@ -3687,10 +3709,16 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/catwalk, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "aBA" = ( @@ -4157,7 +4185,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "aEe" = ( @@ -4850,6 +4878,15 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/garden_room) +"aJI" = ( +/obj/floor_decal/borderfloor, +/obj/floor_decal/corner/lime/border, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/seconddeck/center) "aJJ" = ( /obj/machinery/disposal, /obj/floor_decal/industrial/hatch/yellow, @@ -5037,9 +5074,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/shuttle/escape_pod/escape_pod1/station) "aLc" = ( -/obj/structure/bed/chair/office/comfy/purple{ - dir = 1 - }, +/obj/structure/bed/chair/office/comfy/purple, /turf/simulated/floor/wood/mahogany, /area/crew_quarters/heads/office/rd/cobed) "aLi" = ( @@ -6585,7 +6620,7 @@ on = 1; pixel_x = -25 }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/dark, @@ -6643,6 +6678,20 @@ }, /turf/simulated/floor/tiled/white, /area/medical/wardhallway) +"aXK" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 9 + }, +/obj/structure/closet/hydrant{ + pixel_y = -28 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "aXM" = ( /obj/structure/table/rack/dark, /obj/item/stack/medical/splint, @@ -7679,6 +7728,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "bgx" = ( @@ -8741,7 +8791,8 @@ id_tag = "lockdown3_3" }, /obj/machinery/door/airlock/glass/civilian{ - dir = 4 + dir = 4; + autoset_access = 0 }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/fourthdeck/center) @@ -8844,6 +8895,10 @@ /obj/structure/table/steel, /obj/item/device/flashlight/lamp/green, /obj/decal/cleanable/dirt, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/wood/walnut, /area/vacant/bar) "bqL" = ( @@ -9046,6 +9101,10 @@ }, /obj/structure/table/standard, /obj/item/material/ashtray/bronze, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "brU" = ( @@ -13510,18 +13569,13 @@ /obj/floor_decal/corner/lime/bordercorner2{ dir = 4 }, +/obj/structure/sign/deck/first{ + pixel_y = 35 + }, /obj/structure/sign/directions/security{ pixel_y = 24; dir = 8 }, -/obj/structure/sign/directions/infirmary{ - dir = 4; - pixel_y = 31 - }, -/obj/structure/sign/directions/science{ - pixel_y = 38; - dir = 4 - }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/center) "cbV" = ( @@ -14000,19 +14054,19 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/aftport) "cgh" = ( -/obj/machinery/suit_storage_unit/atmos/alt, -/obj/floor_decal/borderfloor{ - dir = 1 - }, -/obj/floor_decal/corner/yellow/border{ - dir = 1 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/floor_decal/industrial/outline/yellow, -/obj/machinery/light/spot{ - dir = 1 +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_eva) +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/foreport) "cgj" = ( /obj/structure/table/woodentable/maple, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -14214,6 +14268,19 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/hallway/primary/thirddeck/fore) +"cij" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow, +/obj/machinery/status_display{ + pixel_y = 32; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "cio" = ( /obj/floor_decal/borderfloor{ dir = 10 @@ -14340,6 +14407,21 @@ /obj/item/storage/box/lights/led_neon, /turf/simulated/floor/tiled/techfloor/grid, /area/storage/auxillary/port) +"cjk" = ( +/obj/structure/table/woodentable/walnut, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/device/flashlight/lamp/green{ + pixel_x = -5; + pixel_y = 15 + }, +/obj/item/reagent_containers/food/drinks/glass2/coffeecup/NT{ + pixel_y = -6; + pixel_x = 8 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "cjl" = ( /obj/structure/railing/mapped{ dir = 1 @@ -14539,6 +14621,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/computer) "cla" = ( @@ -15033,6 +15118,21 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) +"cpO" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "cpQ" = ( /obj/fluid_mapped, /turf/simulated/floor/tiled/techfloor, @@ -15361,6 +15461,17 @@ /obj/paint/dark_gunmetal, /turf/simulated/wall/r_titanium, /area/exploration_shuttle/airlock) +"csX" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/foreport) "csZ" = ( /obj/structure/cable/green{ d1 = 1; @@ -17379,6 +17490,24 @@ /obj/random/maintenance, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) +"cHE" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 1 + }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "cHJ" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 @@ -17750,6 +17879,17 @@ }, /turf/simulated/floor/tiled, /area/assembly/robotics) +"cKr" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/floor_decal/borderfloorblack/corner2, +/obj/floor_decal/corner/darkblue/bordercorner2, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "cKt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18577,6 +18717,9 @@ dir = 8; pixel_y = 24 }, +/obj/structure/sign/deck/third{ + pixel_y = 35 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/center) "cQn" = ( @@ -19182,6 +19325,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_room) +"cUU" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/center) "cUY" = ( /obj/shuttle_landmark/sierra/deck4/guppy, /turf/space, @@ -19533,6 +19685,21 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/guppy_hangar/start) +"cYe" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "cYk" = ( /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/blast/regular{ @@ -20164,6 +20331,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_room) +"dbB" = ( +/obj/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "dbD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 @@ -20268,6 +20448,18 @@ /obj/random/maintenance, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) +"dcK" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/machinery/alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "dcU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21169,10 +21361,6 @@ /obj/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/rotating_alarm/security_alarm{ - dir = 4; - pixel_x = -14 - }, /obj/floor_decal/techfloor/orange/corner{ dir = 1 }, @@ -21891,6 +22079,16 @@ }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) +"dpT" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/machinery/ship_map, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/center) "dpV" = ( /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/escape_pod/escape_pod1/station) @@ -22154,6 +22352,7 @@ /obj/floor_decal/corner/yellow/border{ dir = 1 }, +/obj/machinery/ship_map, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/aft) "drH" = ( @@ -22243,7 +22442,7 @@ }, /area/space) "dsE" = ( -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 4 }, /obj/structure/table/steel_reinforced, @@ -23189,6 +23388,10 @@ /obj/machinery/vending/coffee{ dir = 8 }, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -29 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "dzh" = ( @@ -23839,6 +24042,17 @@ "dDh" = ( /turf/simulated/wall/prepainted, /area/vacant/utility) +"dDj" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/floor_decal/borderfloorblack/corner2, +/obj/floor_decal/corner/darkblue/bordercorner2, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -29 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "dDp" = ( /obj/floor_decal/steeldecal/steel_decals4{ dir = 8 @@ -23927,10 +24141,6 @@ /obj/floor_decal/techfloor/orange/corner{ dir = 1 }, -/obj/machinery/rotating_alarm/security_alarm{ - dir = 1; - pixel_y = -13 - }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/safe_room) "dEo" = ( @@ -24781,6 +24991,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/forestarboard) +"dLk" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/sign/poster{ + pixel_y = 32 + }, +/turf/simulated/floor/wood/walnut, +/area/crew_quarters/lounge) "dLm" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -25013,13 +25233,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "dNj" = ( @@ -25144,7 +25364,7 @@ /obj/item/reagent_containers/food/drinks/glass2/wine, /obj/item/reagent_containers/food/drinks/bottle/tadmorwine, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, /turf/simulated/floor/wood/walnut, @@ -25440,6 +25660,18 @@ /obj/paint_stripe/nt_red, /turf/simulated/floor/plating, /area/shuttle/petrov/cockpit) +"dQq" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/structure/bed/chair/padded/blue{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -29 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "dQs" = ( /obj/machinery/beehive, /obj/floor_decal/corner/green/half, @@ -26387,8 +26619,8 @@ "dXc" = ( /obj/structure/table/woodentable_reinforced/ebony, /obj/floor_decal/carpet/blue, -/obj/item/folder/nt, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/item/modular_computer/laptop/preset/custom_loadout/advanced, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/office/iaa) "dXe" = ( @@ -27386,6 +27618,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engineering_monitoring) +"efa" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/floor_decal/corner/lime/bordercorner2{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/seconddeck/fore) "efb" = ( /obj/structure/cable/green{ d1 = 1; @@ -27608,10 +27858,6 @@ dir = 8 }, /obj/structure/closet/emcloset/anchored, -/obj/machinery/rotating_alarm/security_alarm{ - dir = 8; - pixel_x = 14 - }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/safe_room) "egL" = ( @@ -27694,9 +27940,13 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) "ehB" = ( -/obj/machinery/ai_status_display, -/turf/simulated/wall/r_wall/prepainted, -/area/engineering/gravitaional_generator) +/obj/structure/table/steel, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -29 + }, +/turf/simulated/floor/wood/walnut, +/area/vacant/bar) "ehI" = ( /obj/floor_decal/techfloor{ dir = 8 @@ -29467,7 +29717,7 @@ /obj/item/frame/air_alarm{ pixel_y = -16 }, -/obj/machinery/light/small, +/obj/machinery/light, /turf/simulated/floor/wood/yew, /area/crew_quarters/heads/office/ce/cobed) "evv" = ( @@ -30289,9 +30539,7 @@ /obj/floor_decal/corner/lime/bordercorner2{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/ship_map, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/fore) "eBA" = ( @@ -30434,6 +30682,9 @@ dir = 1 }, /obj/structure/bed/chair/padded/blue, +/obj/machinery/firealarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "eCO" = ( @@ -31904,6 +32155,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/poster{ + pixel_y = -32 + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "eNR" = ( @@ -32635,6 +32889,20 @@ /obj/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/forestarboard) +"eUc" = ( +/obj/machinery/suit_storage_unit/atmos/alt, +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/yellow/border{ + dir = 1 + }, +/obj/floor_decal/industrial/outline/yellow, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/engine_eva) "eUd" = ( /obj/machinery/door/airlock/external/bolted{ dir = 4; @@ -32910,6 +33178,16 @@ }, /turf/space, /area/space) +"eWI" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/machinery/ship_map, +/turf/simulated/floor/tiled, +/area/hallway/primary/seconddeck/aft) "eWN" = ( /obj/structure/cable/green{ d1 = 1; @@ -33695,6 +33973,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -29 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "fcQ" = ( @@ -34452,7 +34734,7 @@ /area/turret_protected/ai) "fit" = ( /obj/structure/closet/cabinet, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -34561,6 +34843,9 @@ /obj/item/device/paicard, /obj/random/tech_supply, /obj/floor_decal/corner/yellow/mono, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/storage/primary) "fiX" = ( @@ -35684,14 +35969,26 @@ /turf/simulated/floor/lino, /area/maintenance/firstdeck/forestarboard) "fsu" = ( -/obj/machinery/button/alternate/door/bolts{ - id_tag = "bridge_safe_exterior"; - name = "safe room door-control"; - pixel_x = -25; - pixel_y = -1 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/wall/r_wall/prepainted, -/area/crew_quarters/safe_room/bridge) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/floor_decal/corner/yellow, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "fsz" = ( /obj/floor_decal/techfloor{ dir = 4 @@ -36658,13 +36955,12 @@ /obj/floor_decal/carpet/blue{ dir = 9 }, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = -24 - }, /obj/machinery/firealarm{ pixel_y = 24 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/captain) "fAD" = ( @@ -36885,7 +37181,7 @@ /area/quartermaster/hangar) "fCW" = ( /obj/structure/table/woodentable_reinforced/ebony, -/obj/item/modular_computer/laptop/preset/custom_loadout, +/obj/item/modular_computer/laptop/preset/custom_loadout/advanced, /turf/simulated/floor/carpet/red, /area/crew_quarters/heads/office/hos) "fDd" = ( @@ -37221,7 +37517,6 @@ /obj/structure/railing/mapped{ dir = 1 }, -/obj/structure/table/rack, /obj/random/machine, /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) @@ -38359,6 +38654,18 @@ d2 = 8; icon_state = "0-8" }, +/obj/structure/sign/directions/security{ + pixel_y = 24; + dir = 8 + }, +/obj/structure/sign/directions/infirmary{ + dir = 4; + pixel_y = 31 + }, +/obj/structure/sign/directions/science{ + pixel_y = 38; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/central_stairwell) "fNb" = ( @@ -38572,6 +38879,9 @@ icon_state = "4-8" }, /obj/floor_decal/corner/yellow, +/obj/machinery/firealarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "fOL" = ( @@ -38683,15 +38993,14 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) "fPH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/thirddeck/starboard) +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/center) "fPJ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -39888,6 +40197,24 @@ /obj/random/medical, /turf/simulated/floor/tiled/techfloor/grid, /area/storage/auxillary/port) +"fZS" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 4 + }, +/obj/machinery/light/spot{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "gab" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 1 @@ -41431,6 +41758,10 @@ /area/hallway/primary/firstdeck/aft) "gnr" = ( /obj/decal/cleanable/generic, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/simulated/floor/wood/walnut, /area/vacant/bar) "gns" = ( @@ -42134,13 +42465,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "gsg" = ( @@ -42261,6 +42592,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "gtq" = ( @@ -42684,6 +43016,18 @@ /obj/structure/stairs/south, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/primary/fourthdeck/aft_stairwell) +"gxm" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/foreport) "gxn" = ( /obj/floor_decal/borderfloor{ dir = 4 @@ -43804,6 +44148,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/closet/hydrant{ + pixel_x = 28 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "gHq" = ( @@ -44953,9 +45300,6 @@ }, /obj/structure/closet/emcloset, /obj/floor_decal/industrial/outline/yellow, -/obj/structure/sign/deck/third{ - pixel_y = 24 - }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/center) "gQr" = ( @@ -45029,6 +45373,10 @@ /obj/structure/bed/sofa/r/blue{ dir = 4 }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "gQN" = ( @@ -46106,7 +46454,7 @@ on = 1; pixel_x = -25 }, -/obj/machinery/light/small, +/obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/office/rd/cobed) "gYM" = ( @@ -46974,6 +47322,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/crew_quarters/docking) +"hfu" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/ai_status_display{ + pixel_x = -32; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "hfv" = ( /obj/wallframe_spawn/no_grille, /obj/machinery/door/firedoor, @@ -47575,6 +47938,27 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/primary/fourthdeck/central_stairwell) +"hkq" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/floor_decal/corner/yellow, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "hkv" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -49445,6 +49829,14 @@ /obj/machinery/door/blast/regular, /turf/simulated/floor/tiled/white/monotile, /area/medical/virology) +"hAJ" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/machinery/ai_status_display{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "hAO" = ( /obj/floor_decal/borderfloorblack{ dir = 1 @@ -50171,6 +50563,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/structure/sign/deck/fourth{ + pixel_y = 35 + }, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/center) "hGt" = ( @@ -50762,7 +51157,8 @@ dir = 4 }, /obj/machinery/door/airlock/glass/civilian{ - dir = 4 + dir = 4; + autoset_access = 0 }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/fourthdeck/center) @@ -51099,6 +51495,16 @@ /obj/wallframe_spawn/no_grille, /turf/simulated/floor/plating, /area/hallway/primary/seconddeck/aft_stairwell) +"hOL" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/machinery/ship_map, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/aft) "hOR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -53133,6 +53539,10 @@ d2 = 8; icon_state = "0-8" }, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/computer) "ifL" = ( @@ -53901,9 +54311,6 @@ /obj/floor_decal/corner/yellow/mono, /obj/floor_decal/industrial/outline/yellow, /obj/machinery/computer/modular/preset/civilian, -/obj/machinery/light/spot{ - dir = 1 - }, /turf/simulated/floor/tiled/monotile, /area/storage/primary) "ilt" = ( @@ -55482,6 +55889,10 @@ }, /obj/floor_decal/corner/yellow/mono, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/fore) "izk" = ( @@ -56147,6 +56558,9 @@ /obj/machinery/vending/soda{ dir = 8 }, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "iFF" = ( @@ -56417,11 +56831,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -57555,6 +57967,10 @@ /obj/floor_decal/borderfloor, /obj/floor_decal/corner/yellow/border, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_eva) "iPk" = ( @@ -58091,6 +58507,7 @@ }, /obj/floor_decal/corner/yellow/mono, /obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/monotile, /area/storage/primary) "iSZ" = ( @@ -58683,6 +59100,25 @@ "iWV" = ( /turf/simulated/wall/r_wall/hull, /area/maintenance/bridgedeck/aft) +"iWX" = ( +/obj/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 4 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 5 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 5 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "iXp" = ( /obj/structure/bed/chair/padded/blue, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -59096,6 +59532,27 @@ }, /turf/simulated/floor/reinforced, /area/shuttle/petrov/cell1) +"jbJ" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "jbK" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -59364,6 +59821,9 @@ dir = 8 }, /obj/structure/flora/pottedplant/decorative, +/obj/machinery/light/spot{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "jdD" = ( @@ -59963,7 +60423,7 @@ "jit" = ( /obj/floor_decal/corner/black/full, /obj/structure/undies_wardrobe, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /turf/simulated/floor/tiled/dark, @@ -60461,9 +60921,6 @@ /obj/structure/bed/sofa/l/blue{ dir = 4 }, -/obj/machinery/light/spot{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "jmb" = ( @@ -60505,7 +60962,6 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/structure/table/rack, /obj/random/machine, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) @@ -63027,9 +63483,7 @@ /obj/floor_decal/corner/red/bordercorner2{ dir = 4 }, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/ship_map, /turf/simulated/floor/tiled, /area/security/brig) "jIQ" = ( @@ -64894,6 +65348,25 @@ }, /turf/simulated/floor/carpet/purple, /area/crew_quarters/heads/office/rd/cobed) +"jWr" = ( +/obj/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 8 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "jWt" = ( /obj/wallframe_spawn/no_grille, /obj/machinery/door/firedoor, @@ -65503,6 +65976,10 @@ dir = 8 }, /obj/floor_decal/corner/darkblue/mono, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, /turf/simulated/floor/tiled/dark/monotile, /area/hallway/primary/bridgedeck/center) "kbm" = ( @@ -67530,21 +68007,10 @@ /turf/simulated/wall/r_wall/prepainted, /area/engineering/atmos) "kre" = ( -/obj/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/sign/poster{ + pixel_x = -32 }, -/turf/simulated/floor/wood/walnut, +/turf/simulated/floor/carpet, /area/crew_quarters/lounge) "krm" = ( /obj/floor_decal/corner/black{ @@ -67754,6 +68220,9 @@ /obj/machinery/vending/snack{ icon_state = "snack" }, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "ksI" = ( @@ -69920,6 +70389,9 @@ dir = 5 }, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_eva) "kIz" = ( @@ -70036,6 +70508,10 @@ }, /obj/floor_decal/corner/yellow/mono, /obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/fore) "kJJ" = ( @@ -70270,6 +70746,9 @@ /area/crew_quarters/heads/captain/beach) "kLn" = ( /obj/machinery/jukebox/custom_tape/old, +/obj/machinery/light/spot{ + dir = 4 + }, /turf/simulated/floor/wood/walnut, /area/bridge/adjutants) "kLp" = ( @@ -70940,6 +71419,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "kQl" = ( @@ -71482,6 +71965,10 @@ dir = 6 }, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -21 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_eva) "kUj" = ( @@ -72753,6 +73240,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/status_display{ + pixel_y = 32; + pixel_x = -32 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/center) "lfG" = ( @@ -74783,9 +75274,16 @@ /turf/simulated/wall/r_titanium, /area/exploration_shuttle/power) "lvy" = ( -/obj/machinery/status_display, -/turf/simulated/wall/r_wall/prepainted, -/area/engineering/gravitaional_generator) +/obj/structure/bed/chair/rounded/blue{ + dir = 8 + }, +/obj/floor_decal/corner/darkblue/mono, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/hallway/primary/bridgedeck/center) "lvz" = ( /obj/structure/railing/mapped, /turf/simulated/open, @@ -76158,9 +76656,6 @@ /obj/floor_decal/corner/darkblue/bordercorner2{ dir = 1 }, -/obj/structure/sign/deck/bridge{ - pixel_y = 24 - }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "lFj" = ( @@ -77072,6 +77567,15 @@ }, /turf/simulated/floor/reinforced/carbon_dioxide, /area/thruster/d1starboard) +"lLW" = ( +/obj/structure/bed/chair/office/brown{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "lLY" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -79980,9 +80484,15 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/substation/bridgedeck) "mkt" = ( -/obj/machinery/status_display, -/turf/simulated/wall/prepainted, -/area/quartermaster/suplocker_room) +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/machinery/ship_map, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "mku" = ( /obj/structure/cable/green{ d1 = 1; @@ -81354,6 +81864,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/rotating_alarm/security_alarm{ + dir = 8; + pixel_x = 14 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/safe_room) "mwj" = ( @@ -81738,6 +82252,9 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "mzk" = ( @@ -81952,6 +82469,9 @@ /area/crew_quarters/heads/office/iaa) "mAA" = ( /obj/structure/flora/pottedplant/large, +/obj/structure/sign/poster{ + pixel_y = 32 + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "mAC" = ( @@ -84078,6 +84598,10 @@ /obj/item/pen, /obj/floor_decal/corner/yellow/mono, /obj/floor_decal/industrial/outline/yellow, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/fore) "mRQ" = ( @@ -84427,7 +84951,7 @@ "mUO" = ( /obj/floor_decal/corner/black/full, /obj/structure/closet/cabinet, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /obj/floor_decal/corner/red, @@ -84579,14 +85103,12 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/galley/backroom) "mWv" = ( -/obj/structure/table/woodentable/walnut, -/obj/item/device/flashlight/lamp/green{ - pixel_x = -5; - pixel_y = 15 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/bed/sofa/m/beige{ + dir = 8 + }, /turf/simulated/floor/carpet, /area/crew_quarters/lounge) "mWw" = ( @@ -86502,6 +87024,10 @@ /obj/floor_decal/corner/yellow{ dir = 1 }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "nlv" = ( @@ -89434,6 +89960,7 @@ pixel_y = 6; pixel_x = 8 }, +/obj/machinery/light, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "nIk" = ( @@ -89691,6 +90218,24 @@ /obj/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/steel_grid, /area/security/prison) +"nKo" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/floor_decal/corner/lime/bordercorner2{ + dir = 4 + }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/center) "nKq" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 @@ -90271,6 +90816,10 @@ /obj/item/storage/secure/safe{ pixel_y = 28 }, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/captain) "nPA" = ( @@ -90463,6 +91012,9 @@ /area/tcommsat/chamber) "nRV" = ( /obj/machinery/bookbinder, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, /turf/simulated/floor/carpet, /area/crew_quarters/lounge) "nSa" = ( @@ -91511,23 +92063,9 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) "obE" = ( -/obj/floor_decal/borderfloor{ - dir = 1 - }, -/obj/floor_decal/corner/lime/border{ - dir = 1 - }, -/obj/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/floor_decal/corner/lime/bordercorner2{ - dir = 4 - }, -/obj/structure/sign/deck/first{ - pixel_y = 24 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/center) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/quartermaster/hangar/upper) "obG" = ( /obj/structure/cable/green{ d1 = 2; @@ -91728,6 +92266,9 @@ /area/vacant/storage) "ocY" = ( /obj/structure/bed/sofa/l/black, +/obj/machinery/firealarm{ + pixel_y = 24 + }, /turf/simulated/floor/carpet, /area/crew_quarters/lounge) "odj" = ( @@ -92332,6 +92873,9 @@ dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "ohN" = ( @@ -94387,6 +94931,21 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/starboard) +"oxu" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 9 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "oxy" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, @@ -94525,7 +95084,7 @@ pixel_y = 18; pixel_x = -7 }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /obj/random/toy, @@ -94927,6 +95486,12 @@ /obj/shuttle_landmark/skipjack/deck5, /turf/space, /area/space) +"oCq" = ( +/obj/structure/bed/sofa/m/beige{ + dir = 10 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "oCu" = ( /obj/machinery/door/blast/regular/escape_pod{ id_tag = "escape_pod_6" @@ -95405,6 +95970,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light_switch{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/computer) "oFs" = ( @@ -96411,6 +96979,9 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/computer) "oNZ" = ( @@ -98218,6 +98789,15 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) +"pbP" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "pbU" = ( /obj/floor_decal/corner/green, /obj/floor_decal/corner/purple/bordercorner, @@ -101342,6 +101922,18 @@ "pyn" = ( /turf/simulated/wall/r_wall/hull, /area/quartermaster/expedition/eva) +"pyq" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow, +/obj/machinery/alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "pyr" = ( /obj/floor_decal/borderfloorblack{ dir = 9 @@ -103807,6 +104399,27 @@ /obj/structure/bed/chair/padded/yellow, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) +"pSH" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/floor_decal/corner/yellow, +/obj/structure/closet/hydrant{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "pSP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -104654,6 +105267,9 @@ /obj/floor_decal/corner/yellow{ dir = 1 }, +/obj/structure/closet/hydrant{ + pixel_y = -28 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "pZL" = ( @@ -105902,6 +106518,18 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/central_stairwell) +"qiM" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/structure/bed/chair/padded/blue{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "qiT" = ( /obj/structure/railing/mapped{ dir = 1 @@ -106802,7 +107430,9 @@ /turf/simulated/floor/tiled, /area/exploration_shuttle/cargo_r) "qrt" = ( -/obj/structure/bed/chair/office/comfy/teal, +/obj/structure/bed/chair/office/comfy/teal{ + dir = 1 + }, /turf/simulated/floor/wood/maple, /area/crew_quarters/heads/office/cmo/cobed) "qrB" = ( @@ -107624,6 +108254,16 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, /area/storage/primary) +"qyK" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/foreport) "qyL" = ( /obj/structure/cable{ d1 = 4; @@ -107795,6 +108435,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/status_display{ + pixel_y = 32; + pixel_x = 32 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/center) "qzT" = ( @@ -110347,6 +110991,10 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/chamber) "qUp" = ( @@ -111929,6 +112577,10 @@ "rfn" = ( /obj/floor_decal/borderfloorblack, /obj/floor_decal/corner/darkblue/border, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "rfp" = ( @@ -112272,10 +112924,6 @@ /obj/structure/bed/chair/padded/blue{ dir = 8 }, -/obj/machinery/rotating_alarm/security_alarm{ - dir = 1; - pixel_y = -13 - }, /obj/floor_decal/techfloor/orange/corner{ dir = 8 }, @@ -113746,6 +114394,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/vacant/dormintories) +"rut" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 1 + }, +/obj/machinery/ship_map, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "ruz" = ( /obj/floor_decal/corner/darkblue{ dir = 1 @@ -115206,6 +115870,21 @@ "rFq" = ( /turf/simulated/wall/r_wall/prepainted, /area/rnd/xenobiology/storage2) +"rFv" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/ai_status_display{ + pixel_x = 32; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "rFB" = ( /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/tiled/dark, @@ -115225,6 +115904,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/ship_map, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/center) "rFL" = ( @@ -119527,6 +120207,12 @@ }, /turf/simulated/floor/tiled, /area/command/exploration_leader) +"snH" = ( +/obj/structure/bed/sofa/r/beige{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "snI" = ( /obj/structure/cable/green{ d1 = 1; @@ -119962,6 +120648,9 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/floor_decal/corner/yellow/mono, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/storage/primary) "sqV" = ( @@ -120131,6 +120820,12 @@ /obj/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/rnd/locker) +"ssq" = ( +/obj/structure/table/woodentable/walnut, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "sst" = ( /obj/structure/cable/green{ d1 = 4; @@ -121016,6 +121711,16 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/fourthdeck/starboard) +"szf" = ( +/obj/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "szj" = ( /obj/structure/table/standard, /obj/item/storage/box/botanydisk, @@ -121618,6 +122323,18 @@ }, /turf/simulated/floor/plating, /area/rnd/misc_lab) +"sDz" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "sDE" = ( /obj/machinery/door/blast/regular/open{ density = 0; @@ -121985,7 +122702,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "sFU" = ( @@ -123344,6 +124064,24 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology/level1) +"sPE" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 4 + }, +/obj/machinery/alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "sPH" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ id_tag = "petrov_shuttle_dock_pump" @@ -124156,7 +124894,8 @@ }, /obj/machinery/light_switch{ dir = 1; - pixel_y = -21 + pixel_y = -21; + pixel_x = 1 }, /obj/structure/table/steel_reinforced, /obj/machinery/recharger, @@ -125845,6 +126584,24 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/port) +"tkF" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "tkL" = ( /obj/machinery/light_switch{ dir = 4; @@ -127480,6 +128237,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/seconddeck/aftstarboard) +"txC" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/center) "txH" = ( /obj/structure/table/rack, /obj/random/maintenance, @@ -127511,6 +128280,7 @@ /obj/structure/reagent_dispensers/water_cooler{ dir = 8 }, +/obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "tyD" = ( @@ -128706,8 +129476,8 @@ dir = 1 }, /obj/structure/bed/chair/padded/blue, -/obj/structure/closet/hydrant{ - pixel_y = 28 +/obj/item/device/radio/intercom{ + pixel_y = 26 }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) @@ -129353,7 +130123,7 @@ }, /obj/machinery/computer/arcade, /turf/simulated/floor/plating, -/area/tcommsat/chamber) +/area/maintenance/thirddeck/foreport) "tMU" = ( /obj/item/storage/mirror{ pixel_x = -26; @@ -129694,7 +130464,7 @@ /area/hallway/primary/seconddeck/center) "tPA" = ( /obj/floor_decal/corner/black/full, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -131884,7 +132654,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/wood/walnut, +/turf/simulated/floor/carpet, /area/crew_quarters/lounge) "uhk" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel, @@ -133314,6 +134084,25 @@ }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/cafe/upper) +"usD" = ( +/obj/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 4 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 6 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 6 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "usG" = ( /obj/machinery/suit_cycler/medical/alt, /obj/structure/window/basic{ @@ -135211,9 +136000,6 @@ /obj/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, /obj/floor_decal/corner/darkblue/border{ dir = 1 }, @@ -135229,6 +136015,9 @@ /obj/floor_decal/corner/darkblue/bordercorner2{ dir = 4 }, +/obj/structure/sign/deck/bridge{ + pixel_y = 35 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "uIC" = ( @@ -136196,6 +136985,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atm{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/center) "uPY" = ( @@ -137400,6 +138192,13 @@ /obj/structure/table/rack, /turf/simulated/floor/plating, /area/maintenance/seconddeck/port) +"vaw" = ( +/obj/structure/catwalk, +/obj/machinery/light/spot{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/quartermaster/hangar/upper) "vaA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -139270,10 +140069,10 @@ /turf/simulated/floor/tiled/dark/monotile, /area/medical/morgue/autopsy) "vnt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/computer/modular/preset/library{ + dir = 8 }, -/turf/simulated/floor/wood/walnut, +/turf/simulated/floor/carpet, /area/crew_quarters/lounge) "vnD" = ( /obj/floor_decal/spline/fancy/wood, @@ -140077,6 +140876,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) +"vuf" = ( +/obj/structure/table/woodentable/walnut, +/obj/item/book/manual/anomaly_testing, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "vut" = ( /obj/structure/table/rack, /obj/item/storage/firstaid/radiation{ @@ -140607,9 +141411,6 @@ /obj/floor_decal/corner/lime/bordercorner2{ dir = 1 }, -/obj/structure/sign/deck/fourth{ - pixel_y = 24 - }, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/center) "vyf" = ( @@ -140880,6 +141681,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "vAJ" = ( @@ -141236,6 +142041,7 @@ dir = 8 }, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_eva) "vDg" = ( @@ -141489,9 +142295,6 @@ /turf/simulated/wall/ocp_wall, /area/rnd/toxins) "vEX" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, /obj/floor_decal/borderfloor{ dir = 1 }, @@ -141504,6 +142307,14 @@ /obj/floor_decal/corner/lime/bordercorner2{ dir = 1 }, +/obj/structure/sign/directions/science{ + pixel_y = 24; + dir = 4 + }, +/obj/structure/sign/directions/infirmary{ + dir = 4; + pixel_y = 31 + }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/center) "vFf" = ( @@ -141582,6 +142393,9 @@ /obj/floor_decal/corner/darkblue/border{ dir = 1 }, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "vFB" = ( @@ -144608,6 +145422,9 @@ /obj/machinery/chemical_dispenser/bar_soft/full{ dir = 1 }, +/obj/structure/sign/poster{ + pixel_y = -32 + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "wds" = ( @@ -144936,7 +145753,7 @@ }, /obj/structure/dogbed, /mob/living/simple_animal/passive/cat/fluff/Runtime, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, /turf/simulated/floor/carpet/blue3, @@ -145394,6 +146211,35 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/assembly/robotics) +"wiO" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/airless, +/area/solar/port) +"wiU" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "wjg" = ( /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) @@ -146052,6 +146898,18 @@ /obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/storage) +"woR" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "woS" = ( /obj/floor_decal/techfloor/orange{ dir = 9 @@ -146725,7 +147583,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light/small, +/obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/office/ce/cobed) "wuG" = ( @@ -146895,6 +147753,10 @@ /obj/floor_decal/corner/yellow{ dir = 1 }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 24; + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "wvG" = ( @@ -148331,15 +149193,13 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/office/ce) "wLl" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, /obj/floor_decal/borderfloor{ dir = 1 }, /obj/floor_decal/corner/lime/border{ dir = 1 }, +/obj/machinery/ship_map, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) "wLu" = ( @@ -149606,6 +150466,9 @@ dir = 1 }, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_eva) "wVT" = ( @@ -149778,7 +150641,7 @@ /obj/structure/bed/padded, /obj/item/bedsheet/brown, /obj/structure/sign/poster{ - pixel_y = 30 + pixel_y = 32 }, /turf/simulated/floor/carpet, /area/crew_quarters/sleep/bunk) @@ -150254,7 +151117,7 @@ response_harm = "kicks"; response_help = "pets" }, -/obj/machinery/light/small, +/obj/machinery/light, /turf/simulated/floor/carpet/purple, /area/crew_quarters/heads/office/rd/cobed) "xbp" = ( @@ -151448,6 +152311,10 @@ /obj/structure/table/standard{ name = "plastic table frame" }, +/obj/machinery/rotating_alarm/security_alarm{ + dir = 4; + pixel_x = -14 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/safe_room) "xjQ" = ( @@ -152809,6 +153676,13 @@ map_airless = 1 }, /area/vacant/prototype/engine) +"xvV" = ( +/obj/machinery/telecomms/server/presets/common, +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/turf/simulated/floor/bluegrid, +/area/tcommsat/chamber) "xwc" = ( /obj/structure/cable/green{ d2 = 2; @@ -153408,6 +154282,10 @@ /obj/structure/holoplant, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/fore) +"xAq" = ( +/obj/structure/bed/sofa/l/beige, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "xAw" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -155952,6 +156830,7 @@ pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/item/folder/nt, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/office/iaa) "xTD" = ( @@ -157053,7 +157932,7 @@ dir = 1 }, /obj/structure/sign/deck/second{ - pixel_y = 24 + pixel_y = 35 }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) @@ -157653,6 +158532,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/chamber) "ygl" = ( @@ -157735,9 +158618,6 @@ /obj/structure/bed/chair/padded/blue{ dir = 4 }, -/obj/machinery/rotating_alarm/security_alarm{ - pixel_y = 13 - }, /obj/floor_decal/techfloor{ dir = 9 }, @@ -175918,7 +176798,7 @@ phV phV phV phV -mkt +phV drA vJC waJ @@ -207835,7 +208715,7 @@ lBq boS esk ezw -aBL +eUc gNA iTq iPj @@ -208037,7 +208917,7 @@ nsv fDd esk ezw -cgh +aBL gNA iYI gNA @@ -208455,10 +209335,10 @@ pwH pwH pwH pwH +gxm pwH pwH -pwH -pwH +cgh pwH pwH pwH @@ -208657,7 +209537,7 @@ tTX tTX tTX tTX -tTX +qyK oDh tTX tTX @@ -209068,7 +209948,7 @@ bRV quv aHM aHM -nCI +aHM xiD aLQ xog @@ -209273,7 +210153,7 @@ jHu aHM xiD aLQ -uoI +csX tQA tQA wJN @@ -209449,15 +210329,15 @@ hmD gkX cDJ eHP -xgt +rFv cdH gHp nlt pRM -nlt +szf wvA cdH -fFO +cij pnE loO oNQ @@ -209652,13 +210532,13 @@ lVr aCE eHP xgt -ehB kXN kXN kXN kXN kXN -lvy +kXN +kXN fFO pnE loO @@ -209853,7 +210733,7 @@ dnf abj fUP exY -xgt +akl kXN mGL pAL @@ -210055,7 +210935,7 @@ sSB aIM aCE eHP -xgt +cpO kXN xTq woS @@ -210063,7 +210943,7 @@ rKi acR gRz kXN -fFO +pyq pnE loO dCr @@ -210467,7 +211347,7 @@ saT uGF gRz kXN -fFO +woR pnE loO iel @@ -210661,7 +211541,7 @@ qGw gIN sln eHP -wkN +sDz kXN nqH lqX @@ -210678,7 +211558,7 @@ cbO ifH dzO loO -vnK +xvV mYT dBP jBQ @@ -211073,7 +211953,7 @@ rap lMX ttD kXN -fFO +woR fcN evm uhE @@ -211468,7 +212348,7 @@ sxK sbJ uiQ sln -eHP +hkq xgt nqE kXN @@ -211477,7 +212357,7 @@ pgK dsE roS kXN -nZd +pyq pnE evm foq @@ -211505,7 +212385,7 @@ lda lda lda lda -lda +wiO lda rtY wJN @@ -211670,7 +212550,7 @@ gYr hGh jny sln -eHP +fsu uYY bwv kXN @@ -211679,7 +212559,7 @@ kXN kXN kXN kXN -fFO +nZd eOb ezP gSf @@ -211862,7 +212742,7 @@ bHt bHt bHt iHh -akl +pvb dnR dcD sln @@ -211872,7 +212752,7 @@ sln sln sln sln -eHP +pSH xgt bwv kJI @@ -212063,9 +212943,9 @@ mmo pvb pvb pvb -oTo -fPH -akl +cYe +pvb +pvb pvb pvb pvb @@ -212075,7 +212955,7 @@ ipj ipj jCo xNk -xgt +hfu cdH gjd lzz @@ -212083,7 +212963,7 @@ lzz lzz mdZ cdH -fFO +arq shG evm xpJ @@ -212266,9 +213146,9 @@ ejn pvb eUR aBy -lgS +wiU gsf -kMY +wiU kMY kMY hEE @@ -214526,7 +215406,7 @@ sqV sqV tEF dmQ -bhA +ehB kBc qUA oFI @@ -217341,9 +218221,9 @@ hpX cKL fCJ ugW -bje -ugW -oOk +ixQ +kre +lLW cKL ksE bDX @@ -217542,10 +218422,10 @@ exx fDo cKL tod -bDX -hZQ -bDX +ixQ tdI +ssq +vnt cKL pwt bDX @@ -217744,10 +218624,10 @@ tRG oRu cKL hZQ -bDX -pDy -bDX +ixQ bje +oOk +tdI cKL sob bDX @@ -217945,9 +218825,9 @@ qAf qAf vWI cKL +dLk bDX bDX -vnt bDX bDX oue @@ -218149,7 +219029,7 @@ nTE sCT sFS mgE -kre +tJv tJv tJv haA @@ -218357,9 +219237,9 @@ ixQ svl ixQ kdh -ixQ -svl -ixQ +xAq +cjk +vuf cKL gPE ruI @@ -218559,9 +219439,9 @@ jkU qyP tRr nbg -jkU +oCq mWv -tRr +snH cKL emE geF @@ -218948,9 +219828,9 @@ fHq fHq fHq fHq -fHq -fHq -fda +obE +obE +vaw fHq fHq fHq @@ -222584,9 +223464,9 @@ msv fHq fHq fHq -fHq -fHq -fHq +obE +obE +obE fHq fHq fHq @@ -251469,7 +252349,7 @@ ims vOs ims ims -qds +efa pdu nfV tOU @@ -256319,7 +257199,7 @@ dWi fny peo aYz -ccj +aJI qOv aIS xsC @@ -263791,7 +264671,7 @@ qVI qVI qVI qVI -juk +eWI doV rRI tKC @@ -294496,7 +295376,7 @@ dEB dEB dEB kTh -obE +hKe mAC bqO tTe @@ -295506,7 +296386,7 @@ djN xjE fhX stL -hKe +nKo mDg lKS alJ @@ -297122,7 +298002,7 @@ iKp mjY aSg stL -kgs +dpT oJA fVM xsz @@ -304798,7 +305678,7 @@ mBb juu hJd cex -nSY +hOL rjg aZX nOV @@ -327823,7 +328703,7 @@ cxd fMg dBh gUj -rNl +dQq fbE fbE plB @@ -327835,7 +328715,7 @@ fbE fbE tHc gUj -ybl +cKr aqI aqI aqI @@ -328225,9 +329105,9 @@ bNB muF wIY fMg -dwT +sPE thi -rNl +qiM wJP xWY pqy @@ -328239,7 +329119,7 @@ rLG wJP eCI thi -xgB +aXK kka egZ nkO @@ -328831,7 +329711,7 @@ wtg fZb whF xZN -dBh +rut iah xgB wJP @@ -328843,7 +329723,7 @@ bWY pZM ghY wJP -dBh +rut iah xgB kka @@ -330245,7 +331125,7 @@ epB wGh kLl twd -cbV +dcK uGA srp pJF @@ -330449,7 +331329,7 @@ lKZ twd cbV iah -ybl +dDj wJP xwd rbM @@ -330459,7 +331339,7 @@ aHE bop baI wJP -dwT +tkF iah rNl nPg @@ -330651,7 +331531,7 @@ qjy twd dBh thi -xgB +oxu wJP wJP uAj @@ -330661,9 +331541,9 @@ uAj uAj wJP wJP -dBh +cHE thi -isJ +iHc sPt hqH wRf @@ -330865,7 +331745,7 @@ vXn efi vXn qbk -iHc +pbP sPt hZf hqH @@ -331081,7 +331961,7 @@ gqH gqH jwM gqH -fsu +gqH gqH qWz bQU @@ -331875,7 +332755,7 @@ ssI wNp ioI hvn -nwJ +fPH hVv gUC cFs @@ -332267,7 +333147,7 @@ cuI nWa pgS rBV -nwJ +cUU edu mEz ria @@ -332277,7 +333157,7 @@ mEz ria mEz edu -pbH +txC fEm cjn spV @@ -333684,7 +334564,7 @@ aiw eJs jnT xlV -kbe +lvy bzF bfH soR @@ -335301,7 +336181,7 @@ sMj rPt nSy wrR -gNu +fZS jDK ltN tse @@ -335505,7 +336385,7 @@ gZf wrR clD kTQ -dhX +hAJ tse lMi rNK @@ -335705,7 +336585,7 @@ fKs oHh oEO wrR -vFA +mkt fKt iTZ tse @@ -336101,7 +336981,7 @@ tuX mze jDq wdL -apA +dbB jrx apA qNw @@ -336111,7 +336991,7 @@ xSo nLX hAO hdI -rfn +dhX tse tse tse @@ -336318,11 +337198,11 @@ nLX gaH qNw qop -wdL +jWr gQI jlU qNw -qop +jbJ pmk wSG eUW @@ -336504,7 +337384,7 @@ tzM tuX aqr yfi -eWg +usD fBO tpp brI @@ -336723,7 +337603,7 @@ lWD jar eWg jdC -xHi +iWX xAj vsN tym From 011c01934f45a44a1f2dea1430f6d121c10275a9 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Tue, 31 Oct 2023 13:42:05 +0300 Subject: [PATCH 21/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#1265=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-1265.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1265.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1265.yml b/html/changelogs/AutoChangeLog-sierra-pr-1265.yml new file mode 100644 index 0000000000000..8f8f216a8880b --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1265.yml @@ -0,0 +1,10 @@ +author: KandJX +changes: + - {maptweak: Исправлено освещение на мостике} + - {maptweak: Исправлен доступ шлюзов ведущих к порту} + - {maptweak: Добавлены ноутбуки АВД} + - {maptweak: Добавлены голокарты} + - {maptweak: Изменена библиотека} + - {maptweak: Добавлено пару плейтингов на втором этаже ангара} + - {maptweak: Фикс нескольких минорных недочетов} +delete-after: true From 9d68de12aedc4cc2feea20d6f1709f5964768061 Mon Sep 17 00:00:00 2001 From: Alex6511 <7919184+Alex6511@users.noreply.github.com> Date: Sun, 29 Oct 2023 20:43:04 +0300 Subject: [PATCH 22/44] [MIRROR] Planet Gen Redo to make exploration more fun, two --- code/__defines/misc.dm | 11 +++-- .../mob/living/simple_animal/hostile/leech.dm | 2 + code/modules/overmap/exoplanets/_exoplanet.dm | 16 +------ .../exoplanets/exoplanet_atmosphere.dm | 48 ++++++++++++------- .../overmap/exoplanets/planet_types/barren.dm | 10 ++-- .../exoplanets/planet_types/chlorine.dm | 17 ++++--- .../overmap/exoplanets/planet_types/desert.dm | 13 ++--- .../overmap/exoplanets/planet_types/grass.dm | 46 ++++++++++++------ .../exoplanets/planet_types/shrouded.dm | 21 ++++---- .../overmap/exoplanets/planet_types/snow.dm | 21 ++++---- .../exoplanets/planet_types/volcanic.dm | 14 +++--- 11 files changed, 120 insertions(+), 99 deletions(-) diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index c8da27040f9d9..0f9dbf8223ac6 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -259,10 +259,13 @@ //Lying animation #define ANIM_LYING_TIME 2 -//Planet habitability class -#define HABITABILITY_IDEAL 1 -#define HABITABILITY_OKAY 2 -#define HABITABILITY_BAD 3 + +//Planet habitability weight +#define HABITABILITY_LOCKED 1 +#define HABITABILITY_TYPICAL 2 +#define HABITABILITY_BAD 3 +#define HABITABILITY_EXTREME 4 + #ifndef WINDOWS_HTTP_POST_DLL_LOCATION #define WINDOWS_HTTP_POST_DLL_LOCATION "lib/byhttp.dll" diff --git a/code/modules/mob/living/simple_animal/hostile/leech.dm b/code/modules/mob/living/simple_animal/hostile/leech.dm index f03cf30af161d..98244b362da56 100644 --- a/code/modules/mob/living/simple_animal/hostile/leech.dm +++ b/code/modules/mob/living/simple_animal/hostile/leech.dm @@ -20,6 +20,8 @@ Tiny, weak, and mostly harmless alone. dangerous in groups. flash_vulnerability = 0 // We dont have eyes, why should we care about light? bleed_colour = COLOR_VIOLET color = COLOR_GRAY + min_gas = null + max_gas = null ai_holder = /datum/ai_holder/simple_animal/melee/leech diff --git a/code/modules/overmap/exoplanets/_exoplanet.dm b/code/modules/overmap/exoplanets/_exoplanet.dm index caf41e17c9cbd..53fed779d90e3 100644 --- a/code/modules/overmap/exoplanets/_exoplanet.dm +++ b/code/modules/overmap/exoplanets/_exoplanet.dm @@ -71,18 +71,7 @@ GLOBAL_VAR(planet_repopulation_disabled) var/list/spawned_features //Either a type or a list of types and weights. You must include all types if it's a list - var/list/habitability_distribution = list( - HABITABILITY_IDEAL = 10, - HABITABILITY_OKAY = 40, - HABITABILITY_BAD = 50 - ) - var/habitability_class - -/obj/overmap/visitable/sector/exoplanet/proc/generate_habitability() - if (isnum(habitability_distribution)) - habitability_class = habitability_distribution - else - habitability_class = pickweight_index(habitability_distribution) + var/habitability_weight = HABITABILITY_TYPICAL /obj/overmap/visitable/sector/exoplanet/New(nloc, max_x, max_y) if (!GLOB.using_map.use_overmap) @@ -124,14 +113,13 @@ GLOBAL_VAR(planet_repopulation_disabled) ..() /obj/overmap/visitable/sector/exoplanet/proc/build_level() - generate_habitability() generate_atmosphere() for (var/datum/exoplanet_theme/T in themes) T.adjust_atmosphere(src) if (atmosphere) //Set up gases for living things if (!length(breathgas)) - var/list/goodgases = gas_data.gases.Copy() + var/list/goodgases = atmosphere.gas.Copy() var/gasnum = min(rand(1,3), length(goodgases)) for (var/i = 1 to gasnum) var/gas = pick(goodgases) diff --git a/code/modules/overmap/exoplanets/exoplanet_atmosphere.dm b/code/modules/overmap/exoplanets/exoplanet_atmosphere.dm index 5647bd653d360..f094a20728fe3 100644 --- a/code/modules/overmap/exoplanets/exoplanet_atmosphere.dm +++ b/code/modules/overmap/exoplanets/exoplanet_atmosphere.dm @@ -1,9 +1,10 @@ /obj/overmap/visitable/sector/exoplanet/proc/generate_atmosphere() atmosphere = new - if (habitability_class == HABITABILITY_IDEAL) + if (habitability_weight == HABITABILITY_LOCKED) atmosphere.adjust_gas(GAS_OXYGEN, MOLES_O2STANDARD, 0) atmosphere.adjust_gas(GAS_NITROGEN, MOLES_N2STANDARD) else //let the fuckery commence + var/habitability var/list/newgases = gas_data.gases.Copy() if (prob(90)) //all phoron planet should be rare newgases -= GAS_PHORON @@ -11,37 +12,50 @@ newgases -= GAS_ALIEN newgases -= GAS_STEAM - var/total_moles = MOLES_CELLSTANDARD * rand(80,120)/100 + switch(habitability_weight) + if (HABITABILITY_TYPICAL) + habitability = NORMAL_RAND + if (HABITABILITY_BAD) + habitability = LINEAR_RAND + if (HABITABILITY_EXTREME) + habitability = SQUARE_RAND + else + habitability = UNIFORM_RAND + + var/total_moles = MOLES_CELLSTANDARD * (rand(7, 40) / 10) + var/generator/new_moles = generator("num", 0.15 * total_moles, 0.6 * total_moles, habitability) var/badflag = 0 - //Breathable planet - if (habitability_class == HABITABILITY_OKAY) - atmosphere.gas[GAS_OXYGEN] += MOLES_O2STANDARD - total_moles -= MOLES_O2STANDARD - badflag = XGM_GAS_FUEL|XGM_GAS_CONTAMINANT + var/gasnum = rand(max(habitability_weight - 1, 1), 4) + var/i = 0 - var/gasnum = rand(1,4) - var/i = 1 - var/sanity = prob(99.9) while (i <= gasnum && total_moles && length(newgases)) - if (badflag && sanity) + if (badflag) for(var/g in newgases) if (gas_data.flags[g] & badflag) newgases -= g + var/ng = pick_n_take(newgases) //pick a gas - if (sanity) //make sure atmosphere is not flammable... always - if (gas_data.flags[ng] & XGM_GAS_OXIDIZER) - badflag |= XGM_GAS_FUEL - if (gas_data.flags[ng] & XGM_GAS_FUEL) + + if (gas_data.flags[ng] & XGM_GAS_OXIDIZER) + badflag |= XGM_GAS_OXIDIZER + if (prob(33)) + badflag |= (XGM_GAS_FUSION_FUEL | XGM_GAS_FUEL) + + if ((gas_data.flags[ng] & XGM_GAS_FUEL) || (gas_data.flags[ng] & XGM_GAS_FUSION_FUEL)) + badflag |= (XGM_GAS_FUSION_FUEL | XGM_GAS_FUEL) + if (prob(33)) badflag |= XGM_GAS_OXIDIZER - sanity = 0 - var/part = total_moles * rand(3,80)/100 //allocate percentage to it + var/part = new_moles.Rand() //allocate percentage to it if (i == gasnum || !length(newgases)) //if it's last gas, let it have all remaining moles part = total_moles + atmosphere.gas[ng] += part total_moles = max(total_moles - part, 0) i++ + atmosphere.update_values() + /obj/overmap/visitable/sector/exoplanet/proc/get_atmosphere_color() var/list/colors = list() diff --git a/code/modules/overmap/exoplanets/planet_types/barren.dm b/code/modules/overmap/exoplanets/planet_types/barren.dm index 22ef13f949705..7cf874ded2f59 100644 --- a/code/modules/overmap/exoplanets/planet_types/barren.dm +++ b/code/modules/overmap/exoplanets/planet_types/barren.dm @@ -4,23 +4,19 @@ color = "#6c6c6c" planetary_area = /area/exoplanet/barren rock_colors = list(COLOR_BEIGE, COLOR_GRAY80, COLOR_BROWN) - possible_themes = list(/datum/exoplanet_theme/mountains) map_generators = list(/datum/random_map/noise/exoplanet/barren, /datum/random_map/noise/ore/rich) ruin_tags_blacklist = RUIN_HABITAT|RUIN_WATER features_budget = 6 surface_color = "#807d7a" water_color = null - habitability_distribution = HABITABILITY_BAD + habitability_weight = HABITABILITY_LOCKED has_trees = FALSE /obj/overmap/visitable/sector/exoplanet/barren/generate_atmosphere() - ..() - atmosphere.remove_ratio(0.9) + atmosphere = new /obj/overmap/visitable/sector/exoplanet/barren/generate_flora() - if(prob(10)) - flora_diversity = 1 - ..() + return /datum/random_map/noise/exoplanet/barren descriptor = "barren exoplanet" diff --git a/code/modules/overmap/exoplanets/planet_types/chlorine.dm b/code/modules/overmap/exoplanets/planet_types/chlorine.dm index 6e71958e782bf..f43503fc86f80 100644 --- a/code/modules/overmap/exoplanets/planet_types/chlorine.dm +++ b/code/modules/overmap/exoplanets/planet_types/chlorine.dm @@ -9,7 +9,7 @@ ruin_tags_blacklist = RUIN_HABITAT|RUIN_WATER surface_color = "#a3b879" water_color = COLOR_BOTTLE_GREEN - habitability_distribution = HABITABILITY_BAD + habitability_weight = HABITABILITY_BAD has_trees = FALSE flora_diversity = 5 fauna_types = list(/mob/living/simple_animal/thinbug, /mob/living/simple_animal/hostile/retaliate/beast/samak/alt, /mob/living/simple_animal/yithian, /mob/living/simple_animal/tindalos, /mob/living/simple_animal/hostile/retaliate/jelly) @@ -17,14 +17,19 @@ sun_brightness_modifier = 0.5 //The dense atmosphere makes it all dark /obj/overmap/visitable/sector/exoplanet/chlorine/get_atmosphere_color() - return "#e5f2bd" + var/air_color = ..() + return MixColors("#e5f2bd", air_color) /obj/overmap/visitable/sector/exoplanet/chlorine/generate_atmosphere() ..() - if(atmosphere) - atmosphere.adjust_gas(GAS_CHLORINE, MOLES_O2STANDARD) - atmosphere.temperature = T100C - rand(0, 100) - atmosphere.update_values() + var/chlor_moles = (rand(1, 6) / 10) * (atmosphere.total_moles) + atmosphere = atmosphere.remove(chlor_moles ) + atmosphere.adjust_gas(GAS_CHLORINE, chlor_moles ) + + var/datum/species/H = all_species[SPECIES_HUMAN] + var/generator/new_temp = generator("num", H.cold_level_1 + 40, H.heat_level_1 + 10, UNIFORM_RAND) + atmosphere.temperature = new_temp.Rand() + atmosphere.update_values() /datum/random_map/noise/exoplanet/chlorine descriptor = "chlorine exoplanet" diff --git a/code/modules/overmap/exoplanets/planet_types/desert.dm b/code/modules/overmap/exoplanets/planet_types/desert.dm index 629d7203d9b25..c370bf7c9d0e8 100644 --- a/code/modules/overmap/exoplanets/planet_types/desert.dm +++ b/code/modules/overmap/exoplanets/planet_types/desert.dm @@ -8,9 +8,7 @@ map_generators = list(/datum/random_map/noise/exoplanet/desert, /datum/random_map/noise/ore/rich) surface_color = "#d6cca4" water_color = null - habitability_distribution = list(HABITABILITY_IDEAL = 30, HABITABILITY_OKAY = 50, HABITABILITY_BAD = 10) has_trees = FALSE - flora_diversity = 4 fauna_types = list(/mob/living/simple_animal/thinbug, /mob/living/simple_animal/tindalos, /mob/living/simple_animal/hostile/voxslug, /mob/living/simple_animal/hostile/retaliate/beast/antlion) megafauna_types = list(/mob/living/simple_animal/hostile/retaliate/beast/antlion/mega) @@ -21,13 +19,10 @@ /obj/overmap/visitable/sector/exoplanet/desert/generate_atmosphere() ..() - if(atmosphere) - var/limit = 1000 - if(habitability_class <= HABITABILITY_OKAY) - var/datum/species/human/H = /datum/species/human - limit = initial(H.heat_level_1) - rand(1,10) - atmosphere.temperature = min(T20C + rand(20, 100), limit) - atmosphere.update_values() + var/datum/species/H = all_species[SPECIES_HUMAN] + var/generator/new_temp = generator("num", H.heat_level_1, 2 * H.heat_level_1, NORMAL_RAND) + atmosphere.temperature = new_temp.Rand() + atmosphere.update_values() /obj/overmap/visitable/sector/exoplanet/desert/adapt_seed(datum/seed/S) ..() diff --git a/code/modules/overmap/exoplanets/planet_types/grass.dm b/code/modules/overmap/exoplanets/planet_types/grass.dm index 05e4d32450f81..7b5c44956f03c 100644 --- a/code/modules/overmap/exoplanets/planet_types/grass.dm +++ b/code/modules/overmap/exoplanets/planet_types/grass.dm @@ -6,17 +6,23 @@ rock_colors = list(COLOR_ASTEROID_ROCK, COLOR_GRAY80, COLOR_BROWN) plant_colors = list("#0e1e14","#1a3e38","#5a7467","#9eab88","#6e7248", "RANDOM") map_generators = list(/datum/random_map/noise/exoplanet/grass) - habitability_distribution = list(HABITABILITY_IDEAL = 70, HABITABILITY_OKAY = 20, HABITABILITY_BAD = 5) - has_trees = TRUE flora_diversity = 7 - fauna_types = list(/mob/living/simple_animal/yithian, /mob/living/simple_animal/tindalos, /mob/living/simple_animal/hostile/retaliate/jelly) - megafauna_types = list(/mob/living/simple_animal/hostile/retaliate/parrot/space/megafauna, /mob/living/simple_animal/hostile/retaliate/goose/dire) + fauna_types = list( + /mob/living/simple_animal/yithian, + /mob/living/simple_animal/tindalos, + /mob/living/simple_animal/hostile/retaliate/jelly + ) + megafauna_types = list( + /mob/living/simple_animal/hostile/retaliate/parrot/space/megafauna, + /mob/living/simple_animal/hostile/retaliate/goose/dire + ) /obj/overmap/visitable/sector/exoplanet/grass/generate_atmosphere() ..() - if(atmosphere) - atmosphere.temperature = T20C + rand(10, 30) - atmosphere.update_values() + var/datum/species/H = all_species[SPECIES_HUMAN] + var/generator/new_temp = generator("num", T0C, H.heat_level_1 - 10, UNIFORM_RAND) + atmosphere.temperature = new_temp.Rand() + atmosphere.update_values() /obj/overmap/visitable/sector/exoplanet/grass/get_surface_color() return grass_color @@ -74,8 +80,20 @@ sun_brightness_modifier = 0.8 //Fairly bright has_trees = TRUE flora_diversity = 8 - fauna_types = list(/mob/living/simple_animal/passive/cat, /mob/living/simple_animal/passive/chicken, /mob/living/simple_animal/passive/mouse, /mob/living/simple_animal/passive/opossum, /mob/living/simple_animal/hostile/retaliate/goat, /mob/living/simple_animal/hostile/retaliate/goose, /mob/living/simple_animal/passive/cow) - megafauna_types = list(/mob/living/simple_animal/hostile/retaliate/parrot/space/megafauna, /mob/living/simple_animal/hostile/retaliate/goose/dire) + fauna_types = list( + /mob/living/simple_animal/passive/cat, + /mob/living/simple_animal/passive/chicken, + /mob/living/simple_animal/passive/mouse, + /mob/living/simple_animal/passive/opossum, + /mob/living/simple_animal/hostile/retaliate/goat, + /mob/living/simple_animal/hostile/retaliate/goose, + /mob/living/simple_animal/passive/cow + ) + megafauna_types = list( + /mob/living/simple_animal/hostile/retaliate/parrot/space/megafauna, + /mob/living/simple_animal/hostile/retaliate/goose/dire + ) + habitability_weight = HABITABILITY_LOCKED //Animals being named alien creature is a bit odd as these would just be earth transplants species = list( /mob/living/simple_animal/passive/cat = "wild cat", @@ -86,14 +104,12 @@ /mob/living/simple_animal/hostile/retaliate/goose = "goose", /mob/living/simple_animal/passive/cow = "wild cow") -/obj/overmap/visitable/sector/exoplanet/grass/terraformed/generate_habitability() - habitability_class = HABITABILITY_IDEAL - /obj/overmap/visitable/sector/exoplanet/grass/terraformed/generate_atmosphere() ..() - if(atmosphere) - atmosphere.temperature = T0C + rand(0, 50) - atmosphere.update_values() + var/datum/species/H = all_species[SPECIES_HUMAN] + var/generator/new_temp = generator("num", T20C, H.heat_level_1 - 15) + atmosphere.temperature = new_temp.Rand() + atmosphere.update_values() /datum/random_map/noise/exoplanet/grass/terraformed descriptor = "terraformed grass exoplanet" diff --git a/code/modules/overmap/exoplanets/planet_types/shrouded.dm b/code/modules/overmap/exoplanets/planet_types/shrouded.dm index 701d4b6f577ac..56acd2cc86c8b 100644 --- a/code/modules/overmap/exoplanets/planet_types/shrouded.dm +++ b/code/modules/overmap/exoplanets/planet_types/shrouded.dm @@ -10,22 +10,23 @@ sun_brightness_modifier = -0.5 surface_color = "#3e3960" water_color = "#2b2840" - has_trees = TRUE - flora_diversity = 4 - fauna_types = list(/mob/living/simple_animal/hostile/retaliate/royalcrab, - /mob/living/simple_animal/hostile/retaliate/jelly/alt, - /mob/living/simple_animal/hostile/retaliate/beast/shantak/alt, - /mob/living/simple_animal/hostile/leech) + fauna_types = list( + /mob/living/simple_animal/hostile/retaliate/royalcrab, + /mob/living/simple_animal/hostile/retaliate/jelly/alt, + /mob/living/simple_animal/hostile/retaliate/beast/shantak/alt, + /mob/living/simple_animal/hostile/leech + ) /obj/overmap/visitable/sector/exoplanet/shrouded/generate_atmosphere() ..() - if(atmosphere) - atmosphere.temperature = T20C - rand(10, 20) + if (atmosphere) + atmosphere.temperature = rand(T0C, T20C) atmosphere.update_values() /obj/overmap/visitable/sector/exoplanet/shrouded/get_atmosphere_color() - return COLOR_BLACK + var/air_color = ..() + return MixColors(COLOR_BLACK, air_color) /datum/random_map/noise/exoplanet/shrouded descriptor = "shrouded exoplanet" @@ -41,7 +42,7 @@ /datum/random_map/noise/exoplanet/shrouded/get_additional_spawns(value, turf/T) ..() - if(prob(0.1)) + if (prob(0.1)) new/obj/structure/leech_spawner(T) /area/exoplanet/shrouded diff --git a/code/modules/overmap/exoplanets/planet_types/snow.dm b/code/modules/overmap/exoplanets/planet_types/snow.dm index dbe1475c53a34..5ba51855824b0 100644 --- a/code/modules/overmap/exoplanets/planet_types/snow.dm +++ b/code/modules/overmap/exoplanets/planet_types/snow.dm @@ -8,21 +8,20 @@ map_generators = list(/datum/random_map/noise/exoplanet/snow, /datum/random_map/noise/ore/poor) surface_color = "#e8faff" water_color = "#b5dfeb" - habitability_distribution = list(HABITABILITY_IDEAL = 30, HABITABILITY_OKAY = 50, HABITABILITY_BAD = 10) - has_trees = TRUE - flora_diversity = 4 - fauna_types = list(/mob/living/simple_animal/hostile/retaliate/beast/samak, /mob/living/simple_animal/hostile/retaliate/beast/diyaab, /mob/living/simple_animal/hostile/retaliate/beast/shantak) + habitability_weight = HABITABILITY_BAD + fauna_types = list( + /mob/living/simple_animal/hostile/retaliate/beast/samak, + /mob/living/simple_animal/hostile/retaliate/beast/diyaab, + /mob/living/simple_animal/hostile/retaliate/beast/shantak + ) megafauna_types = list(/mob/living/simple_animal/hostile/retaliate/giant_crab) /obj/overmap/visitable/sector/exoplanet/snow/generate_atmosphere() ..() - if(atmosphere) - var/limit = 0 - if(habitability_class <= HABITABILITY_OKAY) - var/datum/species/human/H = /datum/species/human - limit = initial(H.cold_level_1) + rand(1,10) - atmosphere.temperature = max(T0C - rand(10, 100), limit) - atmosphere.update_values() + var/datum/species/H = all_species[SPECIES_HUMAN] + var/generator/new_temp = generator("num", H.cold_level_1 - 50, H.cold_level_3, NORMAL_RAND) + atmosphere.temperature = new_temp.Rand() + atmosphere.update_values() /datum/random_map/noise/exoplanet/snow descriptor = "snow exoplanet" diff --git a/code/modules/overmap/exoplanets/planet_types/volcanic.dm b/code/modules/overmap/exoplanets/planet_types/volcanic.dm index ed74369f255ee..e550fcd4f7f69 100644 --- a/code/modules/overmap/exoplanets/planet_types/volcanic.dm +++ b/code/modules/overmap/exoplanets/planet_types/volcanic.dm @@ -5,25 +5,27 @@ planetary_area = /area/exoplanet/volcanic rock_colors = list(COLOR_DARK_GRAY) plant_colors = list("#a23c05","#3f1f0d","#662929","#ba6222","#7a5b3a","#120309") - possible_themes = list() map_generators = list(/datum/random_map/automata/cave_system/mountains/volcanic, /datum/random_map/noise/exoplanet/volcanic, /datum/random_map/noise/ore/filthy_rich) ruin_tags_blacklist = RUIN_HABITAT|RUIN_WATER surface_color = "#261e19" water_color = "#c74d00" - habitability_distribution = HABITABILITY_BAD + habitability_weight = HABITABILITY_EXTREME has_trees = FALSE flora_diversity = 3 fauna_types = list(/mob/living/simple_animal/thinbug, /mob/living/simple_animal/hostile/retaliate/beast/shantak/lava, /mob/living/simple_animal/hostile/retaliate/beast/charbaby) megafauna_types = list(/mob/living/simple_animal/hostile/drake) /obj/overmap/visitable/sector/exoplanet/volcanic/get_atmosphere_color() - return COLOR_GRAY20 + var/air_color = ..() + return MixColors(COLOR_GRAY20, air_color) /obj/overmap/visitable/sector/exoplanet/volcanic/generate_atmosphere() ..() - if(atmosphere) - atmosphere.temperature = T20C + rand(220, 800) - atmosphere.update_values() + var/datum/species/H = all_species[SPECIES_HUMAN] + var/xtreme = H.heat_level_2 + (rand(1,3) * H.heat_level_2) + var/generator/new_temp = generator("num", H.heat_level_2, xtreme, UNIFORM_RAND) + atmosphere.temperature = new_temp.Rand() + atmosphere.update_values() /obj/overmap/visitable/sector/exoplanet/volcanic/adapt_seed(datum/seed/S) ..() From 963c1cfaf7b2ed0f03ce12fa4725058993c182f1 Mon Sep 17 00:00:00 2001 From: KandJX <83637364+YegorKandziuba@users.noreply.github.com> Date: Tue, 31 Oct 2023 14:57:19 +0300 Subject: [PATCH 23/44] Fix millittary branches and add some Fleet millitary ranks (#1247) --- maps/sierra/job/jobs_security.dm | 5 +- mods/_maps/farfleet/code/farfleet_crew.dm | 23 +++--- mods/_maps/sentinel/code/sentinel_crew.dm | 87 ++++++++++++++++++++--- 3 files changed, 94 insertions(+), 21 deletions(-) diff --git a/maps/sierra/job/jobs_security.dm b/maps/sierra/job/jobs_security.dm index 807e19aab33fc..beb1a926cc75d 100644 --- a/maps/sierra/job/jobs_security.dm +++ b/maps/sierra/job/jobs_security.dm @@ -56,7 +56,8 @@ supervisors = "Главе Службы безопасности" economic_power = 5 minimal_player_age = 7 - ideal_character_age = 35 + minimum_character_age = list(SPECIES_HUMAN = 25) + ideal_character_age = 30 skill_points = 14 alt_titles = list( "Forensic Technician" @@ -98,6 +99,7 @@ supervisors = "Главе Службы безопасности и Смотрителю (сержанту)" economic_power = 6 minimal_player_age = 10 + minimum_character_age = list(SPECIES_HUMAN = 22) ideal_character_age = 25 alt_titles = list("Junior Guard") @@ -139,6 +141,7 @@ spawn_positions = 2 supervisors = "Главе Службы безопасности и остальному охранному персоналу" economic_power = 3 + minimum_character_age = list(SPECIES_HUMAN = 20) ideal_character_age = 21 selection_color = "#601c1c" alt_titles = list("Security Recruit") diff --git a/mods/_maps/farfleet/code/farfleet_crew.dm b/mods/_maps/farfleet/code/farfleet_crew.dm index ee14ecb898a8e..d61c6d239c3e3 100644 --- a/mods/_maps/farfleet/code/farfleet_crew.dm +++ b/mods/_maps/farfleet/code/farfleet_crew.dm @@ -104,7 +104,7 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_droptroops allowed_branches = list(/datum/mil_branch/iccgn) allowed_ranks = list(/datum/mil_rank/iccgn/or3) - supervisors = "sergeant" + supervisors = "Starszy Bosman" loadout_allowed = TRUE is_semi_antagonist = TRUE info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \ @@ -124,13 +124,13 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" access = list(access_away_iccgn, access_away_iccgn_droptroops, access_engine_equip) /datum/job/submap/away_iccgn_farfleet/iccgn_sergeant - title = "Pioneer Corps Sergeant" + title = "Pioneer Corps Starszy Bosman" total_positions = 1 outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_sergeant supervisors = "Recon captain, Command of the Pioneer Corps , ICCGN" minimum_character_age = list(SPECIES_HUMAN = 23) ideal_character_age = 25 - allowed_branches = list(/datum/mil_rank/iccgn) + allowed_branches = list(/datum/mil_branch/iccgn) allowed_ranks = list(/datum/mil_rank/iccgn/or5) loadout_allowed = TRUE is_semi_antagonist = TRUE @@ -158,10 +158,11 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_captain minimum_character_age = list(SPECIES_HUMAN = 36) ideal_character_age = 40 - allowed_branches = list(/datum/mil_rank/iccgn) + allowed_branches = list(/datum/mil_branch/iccgn) allowed_ranks = list( /datum/mil_rank/iccgn/of4, - /datum/mil_rank/iccgn/of5) + /datum/mil_rank/iccgn/of5 + ) supervisors = "command of the Pioneer Corps , ICCGN" loadout_allowed = TRUE is_semi_antagonist = TRUE @@ -189,11 +190,11 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN" outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_medic minimum_character_age = list(SPECIES_HUMAN = 26) ideal_character_age = 30 - allowed_branches = list(/datum/mil_rank/iccgn) + allowed_branches = list(/datum/mil_branch/iccgn) allowed_ranks = list( /datum/mil_rank/iccgn/of1, - /datum/mil_rank/iccgn/of2, - /datum/mil_rank/iccgn/of3) + /datum/mil_rank/iccgn/of3 + ) loadout_allowed = TRUE info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \ Являясь одним из членов экипажа разведывательного корабля Пионерского Корпуса ГКК, ваша задача состоит в медицинской поддержке экипажа. \ @@ -219,11 +220,11 @@ 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 - allowed_branches = list(/datum/mil_rank/iccgn) + allowed_branches = list(/datum/mil_branch/iccgn) allowed_ranks = list( /datum/mil_rank/iccgn/of1, - /datum/mil_rank/iccgn/of2, - /datum/mil_rank/iccgn/of3) + /datum/mil_rank/iccgn/of3 + ) minimum_character_age = list(SPECIES_HUMAN = 23) ideal_character_age = 27 supervisors = "captain" diff --git a/mods/_maps/sentinel/code/sentinel_crew.dm b/mods/_maps/sentinel/code/sentinel_crew.dm index c372cff9c8625..41bcf14617ebd 100644 --- a/mods/_maps/sentinel/code/sentinel_crew.dm +++ b/mods/_maps/sentinel/code/sentinel_crew.dm @@ -79,6 +79,7 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" ideal_character_age = 25 allowed_branches = list(/datum/mil_branch/scga) allowed_ranks = list( + /datum/mil_rank/scga/e4, /datum/mil_rank/scga/e5 ) supervisors = "Army Captain" @@ -106,7 +107,10 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" 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) + allowed_ranks = list( + /datum/mil_rank/scga/o2, + /datum/mil_rank/scga/o3 + ) supervisors = "Lieutenant Commander, Command of the Battle Group Bravo of the 5th fleet, SCGDF" loadout_allowed = TRUE is_semi_antagonist = TRUE @@ -134,7 +138,10 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" 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) + allowed_ranks = list( + /datum/mil_rank/fleet/o3, + /datum/mil_rank/fleet/o4 + ) supervisors = "Command of the Battle Group Bravo of the 5th fleet, SCGDF" loadout_allowed = TRUE info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \ @@ -160,7 +167,10 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" 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) + allowed_ranks = list( + /datum/mil_rank/fleet/o1, + /datum/mil_rank/fleet/o2 + ) supervisors = "Lieutenant Commander" loadout_allowed = TRUE info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \ @@ -186,8 +196,11 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" 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" + allowed_ranks = list( + /datum/mil_rank/fleet/o1, + /datum/mil_rank/fleet/o2 + ) + supervisors = "Fleet Commander" loadout_allowed = TRUE info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \ Являясь одним из членов экипажа патрульного корабля 5-го флота ЦПСС, ваша задача состоит в медицинской поддержке экипажа. \ @@ -214,8 +227,12 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" 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" + allowed_ranks = list( + /datum/mil_rank/fleet/e4, + /datum/mil_rank/fleet/e5, + /datum/mil_rank/fleet/e6 + ) + supervisors = "Fleet Commander" loadout_allowed = TRUE info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \ Являясь одним из членов экипажа патрульного корабля 5-го флота ЦПСС, ваша задача состоит в поддержании работоспособности судна и экипировки экипажа. \ @@ -246,18 +263,24 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" name_short = "SCGF" email_domain = "fleet.mil" rank_types = list( + /datum/mil_rank/fleet/e4, + /datum/mil_rank/fleet/e5, /datum/mil_rank/fleet/e6, /datum/mil_rank/fleet/o1, /datum/mil_rank/fleet/o2, + /datum/mil_rank/fleet/o3, /datum/mil_rank/fleet/o4, /datum/mil_rank/fleet/o6, /datum/mil_rank/fleet/o7, /datum/mil_rank/fleet/o8 ) spawn_rank_types = list( + /datum/mil_rank/fleet/e4, + /datum/mil_rank/fleet/e5, /datum/mil_rank/fleet/e6, /datum/mil_rank/fleet/o1, /datum/mil_rank/fleet/o2, + /datum/mil_rank/fleet/o3, /datum/mil_rank/fleet/o4, /datum/mil_rank/fleet/o6, /datum/mil_rank/fleet/o7, @@ -272,6 +295,18 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" return "E[sort_order]" return "O[sort_order - 10]" +/datum/mil_rank/fleet/e4 + name = "Petty Officer Third Class" + name_short = "PO3" + accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e4, /obj/item/clothing/accessory/solgov/specialty/enlisted) + sort_order = 4 + +/datum/mil_rank/fleet/e5 + name = "Petty Officer Second Class" + name_short = "PO2" + accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e5, /obj/item/clothing/accessory/solgov/specialty/enlisted) + sort_order = 5 + /datum/mil_rank/fleet/e6 name = "Petty Officer First Class" name_short = "PO1" @@ -290,6 +325,12 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/officer/o2, /obj/item/clothing/accessory/solgov/specialty/officer) sort_order = 12 +/datum/mil_rank/fleet/o3 + name = "Lieutenant" + name_short = "LT" + accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/officer/o3, /obj/item/clothing/accessory/solgov/specialty/officer) + sort_order = 13 + /datum/mil_rank/fleet/o4 name = "Lieutenant Commander" name_short = "LCDR" @@ -319,24 +360,52 @@ var/global/const/access_away_cavalry_commander = "ACCESS_CAVALRY_COMMANDER" name_short = "SCGA" email_domain = "army.mil" rank_types = list( + /datum/mil_rank/scga/e4, /datum/mil_rank/scga/e5, + /datum/mil_rank/scga/o2, /datum/mil_rank/scga/o3 ) spawn_rank_types = list( + /datum/mil_rank/scga/e4, /datum/mil_rank/scga/e5, + /datum/mil_rank/scga/o2, /datum/mil_rank/scga/o3 ) +/datum/mil_rank/scga/e4 + name = "Corporal" + name_short = "Cpl" + accessory = list( + /obj/item/clothing/accessory/scga_rank/e4, + /obj/item/clothing/accessory/scga_badge/enlisted + ) + sort_order = 4 + /datum/mil_rank/scga/e5 name = "Sergeant" name_short = "SGT" - accessory = list(/obj/item/clothing/accessory/scga_badge/enlisted) + accessory = list( + /obj/item/clothing/accessory/scga_rank/e5, + /obj/item/clothing/accessory/scga_badge/enlisted + ) sort_order = 5 +/datum/mil_rank/scga/o2 + name = "First Lieutenant" + name_short = "1Lt" + accessory = list( + /obj/item/clothing/accessory/scga_rank/o2, + /obj/item/clothing/accessory/scga_badge/officer + ) + sort_order = 12 + /datum/mil_rank/scga/o3 name = "Captain" name_short = "CAPT" - accessory = list(/obj/item/clothing/accessory/scga_badge/officer) + accessory = list( + /obj/item/clothing/accessory/scga_rank/o3, + /obj/item/clothing/accessory/scga_badge/officer + ) sort_order = 13 /* OUTFITS From e5b1f8eebcf0b6b2f6678ebd2edf465500ae235b Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Tue, 31 Oct 2023 14:58:04 +0300 Subject: [PATCH 24/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#1247=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-1247.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1247.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1247.yml b/html/changelogs/AutoChangeLog-sierra-pr-1247.yml new file mode 100644 index 0000000000000..803f65b91e1b2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1247.yml @@ -0,0 +1,5 @@ +author: KandJX +changes: + - {bugfix: Вернул отображения званий Пионерского корпуса} + - {tweak: Дал разнообразие званий для разных должностей Флота и Пионерского корпуса} +delete-after: true From 93e5311fa4197ebf1528455336a6f297052690c3 Mon Sep 17 00:00:00 2001 From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com> Date: Tue, 31 Oct 2023 16:03:08 +0300 Subject: [PATCH 25/44] [MIRROR] Fix fuel pipes not always being fuel pipes --- code/modules/atmospherics/pipes.dm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm index 1375d38d8ca29..8a705683d1604 100644 --- a/code/modules/atmospherics/pipes.dm +++ b/code/modules/atmospherics/pipes.dm @@ -631,6 +631,9 @@ /obj/machinery/atmospherics/pipe/manifold/visible/fuel name = "Fuel pipe manifold" color = PIPE_COLOR_ORANGE + maximum_pressure = 420*ONE_ATMOSPHERE + fatigue_pressure = 350*ONE_ATMOSPHERE + alert_pressure = 350*ONE_ATMOSPHERE connect_types = CONNECT_TYPE_FUEL /obj/machinery/atmospherics/pipe/manifold/hidden @@ -674,6 +677,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/fuel name = "Fuel pipe manifold" color = PIPE_COLOR_ORANGE + maximum_pressure = 420*ONE_ATMOSPHERE + fatigue_pressure = 350*ONE_ATMOSPHERE + alert_pressure = 350*ONE_ATMOSPHERE connect_types = CONNECT_TYPE_FUEL /obj/machinery/atmospherics/pipe/manifold4w @@ -899,6 +905,9 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible/fuel name = "4-way fuel pipe manifold" color = PIPE_COLOR_ORANGE + maximum_pressure = 420*ONE_ATMOSPHERE + fatigue_pressure = 350*ONE_ATMOSPHERE + alert_pressure = 350*ONE_ATMOSPHERE connect_types = CONNECT_TYPE_FUEL /obj/machinery/atmospherics/pipe/manifold4w/hidden @@ -942,6 +951,9 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel name = "4-way fuel pipe manifold" color = PIPE_COLOR_ORANGE + maximum_pressure = 420*ONE_ATMOSPHERE + fatigue_pressure = 350*ONE_ATMOSPHERE + alert_pressure = 350*ONE_ATMOSPHERE connect_types = CONNECT_TYPE_FUEL /obj/machinery/atmospherics/pipe/cap @@ -1037,6 +1049,9 @@ name = "fuel pipe endcap" desc = "An endcap for fuel pipes." color = PIPE_COLOR_ORANGE + maximum_pressure = 420*ONE_ATMOSPHERE + fatigue_pressure = 350*ONE_ATMOSPHERE + alert_pressure = 350*ONE_ATMOSPHERE connect_types = CONNECT_TYPE_FUEL /obj/machinery/atmospherics/pipe/cap/hidden @@ -1064,6 +1079,9 @@ name = "fuel pipe endcap" desc = "An endcap for fuel pipes." color = PIPE_COLOR_ORANGE + maximum_pressure = 420*ONE_ATMOSPHERE + fatigue_pressure = 350*ONE_ATMOSPHERE + alert_pressure = 350*ONE_ATMOSPHERE connect_types = CONNECT_TYPE_FUEL /obj/machinery/atmospherics/pipe/vent From 15e3e08c78a3c5c4f0952158543c441a349525d6 Mon Sep 17 00:00:00 2001 From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com> Date: Tue, 31 Oct 2023 16:08:05 +0300 Subject: [PATCH 26/44] [MIRROR] Fix combat boots having no sprite --- code/modules/clothing/shoes/miscellaneous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 984b575b2dd67..4c80c545cd8b5 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -34,7 +34,7 @@ /obj/item/clothing/shoes/combat //Basically SWAT shoes combined with galoshes. name = "combat boots" desc = "When you REALLY want to turn up the heat." - icon_state = "jungle" + icon_state = "swat" force = 5 armor = list( melee = ARMOR_MELEE_VERY_HIGH, From f89d2a18e20c6a77a99004146f117df0d1861200 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:33:22 +0300 Subject: [PATCH 27/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#1267=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-1267.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1267.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1267.yml b/html/changelogs/AutoChangeLog-sierra-pr-1267.yml new file mode 100644 index 0000000000000..a8be15046a16c --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1267.yml @@ -0,0 +1,6 @@ +author: SierraKomodo +changes: + - {bugfix: 'Fuel pipe manifolds, corners, caps, etc now have the same pressure resistances + as straight line fuel pipes. Among other things, this means the vox ship fuel + pipes will no longer explode when you ignite the chamber.'} +delete-after: true From b9c07187de2d92651771df4f313ddf9be5e552e0 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:33:55 +0300 Subject: [PATCH 28/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#1268=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-1268.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1268.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1268.yml b/html/changelogs/AutoChangeLog-sierra-pr-1268.yml new file mode 100644 index 0000000000000..287d45ea7696f --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1268.yml @@ -0,0 +1,4 @@ +author: SierraKomodo +changes: + - {bugfix: Combat boots now have a sprite.} +delete-after: true From c067f258d80484ef6d4d41df65f4dbc1998a99c7 Mon Sep 17 00:00:00 2001 From: orelbon <12041669+orelbon@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:28:07 +0300 Subject: [PATCH 29/44] [MIRROR] Fire Extinguisher Fix --- code/game/objects/effects/chem/water.dm | 6 ++- .../objects/items/weapons/extinguisher.dm | 38 +++++-------------- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/code/game/objects/effects/chem/water.dm b/code/game/objects/effects/chem/water.dm index 613b3e31fd664..ce88e14aa127a 100644 --- a/code/game/objects/effects/chem/water.dm +++ b/code/game/objects/effects/chem/water.dm @@ -37,8 +37,10 @@ if(reagents.total_volume < 1) break if(T == get_turf(target)) - for(var/atom/A in splash_others) - reagents.splash(A, reagents.total_volume/length(splash_others)) //splash anything left + var/list/splash_targets = splash_others + splash_mobs + var/splash_amount = reagents.total_volume / length(splash_targets) + for(var/atom/atom in splash_targets) + reagents.splash(atom, splash_amount) break sleep(delay) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index c6c52136b6da1..cdb002c1b8700 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -15,7 +15,6 @@ matter = list(MATERIAL_STEEL = 90) attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") - var/spray_particles = 3 var/spray_amount = 120 //units of liquid per spray - 120 -> same as splashing them with a bucket per spray var/starting_water = 2000 var/max_water = 2000 @@ -62,23 +61,6 @@ to_chat(user, "The safety is [safety ? "on" : "off"].") return -/obj/item/extinguisher/use_before(mob/living/M, mob/user) - . = FALSE - if (user.a_intent == I_HELP && !safety) - if (world.time < last_use + 20) - return TRUE - if (reagents.total_volume < 1) - to_chat(user, SPAN_NOTICE("\The [src] is empty.")) - return TRUE - - last_use = world.time - reagents.splash(M, min(reagents.total_volume, spray_amount)) - - user.visible_message(SPAN_NOTICE("\The [user] sprays \the [M] with \the [src].")) - playsound(src.loc, 'sound/effects/extinguish.ogg', 75, 1, -3) - - return TRUE - /obj/item/extinguisher/proc/propel_object(obj/O, mob/user, movementdirection) if(O.anchored) return @@ -102,7 +84,6 @@ return FALSE return ..() - /obj/item/extinguisher/afterattack(atom/target, mob/user, flag) var/issink = istype(target, /obj/structure/hygiene/sink) @@ -145,6 +126,7 @@ if(user.buckled && isobj(user.buckled)) addtimer(new Callback(src, .proc/propel_object, user.buckled, user, direction), 0) + visible_message(SPAN_NOTICE("\The [user] sprays towards \the [target] with \the [src].")) addtimer(new Callback(src, .proc/do_spray, target), 0) if(!user.check_space_footing()) @@ -156,12 +138,12 @@ /obj/item/extinguisher/proc/do_spray(atom/Target) var/turf/T = get_turf(Target) - var/per_particle = min(spray_amount, reagents.total_volume)/spray_particles - for(var/a = 1 to spray_particles) - if(!src || !reagents.total_volume) return - - var/obj/effect/water/W = new /obj/effect/water(get_turf(src)) - W.create_reagents(per_particle) - reagents.trans_to_obj(W, per_particle) - W.set_color() - W.set_up(T) + var/available_spray = min(spray_amount, reagents.total_volume) + if(!src || !reagents.total_volume) + return + + var/obj/effect/water/W = new /obj/effect/water(get_turf(src)) + W.create_reagents(available_spray) + reagents.trans_to_holder(W.reagents, available_spray, safety = 1) + W.set_color() + W.set_up(T) From 0c6df9fab8229937f3f53be134f50dd243cc6077 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:36:02 +0300 Subject: [PATCH 30/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#1269=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-1269.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1269.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1269.yml b/html/changelogs/AutoChangeLog-sierra-pr-1269.yml new file mode 100644 index 0000000000000..a75b5cdcd47f6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1269.yml @@ -0,0 +1,5 @@ +author: orelbon +changes: + - {bugfix: Fire extinguisher spray should now act as expected without having to + directly click on target.} +delete-after: true From e8c0a64ffdaffba88e12c41baa0c1865fda83c66 Mon Sep 17 00:00:00 2001 From: TheNightingale <137739943+TheNightingale@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:28:14 +0300 Subject: [PATCH 31/44] [MIRROR] More Reliable Shrapnel Removal --- code/modules/surgery/implant.dm | 41 +++++++++++---------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 997f6d13ec590..ea1a1a38ae00b 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -150,8 +150,8 @@ /obj/item/wirecutters = 75, /obj/item/material/kitchen/utensil/fork = 20 ) - min_duration = 80 - max_duration = 100 + min_duration = 120 + max_duration = 150 /singleton/surgery_step/cavity/implant_removal/assess_bodypart(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = ..() @@ -177,7 +177,6 @@ if(BP_IS_ROBOTIC(affected) && affected.hatch_state == HATCH_OPENED) exposed = 1 - var/find_prob = 0 var/list/loot = list() if(exposed) loot = affected.implants @@ -185,41 +184,27 @@ for(var/datum/wound/wound in affected.wounds) if(LAZYLEN(wound.embedded_objects)) loot |= wound.embedded_objects - find_prob += 50 if (length(loot)) var/obj/item/obj = pick(loot) - if(istype(obj,/obj/item/implant)) - var/obj/item/implant/imp = obj - if (imp.islegal()) - find_prob +=60 - else - find_prob +=40 - else - find_prob +=50 - - if (prob(find_prob)) - user.visible_message(SPAN_NOTICE("[user] takes something out of incision on [target]'s [affected.name] with \the [tool]."), \ - SPAN_NOTICE("You take \the [obj] out of incision on \the [target]'s [affected.name] with \the [tool].") ) - target.remove_implant(obj, TRUE, affected) + user.visible_message(SPAN_NOTICE("[user] takes something out of incision on [target]'s [affected.name] with \the [tool]."), \ + SPAN_NOTICE("You take \the [obj] out of incision on \the [target]'s [affected.name] with \the [tool].") ) + target.remove_implant(obj, TRUE, affected) - SET_BIT(target.hud_updateflag, IMPLOYAL_HUD) + SET_BIT(target.hud_updateflag, IMPLOYAL_HUD) - //Handle possessive brain borers. - if(istype(obj,/mob/living/simple_animal/borer)) - var/mob/living/simple_animal/borer/worm = obj - if(worm.controlling) - target.release_control() - worm.detatch() - worm.leave_host() + //Handle possessive brain borers. + if(istype(obj,/mob/living/simple_animal/borer)) + var/mob/living/simple_animal/borer/worm = obj + if(worm.controlling) + target.release_control() + worm.detatch() + worm.leave_host() playsound(target.loc, 'sound/effects/squelch1.ogg', 15, 1) - else - user.visible_message(SPAN_NOTICE("[user] removes \the [tool] from [target]'s [affected.name]."), \ - SPAN_NOTICE("There's something inside [target]'s [affected.name], but you just missed it this time.") ) else user.visible_message(SPAN_NOTICE("[user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out."), \ SPAN_NOTICE("You could not find anything inside [target]'s [affected.name].") ) From 03ba93725fdfa883d08ad48ccd1d9ca2f7ddf5f6 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:37:04 +0300 Subject: [PATCH 32/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#1270=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-1270.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1270.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1270.yml b/html/changelogs/AutoChangeLog-sierra-pr-1270.yml new file mode 100644 index 0000000000000..972d7516de462 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1270.yml @@ -0,0 +1,5 @@ +author: TheNightingale +changes: + - {tweak: Embed removal surgery uses normal surgery success rates but takes a little + longer.} +delete-after: true From d40b2d9da61cf51383bf34d5f682f29edd4ab29d Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Wed, 1 Nov 2023 01:22:10 +0000 Subject: [PATCH 33/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 | 33 ++++++++++++--- html/changelogs/.all_changelog.yml | 41 +++++++++++++++++++ .../AutoChangeLog-sierra-pr-1247.yml | 5 --- .../AutoChangeLog-sierra-pr-1265.yml | 10 ----- .../AutoChangeLog-sierra-pr-1267.yml | 6 --- .../AutoChangeLog-sierra-pr-1268.yml | 4 -- .../AutoChangeLog-sierra-pr-1269.yml | 5 --- .../AutoChangeLog-sierra-pr-1270.yml | 5 --- 8 files changed, 68 insertions(+), 41 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1247.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1265.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1267.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1268.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1269.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1270.yml diff --git a/html/changelog.html b/html/changelog.html index ad5ed7f4fa085..8102b43c181fa 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -28,6 +28,33 @@

Sierra SS13

-->
+

01.11 - 2023

+

Обновления KandJX:

+
+
Вернул отображения званий Пионерского корпуса
+
Дал разнообразие званий для разных должностей Флота и Пионерского корпуса
+
Исправлено освещение на мостике
+
Исправлен доступ шлюзов ведущих к порту
+
Добавлены ноутбуки АВД
+
Добавлены голокарты
+
Изменена библиотека
+
Добавлено пару плейтингов на втором этаже ангара
+
Фикс нескольких минорных недочетов
+
+

Обновления SierraKomodo:

+
+
Fuel pipe manifolds, corners, caps, etc now have the same pressure resistances as straight line fuel pipes. Among other things, this means the vox ship fuel pipes will no longer explode when you ignite the chamber.
+
Combat boots now have a sprite.
+
+

Обновления TheNightingale:

+
+
Embed removal surgery uses normal surgery success rates but takes a little longer.
+
+

Обновления orelbon:

+
+
Fire extinguisher spray should now act as expected without having to directly click on target.
+
+

31.10 - 2023

Обновления Aigamuxa:

@@ -584,12 +611,6 @@

Обновления SuhEugene:

Сделал скроллбар ченджлога тёмным.
Добавил штуку, делающую движение плавным, на замену дёрганиям экрана оффов.
- -

30.08 - 2023

-

Обновления SierraKomodo:

-
-
Self-recharging guns such as the Advanced Energy Gun and energy based borg and mech weapons now delay recharging when they are fired. This is to prevent guns from self-charging in the middle of mag-dumping the gun and force more tactical consideration of when to fall back to "recharge" the weapon.
-
Icons by Icons8
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index f2fded8a15d01..93f7ab12a35c6 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -22150,3 +22150,44 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY sierra_genchangelog.p - spellcheck: Fixed a typo in the organic body part gibbing message. Spookerton: - bugfix: Mapped injectors don't turn themselves off during game setup. +2023-11-01: + KandJX: + - bugfix: "\u0412\u0435\u0440\u043D\u0443\u043B \u043E\u0442\u043E\u0431\u0440\u0430\ + \u0436\u0435\u043D\u0438\u044F \u0437\u0432\u0430\u043D\u0438\u0439 \u041F\u0438\ + \u043E\u043D\u0435\u0440\u0441\u043A\u043E\u0433\u043E \u043A\u043E\u0440\u043F\ + \u0443\u0441\u0430" + - tweak: "\u0414\u0430\u043B \u0440\u0430\u0437\u043D\u043E\u043E\u0431\u0440\u0430\ + \u0437\u0438\u0435 \u0437\u0432\u0430\u043D\u0438\u0439 \u0434\u043B\u044F \u0440\ + \u0430\u0437\u043D\u044B\u0445 \u0434\u043E\u043B\u0436\u043D\u043E\u0441\u0442\ + \u0435\u0439 \u0424\u043B\u043E\u0442\u0430 \u0438 \u041F\u0438\u043E\u043D\u0435\ + \u0440\u0441\u043A\u043E\u0433\u043E \u043A\u043E\u0440\u043F\u0443\u0441\u0430" + - maptweak: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\ + \u0441\u0432\u0435\u0449\u0435\u043D\u0438\u0435 \u043D\u0430 \u043C\u043E\u0441\ + \u0442\u0438\u043A\u0435" + - maptweak: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0434\u043E\ + \u0441\u0442\u0443\u043F \u0448\u043B\u044E\u0437\u043E\u0432 \u0432\u0435\u0434\ + \u0443\u0449\u0438\u0445 \u043A \u043F\u043E\u0440\u0442\u0443" + - maptweak: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\ + \u0443\u0442\u0431\u0443\u043A\u0438 \u0410\u0412\u0414" + - maptweak: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0433\u043E\ + \u043B\u043E\u043A\u0430\u0440\u0442\u044B" + - maptweak: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u0431\u0438\u0431\ + \u043B\u0438\u043E\u0442\u0435\u043A\u0430" + - maptweak: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043F\u0430\ + \u0440\u0443 \u043F\u043B\u0435\u0439\u0442\u0438\u043D\u0433\u043E\u0432 \u043D\ + \u0430 \u0432\u0442\u043E\u0440\u043E\u043C \u044D\u0442\u0430\u0436\u0435 \u0430\ + \u043D\u0433\u0430\u0440\u0430" + - maptweak: "\u0424\u0438\u043A\u0441 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\ + \u043A\u0438\u0445 \u043C\u0438\u043D\u043E\u0440\u043D\u044B\u0445 \u043D\u0435\ + \u0434\u043E\u0447\u0435\u0442\u043E\u0432" + SierraKomodo: + - bugfix: Fuel pipe manifolds, corners, caps, etc now have the same pressure resistances + as straight line fuel pipes. Among other things, this means the vox ship fuel + pipes will no longer explode when you ignite the chamber. + - bugfix: Combat boots now have a sprite. + TheNightingale: + - tweak: Embed removal surgery uses normal surgery success rates but takes a little + longer. + orelbon: + - bugfix: Fire extinguisher spray should now act as expected without having to directly + click on target. diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1247.yml b/html/changelogs/AutoChangeLog-sierra-pr-1247.yml deleted file mode 100644 index 803f65b91e1b2..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1247.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: KandJX -changes: - - {bugfix: Вернул отображения званий Пионерского корпуса} - - {tweak: Дал разнообразие званий для разных должностей Флота и Пионерского корпуса} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1265.yml b/html/changelogs/AutoChangeLog-sierra-pr-1265.yml deleted file mode 100644 index 8f8f216a8880b..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1265.yml +++ /dev/null @@ -1,10 +0,0 @@ -author: KandJX -changes: - - {maptweak: Исправлено освещение на мостике} - - {maptweak: Исправлен доступ шлюзов ведущих к порту} - - {maptweak: Добавлены ноутбуки АВД} - - {maptweak: Добавлены голокарты} - - {maptweak: Изменена библиотека} - - {maptweak: Добавлено пару плейтингов на втором этаже ангара} - - {maptweak: Фикс нескольких минорных недочетов} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1267.yml b/html/changelogs/AutoChangeLog-sierra-pr-1267.yml deleted file mode 100644 index a8be15046a16c..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1267.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: SierraKomodo -changes: - - {bugfix: 'Fuel pipe manifolds, corners, caps, etc now have the same pressure resistances - as straight line fuel pipes. Among other things, this means the vox ship fuel - pipes will no longer explode when you ignite the chamber.'} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1268.yml b/html/changelogs/AutoChangeLog-sierra-pr-1268.yml deleted file mode 100644 index 287d45ea7696f..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1268.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: SierraKomodo -changes: - - {bugfix: Combat boots now have a sprite.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1269.yml b/html/changelogs/AutoChangeLog-sierra-pr-1269.yml deleted file mode 100644 index a75b5cdcd47f6..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1269.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: orelbon -changes: - - {bugfix: Fire extinguisher spray should now act as expected without having to - directly click on target.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1270.yml b/html/changelogs/AutoChangeLog-sierra-pr-1270.yml deleted file mode 100644 index 972d7516de462..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1270.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: TheNightingale -changes: - - {tweak: Embed removal surgery uses normal surgery success rates but takes a little - longer.} -delete-after: true From eb70ee8da5bf2279aded24a6a65834868080b200 Mon Sep 17 00:00:00 2001 From: Vuradu <71703796+Vuradu@users.noreply.github.com> Date: Wed, 1 Nov 2023 23:13:06 +1000 Subject: [PATCH 34/44] Fix 4th deck elevator area name (#1272) --- maps/sierra/areas/shuttles.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/sierra/areas/shuttles.dm b/maps/sierra/areas/shuttles.dm index e0b1cf0f6cd1b..c77b3180be35c 100644 --- a/maps/sierra/areas/shuttles.dm +++ b/maps/sierra/areas/shuttles.dm @@ -247,8 +247,8 @@ lift_announce_str = "Палуба 3 - Инженерная." /area/turbolift/sierra_ground - name = "Elevator - Third Deck" - lift_floor_label = "3 Палуба" + name = "Elevator - Fourth Deck" + lift_floor_label = "4 Палуба" lift_floor_name = "Лётная палуба" lift_announce_str = "Палуба 4 - Лётная." base_turf = /turf/simulated/floor From 51c661194c7b609f905f47253ebea6d7be499d93 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Wed, 1 Nov 2023 16:13:58 +0300 Subject: [PATCH 35/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#1272=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-1272.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1272.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1272.yml b/html/changelogs/AutoChangeLog-sierra-pr-1272.yml new file mode 100644 index 0000000000000..71d31887cc605 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1272.yml @@ -0,0 +1,4 @@ +author: Vuradu +changes: + - {bugfix: Изменил палубу в имени зоны с 3-ей на 4-ю.} +delete-after: true From 78a9c9363ffcebf8542483cdbfa1113cd6229b02 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Thu, 2 Nov 2023 01:17:33 +0000 Subject: [PATCH 36/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 | 13 ++++++------- html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-sierra-pr-1272.yml | 4 ---- 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1272.yml diff --git a/html/changelog.html b/html/changelog.html index 8102b43c181fa..f7b9f2be529ea 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -28,6 +28,12 @@

Sierra SS13

-->
+

02.11 - 2023

+

Обновления Vuradu:

+
+
Изменил палубу в имени зоны с 3-ей на 4-ю.
+
+

01.11 - 2023

Обновления KandJX:

@@ -604,13 +610,6 @@

Обновления SuhEugene, Remission:

Добавлено новое красивое лобби. Все ассеты за авторством прекрасной Remission.
- -

31.08 - 2023

-

Обновления SuhEugene:

-
-
Сделал скроллбар ченджлога тёмным.
-
Добавил штуку, делающую движение плавным, на замену дёрганиям экрана оффов.
-
Icons by Icons8
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 93f7ab12a35c6..5e2278ccaf863 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -22191,3 +22191,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY sierra_genchangelog.p orelbon: - bugfix: Fire extinguisher spray should now act as expected without having to directly click on target. +2023-11-02: + Vuradu: + - bugfix: "\u0418\u0437\u043C\u0435\u043D\u0438\u043B \u043F\u0430\u043B\u0443\u0431\ + \u0443 \u0432 \u0438\u043C\u0435\u043D\u0438 \u0437\u043E\u043D\u044B \u0441\ + \ 3-\u0435\u0439 \u043D\u0430 4-\u044E." diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1272.yml b/html/changelogs/AutoChangeLog-sierra-pr-1272.yml deleted file mode 100644 index 71d31887cc605..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1272.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Vuradu -changes: - - {bugfix: Изменил палубу в имени зоны с 3-ей на 4-ю.} -delete-after: true From 0a96592241d5b9b6bb315cb79619b16bf0da27ba Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Fri, 3 Nov 2023 01:18:00 +0000 Subject: [PATCH 37/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 ---------------- 1 file changed, 16 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index f7b9f2be529ea..c1e9740037b0d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -594,22 +594,6 @@

Обновления SuhEugene:

Видео в лобби теперь не прямоугольное, а квадратное. (Размер файлов уменшился на 36 и 330КБ).
- -

01.09 - 2023

-

Обновления Sbotkin:

-
-
The hypospray can be holstered now. Yee-haw!
-
Removed lock from the hydroponics closet.
-
-

Обновления SuhEugene:

-
-
Пофиксил кривую загрузку превью моба в лодауте.
-
Пофиксил постеры, которые сам же и сломал.
-
-

Обновления SuhEugene, Remission:

-
-
Добавлено новое красивое лобби. Все ассеты за авторством прекрасной Remission.
-
Icons by Icons8
From c80d4d84089cb6b8c0360ab85bfd04e7dcf6fd53 Mon Sep 17 00:00:00 2001 From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com> Date: Fri, 3 Nov 2023 02:53:08 +0300 Subject: [PATCH 38/44] [MIRROR] Make cryopods immune to power loss --- code/game/machinery/cryopod.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 35fdb07c0da6b..c9cfeadcc81e9 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -15,6 +15,7 @@ icon_state = "cellconsole" density = FALSE interact_offline = 1 + stat_immune = MACHINE_STAT_NOSCREEN | MACHINE_STAT_NOINPUT | MACHINE_STAT_NOPOWER var/mode = null //Used for logging people entering cryosleep and important items they are carrying. From 6144e402e82cd74a917e4c5824a2204ad542b089 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Fri, 3 Nov 2023 09:27:14 +0300 Subject: [PATCH 39/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#1276=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-1276.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1276.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1276.yml b/html/changelogs/AutoChangeLog-sierra-pr-1276.yml new file mode 100644 index 0000000000000..6e3a9f325a36c --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1276.yml @@ -0,0 +1,4 @@ +author: SierraKomodo +changes: + - {bugfix: Cryopods can now be used to leave the round even if there's no power.} +delete-after: true From 66bbbf2144ecd9b594655b25186f44df473b5a19 Mon Sep 17 00:00:00 2001 From: emmanuelbassil <6874235+emmanuelbassil@users.noreply.github.com> Date: Fri, 3 Nov 2023 06:53:07 +0300 Subject: [PATCH 40/44] [MIRROR] Makes storage take priority on use_after --- code/_onclick/item_attack.dm | 1 + code/game/objects/items.dm | 26 ++++++++++++++++--- .../items/devices/scanners/_scanner.dm | 24 ++++++++--------- code/game/objects/items/stacks/stack.dm | 1 + .../objects/items/weapons/storage/backpack.dm | 10 +++---- .../objects/items/weapons/storage/storage.dm | 23 +++++++++++++--- .../objects/items/weapons/weldbackpack.dm | 22 ++++++++-------- code/game/objects/objs.dm | 7 +++-- code/game/objects/structures/bedsheet_bin.dm | 1 + code/modules/recycling/sortingmachinery.dm | 1 + code/modules/research/message_server.dm | 2 +- test/check-paths.sh | 2 +- 12 files changed, 79 insertions(+), 41 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index cc89c66e14ae0..bd92497978c03 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -352,6 +352,7 @@ avoid code duplication. This includes items that may sometimes act as a standard * resolve chain will be called. */ /atom/proc/use_tool(obj/item/tool, mob/living/user, list/click_params) + SHOULD_CALL_PARENT(TRUE) return FALSE diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 5bbeaa90d9a91..7933b130f1224 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -275,9 +275,9 @@ R.activate_module(src) R.hud_used.update_robot_modules_display() -/obj/item/attackby(obj/item/W, mob/user) - if((. = SSfabrication.try_craft_with(src, W, user))) - return +/obj/item/use_tool(obj/item/W, mob/living/user, list/click_params) + if(SSfabrication.try_craft_with(src, W, user)) + return TRUE if(istype(W, /obj/item/storage)) var/obj/item/storage/S = W @@ -285,8 +285,28 @@ if(S.collection_mode) //Mode is set to collect all items if(isturf(src.loc)) S.gather_all(src.loc, user) + return TRUE else if (S.can_be_inserted(src, user)) S.handle_item_insertion(src) + return TRUE + return ..() + +///Eventually should be deleted in favor of use_tool; keeping duplicate until downstream attackbys are replaced. +/obj/item/attackby(obj/item/W, mob/living/user, list/click_params) + if(SSfabrication.try_craft_with(src, W, user)) + return TRUE + + if(istype(W, /obj/item/storage)) + var/obj/item/storage/S = W + if(S.use_to_pickup) + if(S.collection_mode) //Mode is set to collect all items + if(isturf(src.loc)) + S.gather_all(src.loc, user) + return TRUE + else if (S.can_be_inserted(src, user)) + S.handle_item_insertion(src) + return TRUE + return ..() /obj/item/can_embed() if (!canremove) diff --git a/code/game/objects/items/devices/scanners/_scanner.dm b/code/game/objects/items/devices/scanners/_scanner.dm index 3185132e4b613..8c9de353bf7c1 100644 --- a/code/game/objects/items/devices/scanners/_scanner.dm +++ b/code/game/objects/items/devices/scanners/_scanner.dm @@ -36,27 +36,27 @@ return return TRUE -/obj/item/device/scanner/afterattack(atom/A, mob/user, proximity) - if(!proximity) - return +/obj/item/device/scanner/use_after(atom/target, mob/living/user, click_parameters) if(!can_use(user)) return - if(is_valid_scan_target(A)) + if(is_valid_scan_target(target)) user.visible_message( - SPAN_NOTICE("\The [user] runs \the [src] over \the [A]."), - SPAN_NOTICE("You run \the [src] over \the [A]."), + SPAN_NOTICE("\The [user] runs \the [src] over \the [target]."), + SPAN_NOTICE("You run \the [src] over \the [target]."), range = 2 ) if(scan_sound) playsound(src, scan_sound, 30) - if(use_delay && !do_after(user, use_delay, A, DO_PUBLIC_UNIQUE)) - to_chat(user, "You stop scanning \the [A] with \the [src].") - return - scan(A, user) + if(use_delay && !do_after(user, use_delay, target, DO_PUBLIC_UNIQUE)) + to_chat(user, "You stop scanning \the [target] with \the [src].") + return TRUE + scan(target, user) if(!scan_title) - scan_title = "[capitalize(name)] scan - [A]" + scan_title = "[capitalize(name)] scan - [target]" + return TRUE else - to_chat(user, "You cannot get any results from \the [A] with \the [src].") + to_chat(user, "You cannot get any results from \the [target] with \the [src].") + return TRUE /obj/item/device/scanner/proc/is_valid_scan_target(atom/O) return FALSE diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 865c0b2224708..5c7f1d35dec39 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -341,6 +341,7 @@ if (src && user.machine == src) interact(user) return TRUE + return ..() /** * Returns a string forming a basic name of the stack. By default, this is `name`. diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index bd892df876d75..ea1130956a520 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -28,9 +28,9 @@ /// Can this backpack be opened while worn on the back? var/worn_access = TRUE -/obj/item/storage/backpack/attackby(obj/item/W as obj, mob/user as mob) - if (src.use_sound) - playsound(src.loc, src.use_sound, 50, 1, -5) +/obj/item/storage/backpack/use_tool(obj/item/tool, mob/living/user, list/click_params) + if (use_sound) + playsound(loc, use_sound, 50, 1, -5) return ..() /obj/item/storage/backpack/equipped(mob/user, slot) @@ -73,11 +73,11 @@ ..() return -/obj/item/storage/backpack/holding/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/storage/backpack/holding/use_tool(obj/item/W, mob/living/user, list/click_params) if(istype(W, /obj/item/storage/backpack/holding) || istype(W, /obj/item/storage/bag/trash/bluespace)) to_chat(user, SPAN_WARNING("The Bluespace interfaces of the two devices conflict and malfunction.")) qdel(W) - return 1 + return TRUE return ..() //Please don't clutter the parent storage item with stupid hacks. diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index d50e2ed5ec498..11a6b59585495 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -281,11 +281,25 @@ update_icon() //This proc is called when you want to place an item into the storage item. -/obj/item/storage/attackby(obj/item/W as obj, mob/user as mob) - . = ..() - if (.) //if the item was used as a crafting component, just return +/obj/item/storage/use_tool(obj/item/W, mob/living/user, list/click_params) + if ((. = ..())) //if the item was used as a crafting component, just return + return TRUE + + if(isrobot(user) && (W == user.get_active_hand())) + return //Robots can't store their modules. + + if(!can_be_inserted(W, user)) return + W.add_fingerprint(user) + handle_item_insertion(W) + return TRUE + +///Eventually should be deleted in favor of use_tool; keeping duplicate until downstream attackbys are replaced. +/obj/item/storage/attackby(obj/item/W, mob/living/user, click_params) + if ((. = ..())) //if the item was used as a crafting component, just return + return TRUE + if(isrobot(user) && (W == user.get_active_hand())) return //Robots can't store their modules. @@ -293,7 +307,8 @@ return W.add_fingerprint(user) - return handle_item_insertion(W) + handle_item_insertion(W) + return TRUE /obj/item/storage/attack_hand(mob/user as mob) if(ishuman(user)) diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm index 897aac9c7c22f..7f4cefb634247 100644 --- a/code/game/objects/items/weapons/weldbackpack.dm +++ b/code/game/objects/items/weapons/weldbackpack.dm @@ -17,15 +17,15 @@ . = ..() -/obj/item/storage/backpack/weldpack/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/storage/backpack/weldpack/use_tool(obj/item/W, mob/living/user, list/click_params) if(isWelder(W)) var/obj/item/weldingtool/T = W if (!T.tank) to_chat(user, SPAN_WARNING("\The [T] has no tank attached!")) - return + return TRUE if (!T.tank.can_refuel) to_chat(user, SPAN_WARNING("\The [T]'s [T.tank.name] does not have a refuelling port.")) - return + return TRUE if (T.welding) if (user.a_intent == I_HURT) user.visible_message( @@ -36,30 +36,30 @@ explosion(get_turf(src), 4, EX_ACT_HEAVY) if (!QDELETED(src)) qdel(src) - return + return TRUE else to_chat(user, SPAN_WARNING("You need to turn \the [T] off before you can refuel it. Or use harm intent if you're suicidal.")) - return + return TRUE if (!reagents.trans_to_obj(T.tank, T.tank.max_fuel)) to_chat(user, SPAN_WARNING("\The [T]'s [T.tank.name] is already full.")) - return + return TRUE to_chat(user, SPAN_NOTICE("You refill \the [T] with \the [src].")) playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) - return + return TRUE else if(istype(W, /obj/item/welder_tank)) var/obj/item/welder_tank/tank = W if (!tank.can_refuel) to_chat(user, SPAN_WARNING("\The [tank] does not have a refuelling port.")) - return + return TRUE if (!reagents.trans_to_obj(tank, tank.max_fuel)) to_chat(user, SPAN_WARNING("\The [tank] is already full.")) - return + return TRUE to_chat(user, SPAN_NOTICE("You refuel \the [tank] with \the [src].")) playsound(loc, 'sound/effects/refill.ogg', 50, 1, -6) - return + return TRUE - ..() + else return ..() /obj/item/storage/backpack/weldpack/afterattack(obj/O as obj, mob/user as mob, proximity) if(!proximity) // this replaces and improves the get_dist(src,O) <= 1 checks used previously diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index dd8c587cfa014..d66ca6c18a56c 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -189,13 +189,12 @@ if (damtype == DAMAGE_BURN) . |= DAMAGE_FLAG_LASER -/obj/attackby(obj/item/O, mob/user) - if (isWrench(O) && HAS_FLAGS(obj_flags, OBJ_FLAG_ANCHORABLE)) - wrench_floor_bolts(user, O) +/obj/use_tool(obj/item/tool, mob/living/user, list/click_params) + if (isWrench(tool) && HAS_FLAGS(obj_flags, OBJ_FLAG_ANCHORABLE)) + wrench_floor_bolts(user, tool) return TRUE return ..() - /** * Whether or not the object can be anchored in its current state/position. Assumes the anchorable flag has already been checked. * diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 1ded51310c401..401e354f0a087 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -28,6 +28,7 @@ LINEN BINS new /obj/item/reagent_containers/glass/rag(get_turf(src)) qdel(src) return TRUE + return ..() /obj/item/bedsheet/blue icon_state = "sheetblue" diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 14d53342465bd..a10c9d9fdb549 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -321,6 +321,7 @@ SPAN_NOTICE("You label \the [src]: \"[examtext]\""),\ "You hear someone scribbling a note.") return TRUE + return ..() /obj/item/smallDelivery/on_update_icon() ClearOverlays() diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 9c93b1f2e55fb..eeebef0de64af 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -111,7 +111,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() /obj/machinery/message_server/use_tool(obj/item/tool, mob/living/user, list/click_params) if (!istype(tool, /obj/item/stock_parts/circuitboard/message_monitor)) - return + return ..() if (spamfilter_limit >= initial(spamfilter_limit) * 2) to_chat(user, SPAN_WARNING("\The [src] already has as many boards as it can hold.")) return TRUE diff --git a/test/check-paths.sh b/test/check-paths.sh index e9eb81dbe7d18..2a6aab561b11d 100755 --- a/test/check-paths.sh +++ b/test/check-paths.sh @@ -57,7 +57,7 @@ exactly 0 "simulated = 0/1" 'simulated\s*=\s*\d' -P exactly 2 "var/ in proc arguments" '(^/[^/].+/.+?\(.*?)var/' -P exactly 0 "tmp/ vars" 'var.*/tmp/' -P exactly 7 "uses of .len" '\.len\b' -P -exactly 384 "attackby() override" '\/attackby\((.*)\)' -P +exactly 380 "attackby() override" '\/attackby\((.*)\)' -P exactly 15 "uses of examine()" '[.|\s]examine\(' -P # If this fails it's likely because you used '/atom/proc/examine(mob)' instead of '/proc/examinate(mob, atom)' - Exception: An examine()-proc may call other examine()-procs exactly 7 "direct modifications of overlays list" '\boverlays((\s*[|^=+&-])|(\.(Cut)|(Add)|(Copy)|(Remove)|(Remove)))' -P exactly 0 "new/list list instantiations" 'new\s*/list' -P From 615ee237d147d9b354446f9f303a40915db280e9 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Fri, 3 Nov 2023 09:31:32 +0300 Subject: [PATCH 41/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#1277=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-1277.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1277.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1277.yml b/html/changelogs/AutoChangeLog-sierra-pr-1277.yml new file mode 100644 index 0000000000000..8412de86af472 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1277.yml @@ -0,0 +1,4 @@ +author: emmanuelbassil +changes: + - {bugfix: Gas scanner no longer scans the inside of your backpack on storage} +delete-after: true From 813a2c956c832208ecf614dfc569be06d02f32c3 Mon Sep 17 00:00:00 2001 From: KandJX <83637364+YegorKandziuba@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:56:10 +0200 Subject: [PATCH 42/44] Fix areas, holomap and minor mapping bugs Co-authored-by: LordNest --- maps/sierra/areas/shuttles.dm | 4 + maps/sierra/areas/z1_sierra_deck4.dm | 29 +- maps/sierra/areas/z2_sierra_deck3.dm | 68 ++ maps/sierra/areas/z3_sierra_deck2.dm | 43 + maps/sierra/areas/z4_sierra_deck1.dm | 50 +- maps/sierra/areas/z5_sierra_bridge.dm | 26 + maps/sierra/z1-z5_sierra.dmm | 1123 +++++++++++++++++++------ mods/jukebox_tapes/code/jukebox.dm | 9 + 8 files changed, 1049 insertions(+), 303 deletions(-) diff --git a/maps/sierra/areas/shuttles.dm b/maps/sierra/areas/shuttles.dm index c77b3180be35c..5463ff9c0d6e3 100644 --- a/maps/sierra/areas/shuttles.dm +++ b/maps/sierra/areas/shuttles.dm @@ -10,6 +10,7 @@ /area/shuttle/escape_pod area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT icon_state = "exit" + holomap_color = HOLOMAP_AREACOLOR_ESCAPE /area/shuttle/escape_pod/escape_pod1/station name = "Shuttle - Escape - Pod One" @@ -56,6 +57,7 @@ icon_state = "shuttlered" base_turf = /turf/simulated/floor/plating area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_EXPLORATION /area/exploration_shuttle/cockpit name = "Shuttle - Charon - Cockpit" @@ -79,6 +81,7 @@ dynamic_lighting = 1 area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED req_access = list(access_guppy) + holomap_color = HOLOMAP_AREACOLOR_CARGO /area/crucian_hangar/start name = "Shuttle - Сrucian" @@ -94,6 +97,7 @@ dynamic_lighting = 1 area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED req_access = list(access_petrov) + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/shuttle/petrov/ship icon_state = "shuttlered" diff --git a/maps/sierra/areas/z1_sierra_deck4.dm b/maps/sierra/areas/z1_sierra_deck4.dm index e3b826eb1fb71..f59d1633c74f8 100644 --- a/maps/sierra/areas/z1_sierra_deck4.dm +++ b/maps/sierra/areas/z1_sierra_deck4.dm @@ -2,22 +2,27 @@ name = "Fourth Deck - Hallway - Fore" icon_state = "hallF" req_access = list(access_external_airlocks) + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/fourthdeck/center name = "Fourth Deck - Hallway - Central" icon_state = "hallC3" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/fourthdeck/aft name = "Fourth Deck - Hallway - Aft" icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/fourthdeck/central_stairwell name = "Fourth Deck - Stairwell - Central" icon_state = "hallC2" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/fourthdeck/aft_stairwell name = "Fourth Deck - Stairwell - Fore " icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/maintenance/fourthdeck name = "Fourth Deck - Maintenance" @@ -53,16 +58,19 @@ /area/crew_quarters/visitors name = "Fourth Deck - Visitors" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/commissary name = "Fourth Deck - Commissary" icon_state = "crew_quarters" req_access = list(access_commissary) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/docking name = "Fourth Deck - Docking Bay" icon_state = "crew_quarters" lighting_tone = AREA_LIGHTING_COOL + holomap_color = HOLOMAP_AREACOLOR_CREW /* COMMAND AREAS * ============= @@ -71,6 +79,7 @@ name = "Fourth Deck - Expedition - Leader's Office" icon_state = "heads_sea" req_access = list(access_el) + holomap_color = HOLOMAP_AREACOLOR_EXPLORATION /* ENGINEERING AREAS * ================= @@ -79,21 +88,26 @@ /area/storage/primary name = "Fourth Deck - Primary Tool Storage" icon_state = "primarystorage" + holomap_color = HOLOMAP_AREACOLOR_CARGO /area/storage/auxillary/port name = "Fourth Deck - Supply - Auxillary Warehouse" icon_state = "auxstorage" req_access = list(access_cargo) + holomap_color = HOLOMAP_AREACOLOR_CARGO /area/storage/airlock_canisters name = "Fourth Deck - Supply - Central Airlock's Canisters" req_access = list(list(access_cargo, access_engine)) + holomap_color = HOLOMAP_AREACOLOR_CARGO // Thusters /area/thruster/d3port name = "Fourth Deck - Nacelle - Port" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/thruster/d3starboard name = "Fourth Deck - Nacelle - Starboard" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /* VACANT AREAS * ============ @@ -119,7 +133,6 @@ /area/vacant/cargo name = "Fourth Deck - Abandoned - Requisition" icon_state = "quart" - holomap_color = HOLOMAP_AREACOLOR_CARGO /* RND AREAS * ========= @@ -130,12 +143,14 @@ icon_state = "toxstorage" sound_env = SMALL_ENCLOSED req_access = list(access_tox_storage) + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /* SUPPLY AREAS * ============ */ /area/quartermaster req_access = list(access_cargo) + holomap_color = HOLOMAP_AREACOLOR_CARGO /area/quartermaster/office name = "Fourth Deck - Supply" @@ -177,6 +192,7 @@ name = "Fourth Deck - Expedition - Locker Room" icon_state = "exploration" req_access = list(access_explorer) + holomap_color = HOLOMAP_AREACOLOR_EXPLORATION /area/quartermaster/exploration/eva name = "Fourth Deck - Expedition - EVA" @@ -215,17 +231,6 @@ name = "Fourth Deck - Hangar - Stairs" icon_state = "auxstorage" -/* CREW AREAS - * ========== - */ -/area/janitor - name = "Fourth Deck - Service - Custodial Closet" - icon_state = "janitor" - req_access = list(access_janitor) - -/area/hydroponics/third_deck_storage - name = "Fourth Deck - Service - Hydroponics Storage" - /* SECURITY AREAS * */ diff --git a/maps/sierra/areas/z2_sierra_deck3.dm b/maps/sierra/areas/z2_sierra_deck3.dm index a396c921922a5..c6671dd3ac88e 100644 --- a/maps/sierra/areas/z2_sierra_deck3.dm +++ b/maps/sierra/areas/z2_sierra_deck3.dm @@ -2,18 +2,22 @@ name = "Third Deck - Hallway - Fore" icon_state = "hallF" req_access = list(access_external_airlocks) + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/thirddeck/center name = "Third Deck - Hallway - Central" icon_state = "hallC3" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/thirddeck/central_stairwell name = "Third Deck - Stairwell - Central" icon_state = "hallC2" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/thirddeck/aft_stairwell name = "Third Deck - Stairwell - Fore " icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/maintenance/thirddeck name = "Third Deck - Maintenance" @@ -51,24 +55,33 @@ icon_state = "disposal" req_access = list(list(access_cargo, access_engine, access_el)) +/area/hydroponics/third_deck_storage + name = "Third Deck - Service - Hydroponics Storage" + holomap_color = HOLOMAP_AREACOLOR_CREW + /area/crew_quarters/sleep/cryo/thirddeck name = "Third Deck - Living - Cryogenic Storage" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/head/deck3 name = "Third Deck - Head" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/bar name = "Third Deck - Service - Bar" icon_state = "bar" sound_env = SMALL_ENCLOSED req_access = list(list(access_kitchen, access_bar)) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/bar/cobed name = "Third Deck - Service - Bartender's Room" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/cafe name = "Third Deck - Living - Cafe" icon_state = "cafeteria" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/command/chief_steward name = "Third Deck - Service - Chief Steward's Office" @@ -76,6 +89,7 @@ sound_env = SMALL_ENCLOSED lighting_tone = AREA_LIGHTING_WARM req_access = list(access_chief_steward) + holomap_color = HOLOMAP_AREACOLOR_CREW /* ENGINEERING AREAS * ================= @@ -84,6 +98,7 @@ name = "Third Deck - Engineering - Storage" icon_state = "engineering_storage" sound_env = SMALL_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/engine_room name = "Third Deck - Engine - Supermatter" @@ -96,11 +111,13 @@ 'maps/sierra/sound/ambience/engineering3.ogg' ) req_access = list(access_engine_equip) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/engine_eva name = "Third Deck - Engineering - EVA" icon_state = "engine_eva" req_access = list(list(access_eva, access_external_airlocks), access_engine) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/engine_monitoring name = "Third Deck - Engine - Monitoring" @@ -110,23 +127,28 @@ 'maps/sierra/sound/ambience/engineering2.ogg', 'maps/sierra/sound/ambience/engineering3.ogg' ) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/engine_smes name = "Third Deck - Engine - SMES" icon_state = "engine_smes" sound_env = SMALL_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/engineering_monitoring name = "Third Deck - Engineering - Monitoring" icon_state = "engine_monitoring" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/locker_room name = "Third Deck - Engineering - Locker Room" icon_state = "engineering_locker" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/materials_storage name = "Third Deck - Engineering - Materials Storage" icon_state = "engineering_storage" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/atmos name = "Third Deck - Engineering - Atmospherics" @@ -139,46 +161,54 @@ ) sound_env = LARGE_ENCLOSED req_access = list(access_atmospherics) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/gravitaional_generator name = "Third Deck - Gravitational Generator" icon_state = "engine_monitoring" req_access = list(list(access_engine_equip, access_heads), list(access_seneng, access_engine_equip)) sound_env = SMALL_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/bluespace name = "Third Deck - Engineering - BlueSpace Drive" icon_state = "engine_monitoring" req_access = list(list(access_engine_equip, access_heads), access_engine, access_maint_tunnels) sound_env = SMALL_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/bluespace/chamber name = "Third Deck - Engineering - BlueSpace Drive - Chamber" icon_state = "engine" sound_env = LARGE_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/fuelbay name = "Third Deck - Engineering - Fuel Bay" icon_state = "engineering" req_access = list(access_construction) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/atmos/storage name = "Third Deck - Engineering - Atmospherics Storage" icon_state = "atmos_storage" sound_env = SMALL_ENCLOSED req_access = list(access_atmospherics) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/turret_protected/ai_cyborg_station name = "Third Deck - Cyborg Station" icon_state = "ai_cyborg" sound_env = SMALL_ENCLOSED area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/turret_protected/ai_cyborg_upload name = "Third Deck - Cyborg Upload" icon_state = "ai_cyborg" sound_env = SMALL_ENCLOSED area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/shield/thirddeck name = "Third Deck - Shield Generator" @@ -189,6 +219,30 @@ icon_state = "heads_ce" name = "Bridge - Command - CE's Office" req_access = list(access_ce) + holomap_color = HOLOMAP_AREACOLOR_COMMAND + +// Tcomm +/area/tcommsat/ + ambience = list( + 'sound/ambience/ambisin2.ogg', + 'sound/ambience/signal.ogg', + 'sound/ambience/ambigen10.ogg', + 'maps/sierra/sound/ambience/aiservers.wav' + ) + req_access = list(access_tcomsat) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING + +/area/tcommsat/chamber + name = "Third Deck - Telecoms" + icon_state = "tcomsatcham" + +/area/tcommsat/computer + name = "Third Deck - Telecoms - Monitoring" + icon_state = "tcomsatcomp" + +/area/tcommsat/storage + name = "Third Deck - Telecoms - Storage" + icon_state = "tcomsatstore" /* RUST * ================= @@ -196,6 +250,7 @@ /area/vacant/prototype req_access = list(access_engine) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/vacant/prototype/control name = "\improper Prototype Fusion Reactor Control Room" @@ -211,10 +266,12 @@ icon_state = "SolarcontrolP" sound_env = SMALL_ENCLOSED req_access = list(access_engine) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/maintenance/solar/starboard name = "First Deck - Solar - Starboard" icon_state = "SolarcontrolS" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/solar area_flags = AREA_FLAG_EXTERNAL @@ -237,9 +294,11 @@ name = "Third Deck - Engineering - Technical Storage" icon_state = "storage" req_access = list(access_tech_storage) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/storage/tech/high_risk name = "Third Deck - Engineering - High Security Storage" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING // Hangar /area/quartermaster/hangar/upper @@ -278,7 +337,16 @@ /area/rnd/xenobiology/entry2 name = "Xenobiology Access" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/xenobiology/level2 name = "Xenobiology Level Two" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE + +// EVA + +/area/storage/eva + name = "Third Deck - EVA" + icon_state = "eva" + req_access = list(access_eva) diff --git a/maps/sierra/areas/z3_sierra_deck2.dm b/maps/sierra/areas/z3_sierra_deck2.dm index 46217b989c9de..daae6d65dbb8d 100644 --- a/maps/sierra/areas/z3_sierra_deck2.dm +++ b/maps/sierra/areas/z3_sierra_deck2.dm @@ -1,22 +1,27 @@ /area/hallway/primary/seconddeck/fore name = "Second Deck - Hallway - Fore " icon_state = "hallF" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/seconddeck/center name = "Second Deck - Hallway - Central" icon_state = "hallC3" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/seconddeck/aft name = "Second Deck - Hallway - Aft" icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/seconddeck/central_stairwell name = "Second Deck - Stairwell - Central " icon_state = "hallC2" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/seconddeck/aft_stairwell name = "Second Deck - Stairwell - Fore " icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/maintenance/seconddeck name = "Second Deck - Maintenance" @@ -57,6 +62,7 @@ /area/crew_quarters/safe_room/seconddeck name = "Second Deck - Safe Room" area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_ESCAPE /area/maintenance/substation/seconddeck name = "Second Deck - Substation" @@ -64,6 +70,7 @@ /area/crew_quarters/laundry name = "Second Deck - Laundry Room" icon_state = "Sleep" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/maintenance/abandoned_hydroponics name = "Second Deck - Abandoned - Hydroponics" @@ -77,38 +84,47 @@ /area/rnd/xenobiology/entry name = "Xenobiology Access" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/xenobiology/storage2 name = "Xenobiology Access" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/xenobiology/level1 name = "Xenobiology Level One" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/xenobiology/atmos name = "Xenobiology - Atmos Hub" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/xenobiology/water_cell name = "Xenobiology - Water Cell" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/assembly/chargebay name = "Second Deck - RND - Mech Bay" icon_state = "mechbay" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/assembly/robotics name = "Second Deck - RND - Robotics Lab" icon_state = "robotics" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/toxins name = "Second Deck - RND - Toxins Lab" icon_state = "toxstorage" req_access = list(access_tox_storage) + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/toxins/storage name = "Second Deck - RND - Canister Storage" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /* VACANT AREAS * ============ @@ -142,81 +158,105 @@ /area/holocontrol name = "Second Deck - Holodeck Control" icon_state = "Holodeck" + holomap_color = HOLOMAP_AREACOLOR_CREW /* CREW AREAS * ========== */ + +/area/janitor + name = "Second Deck - Service - Custodial Closet" + icon_state = "janitor" + req_access = list(access_janitor) + holomap_color = HOLOMAP_AREACOLOR_CREW + /area/hydroponics name = "Second Deck - Service - Hydroponics" icon_state = "hydro" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/galley name = "Second Deck - Service - Galley" icon_state = "kitchen" req_access = list(list(access_kitchen, access_bar)) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/galley/backroom name = "Second Deck - Service - Galley Backroom" icon_state = "kitchen" req_access = list(list(access_kitchen, access_bar)) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/galley/freezer name = "Second Deck - Service - Galley Cold Storage" icon_state = "kitchen" req_access = list(list(access_kitchen, access_bar)) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/cafe/upper name = "Second Deck - Living - Cafe" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/sauna name = "Second Deck - Living - Sauna" icon_state = "sauna" sound_env = SMALL_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/head name = "Second Deck - Living - Restroom" icon_state = "toilet" sound_env = SMALL_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/garden_room name = "Second deck - living - Lounge" icon_state = "game_room_inf" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/gym name = "Second Deck - Living - Gym" icon_state = "fitness" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/actor name = "Second Deck - Service - Actor" icon_state = "Theatre" sound_env = SMALL_SOFTFLOOR req_access = list(access_actor) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/actor/stage name = "Second Deck - Service - Stage" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/lounge name = "Second Deck - Living - Lounge" sound_env = MEDIUM_SOFTFLOOR + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/sleep/bunk name = "Second Deck - Living - Dormitory" icon_state = "Sleep" sound_env = SMALL_SOFTFLOOR area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/sleep/cryo name = "Second Deck - Living - Cryogenic Storage" icon = 'maps/sierra/icons/turf/areas.dmi' icon_state = "cryo" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/sleep/cryo/south name = "Second Deck - Living - Cryogenic Storage - South" icon_state = "cryo_south" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/adherent name = "Second Deck - Living - Adherent Maintenence" icon_state = "robotics" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/chapel/main name = "Second Deck - Chapel" @@ -228,17 +268,20 @@ 'maps/sierra/sound/ambience/chapel4.ogg' ) sound_env = LARGE_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_CREW /area/chapel/office name = "Second Deck - Chapel - Chaplain's Office" req_access = list(access_chapel_office) color = COLOR_GRAY80 sound_env = SMALL_SOFTFLOOR + holomap_color = HOLOMAP_AREACOLOR_CREW /area/chapel/mortuary name = "Second Deck - Chapel - Morgue" req_access = list(access_chapel_office) color = COLOR_GRAY80 + holomap_color = HOLOMAP_AREACOLOR_CREW /* MEDBAY AREAS diff --git a/maps/sierra/areas/z4_sierra_deck1.dm b/maps/sierra/areas/z4_sierra_deck1.dm index d99c1ec1a0117..3149874b5067a 100644 --- a/maps/sierra/areas/z4_sierra_deck1.dm +++ b/maps/sierra/areas/z4_sierra_deck1.dm @@ -37,22 +37,27 @@ /area/hallway/primary/firstdeck/fore name = "First Deck - Hallway - Fore" icon_state = "hallF" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/firstdeck/center name = "First Deck - Hallway - Central" icon_state = "hallC1" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/firstdeck/aft name = "First Deck - Hallway - Aft" icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/firstdeck/central_stairwell name = "First Deck - Stairwell - Central" icon_state = "hallC2" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/firstdeck/aft_stairwell name = "First Deck - Stairwell - Fore" icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/maintenance/substation/firstdeck name = "First Deck - Substation" @@ -65,22 +70,26 @@ icon_state = "heads_rd" name = "First Deck - Command - RD's Office" req_access = list(access_rd) + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/crew_quarters/heads/office/cmo icon_state = "heads_cmo" name = "First Deck - Command - CMO's Office" req_access = list(access_cmo) + holomap_color = HOLOMAP_AREACOLOR_MEDICAL /area/crew_quarters/heads/office/hos icon_state = "heads_hos" - name = "First Deck - Command - HoS' Office" + name = "Bridge - Command - HoS' Office" req_access = list(access_hos) + holomap_color = HOLOMAP_AREACOLOR_SECURITY /area/command/bsa - name = "Fourth Deck - Obstruction Field Disperser" + name = "First Deck - Obstruction Field Disperser" icon = 'maps/sierra/icons/turf/areas.dmi' icon_state = "bridge_gun" req_access = list(access_gun) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /* ENGINEERING AREAS * ================= @@ -89,42 +98,16 @@ name = "First Deck - Engineering - Auxiliary Power Storage" icon_state = "engine_smes" sound_env = SMALL_ENCLOSED - -// Tcomm -/area/tcommsat/ - ambience = list( - 'sound/ambience/ambisin2.ogg', - 'sound/ambience/signal.ogg', - 'sound/ambience/ambigen10.ogg', - 'maps/sierra/sound/ambience/aiservers.wav' - ) - req_access = list(access_tcomsat) - -/area/tcommsat/chamber - name = "First Deck - Telecoms" - icon_state = "tcomsatcham" - -/area/tcommsat/computer - name = "First Deck - Telecoms - Monitoring" - icon_state = "tcomsatcomp" - -/area/tcommsat/storage - name = "First Deck - Telecoms - Storage" - icon_state = "tcomsatstore" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING // Thusters /area/thruster/d1port name = "First Deck - Nacelle - Port " + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/thruster/d1starboard name = "First Deck - Nacelle - Starboard" - -/area/storage/eva - name = "First Deck - EVA" - icon_state = "eva" - req_access = list(access_eva) - - + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /* RND AREAS * ========= @@ -187,17 +170,21 @@ /area/crew_quarters/sleep/cryo/firstdeck name = "First Deck - Living - Cryogenic Storage" icon_state = "cryo_up" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/dungeon_master_lounge name = "First Deck - Living Room" sound_env = MEDIUM_SOFTFLOOR + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/lounge/upper name = "First Deck - Living - Library" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/safe_room name = "First Deck - Citadel" area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_ESCAPE /* SECURITY AREAS * ============== @@ -292,6 +279,7 @@ /area/hallway/infirmary name = "First Deck - Infirmary - Hallway" icon_state = "medbay" + holomap_color = HOLOMAP_AREACOLOR_MEDICAL /area/medical/infirmreception name = "First Deck - Infirmary - Reception" diff --git a/maps/sierra/areas/z5_sierra_bridge.dm b/maps/sierra/areas/z5_sierra_bridge.dm index ec0fd7dfed432..dc71fe303eb88 100644 --- a/maps/sierra/areas/z5_sierra_bridge.dm +++ b/maps/sierra/areas/z5_sierra_bridge.dm @@ -1,14 +1,17 @@ /area/hallway/primary/bridgedeck/center name = "Bridge - Hallway - Central" icon_state = "hallC3" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/bridgedeck/aft name = "Bridge - Hallway - Aft" icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/bridgedeck/central_stairwell name = "Bridge - Stairwell - Central" icon_state = "hallC2" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/maintenance/bridgedeck name = "Bridge - Maintenance" @@ -31,6 +34,7 @@ /area/crew_quarters/sleep/cryo/bridge name = "Bridge - Living - Cryogenic Storage" + holomap_color = HOLOMAP_AREACOLOR_CREW /* COMMAND AREAS * ============= @@ -40,22 +44,26 @@ icon_state = "heads_cap" sound_env = MEDIUM_SOFTFLOOR req_access = list(access_captain) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/captain req_access = list(access_captain) icon_state = "heads_cap" + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/captain/beach name = "Bridge - Command - Captain's Recreation Facility" icon_state = "heads_cap" sound_env = PLAIN req_access = list("ACCESS_BRIDGE") + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/bridge name = "Bridge Deck - Bridge" icon_state = "bridge" req_access = list(access_bridge) ambience = list('maps/sierra/sound/ambience/bridge.wav') + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/bridge/nano icon = 'maps/sierra/icons/turf/areas.dmi' @@ -89,6 +97,7 @@ icon_state = "teleporter" sound_env = SMALL_ENCLOSED req_access = list(access_teleporter) + holomap_color = HOLOMAP_AREACOLOR_COMMAND // AI /area/turret_protected @@ -102,6 +111,7 @@ 'maps/sierra/sound/ambience/ai3.ogg' ) forced_ambience = list('maps/sierra/sound/ambience/ambxerxes_looped.wav') + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/turret_protected/ai name = "AI Chamber" @@ -119,54 +129,66 @@ /area/crew_quarters/safe_room/bridge name = "Bridge - Safe Room" + holomap_color = HOLOMAP_AREACOLOR_ESCAPE /area/crew_quarters/heads/office/rd/cobed icon_state = "heads_rd" name = "Bridge - Command - RD's Quarters" req_access = list(access_rd) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/cmo/cobed icon_state = "heads_cmo" name = "Bridge - Command - CMO's Quarters" req_access = list(access_cmo) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/ce/cobed icon_state = "heads_ce" name = "Bridge - Command - CE's Quarters" req_access = list(access_ce) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/hos/cobed icon_state = "heads_hos" name = "Bridge - Command - HoS's Quarters" req_access = list(access_hos) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/hop name = "Bridge - Command - HoP's Office" icon_state = "heads_hop" req_access = list(access_hop) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/hop/cobed name = "Bridge - Command - HoP's Quarters" + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/iaa icon_state = "heads_cl" name = "Bridge - Command - IAA's Office" req_access = list(access_iaa) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/iaa/high_sec name = "Bridge - Command - IAA's Communication Relay" + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/iaa/cobed name = "Bridge - Command - IAA's Quarters" area_flags = AREA_FLAG_RAD_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/bridge/adjutants name = "Bridge - Adjutants Room" icon = 'maps/sierra/icons/turf/areas.dmi' icon_state = "bridge_gun" + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/bridge/adjutants/cobed name = "Bridge - Adjutants Dormintories" + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/captain/secret_room/level_one @@ -178,16 +200,19 @@ icon_state = "toilet" sound_env = SMALL_ENCLOSED area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_CREW // Solars /area/maintenance/solar/bridge_port name = "Bridge - Solar - Port" icon_state = "SolarcontrolP" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/maintenance/solar/bridge_starboard name = "Bridge - Solar - Starboard" icon_state = "SolarcontrolS" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/solar/bridge_starboard name = "Bridge - Solar - Starboard Array" @@ -202,3 +227,4 @@ icon_state = "atmos_storage" sound_env = SMALL_ENCLOSED req_access = list(access_atmospherics) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 579018e35cfe5..158dd5725b196 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -1054,6 +1054,10 @@ icon_state = "desert2" }, /area/crew_quarters/garden_room) +"ahU" = ( +/obj/machinery/light/spot, +/turf/simulated/wall/r_wall/prepainted, +/area/crew_quarters/heads/office/hop/cobed) "aif" = ( /obj/wallframe_spawn/reinforced/hull, /obj/machinery/door/firedoor, @@ -1630,10 +1634,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/centralstarboard) "amo" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -3919,6 +3919,7 @@ }, /obj/structure/table/standard, /obj/floor_decal/corner/grey/diagonal, +/obj/random/clipboard, /turf/simulated/floor/tiled, /area/rnd/research) "aCs" = ( @@ -4086,6 +4087,9 @@ /obj/structure/railing/mapped{ dir = 8 }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/open, /area/hallway/primary/bridgedeck/central_stairwell) "aDB" = ( @@ -4387,7 +4391,11 @@ /area/maintenance/seconddeck/aftstarboard) "aFR" = ( /obj/machinery/washing_machine, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "aFT" = ( /obj/structure/cable/green{ @@ -5170,6 +5178,7 @@ /obj/structure/railing/mapped{ dir = 1 }, +/obj/structure/railing/mapped, /turf/simulated/open, /area/hallway/primary/firstdeck/central_stairwell) "aMo" = ( @@ -5237,7 +5246,6 @@ /obj/structure/bed/chair/padded/red{ dir = 1 }, -/obj/item/modular_computer/laptop/preset/custom_loadout, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/heads/office/hos) "aML" = ( @@ -7939,6 +7947,9 @@ dir = 8 }, /obj/structure/closet/secure_closet/personal, +/obj/floor_decal/techfloor{ + dir = 4 + }, /obj/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -8158,7 +8169,7 @@ /turf/simulated/floor/reinforced/oxygen, /area/thruster/d1port) "bjU" = ( -/obj/machinery/light, +/obj/machinery/light/spot, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -8270,7 +8281,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "bld" = ( /obj/structure/railing/mapped{ @@ -9446,6 +9464,19 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/marine_room) +"buZ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/rotating_alarm/supermatter{ + dir = 8; + pixel_x = 14 + }, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftstarboard) "bva" = ( /obj/floor_decal/corner/yellow/three_quarters{ dir = 8 @@ -10306,15 +10337,16 @@ /turf/simulated/floor/tiled/white/monotile, /area/medical/locker) "bBr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/floor_decal/techfloor/orange{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "bBv" = ( @@ -11288,7 +11320,14 @@ /area/turret_protected/ai_cyborg_upload) "bJC" = ( /obj/floor_decal/techfloor, -/obj/machinery/light/small, +/obj/machinery/light, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/random/machine/jukebox_custom, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "bJI" = ( @@ -11559,12 +11598,11 @@ /turf/simulated/floor/carpet/blue2, /area/crew_quarters/heads/office/captain) "bLS" = ( -/obj/wallframe_spawn/reinforced/hull, -/obj/machinery/door/firedoor{ - dir = 4 +/obj/floor_decal/techfloor{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/quartermaster/hangar/upper) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo/south) "bLT" = ( /obj/machinery/atmospherics/unary/vent_pump/tank{ external_pressure_bound = 0; @@ -11729,6 +11767,9 @@ "bNq" = ( /obj/machinery/portable_atmospherics/canister/helium, /obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins/storage) "bNu" = ( @@ -12601,6 +12642,9 @@ /obj/floor_decal/techfloor/orange{ dir = 9 }, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/seconddeck/aftstarboard) "bUM" = ( @@ -13183,7 +13227,11 @@ /area/maintenance/firstdeck/foreport) "bYX" = ( /obj/random/ironing_board_structure, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "bZf" = ( /obj/structure/largecrate, @@ -14675,7 +14723,7 @@ /obj/floor_decal/corner/lime/border{ dir = 1 }, -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -14795,6 +14843,16 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) +"cmk" = ( +/obj/floor_decal/techfloor, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/floodlight{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/firstdeck/aftport) "cmm" = ( /obj/floor_decal/spline/fancy/black{ dir = 4 @@ -15314,7 +15372,13 @@ dir = 8; pixel_x = 32 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "crs" = ( /obj/machinery/door/firedoor, @@ -16608,6 +16672,15 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/hallway/primary/fourthdeck/center) +"cBm" = ( +/obj/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/rotating_alarm/supermatter{ + pixel_y = 14 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "cBq" = ( /obj/structure/catwalk, /obj/machinery/space_heater, @@ -18544,6 +18617,15 @@ /obj/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/medical/virology/atmos) +"cOZ" = ( +/obj/floor_decal/techfloor/orange{ + dir = 1 + }, +/obj/machinery/rotating_alarm/supermatter{ + pixel_y = 14 + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/engine_room) "cPc" = ( /obj/structure/cable/green{ d1 = 1; @@ -18884,6 +18966,7 @@ /obj/structure/railing/mapped{ dir = 4 }, +/obj/structure/railing/mapped, /turf/simulated/open, /area/maintenance/seconddeck/aftstarboard) "cRI" = ( @@ -22206,9 +22289,6 @@ /obj/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/light/spot{ - dir = 1 - }, /obj/machinery/atm{ pixel_y = 33 }, @@ -23316,6 +23396,7 @@ "dyD" = ( /obj/machinery/vending/coffee, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "dyK" = ( @@ -24734,6 +24815,16 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/interrogation/second) +"dJd" = ( +/obj/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "dJe" = ( /obj/floor_decal/industrial/traffic, /turf/simulated/floor/reinforced{ @@ -27861,13 +27952,16 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/safe_room) "egL" = ( -/obj/structure/closet/emcloset/anchored, -/obj/structure/railing/mapped{ - dir = 1 +/obj/floor_decal/techfloor{ + dir = 4 }, /obj/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/light/spot{ dir = 4 }, +/obj/structure/closet/secure_closet/personal, /obj/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -29447,6 +29541,10 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white/monotile, /area/rnd/xenobiology/xenoflora) +"esn" = ( +/obj/item/taperoll/engineering/applied, +/turf/simulated/wall/prepainted, +/area/janitor) "eso" = ( /obj/floor_decal/borderfloor{ dir = 4 @@ -33070,6 +33168,7 @@ /obj/floor_decal/techfloor{ dir = 4 }, +/obj/random/sierracloset, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "eVJ" = ( @@ -33095,6 +33194,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/safe_room) +"eVU" = ( +/obj/machinery/computer/station_alert/security, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/escape_pod/escape_pod5/station) "eVW" = ( /obj/structure/closet/emcloset/anchored, /turf/simulated/floor/plating, @@ -35379,6 +35482,10 @@ /obj/floor_decal/techfloor{ dir = 5 }, +/obj/structure/flora/pottedplant/overgrown, +/obj/structure/sign/warning/smoking{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "fnv" = ( @@ -35503,6 +35610,9 @@ "foH" = ( /obj/machinery/portable_atmospherics/canister/sleeping_agent, /obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins/storage) "foM" = ( @@ -36005,6 +36115,9 @@ /obj/floor_decal/industrial/warning{ dir = 1 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins) "fsK" = ( @@ -37517,7 +37630,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/obj/random/machine, +/obj/random/machine/jukebox_custom, /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) "fFs" = ( @@ -39251,6 +39364,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/seconddeck/starboard) +"fRz" = ( +/obj/floor_decal/techfloor/orange{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/thirddeck/aftstarboard) "fRI" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -40139,7 +40261,7 @@ /obj/machinery/door/airlock/multi_tile/virology{ dir = 8 }, -/obj/wallframe_spawn/reinforced, +/obj/item/taperoll/engineering/applied, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "fZy" = ( @@ -41610,6 +41732,12 @@ /obj/structure/largecrate, /obj/random/maintenance, /obj/random/maintenance, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "glV" = ( @@ -42479,7 +42607,7 @@ dir = 4 }, /obj/floor_decal/industrial/warning/full, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "gss" = ( /obj/structure/closet/secure_closet/personal/patient, @@ -43026,7 +43154,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/foreport) "gxn" = ( /obj/floor_decal/borderfloor{ @@ -44288,10 +44416,13 @@ /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/aft) "gIe" = ( -/obj/machinery/light/small{ +/obj/floor_decal/corner/grey/border{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "gIf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -44512,6 +44643,8 @@ /obj/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/standard, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/monotile, /area/rnd/research) "gJQ" = ( @@ -47165,6 +47298,9 @@ }, /obj/decal/cleanable/blood/drip, /obj/decal/cleanable/blood/splatter, +/obj/structure/hygiene/toilet{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) "hdN" = ( @@ -51751,9 +51887,7 @@ /obj/floor_decal/techfloor/orange{ dir = 5 }, -/obj/structure/bed/chair/office/hard{ - dir = 4 - }, +/obj/structure/closet/emcloset/anchored, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -51971,6 +52105,9 @@ /obj/machinery/alarm{ pixel_y = 24 }, +/obj/structure/flora/pottedplant/thinbush{ + pixel_y = 10 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/cmo) "hSU" = ( @@ -52260,7 +52397,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light, /obj/floor_decal/techfloor/orange, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftstarboard) @@ -53618,20 +53755,11 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "igz" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/fourthdeck/port) +/obj/floor_decal/techfloor, +/obj/structure/table/standard, +/obj/item/reagent_containers/food/drinks/glass2/coffeecup/corp, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/firstdeck/aftport) "igB" = ( /obj/machinery/light/small/emergency{ dir = 4 @@ -54959,7 +55087,11 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "irA" = ( /obj/random/closet, @@ -56079,6 +56211,10 @@ /obj/structure/railing/mapped{ dir = 4 }, +/obj/structure/railing/mapped{ + dir = 1; + icon_state = "railing0-1" + }, /turf/simulated/open, /area/maintenance/seconddeck/aftstarboard) "iAW" = ( @@ -56282,6 +56418,12 @@ /obj/structure/synthesized_instrument/synthesizer/piano, /turf/simulated/floor/wood/walnut, /area/vacant/bar) +"iDb" = ( +/obj/machinery/computer/modular/preset/medical{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/escape_pod/escape_pod5/station) "iDf" = ( /obj/floor_decal/borderfloor{ dir = 10 @@ -57321,6 +57463,27 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/center) +"iKC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/fourthdeck/aft) "iKK" = ( /obj/structure/cable/green{ d1 = 4; @@ -60962,7 +61125,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/random/machine, +/obj/random/machine/jukebox_custom, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) "jms" = ( @@ -62426,7 +62589,7 @@ /area/crew_quarters/docking) "jzN" = ( /obj/floor_decal/industrial/warning/corner, -/obj/structure/bed/chair/comfy/beige{ +/obj/structure/bed/chair/armchair/beige{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, @@ -63360,7 +63523,7 @@ /obj/structure/cart{ dir = 8 }, -/obj/machinery/light_construct{ +/obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, @@ -63843,10 +64006,6 @@ /turf/simulated/floor/plating, /area/hallway/primary/fourthdeck/fore) "jMh" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -65753,6 +65912,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/structure/bed/chair/armchair/beige{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/atmos) "jZR" = ( @@ -67263,6 +67425,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins) "kly" = ( @@ -68924,6 +69087,20 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/xenobiology/atmos) +"kxI" = ( +/obj/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/closet/secure_closet/personal, +/obj/machinery/light/spot{ + dir = 8 + }, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/obj/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo/south) "kxQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -68961,6 +69138,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "kyc" = ( @@ -70634,9 +70814,9 @@ /area/crew_quarters/sleep/cryo/south) "kKz" = ( /obj/floor_decal/techfloor{ - dir = 1 + dir = 5 }, -/obj/structure/table/standard, +/obj/machinery/computer/modular/preset/civilian, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "kKC" = ( @@ -70706,6 +70886,13 @@ }, /turf/simulated/floor/plating, /area/vacant/gambling) +"kLd" = ( +/obj/structure/bed/chair/comfy/purple{ + dir = 1 + }, +/obj/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/firstdeck/aftport) "kLe" = ( /obj/landmark{ name = "JoinLateCryo" @@ -71526,12 +71713,12 @@ /turf/simulated/floor/plating, /area/vacant/gambling) "kQH" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, -/obj/floor_decal/techfloor/orange{ - dir = 1 +/obj/floor_decal/corner/grey/border{ + dir = 9 }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/thirddeck/aftstarboard) +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "kQK" = ( /obj/floor_decal/borderfloor{ dir = 1 @@ -72730,7 +72917,13 @@ dir = 4; pixel_x = -24 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "lbY" = ( /obj/floor_decal/borderfloorblack{ @@ -72919,10 +73112,11 @@ "ldC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light/small{ +/obj/floor_decal/corner/grey/border{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "ldI" = ( /obj/item/device/radio/intercom{ @@ -74975,6 +75169,7 @@ /obj/floor_decal/techfloor{ dir = 6 }, +/obj/random/closet, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "ltH" = ( @@ -75770,9 +75965,6 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/foreport) "lzk" = ( -/obj/structure/table/wallf/steel{ - dir = 4 - }, /obj/machinery/door/window/brigdoor/westleft{ dir = 1 }, @@ -75796,6 +75988,10 @@ id_tag = "security_lockdown"; name = "Security Department Lockdown" }, +/obj/structure/wall_frame/standard, +/obj/structure/table/wallf/steel{ + dir = 4 + }, /turf/simulated/floor/plating, /area/security/sierra/brig) "lzz" = ( @@ -78685,7 +78881,16 @@ dir = 4; pixel_x = 24 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "lWr" = ( /obj/structure/table/marble, @@ -80026,7 +80231,11 @@ "mgz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "mgE" = ( /obj/floor_decal/spline/fancy/wood{ @@ -83073,6 +83282,19 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) +"mEt" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/rotating_alarm/supermatter{ + dir = 8; + pixel_x = 14 + }, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftport) "mEz" = ( /obj/wallframe_spawn/reinforced, /obj/machinery/door/firedoor{ @@ -83569,6 +83791,7 @@ /obj/structure/railing/mapped{ dir = 1 }, +/obj/structure/railing/mapped, /turf/simulated/open, /area/hallway/primary/firstdeck/central_stairwell) "mJw" = ( @@ -84141,7 +84364,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/catwalk, /obj/floor_decal/techfloor/orange{ dir = 10 }, @@ -84486,10 +84708,11 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/aftport) "mQL" = ( -/obj/floor_decal/corner_techfloor_grid, -/obj/floor_decal/techfloor/corner, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/firstdeck/aftport) +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/machinery/light/spot, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/center) "mQV" = ( /obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, @@ -84847,7 +85070,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "mTI" = ( /turf/simulated/floor/greengrid, @@ -85171,6 +85403,11 @@ dir = 8 }, /obj/structure/table/standard, +/obj/item/folder/nt, +/obj/item/folder/white{ + pixel_y = 6; + pixel_x = 3 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/research) "mXk" = ( @@ -86190,6 +86427,7 @@ /obj/floor_decal/techfloor/orange{ dir = 10 }, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/techfloor, /area/maintenance/seconddeck/aftstarboard) "nfe" = ( @@ -86493,7 +86731,8 @@ /area/exploration_shuttle/medical) "nhX" = ( /obj/machinery/door/airlock/civilian{ - name = "Theatr" + name = "Theatr"; + autoset_access = 0 }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/actor/stage) @@ -86531,6 +86770,21 @@ }, /turf/simulated/floor/tiled/dark/monotile, /area/bridge) +"nim" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/fourthdeck/port) "nit" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -86624,7 +86878,7 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/foreport) "njl" = ( -/obj/structure/bed/chair/comfy/beige{ +/obj/structure/bed/chair/armchair/beige{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, @@ -88014,14 +88268,14 @@ /turf/simulated/floor/bluegrid, /area/rnd/servers) "nsf" = ( -/obj/floor_decal/corner_techfloor_grid{ - dir = 8 +/obj/structure/bed/chair/padded/green{ + dir = 1 }, -/obj/floor_decal/techfloor/corner{ - dir = 8 +/obj/floor_decal/techfloor{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/firstdeck/aftport) +/area/crew_quarters/sleep/cryo/south) "nsl" = ( /obj/floor_decal/corner/paleblue/bordercorner, /obj/structure/cable/green{ @@ -88040,14 +88294,14 @@ /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) "nsm" = ( -/obj/floor_decal/borderfloor, -/obj/floor_decal/corner/lime/border, -/obj/machinery/light, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/floor_decal/techfloor{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/hallway/primary/seconddeck/center) +/obj/random/vendor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/firstdeck/aftport) "nsv" = ( /turf/simulated/wall/prepainted, /area/engineering/locker_room) @@ -88425,7 +88679,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, /obj/machinery/shieldwallgen, @@ -89121,11 +89375,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/floor_decal/corner_techfloor_grid{ - dir = 4 - }, -/obj/floor_decal/techfloor/corner{ - dir = 4 +/obj/floor_decal/techfloor{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -89215,7 +89466,7 @@ /obj/machinery/door/blast/regular{ dir = 4; id_tag = "selfdestruct"; - name = "Self Destruct Access Blast Door" + name = "Delta Code Access Blast Door" }, /obj/machinery/button/blast_door{ id_tag = "selfdestruct"; @@ -90120,9 +90371,12 @@ /area/medical/virology/lab) "nJn" = ( /obj/floor_decal/techfloor{ - dir = 5 + dir = 4 }, -/obj/structure/table/standard, +/obj/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "nJr" = ( @@ -92433,7 +92687,7 @@ dir = 1 }, /obj/floor_decal/industrial/warning/full, -/obj/machinery/light/small, +/obj/machinery/light, /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) @@ -93435,6 +93689,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/center) "okZ" = ( @@ -93578,13 +93833,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "omE" = ( /obj/floor_decal/spline/fancy/black{ @@ -94317,6 +94574,14 @@ /obj/floor_decal/techfloor, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) +"osm" = ( +/obj/floor_decal/techfloor/orange, +/obj/machinery/rotating_alarm/supermatter{ + pixel_y = -14; + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/engine_room) "osy" = ( /obj/machinery/atmospherics/tvalve/mirrored/digital{ dir = 1 @@ -94512,7 +94777,8 @@ /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/civilian{ - dir = 8 + dir = 8; + autoset_access = 0 }, /turf/simulated/floor/tiled/dark/monotile, /area/hallway/primary/fourthdeck/central_stairwell) @@ -94564,6 +94830,27 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/bridge/storage) +"ouq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/warning/smoking{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/maintenance/firstdeck/aftport) "out" = ( /obj/structure/flora/ausbushes/genericbush, /obj/structure/railing/mapped, @@ -96156,6 +96443,9 @@ dir = 8 }, /obj/machinery/portable_atmospherics/powered/pump, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins) "oGL" = ( @@ -96232,7 +96522,14 @@ /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/aft) "oGZ" = ( -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 5 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/structure/flora/pottedplant/large, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "oHh" = ( /obj/floor_decal/borderfloorblack{ @@ -96704,6 +97001,12 @@ }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/office/iaa/high_sec) +"oLd" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/open, +/area/hallway/primary/bridgedeck/central_stairwell) "oLh" = ( /obj/structure/table/steel, /obj/item/rcd_ammo, @@ -96990,6 +97293,7 @@ /area/security/sierra/suits) "oOc" = ( /obj/floor_decal/techfloor, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "oOh" = ( @@ -97407,6 +97711,18 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/morgue/autopsy) +"oQH" = ( +/obj/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/machinery/light/spot{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "oQJ" = ( /obj/floor_decal/techfloor/orange, /obj/structure/bed/chair/padded/blue{ @@ -97840,13 +98156,18 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/small, /obj/floor_decal/corner_techfloor_grid{ dir = 8 }, /obj/floor_decal/techfloor/corner{ dir = 8 }, +/obj/floor_decal/corner_techfloor_grid{ + dir = 4 + }, +/obj/floor_decal/techfloor/corner{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "oUp" = ( @@ -98082,6 +98403,9 @@ /obj/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, /obj/random/masks, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/fourthdeck/aft) "oWk" = ( @@ -98929,11 +99253,28 @@ /turf/simulated/floor/tiled/steel_grid, /area/shuttle/escape_pod/escape_pod3/station) "pdl" = ( -/obj/machinery/atm{ - pixel_x = 33 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/wall/r_wall/prepainted, -/area/crew_quarters/safe_room/seconddeck) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "pdt" = ( /obj/structure/table/marble, /obj/item/reagent_containers/food/condiment/barbecue{ @@ -100732,13 +101073,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/centralstarboard) "ppn" = ( -/obj/floor_decal/techfloor{ - dir = 10 +/obj/floor_decal/techfloor, +/obj/structure/bed/chair/comfy/purple{ + dir = 8 }, -/obj/structure/closet/secure_closet/personal, -/obj/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo/south) +/area/maintenance/firstdeck/aftport) "pps" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -101104,16 +101444,13 @@ }, /obj/floor_decal/borderfloor/corner2, /obj/floor_decal/corner/lime/bordercorner2, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, /obj/floor_decal/borderfloor/corner2{ dir = 9 }, /obj/floor_decal/corner/lime/bordercorner2{ dir = 9 }, +/obj/machinery/light/spot, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) "prX" = ( @@ -102012,11 +102349,14 @@ /turf/simulated/floor/plating, /area/engineering/atmos/storage) "pzl" = ( -/obj/structure/closet/emcloset/anchored, +/obj/structure/closet/secure_closet/personal, /obj/structure/railing/mapped, /obj/floor_decal/techfloor{ dir = 4 }, +/obj/floor_decal/techfloor{ + dir = 8 + }, /obj/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -103335,6 +103675,7 @@ /obj/structure/railing/mapped{ dir = 1 }, +/obj/structure/railing/mapped, /turf/simulated/open, /area/hallway/primary/thirddeck/central_stairwell) "pKd" = ( @@ -104934,7 +105275,7 @@ /turf/simulated/wall/r_wall/hull, /area/turret_protected/ai) "pXx" = ( -/obj/structure/flora/pottedplant/aquatic, +/obj/structure/closet/emcloset/anchored, /obj/structure/cable/green{ d2 = 2; icon_state = "0-2" @@ -105248,6 +105589,21 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) +"pZG" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/rotating_alarm/supermatter{ + dir = 8; + pixel_x = 14 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "pZH" = ( /obj/structure/cable/green{ d1 = 4; @@ -105385,6 +105741,7 @@ /obj/structure/railing/mapped{ dir = 4 }, +/obj/structure/railing/mapped, /turf/simulated/open, /area/hallway/primary/thirddeck/central_stairwell) "qap" = ( @@ -107097,8 +107454,15 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "qoq" = ( +/obj/floor_decal/techfloor, +/obj/structure/table/rack, +/obj/random/maintenance, +/obj/floor_decal/techfloor, /obj/floor_decal/techfloor{ - dir = 10 + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) @@ -107205,7 +107569,7 @@ dir = 4 }, /obj/floor_decal/industrial/warning/full, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "qpp" = ( /turf/simulated/wall/r_wall/prepainted, @@ -108262,7 +108626,7 @@ }, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/foreport) "qyL" = ( /obj/structure/cable{ @@ -110302,7 +110666,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/hallway/aft) "qOC" = ( -/obj/machinery/vending/boozeomat, +/obj/machinery/vending/boozeomat{ + req_access = list("ACCESS_BAR") + }, /obj/machinery/light/led/small{ dir = 1 }, @@ -110428,7 +110794,14 @@ /obj/floor_decal/techfloor{ dir = 4 }, -/obj/structure/holoplant, +/obj/structure/closet/emcloset/anchored, +/obj/floor_decal/techfloor{ + dir = 8 + }, +/obj/floor_decal/industrial/outline/grey, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "qPx" = ( @@ -110585,7 +110958,16 @@ "qQM" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "qQO" = ( /obj/floor_decal/industrial/warning{ @@ -110680,7 +111062,10 @@ "qRx" = ( /obj/structure/holoplant, /obj/floor_decal/techfloor{ - dir = 9 + dir = 8 + }, +/obj/floor_decal/techfloor{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -110853,10 +111238,13 @@ /turf/simulated/wall/r_wall/prepainted, /area/rnd/misc_lab) "qSy" = ( -/obj/structure/closet/emcloset/anchored, +/obj/structure/closet/secure_closet/personal, /obj/floor_decal/techfloor{ dir = 4 }, +/obj/floor_decal/techfloor{ + dir = 8 + }, /obj/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -110964,6 +111352,33 @@ }, /turf/simulated/floor/carpet/green, /area/medical/mentalhealth/therapyroom) +"qTL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/rotating_alarm/supermatter{ + pixel_y = -14; + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "qTM" = ( /obj/floor_decal/industrial/warning{ dir = 10 @@ -111979,13 +112394,13 @@ /area/engineering/engine_room) "rbh" = ( /obj/floor_decal/corner_techfloor_grid{ - dir = 5 + dir = 4 }, /obj/floor_decal/techfloor/corner{ dir = 4 }, -/obj/floor_decal/techfloor/corner{ - dir = 1 +/obj/floor_decal/techfloor{ + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -112516,6 +112931,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/airlock/multi_tile/glass/security{ + dir = 8; + name = "Security Airlock" + }, /turf/simulated/floor/tiled/monotile, /area/security/sierra/hallway) "reP" = ( @@ -114521,6 +114940,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) "rvh" = ( @@ -114749,6 +115172,9 @@ dir = 8 }, /obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/open, /area/hallway/primary/seconddeck/central_stairwell) "rwV" = ( @@ -115058,6 +115484,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +"rzi" = ( +/obj/floor_decal/corner/grey/border{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "rzl" = ( /obj/floor_decal/industrial/warning{ dir = 5 @@ -116029,10 +116462,13 @@ /obj/floor_decal/techfloor{ dir = 8 }, -/obj/structure/closet/secure_closet/personal, +/obj/structure/closet/emcloset/anchored, /obj/structure/railing/mapped{ dir = 1 }, +/obj/floor_decal/techfloor{ + dir = 4 + }, /obj/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -116140,7 +116576,16 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "rIu" = ( /obj/structure/table/steel, @@ -117585,6 +118030,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/aft) +"rTs" = ( +/obj/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo/south) "rTz" = ( /obj/structure/cable/green{ d1 = 4; @@ -118169,7 +118620,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/storage/tech) "rXn" = ( -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /obj/floor_decal/techfloor{ @@ -118305,14 +118756,18 @@ /turf/simulated/floor/carpet/blue2, /area/crew_quarters/cafe/upper) "rYW" = ( -/obj/floor_decal/techfloor{ - dir = 6 - }, /obj/structure/closet/crate/freezer, /obj/random/medical, /obj/random/medical, /obj/random/medical, /obj/random/firstaid, +/obj/floor_decal/techfloor, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "rYX" = ( @@ -118592,10 +119047,6 @@ /turf/simulated/floor/plating, /area/maintenance/fourthdeck/aft) "sbo" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24 - }, /obj/structure/closet/emcloset/anchored, /obj/floor_decal/borderfloor{ dir = 6 @@ -119937,7 +120388,7 @@ icon_state = "1-2" }, /obj/item/airlock_brace{ - req_access = list("ACCESS_CAPTAIN") + req_access = list("ACCESS_AI_UPLOAD") }, /obj/machinery/door/blast/regular{ id_tag = "ai_upload_blast"; @@ -121037,6 +121488,7 @@ /obj/floor_decal/industrial/danger/corner{ dir = 8 }, +/obj/machinery/light/spot, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/aft_stairwell) "sut" = ( @@ -121807,14 +122259,11 @@ /turf/simulated/floor/carpet/purple, /area/crew_quarters/sleep/bunk) "szJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9 - }, -/obj/floor_decal/techfloor/orange{ - dir = 5 +/obj/structure/bed/chair/comfy/purple{ + dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/thirddeck/aftstarboard) +/area/maintenance/firstdeck/aftport) "szK" = ( /obj/structure/sign/warning/airlock{ dir = 1; @@ -122236,9 +122685,6 @@ /turf/simulated/floor/carpet/purple, /area/chapel/office) "sDk" = ( -/obj/structure/table/wallf/steel{ - dir = 4 - }, /obj/machinery/door/window/brigdoor/westright{ dir = 2; id_tag = "prison_lobby_window" @@ -122255,6 +122701,10 @@ name = "Prison Lobby Windows Shutters"; id_tag = "prison_lobby_window" }, +/obj/structure/wall_frame/standard, +/obj/structure/table/wallf/steel{ + dir = 4 + }, /turf/simulated/floor/plating, /area/security/sierra/brig) "sDn" = ( @@ -122437,6 +122887,15 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/item/device/flashlight/lamp/green{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/paper/sierra/medical_blood, +/obj/item/reagent_containers/food/drinks/glass2/coffeecup/glass{ + pixel_y = 7; + pixel_x = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/cmo) "sEd" = ( @@ -123779,7 +124238,13 @@ "sNa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "sNg" = ( /obj/floor_decal/borderfloorblack/corner{ @@ -123983,6 +124448,10 @@ dir = 10 }, /obj/floor_decal/corner/darkblue/border, +/obj/item/paper_bin, +/obj/item/stamp/cmo, +/obj/item/sticky_pad/random, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/cmo) "sPn" = ( @@ -124190,7 +124659,7 @@ /obj/floor_decal/techfloor/orange{ dir = 8 }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, @@ -124216,7 +124685,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "sQx" = ( /obj/structure/railing/mapped{ @@ -124303,6 +124781,16 @@ /obj/item/stock_parts/manipulator, /turf/simulated/floor/plating, /area/maintenance/thirddeck/forestarboard) +"sQY" = ( +/obj/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/rotating_alarm/supermatter{ + pixel_y = -14; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "sQZ" = ( /obj/machinery/firealarm{ dir = 1; @@ -124372,11 +124860,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/floor_decal/techfloor/orange{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) @@ -124713,6 +125199,9 @@ /obj/floor_decal/techfloor{ dir = 8 }, +/obj/machinery/vending/cigarette{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "sTO" = ( @@ -125077,6 +125566,10 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/rotating_alarm/supermatter{ + dir = 8; + pixel_x = 14 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "sWn" = ( @@ -127393,6 +127886,14 @@ }, /turf/simulated/floor/plating, /area/quartermaster/hangar) +"tqy" = ( +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 1; + icon_state = "railing0-1" + }, +/turf/simulated/open, +/area/maintenance/seconddeck/aftstarboard) "tqE" = ( /obj/structure/cable/green{ d1 = 1; @@ -127672,7 +128173,14 @@ /obj/machinery/light/spot, /obj/structure/table/standard, /obj/item/storage/box/detergent, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "ttq" = ( /obj/structure/table/rack, @@ -127786,6 +128294,7 @@ /area/hallway/primary/seconddeck/center) "tuN" = ( /obj/structure/table/standard, +/obj/item/reagent_containers/food/drinks/glass2/coffeecup/foundation, /turf/simulated/floor/tiled/dark, /area/medical/mentalhealth) "tuR" = ( @@ -127843,6 +128352,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/rotating_alarm/supermatter{ + pixel_y = 14 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "tvu" = ( @@ -127874,6 +128386,9 @@ tag_south = 1; tag_west = 1 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins) "tvK" = ( @@ -130227,7 +130742,13 @@ d2 = 8; icon_state = "0-8" }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "tOd" = ( /obj/machinery/shield_diffuser, @@ -130652,7 +131173,7 @@ /obj/floor_decal/techfloor{ dir = 1 }, -/obj/structure/table/standard, +/obj/random/vendor, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -131488,10 +132009,15 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/heads/captain/secret_room/level_one) "tWK" = ( -/obj/wallframe_spawn/reinforced/hull, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/quartermaster/hangar/upper) +/obj/floor_decal/corner/grey/border{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "tWT" = ( /obj/machinery/door/airlock/research{ dir = 4; @@ -135945,16 +136471,12 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/bluespace) "uIl" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/floor_decal/industrial/warning/cee{ - dir = 8 +/obj/machinery/washing_machine, +/obj/floor_decal/corner/grey/border{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/maintenance/thirddeck/aftstarboard) +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "uIp" = ( /obj/structure/catwalk, /obj/floor_decal/borderfloor, @@ -136026,6 +136548,8 @@ }, /obj/structure/table/standard, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "uIE" = ( @@ -137902,6 +138426,7 @@ }, /obj/structure/reagent_dispensers/watertank, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/maintenance/fourthdeck/aft) "uYw" = ( @@ -138848,6 +139373,20 @@ /obj/random/maintenance, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) +"ves" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "vez" = ( /obj/structure/cable/green{ d1 = 2; @@ -139183,6 +139722,13 @@ /obj/floor_decal/corner/red, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/hangar_stairs) +"vhj" = ( +/obj/structure/catwalk, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/port) "vho" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -140366,6 +140912,12 @@ }, /turf/simulated/floor/plating, /area/hallway/primary/seconddeck/fore) +"vpp" = ( +/obj/machinery/computer/modular/preset/security{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/escape_pod/escape_pod5/station) "vpr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -140602,7 +141154,7 @@ /obj/floor_decal/techfloor/orange{ dir = 6 }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, @@ -143717,6 +144269,7 @@ }, /obj/structure/table/standard, /obj/floor_decal/corner/grey/diagonal, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled, /area/rnd/research) "vRl" = ( @@ -145826,6 +146379,26 @@ }, /turf/simulated/floor/carpet/red, /area/crew_quarters/heads/office/hos) +"wgr" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "wgs" = ( /obj/floor_decal/borderfloor/corner{ dir = 4 @@ -145997,6 +146570,23 @@ /obj/floor_decal/snow, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/galley/freezer) +"whn" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/seconddeck/center) "whv" = ( /obj/machinery/portable_atmospherics/canister/hydrogen, /obj/floor_decal/industrial/outline/blue, @@ -147458,6 +148048,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/item/modular_computer/tablet/lease/preset/command, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/cmo) "wtD" = ( @@ -148693,7 +149284,7 @@ "wEU" = ( /obj/machinery/door/airlock/vault/bolted{ id_tag = "selfddoor"; - name = "Self Destruct Access" + name = "Delta Code Chamber Access" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -150803,13 +151394,12 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/office/iaa) "wYN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5 - }, -/obj/floor_decal/techfloor/orange{ - dir = 9 +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/floor_decal/industrial/warning/cee{ + dir = 8 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/plating, /area/maintenance/thirddeck/aftstarboard) "wYV" = ( /obj/machinery/power/apc{ @@ -152794,6 +153384,9 @@ /area/hallway/primary/firstdeck/aft) "xoc" = ( /obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/open, /area/hallway/primary/seconddeck/central_stairwell) "xof" = ( @@ -155883,6 +156476,16 @@ /obj/item/paper/sierra/compactor, /turf/simulated/floor/tiled/techfloor, /area/maintenance/compactor) +"xMK" = ( +/obj/floor_decal/corner/grey/border{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "xMO" = ( /obj/structure/railing/mapped{ dir = 4 @@ -157252,7 +157855,7 @@ "xXt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /turf/simulated/floor/plating, @@ -177827,7 +178430,7 @@ pBU ouV hFo tKP -spm +nim vDr wid pGs @@ -178231,7 +178834,7 @@ bBf rAj ihy tKP -igz +spm mfJ pGs pGs @@ -183886,7 +184489,7 @@ fsX bZH adx seP -aUN +iKC lQb xuO aUd @@ -211146,7 +211749,7 @@ shn adB kXN nZd -pnE +qTL loO ckW tmA @@ -213359,7 +213962,7 @@ ego dWB bwv jDf -mkQ +pZG czb dtE mkQ @@ -218432,7 +219035,7 @@ bDX kCy aEa cKL -gPE +vhj gPE nyY mtR @@ -221231,8 +221834,8 @@ wUa nvT nvT kQa -bLS -bLS +bJM +bJM nvT vzJ uoA @@ -221435,7 +222038,7 @@ gms wgD aYW nAg -tWK +iIc uoA uoA uoA @@ -221632,12 +222235,12 @@ cqk mGJ dII wxL -tWK +iIc fPl esy wBV rrR -tWK +iIc uoA uoA uoA @@ -221839,7 +222442,7 @@ kno nrW cMY oii -tWK +iIc uoA uoA uoA @@ -222039,8 +222642,8 @@ wUa nvT nvT kQa -bLS -bLS +bJM +bJM nvT vzJ uoA @@ -223634,9 +224237,9 @@ tXe tXe sbr sbr -uIl +sbr wYN -mbu +fRz hjx qsg cTV @@ -223836,8 +224439,8 @@ tXe sbr sbr sbr +sbr mNF -kQH bBr xOY ptT @@ -224038,8 +224641,8 @@ tXe sbr sbr sbr +sbr dyd -szJ sRw vrX fqU @@ -224063,12 +224666,12 @@ noY aTn sNN aTn -aTn +buZ aTn aTn noY mHe -mHe +mEt fIN mHe mHe @@ -224076,7 +224679,7 @@ oyp mHe kGH mHe -mHe +mEt oyp mHe xDT @@ -226500,7 +227103,7 @@ teQ teQ teQ teQ -fEY +sQY jLt jLt jLt @@ -226686,7 +227289,7 @@ cfi aeU cOX cfi -nhq +cBm fEY wZg meg @@ -227904,13 +228507,13 @@ gzu cwp rbg rfI -rhb +osm sKx jYs oKq fNJ sKx -lXp +cOZ rfI nwB jEI @@ -253766,7 +254369,7 @@ ddv kCS vbG ske -pdl +ifz dNl rFj iAP @@ -254177,9 +254780,9 @@ asr eln qRx rGK +kxI biE biE -ppn ifz qrB ifz @@ -254378,10 +254981,10 @@ ydn iql szv rbh -faN -faN -faN -oOc +rTs +rTs +rTs +bLS ifz ifz ifz @@ -254984,10 +255587,10 @@ tvF fSx eln kKz -faN -faN -faN -faN +nsf +dHC +dHC +dHC oUm rFS cos @@ -255987,7 +256590,7 @@ bPF bPF clp pFH -nsm +gav wle chf dSQ @@ -256985,7 +257588,7 @@ jWt wzy wzy wzy -wzy +pMh pMh isY jbN @@ -257187,7 +257790,7 @@ pRi wzy wzy wzy -wzy +pMh pMh hdq jor @@ -257210,9 +257813,9 @@ eKL tKT qOv jyD -oGZ -omy -aFR +kQH +pdl +uIl mfA kDQ iMW @@ -257412,7 +258015,7 @@ kCN joT qOv dyD -oGZ +tWK omy tto mfA @@ -257614,8 +258217,8 @@ trz qOv qOv yka -oGZ -omy +rzi +wgr bYX mfA qVV @@ -257807,11 +258410,11 @@ qeZ cMN ccj mZx -oGZ +xMK mTF -sNa +ldC lbL -sNa +ldC qQM ldC sNa @@ -258012,12 +258615,12 @@ qOv oGZ bkU gIe -oGZ -oGZ -bkU +oQH +dJd +ves lWg crr -oGZ +gIe bkU tNN rIt @@ -259010,7 +259613,7 @@ lzW aGk adM aqL -xUw +esn qvO rYT crD @@ -260215,7 +260818,7 @@ lEK dBU eIl tUB -ccj +aJI dFc euX aWI @@ -260617,7 +261220,7 @@ wQk oVN sKf dBU -eIl +whn tUB kXS jNk @@ -264243,9 +264846,9 @@ wKF nUm bdT gPe -rWg -rWg qtw +rWg +tqy wwV lKH mBr @@ -289742,9 +290345,9 @@ gfi lko sjA sjA -bAr +vpp rky -bAr +iDb sjA sjA lko @@ -289943,7 +290546,7 @@ vUv gfi lko sjA -bAr +eVU psD rEh sKN @@ -300851,7 +301454,7 @@ iGy kVd kVd gHP -jmN +ouq rXn wop wop @@ -301056,7 +301659,7 @@ dNz jmN lln sTL -qoq +nsm wop wop wop @@ -301258,7 +301861,7 @@ daa kPc iWF ecL -nsf +fwh qoq wop wop @@ -301460,7 +302063,7 @@ dNz rMx peH ecL -ecL +kLd glU wop wop @@ -301661,8 +302264,8 @@ gNW qSx lrY bso -ecL -ecL +szJ +igz glU wop wop @@ -301864,7 +302467,7 @@ qSx cNo jJA ecL -ecL +ppn bJC wop wop @@ -302066,8 +302669,8 @@ qSx xiV jJA ecL -ecL fwh +cmk wop wop uYw @@ -302268,7 +302871,7 @@ qSx tkY rhy eFZ -mQL +fwh rYW wop wop @@ -335577,10 +336180,10 @@ rNx gDd eea alU -nwJ +mQL tqf lZj -lZj +oLd ftd mRr chE @@ -336187,7 +336790,7 @@ ltN tse tse tse -tse +ahU tse tse tse diff --git a/mods/jukebox_tapes/code/jukebox.dm b/mods/jukebox_tapes/code/jukebox.dm index 8b3b8668321de..c15c3f691f597 100644 --- a/mods/jukebox_tapes/code/jukebox.dm +++ b/mods/jukebox_tapes/code/jukebox.dm @@ -138,3 +138,12 @@ var/obj/machinery/jukebox/custom_tape/J = owner J.eject() return TOPIC_REFRESH + +/obj/random/machine/jukebox_custom + name = "random jukebox" + +/obj/random/machine/jukebox_custom/spawn_choices() + return list( + /obj/machinery/jukebox/custom_tape, + /obj/machinery/jukebox/custom_tape/old + ) From 25606542f22d6f907d6c9b24f5e87a5b60458fa4 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Fri, 3 Nov 2023 11:56:52 +0300 Subject: [PATCH 43/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#1271=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-1271.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1271.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1271.yml b/html/changelogs/AutoChangeLog-sierra-pr-1271.yml new file mode 100644 index 0000000000000..9d8ac8a503c39 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1271.yml @@ -0,0 +1,5 @@ +author: KandJX +changes: + - {tweak: Голокарты теперь корректно отображают цвета зон} + - {maptweak: Мелкофиксы то тут то там} +delete-after: true From c38b4a110f2edfdf6290639126fa5a3a4b89dcb5 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Fri, 3 Nov 2023 09:01:23 +0000 Subject: [PATCH 44/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 | 15 +++++++++++++++ html/changelogs/.all_changelog.yml | 12 ++++++++++++ html/changelogs/AutoChangeLog-sierra-pr-1271.yml | 5 ----- html/changelogs/AutoChangeLog-sierra-pr-1276.yml | 4 ---- html/changelogs/AutoChangeLog-sierra-pr-1277.yml | 4 ---- 5 files changed, 27 insertions(+), 13 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1271.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1276.yml delete mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1277.yml diff --git a/html/changelog.html b/html/changelog.html index c1e9740037b0d..e2acb18dd3da8 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -28,6 +28,21 @@

Sierra SS13

-->
+

03.11 - 2023

+

Обновления KandJX:

+
+
Голокарты теперь корректно отображают цвета зон
+
Мелкофиксы то тут то там
+
+

Обновления SierraKomodo:

+
+
Cryopods can now be used to leave the round even if there's no power.
+
+

Обновления emmanuelbassil:

+
+
Gas scanner no longer scans the inside of your backpack on storage
+
+

02.11 - 2023

Обновления Vuradu:

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 5e2278ccaf863..420843512aca3 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -22196,3 +22196,15 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY sierra_genchangelog.p - bugfix: "\u0418\u0437\u043C\u0435\u043D\u0438\u043B \u043F\u0430\u043B\u0443\u0431\ \u0443 \u0432 \u0438\u043C\u0435\u043D\u0438 \u0437\u043E\u043D\u044B \u0441\ \ 3-\u0435\u0439 \u043D\u0430 4-\u044E." +2023-11-03: + KandJX: + - tweak: "\u0413\u043E\u043B\u043E\u043A\u0430\u0440\u0442\u044B \u0442\u0435\u043F\ + \u0435\u0440\u044C \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u043E \u043E\ + \u0442\u043E\u0431\u0440\u0430\u0436\u0430\u044E\u0442 \u0446\u0432\u0435\u0442\ + \u0430 \u0437\u043E\u043D" + - maptweak: "\u041C\u0435\u043B\u043A\u043E\u0444\u0438\u043A\u0441\u044B \u0442\ + \u043E \u0442\u0443\u0442 \u0442\u043E \u0442\u0430\u043C" + SierraKomodo: + - bugfix: Cryopods can now be used to leave the round even if there's no power. + emmanuelbassil: + - bugfix: Gas scanner no longer scans the inside of your backpack on storage diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1271.yml b/html/changelogs/AutoChangeLog-sierra-pr-1271.yml deleted file mode 100644 index 9d8ac8a503c39..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1271.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: KandJX -changes: - - {tweak: Голокарты теперь корректно отображают цвета зон} - - {maptweak: Мелкофиксы то тут то там} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1276.yml b/html/changelogs/AutoChangeLog-sierra-pr-1276.yml deleted file mode 100644 index 6e3a9f325a36c..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1276.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: SierraKomodo -changes: - - {bugfix: Cryopods can now be used to leave the round even if there's no power.} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1277.yml b/html/changelogs/AutoChangeLog-sierra-pr-1277.yml deleted file mode 100644 index 8412de86af472..0000000000000 --- a/html/changelogs/AutoChangeLog-sierra-pr-1277.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: emmanuelbassil -changes: - - {bugfix: Gas scanner no longer scans the inside of your backpack on storage} -delete-after: true