diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index ccb156624c71..bbb0d9db5ba4 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -56,23 +56,18 @@ sound = SSstation.announcer.event_sounds[sound] var/header - var/title_shit // MASSMETA EDIT (вебхуки) switch(type) if(ANNOUNCEMENT_TYPE_PRIORITY) header = MAJOR_ANNOUNCEMENT_TITLE("Priority Announcement") - title_shit = "Priority Announcement" // MASSMETA EDIT (вебхуки) if(length(title) > 0) header += SUBHEADER_ANNOUNCEMENT_TITLE(title) if(ANNOUNCEMENT_TYPE_CAPTAIN) header = MAJOR_ANNOUNCEMENT_TITLE("Captain's Announcement") - title_shit = "Captain's Announcement" // MASSMETA EDIT (вебхуки) GLOB.news_network.submit_article(text, "Captain's Announcement", NEWSCASTER_STATION_ANNOUNCEMENTS, null) if(ANNOUNCEMENT_TYPE_SYNDICATE) header = MAJOR_ANNOUNCEMENT_TITLE("Syndicate Captain's Announcement") - title_shit = "Syndicate Captain's Announcement" // MASSMETA EDIT (вебхуки) else header += generate_unique_announcement_header(title, sender_override) - title_shit = title // MASSMETA EDIT (вебхуки) announcement_strings += ANNOUNCEMENT_HEADER(header) @@ -96,8 +91,6 @@ else GLOB.news_network.submit_article(text, "[command_name()] Update", NEWSCASTER_STATION_ANNOUNCEMENTS, null) - send2announcement_webhook(title_shit, text, sender_override, color_override) // MASSMETA EDIT: Добавляем отправку анонсов в Discord - /proc/print_command_report(text = "", title = null, announce=TRUE) if(!title) title = "Classified [command_name()] Update" @@ -152,14 +145,6 @@ var/custom_sound = sound_override || (alert ? 'sound/announcer/notice/notice1.ogg' : 'sound/announcer/notice/notice2.ogg') dispatch_announcement_to_players(finalized_announcement, players, custom_sound, should_play_sound) - // MASSMETA EDIT BEGIN (вебхуки) - var/text = message - if(title != null && title != "" && title == "Attention:") - send2announcement_webhook(title, text, color_override) // MASSMETA EDIT: Добавляем отправку анонсов в Discord - else - send2announcement_webhook("Attention", text, color_override) // MASSMETA EDIT: Добавляем отправку анонсов в Discord - // MASSMETA EDIT END - /// Sends an announcement about the level changing to players. Uses the passed in datum and the subsystem's previous security level to generate the message. /proc/level_announce(datum/security_level/selected_level, previous_level_number) var/current_level_number = selected_level.number_level diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index a2386a9ecffd..62273fbb7c2f 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -292,9 +292,6 @@ GLOBAL_LIST_INIT(achievements_unlocked, list()) world.TgsTriggerEvent("tg-Roundend", wait_for_completion = TRUE) - // MASSMETA EDIT (вебхуки) - send2announcement_webhook("Round Ended", "[GLOB.round_id ? "Round [GLOB.round_id]" : "The round has"] just ended.", null, "green") - sleep(5 SECONDS) ready_for_reboot = TRUE standard_reboot() diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 12c02b11675e..60898e26bbc1 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -297,9 +297,6 @@ SUBSYSTEM_DEF(ticker) PostSetup() - // MASSMETA EDIT (вебхуки) - send2announcement_webhook("Round Start", "[GLOB.round_id ? "Round [GLOB.round_id]" : "The round has"] started.", null, "green") - return TRUE /datum/controller/subsystem/ticker/proc/PostSetup() diff --git a/modular_meta/__modpack/modpack.dm b/modular_meta/__modpack/modpack.dm index 5446ee343ee3..6ecd0bb29446 100644 --- a/modular_meta/__modpack/modpack.dm +++ b/modular_meta/__modpack/modpack.dm @@ -9,7 +9,7 @@ var/desc /// A string with authors of this modpack. var/author - /// A string with group of this modpack. Choose between "Features", "Translations" and "Reverts" + /// A string with group of this modpack. Choose between "Features", "Tweaks" and "Reverts" var/group /// A list of your modpack's dependencies. If you use obj from another modpack - put it here. var/list/mod_depends = list() @@ -58,9 +58,9 @@ /datum/modpack/ui_static_data(mob/user) . = ..() - .["categories"] = list("Features", "Translations", "Reverts") + .["categories"] = list("Features", "Tweaks", "Reverts") .["features"] = list() - .["translations"] = list() + .["tweaks"] = list() .["reverts"] = list() var/datum/asset/spritesheet_batched/assets = get_asset_datum(/datum/asset/spritesheet_batched/modpacks) @@ -78,9 +78,9 @@ if (modpack.group == "Фичи" || modpack.group == "Features") .["features"] += list(modpack_data) - else if (modpack.group == "Переводы" || modpack.group == "Translations") - .["translations"] += list(modpack_data) - else if (modpack.group == "Балансы" || modpack.group == "Reverts") + else if (modpack.group == "Твики" || modpack.group == "Tweaks") + .["tweaks"] += list(modpack_data) + else if (modpack.group == "Откаты" || modpack.group == "Reverts") .["reverts"] += list(modpack_data) else CRASH("Modpack [modpack.name] has bad group name or queued for deletion.") diff --git a/modular_meta/features/countdown_antimov_sfx/includes.dm b/modular_meta/features/countdown_antimov_sfx/includes.dm index 9b8cc3958806..9d95fd817eca 100644 --- a/modular_meta/features/countdown_antimov_sfx/includes.dm +++ b/modular_meta/features/countdown_antimov_sfx/includes.dm @@ -2,9 +2,9 @@ #include "code\countdown.dm" /datum/modpack/countdown_antimov_sfx - id = "COUNTDOWN" + id = "countdown_antimov_sfx" icon = 'modular_meta/features/countdown_antimov_sfx/preview.dmi' - name = "Misc stuff" + name = "Countdown Antimov SFX" group = "Features" - desc = "Добавляет звук ИИ-шке при получении набора законов «Антимов». А также музыку при объявлении войны и запуске ядерной боеголовки" + desc = "Добавляет звук ИИ при получении набора законов «Антимов». А также музыку при объявлении войны и запуске ядерной боеголовки" author = "code by Bruh24, idea by piki.ta" diff --git a/modular_meta/features/hierophant_club_resprite/code/master_megafauna_loot.dm b/modular_meta/features/hierophant_club_resprite/code/master_megafauna_loot.dm deleted file mode 100644 index 104cfec5abfe..000000000000 --- a/modular_meta/features/hierophant_club_resprite/code/master_megafauna_loot.dm +++ /dev/null @@ -1,5 +0,0 @@ -//ORIGINAL FILE: code/modules/mining/lavaland/megafauna_loot.dm -/obj/item/hierophant_club - icon = 'modular_meta/features/hierophant_club_resprite/icons/artefacts.dmi' - lefthand_file = 'modular_meta/features/hierophant_club_resprite/icons/64x64_lefthand.dmi' - righthand_file = 'modular_meta/features/hierophant_club_resprite/icons/64x64_righthand.dmi' diff --git a/modular_meta/features/hierophant_club_resprite/includes.dm b/modular_meta/features/hierophant_club_resprite/includes.dm deleted file mode 100644 index b1ad45cca129..000000000000 --- a/modular_meta/features/hierophant_club_resprite/includes.dm +++ /dev/null @@ -1,8 +0,0 @@ -#include "code\master_megafauna_loot.dm" - -/datum/modpack/hierophant_club_resprite - id = "hierophant_club_resprite" - name = "Рескин посоха херофанта" - group = "Features" - desc = "Мы посчитали, что оригинальный спрайт надо переделать, вроде получилось норм" - author = "biratomi00" diff --git a/modular_meta/features/roundstart_shell/includes.dm b/modular_meta/features/roundstart_shell/includes.dm index e4beadf5c44a..463d0f624cae 100644 --- a/modular_meta/features/roundstart_shell/includes.dm +++ b/modular_meta/features/roundstart_shell/includes.dm @@ -2,7 +2,7 @@ /datum/modpack/roundstart_shell id = "roundstart_shell" - name = "Раундстартовые шеллы для ИИ" + name = "Раундстартовые оболочки для ИИ" group = "Features" desc = "Добавляет на каждую станцию по 2 шелла для ИИ." author = "Sanecman" diff --git a/modular_meta/features/send2status/code/webhook.dm b/modular_meta/features/send2status/code/webhook.dm deleted file mode 100644 index e38f1eb868ed..000000000000 --- a/modular_meta/features/send2status/code/webhook.dm +++ /dev/null @@ -1,46 +0,0 @@ -/proc/send2announcement_webhook(title, text, sender_override = null, color_override = null) - // Получаем Discord webhook URL из конфига (или хардкод для теста) - var/webhook_url = CONFIG_GET(string/round_announce_webhook_url) - if (!webhook_url) - return - - var/color_code = 0x3498DB - if (color_override) - switch(LOWER_TEXT(color_override)) - if ("green") color_code = 0x57F287 - if ("blue") color_code = 0x3498DB - if ("pink") color_code = 0xE91E63 - if ("yellow") color_code = 0xFEE75C - if ("orange") color_code = 0xFAA61A - if ("red") color_code = 0xED4245 - if ("purple") color_code = 0x9B59B6 - if ("default") color_code = 0x3498DB - - if (title == null || title == "") - title = "Attention" - - // Формируем embed для Discord - var/embed = list( - "title" = title, - "description" = text, - "color" = color_code - ) - if (sender_override) - embed["author"] = list("name" = sender_override) - - var/webhook_info = list("embeds" = list(embed), "attachments" = list()) - - // Заголовки - var/list/headers = list() - headers["Content-Type"] = "application/json" - - // Отправка через rust-g - var/datum/http_request/request = new() - request.prepare( - RUSTG_HTTP_METHOD_POST, - webhook_url, - json_encode(webhook_info), - headers, - "tmp/discord_announce_response.json" - ) - request.begin_async() diff --git a/modular_meta/features/send2status/include.dm b/modular_meta/features/send2status/include.dm deleted file mode 100644 index 3618cfbcc747..000000000000 --- a/modular_meta/features/send2status/include.dm +++ /dev/null @@ -1,8 +0,0 @@ -#include "code\webhook.dm" - -/datum/modpack/send2status - id = "send2status" - name = "Дискорд оповещения" - group = "Features" - desc = "Отправляет различные оповещения в Дискорд канал через вебхук." - author = "SanecMan" diff --git a/modular_meta/main_modular_include.dm b/modular_meta/main_modular_include.dm index 3d0a136bb6ed..8a3e9a257f61 100644 --- a/modular_meta/main_modular_include.dm +++ b/modular_meta/main_modular_include.dm @@ -2,29 +2,21 @@ // Some modules can be easy excludes from code compile sequence by commenting #define you need to remove in code\__DEFINES\__meta_modpaks_includes.dm // Keep in mind, that module may not be only in modular folder but also embedded directly in TG code and covered with #ifdef - #endif structure -#include "__modpack\assets_modpacks.dm" -#include "__modpack\modpack.dm" //modpack obj -#include "__modpack\modpacks_subsystem.dm" //actually mods subsystem + tgui in "tgui/packages/tgui/interfaces/Modpacks.tsx" +#include "__modpack\assets_modpacks.dm" //Assets for modpacks subsystem, used for TGUI and other things +#include "__modpack\modpack.dm" //Modpack base class, used for all modpacks +#include "__modpack\modpacks_subsystem.dm" //Actually modpacks subsystem + TGUI in "tgui/packages/tgui/interfaces/Modpacks.tsx" -/* --FEATURES-- */ +/* --- Features --- */ #include "features\additional_circuit\includes.dm" #include "features\admin\includes.dm" #include "features\ai_things\includes.dm" #include "features\antagonists\includes.dm" -#include "features\antagonists_balance\includes.dm" -#include "features\better_ui\includes.dm" #include "features\cheburek_car\includes.dm" -#include "features\colossus\includes.dm" -#include "features\del_required_experiments\includes.dm" #include "features\more_clothes\includes.dm" -#include "features\gases\includes.dm" #include "features\hardsuits\includes.dm" -#include "features\hierophant_club_resprite\includes.dm" #include "features\kvass_beverage\includes.dm" -#include "features\lead_pipe\includes.dm" -#include "features\lgbt_removal\includes.dm" #include "features\oguzok_cook\includes.dm" #include "features\quirk_augmented\includes.dm" #include "features\meta_maps\includes.dme" @@ -42,24 +34,28 @@ #include "features\mod_vend\includes.dm" #include "features\roundstart_shell\includes.dm" #include "features\telescience\includes.dm" -#include "features\send2status\include.dm" #include "features\deathmatch\includes.dm" #include "features\countdown_antimov_sfx\includes.dm" -/* -- REVERTS -- */ -#include "reverts\re_beheading\includes.dm" -#include "reverts\re_buff_lasers\includes.dm" -#include "reverts\re_glasses_protect_welding\includes.dm" -#include "reverts\re_hooch_heals_assistants\includes.dm" -#include "reverts\re_satchels_num_back\includes.dm" -#include "reverts\re_bulky_extinguishers\includes.dm" -#include "reverts\re_wallmed\includes.dm" +/* --- Reverts --- */ -/* --TRANSLATIONS-- */ +#include "reverts\beheading\includes.dm" +#include "reverts\buff_lasers\includes.dm" +#include "reverts\bulky_extinguishers\includes.dm" +#include "reverts\colossus\includes.dm" +#include "reverts\glasses_protect\includes.dm" +#include "reverts\hooch\includes.dm" +#include "reverts\nanomed\includes.dm" +#include "reverts\satchels_back\includes.dm" -#include "ru_translate\ru_ai_laws\includes.dm" -#include "ru_translate\ru_crayons\includes.dm" -#include "ru_translate\ru_pets_commands\includes.dm" -#include "ru_translate\ru_traumas\includes.dm" -#include "ru_translate\ru_tweak_say_fonts\includes.dm" -#include "ru_translate\ru_vendors\includes.dm" +/* --- Tweaks --- */ + +#include "tweaks\antagonists_balance\includes.dm" +#include "tweaks\better_ui\includes.dm" +#include "tweaks\del_required_experiments\includes.dm" +#include "tweaks\fonts\includes.dm" +#include "tweaks\resprite\includes.dm" +#include "tweaks\russian_translation\includes.dm" +#include "tweaks\gases\includes.dm" +#include "tweaks\lead_pipe\includes.dm" +#include "tweaks\lgbt_removal\includes.dm" diff --git a/modular_meta/modularization_guide_ru.md b/modular_meta/modularization_guide.md similarity index 100% rename from modular_meta/modularization_guide_ru.md rename to modular_meta/modularization_guide.md diff --git a/modular_meta/reverts/re_beheading/code/master_head.dm b/modular_meta/reverts/beheading/code/head.dm similarity index 100% rename from modular_meta/reverts/re_beheading/code/master_head.dm rename to modular_meta/reverts/beheading/code/head.dm diff --git a/modular_meta/reverts/re_beheading/includes.dm b/modular_meta/reverts/beheading/includes.dm similarity index 58% rename from modular_meta/reverts/re_beheading/includes.dm rename to modular_meta/reverts/beheading/includes.dm index b4cef934928b..300789d441e0 100644 --- a/modular_meta/reverts/re_beheading/includes.dm +++ b/modular_meta/reverts/beheading/includes.dm @@ -1,8 +1,8 @@ -#include "code\master_head.dm" +#include "code\head.dm" -/datum/modpack/re_beheading - id = "re_beheading" - name = "Секир-бошка" +/datum/modpack/beheading + id = "beheading" + name = "Декап головы" group = "Reverts" desc = "Возвращает возможность отрубать голову 2D космонафтикам" author = "homexp13" diff --git a/modular_meta/reverts/re_buff_lasers/code/master_beams.dm b/modular_meta/reverts/buff_lasers/code/beams.dm similarity index 100% rename from modular_meta/reverts/re_buff_lasers/code/master_beams.dm rename to modular_meta/reverts/buff_lasers/code/beams.dm diff --git a/modular_meta/reverts/re_buff_lasers/includes.dm b/modular_meta/reverts/buff_lasers/includes.dm similarity index 58% rename from modular_meta/reverts/re_buff_lasers/includes.dm rename to modular_meta/reverts/buff_lasers/includes.dm index 9517bc38a472..78a5edcc9c9c 100644 --- a/modular_meta/reverts/re_buff_lasers/includes.dm +++ b/modular_meta/reverts/buff_lasers/includes.dm @@ -1,8 +1,8 @@ -#include "code\master_beams.dm" +#include "code\beams.dm" -/datum/modpack/re_buff_lasers - id = "re_buff_lasers" - name = "Сниженый урон лазеров" +/datum/modpack/buff_lasers + id = "buff_lasers" + name = "Сниженный урон лазеров" group = "Reverts" desc = "Возвращает возвращает урон у лазеров каким он был, делая его не таким имбой" author = "homexp13" diff --git a/modular_meta/reverts/re_buff_lasers/readme.md b/modular_meta/reverts/buff_lasers/readme.md similarity index 100% rename from modular_meta/reverts/re_buff_lasers/readme.md rename to modular_meta/reverts/buff_lasers/readme.md diff --git a/modular_meta/reverts/re_bulky_extinguishers/code/extinguisher.dm b/modular_meta/reverts/bulky_extinguishers/code/extinguisher.dm similarity index 100% rename from modular_meta/reverts/re_bulky_extinguishers/code/extinguisher.dm rename to modular_meta/reverts/bulky_extinguishers/code/extinguisher.dm diff --git a/modular_meta/reverts/re_bulky_extinguishers/includes.dm b/modular_meta/reverts/bulky_extinguishers/includes.dm similarity index 56% rename from modular_meta/reverts/re_bulky_extinguishers/includes.dm rename to modular_meta/reverts/bulky_extinguishers/includes.dm index 135e8365dd7b..445e0632dbbf 100644 --- a/modular_meta/reverts/re_bulky_extinguishers/includes.dm +++ b/modular_meta/reverts/bulky_extinguishers/includes.dm @@ -1,8 +1,8 @@ #include "code\extinguisher.dm" -/datum/modpack/re_bulky_extinguishers - id = "re_bulky_extinguishers" - name = "normal-sized огнетушители" +/datum/modpack/bulky_extinguishers + id = "bulky_extinguishers" + name = "Огнетушители нормального размера" group = "Reverts" desc = "Огнетушители вновь могут храниться в вашем рюкзаке." author = "Bruh24" diff --git a/modular_meta/reverts/re_bulky_extinguishers/readme.md b/modular_meta/reverts/bulky_extinguishers/readme.md similarity index 100% rename from modular_meta/reverts/re_bulky_extinguishers/readme.md rename to modular_meta/reverts/bulky_extinguishers/readme.md diff --git a/modular_meta/features/colossus/code/colossus.dm b/modular_meta/reverts/colossus/code/colossus.dm similarity index 100% rename from modular_meta/features/colossus/code/colossus.dm rename to modular_meta/reverts/colossus/code/colossus.dm diff --git a/modular_meta/features/colossus/includes.dm b/modular_meta/reverts/colossus/includes.dm similarity index 100% rename from modular_meta/features/colossus/includes.dm rename to modular_meta/reverts/colossus/includes.dm diff --git a/modular_meta/reverts/re_glasses_protect_welding/code/m_huds_welding.dm b/modular_meta/reverts/glasses_protect/code/_glasses_hud.dm similarity index 100% rename from modular_meta/reverts/re_glasses_protect_welding/code/m_huds_welding.dm rename to modular_meta/reverts/glasses_protect/code/_glasses_hud.dm diff --git a/modular_meta/reverts/re_glasses_protect_welding/includes.dm b/modular_meta/reverts/glasses_protect/includes.dm similarity index 68% rename from modular_meta/reverts/re_glasses_protect_welding/includes.dm rename to modular_meta/reverts/glasses_protect/includes.dm index 1a98566dc955..7dd82e953c32 100644 --- a/modular_meta/reverts/re_glasses_protect_welding/includes.dm +++ b/modular_meta/reverts/glasses_protect/includes.dm @@ -1,7 +1,7 @@ -#include "code\m_huds_welding.dm" +#include "code\_glasses_hud.dm" -/datum/modpack/revert_glasses_protect_welding - id = "revert_glasses_protect_welding" +/datum/modpack/glasses_protect + id = "glasses_protect" //no icon for example name = "Очки защищают от сварки" group = "Reverts" diff --git a/modular_meta/reverts/re_glasses_protect_welding/readme.md b/modular_meta/reverts/glasses_protect/readme.md similarity index 100% rename from modular_meta/reverts/re_glasses_protect_welding/readme.md rename to modular_meta/reverts/glasses_protect/readme.md diff --git a/modular_meta/reverts/re_hooch_heals_assistants/code/hooch_for_assistants.dm b/modular_meta/reverts/hooch/code/assistant.dm similarity index 100% rename from modular_meta/reverts/re_hooch_heals_assistants/code/hooch_for_assistants.dm rename to modular_meta/reverts/hooch/code/assistant.dm diff --git a/modular_meta/reverts/re_hooch_heals_assistants/includes.dm b/modular_meta/reverts/hooch/includes.dm similarity index 72% rename from modular_meta/reverts/re_hooch_heals_assistants/includes.dm rename to modular_meta/reverts/hooch/includes.dm index 8fc77ac4b22f..26cfcfa403ca 100644 --- a/modular_meta/reverts/re_hooch_heals_assistants/includes.dm +++ b/modular_meta/reverts/hooch/includes.dm @@ -1,7 +1,7 @@ -#include "code\hooch_for_assistants.dm" +#include "code\assistant.dm" -/datum/modpack/re_hooch_heals_assistants - id = "re_hooch_heals_assistants" +/datum/modpack/hooch + id = "hooch" name = "Хуч лечит ассистентов" group = "Reverts" desc = "Напиток Hooch теперь опять лечит ассистентов, как это было до" diff --git a/modular_meta/reverts/re_wallmed/code/medical_wall.dm b/modular_meta/reverts/nanomed/code/nanomed.dm similarity index 100% rename from modular_meta/reverts/re_wallmed/code/medical_wall.dm rename to modular_meta/reverts/nanomed/code/nanomed.dm diff --git a/modular_meta/reverts/re_wallmed/includes.dm b/modular_meta/reverts/nanomed/includes.dm similarity index 53% rename from modular_meta/reverts/re_wallmed/includes.dm rename to modular_meta/reverts/nanomed/includes.dm index 9ce029e1cbc4..524561aa628d 100644 --- a/modular_meta/reverts/re_wallmed/includes.dm +++ b/modular_meta/reverts/nanomed/includes.dm @@ -1,8 +1,8 @@ -#include "code\medical_wall.dm" +#include "code\nanomed.dm" -/datum/modpack/re_wallmed - id = "re_wallmed" - name = "Спреи обратно в настенный НаноМед!" +/datum/modpack/nanomed + id = "nanomed" + name = "Спреи обратно в настенный НаноМед" group = "Reverts" - desc = "Возвращает спреи прочие предметы обратно в настенный НаноМед." + desc = "Возвращает спреи прочие предметы обратно в настенный НаноМед" author = "Bruh24" diff --git a/modular_meta/reverts/re_wallmed/readme.md b/modular_meta/reverts/nanomed/readme.md similarity index 100% rename from modular_meta/reverts/re_wallmed/readme.md rename to modular_meta/reverts/nanomed/readme.md diff --git a/modular_meta/reverts/re_satchels_num_back/includes.dm b/modular_meta/reverts/satchels_back/includes.dm similarity index 69% rename from modular_meta/reverts/re_satchels_num_back/includes.dm rename to modular_meta/reverts/satchels_back/includes.dm index a6fe57281700..9c16c5c1892d 100644 --- a/modular_meta/reverts/re_satchels_num_back/includes.dm +++ b/modular_meta/reverts/satchels_back/includes.dm @@ -1,6 +1,6 @@ -/datum/modpack/re_satchels_num_back - id = "re_satchels_num_back" - name = "Подпольных сумок - 10!" +/datum/modpack/satchels_back + id = "satchels_back" + name = "Больше подпольных сумок" group = "Reverts" desc = "Возвращает кол-во подпольных мешков с прикольным лутом c 2 до 10 штук" author = "Artemchik542" diff --git a/modular_meta/ru_translate/readme.md b/modular_meta/ru_translate/readme.md deleted file mode 100644 index 845654844dd7..000000000000 --- a/modular_meta/ru_translate/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -## Все переводы на сами знаете какой язык. - -Применимо только для русско говорящего сервера, для других лучше отключить все модули этой категории. - -Всецело содежит много полезностей, что будут очень удобны не просто для лучшего понимания игры, а порой для более удобной игры, например чтобы реже приходилось переключать англ/ру раскладку во время игры. diff --git a/modular_meta/ru_translate/ru_ai_laws/includes.dm b/modular_meta/ru_translate/ru_ai_laws/includes.dm deleted file mode 100644 index f4bba4674173..000000000000 --- a/modular_meta/ru_translate/ru_ai_laws/includes.dm +++ /dev/null @@ -1,14 +0,0 @@ -#include "code\m_laws_antagonistic.dm" -#include "code\m_laws_neutral.dm" -#include "code\m_laws_station_sided.dm" -#include "code\m_supplied.dm" -#include "code\m_zeroth.dm" - - -/datum/modpack/ru_ai_laws - id = "ru_ai_laws" - icon = 'modular_meta/ru_translate/ru_ai_laws/preview.dmi' - name = "Законы ИИ на русском" - group = "Translations" - desc = "Теперь будет понятнее какой там опять ионный закон дало ИИ после магнитной бури." - author = "Artemchik542 и Pik1ta" diff --git a/modular_meta/ru_translate/ru_ai_laws/preview.dmi b/modular_meta/ru_translate/ru_ai_laws/preview.dmi deleted file mode 100644 index 1e8cf4c3a786..000000000000 Binary files a/modular_meta/ru_translate/ru_ai_laws/preview.dmi and /dev/null differ diff --git a/modular_meta/ru_translate/ru_crayons/includes.dm b/modular_meta/ru_translate/ru_crayons/includes.dm deleted file mode 100644 index d07c8ef11e34..000000000000 --- a/modular_meta/ru_translate/ru_crayons/includes.dm +++ /dev/null @@ -1,9 +0,0 @@ -#include "code\m_crayon.dm" - -/datum/modpack/ru_crayons - id = "ru_crayons" - icon = 'modular_meta/ru_translate/ru_crayons/preview.dmi' - name = "Мелок с Кириллицей" - group = "Translations" - desc = "Теперь можно писать пакости на стенах станции не только на буржуйском!" - author = "Artemchik542" diff --git a/modular_meta/ru_translate/ru_crayons/preview.dmi b/modular_meta/ru_translate/ru_crayons/preview.dmi deleted file mode 100644 index 7f442d7200da..000000000000 Binary files a/modular_meta/ru_translate/ru_crayons/preview.dmi and /dev/null differ diff --git a/modular_meta/ru_translate/ru_crayons/readme.md b/modular_meta/ru_translate/ru_crayons/readme.md deleted file mode 100644 index eca5b5e4578d..000000000000 --- a/modular_meta/ru_translate/ru_crayons/readme.md +++ /dev/null @@ -1,13 +0,0 @@ -## Module ID: RU_CRAYONS - -### Defines: - -- N/A - -### TG Proc/File Changes: - -- code/game/objects/items/crayons.dm - -### TGUI Files: - -- N/A diff --git a/modular_meta/ru_translate/ru_pets_commands/includes.dm b/modular_meta/ru_translate/ru_pets_commands/includes.dm deleted file mode 100644 index 56677c99e002..000000000000 --- a/modular_meta/ru_translate/ru_pets_commands/includes.dm +++ /dev/null @@ -1,10 +0,0 @@ -#include "code\basic_commands.dm" -#include "code\bots_commands.dm" -#include "code\creatures_commands.dm" - -/datum/modpack/ru_pets_commands - id = "ru_pets_commands" - name = "Команды для питомцев на русском" - group = "Translations" - desc = "Питомцы теперь слушаются коммандам на Русском. Например, король Крыс может таким образом повелевать своими мышами" - author = "Artemchik542" diff --git a/modular_meta/ru_translate/ru_traumas/includes.dm b/modular_meta/ru_translate/ru_traumas/includes.dm deleted file mode 100644 index 9923703afe80..000000000000 --- a/modular_meta/ru_translate/ru_traumas/includes.dm +++ /dev/null @@ -1,6 +0,0 @@ -/datum/modpack/ru_traumas - id = "ru_traumas" - name = "Фразы травм на русском" - group = "Translations" - desc = "Теперь ваши беды с башкой будут поняты правильно окружающими" - author = "Artemchik542" diff --git a/modular_meta/ru_translate/ru_tweak_say_fonts/includes.dm b/modular_meta/ru_translate/ru_tweak_say_fonts/includes.dm deleted file mode 100644 index fe1421f98da4..000000000000 --- a/modular_meta/ru_translate/ru_tweak_say_fonts/includes.dm +++ /dev/null @@ -1,7 +0,0 @@ -/datum/modpack/ru_tweak_say_fonts - id = "ru_tweak_say_fonts" - icon = 'modular_meta/ru_translate/ru_tweak_say_fonts/preview.dmi' - name = "Исправленный шрифт" - group = "Translations" - desc = "Исправляет шрифты, делает его чётким, читаемым и красивым." - author = "Zavogori. Портирование: Quinal" diff --git a/modular_meta/ru_translate/ru_vendors/includes.dm b/modular_meta/ru_translate/ru_vendors/includes.dm deleted file mode 100644 index acf5cb1c8ae8..000000000000 --- a/modular_meta/ru_translate/ru_vendors/includes.dm +++ /dev/null @@ -1,9 +0,0 @@ -#include "code\m_vending.dm" - -/datum/modpack/ru_vendors - id = "ru_vendors" - icon = 'modular_meta/ru_translate/ru_vendors/preview.dmi' - name = "Торгоматы на русском" - group = "Translations" - desc = "Теперь реклама вендорматов работает чуть лучше из-за их локализации. Сделано только ради нормальной озвучки ТТСом." - author = "Artemchik542 и Frogich" diff --git a/modular_meta/ru_translate/ru_vendors/preview.dmi b/modular_meta/ru_translate/ru_vendors/preview.dmi deleted file mode 100644 index 8789da7d60f4..000000000000 Binary files a/modular_meta/ru_translate/ru_vendors/preview.dmi and /dev/null differ diff --git a/modular_meta/ru_translate/speech_mod/readme.md b/modular_meta/ru_translate/speech_mod/readme.md deleted file mode 100644 index a5bf5dcca03f..000000000000 --- a/modular_meta/ru_translate/speech_mod/readme.md +++ /dev/null @@ -1 +0,0 @@ -Перевод шшшипящших ящшшеров и зззузащих мух с ууулллиииттткккааамммиии \ No newline at end of file diff --git a/modular_meta/tools/massmeta_check_grep.sh b/modular_meta/tools/massmeta_check_grep.sh index 8f705066776f..c02104c4a25c 100644 --- a/modular_meta/tools/massmeta_check_grep.sh +++ b/modular_meta/tools/massmeta_check_grep.sh @@ -14,8 +14,8 @@ sed 's/code\/\*\*\/\*\*.dm/modular_meta\/features\/\*\*\/\*\*.dm/g' { - В данный момент идёт наполнение меню модпаков, в игре модицикаций + В данный момент идёт наполнение меню модификаций, в игре модицикаций больше чем вы можете тут видеть. @@ -46,23 +46,23 @@ export const Modpacks = (props) => { selected={selectedCategory === 'Features'} onClick={() => setSelectedCategory('Features')} > - Фичи и Приколы + Фичи и добавления setSelectedCategory('Translations')} + selected={selectedCategory === 'Tweaks'} + onClick={() => setSelectedCategory('Tweaks')} > - Переводы на Русский + Твики и доработки setSelectedCategory('Reverts')} > - Балансы и Реверты + Откаты и баланс {(selectedCategory === 'Features' && ) || - (selectedCategory === 'Translations' && ) || + (selectedCategory === 'Tweaks' && ) || (selectedCategory === 'Reverts' && )} @@ -78,7 +78,7 @@ const FeaturesTable = () => { if (features.length === 0) { return ( - Этот сервер не использует какие-либо прикольные Фичи + Этот сервер не использует какие-либо прикольные фичи ); } @@ -90,7 +90,7 @@ const FeaturesTable = () => { @@ -100,8 +100,8 @@ const FeaturesTable = () => { scrollable title={ searchText.length > 0 - ? `Результаты поиска "${searchText}"` - : `Суммарно модификаций — ${features.length}` + ? `Результаты поиска "${searchText}":` + : `Суммарно модификаций: ${features.length}` } > @@ -161,13 +161,13 @@ const FeaturesTable = () => { ); }; -const TranslationsTable = () => { +const TweaksTable = () => { const { data } = useBackend(); - const { translations } = data; + const { tweaks } = data; const [searchText, setSearchText] = useLocalState('searchText', ''); - if (translations.length === 0) { + if (tweaks.length === 0) { return ( Этот сервер не использует какие-либо переводы на Русский @@ -182,7 +182,7 @@ const TranslationsTable = () => { @@ -193,12 +193,12 @@ const TranslationsTable = () => { title={ searchText.length > 0 ? `Результаты поиска "${searchText}":` - : `Суммарно модификаций — ${translations.length}` + : `Суммарно модификаций: ${tweaks.length}` } > - {translations + {tweaks .filter( (translate) => translate.name && @@ -276,7 +276,7 @@ const RevertsTable = () => { @@ -287,7 +287,7 @@ const RevertsTable = () => { title={ searchText.length > 0 ? `Результаты поиска "${searchText}":` - : `Суммарно модификаций — ${reverts.length}` + : `Суммарно модификаций: ${reverts.length}` } >