Commit graph

302 commits

Author SHA1 Message Date
Vigers Ray
391cbfe378 Locale update 2025-06-01 15:35:28 +03:00
ThereDrD
66f4bd1d75
Рефактор системы автодоступов (#2237) 2025-05-29 10:28:57 +03:00
Vigers Ray
202c27c6e1
Dummy update (#2236) 2025-05-29 10:25:30 +03:00
Vigers Ray
ddb31742b6 Locale update 2025-05-28 22:59:22 +03:00
Vigers Ray
f3cc466c12 Revert "Шприцемёты! (#1035)"
This reverts commit 4e556b68
2025-05-27 03:56:23 +03:00
ThereDrD
bafbf77fe9
Фикс линтера и валидатора локали (#2210)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-05-27 02:24:15 +03:00
iDesmond
d22b59ef4f
IC Флуд-защита (#2216) 2025-05-27 02:02:37 +03:00
ThereDrD
6dd451a5c7
Панель телепорта призрака (#2157)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-05-27 01:34:29 +03:00
ThereDrD
f23628a833
Новые смешные эффекты для артефактов с Fire Station (#2135)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-05-27 01:10:10 +03:00
vinogradgarden
e8f9b306a8
Обновление форм в принтере (#2125) 2025-05-27 00:58:22 +03:00
KaiserMaus
791729d906
Специалист Шатхтёр и Подик (Прототипы) (#2056) 2025-05-27 00:26:40 +03:00
KaiserMaus
d51ba21552
Убран Броне Костюм ДО из ЗаконШкафа (#2179) 2025-05-19 18:02:19 +01:00
KaiserMaus
dfaece793f
Обновление Шаттла Нюки и Аванпоста (#2136)
Само мерж залог успеха, но я чесно проверил)
2025-05-12 21:50:35 +01:00
iDesmond
7357584600
Рекламные фразы банкомата (#2129) 2025-05-12 15:35:59 +01:00
ThereDrD
4b97741aba
Фикс и переработка системы сердцебиения (#2098) 2025-05-07 03:27:36 +03:00
Vigers Ray
2ebe9f2b1b фикс перевода ОСЩ 2025-05-05 16:53:03 +03:00
Echo
2d3602a8aa
Update loadout group names and categories. (#2053)
Co-authored-by: Виктор Дроздов <vdrozdov@opsygen.ru>
2025-05-05 16:50:22 +03:00
Vigers Ray
9cc7ae5a5e
Принтер документов (#2062) 2025-05-05 11:42:47 +03:00
Vigers Ray
9e4b0ae08c увы 2025-05-04 23:28:17 +03:00
Vigers Ray
95b86d7a4b Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/Construction/UI/ConstructionMenu.xaml
#	Content.Client/Construction/UI/ConstructionMenu.xaml.cs
#	Content.Client/Construction/UI/ConstructionMenuPresenter.cs
#	Content.Server/Warps/WarpPointSystem.cs
#	Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
#	Content.Server/Weapons/Ranged/Systems/GunSystem.cs
#	Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
#	Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Weapons/Reflect/ReflectSystem.cs
#	Resources/Locale/en-US/_strings/plants/mutations.ftl
#	Resources/Locale/en-US/_strings/stack/stacks.ftl
#	Resources/Locale/en-US/_strings/teleportation/teleportation-menu-gui.ftl
#	Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
#	Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
#	Resources/Prototypes/Entities/Objects/Power/powercells.yml
#	Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Machines/nuke.yml
#	Resources/Prototypes/Reagents/toxins.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/mechs/hamtr_construction.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/mechs/honker_construction.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/mechs/ripley_construction.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/mechs/vim_construction.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/structures/blast_door.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/structures/secretdoor.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/utilities/station_maps.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_generator.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/weapons/bola.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
#	Resources/Prototypes/Recipes/Construction/structures.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/bots/cleanbot.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/bots/firebot.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/bots/medibot.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/improvised/firebomb.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pipebomb.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
#	Resources/Prototypes/Recipes/Crafting/improvised.yml
#	Resources/Prototypes/Recipes/Reactions/medicine.yml
#	Resources/Prototypes/Roles/Jobs/CentComm/official.yml
#	Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png
#	Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json
2025-05-04 23:13:12 +03:00
Vigers Ray
8015566d51
Реворк департамента Синего Щита. (#2048) 2025-05-04 22:48:46 +03:00
ASLEEP331
23f69deeca
Портативный факс (#2045)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-05-04 22:45:28 +03:00
iDesmond
8077e8f33f
КраскоМат HotFix (#2051) 2025-05-04 21:41:20 +03:00
KaiserMaus
5889635099
Свой лодаут Оружия ГСБ + .60 Антиматериальные новый вид (#2033) 2025-05-04 19:23:51 +03:00
fosfuchs
ff4b970c25
Translation (#2028) 2025-05-03 02:39:57 +03:00
ASLEEP331
781f931391
Скин пирата для гостов (#2012) 2025-04-30 17:32:00 +03:00
banumbas
c851b71c1b
Плата с законами синдиката в аплинк агентов. (#1924) 2025-04-27 23:37:46 +03:00
Noychik
ae634570f8
Lockermech (#1965) 2025-04-27 23:25:39 +03:00
TryPank
06db7c6be2
Перевод (#1951)
Co-authored-by: tajikartem@yandex.ru <tajik@artem@yandex.ru>
2025-04-27 22:40:10 +03:00
fosfuchs
3ed8858dee
Маленький перевод (#1915) 2025-04-22 04:53:02 +03:00
banumbas
70cc8b6d39
Новая гост тема для контрибьюторов. (#1897) 2025-04-21 07:38:02 +03:00
Vigers Ray
78e6c80a70
Исправление целей культа (#1883) 2025-04-20 02:41:02 +03:00
mojokelp
8cd8ee9534
Xenoarcheology-translate (#1856) 2025-04-19 00:21:15 +03:00
mojokelp
a40058f9df
Описание вампира (#1845) 2025-04-18 04:05:29 +03:00
Kot
d3705dc0e5
Мед борг QoL (#1825) 2025-04-16 21:25:23 +03:00
Focstor
807b3b56f9
Печать Начальника ПТ (#1782) 2025-04-16 05:11:05 +03:00
Vigers Ray
cb13892d29 Откатил стамина резисты старлайна чтобы не было конфликтов с оффами 2025-04-15 04:32:47 +03:00
Vigers Ray
3d8b756b88 фиксы апстрима 2025-04-13 17:45:33 +03:00
Nrd-K
fb765e6988
новая цель (#1491) 2025-04-13 15:36:03 +03:00
Vigers Ray
19f1494f08 Актуализацией локали без дублей и пропуска существующих переводов 2025-04-12 22:59:17 +03:00
Vigers Ray
993ea3511a Revert "Актуализация локали"
This reverts commit 53f8e15e1d.
2025-04-12 21:14:14 +03:00
Vigers Ray
571047503e мини фикс анализатора 2025-04-12 04:24:25 +03:00
Vigers Ray
53f8e15e1d Актуализация локали 2025-04-12 04:12:13 +03:00
Vigers Ray
2c1db3ffdf
Анализатор растений (#1755)
Co-authored-by: Ignaz Kraft <ignaz.k@live.de>
2025-04-12 04:05:07 +03:00
Vigers Ray
0189920bf2 фиксы апстрима 2025-04-06 05:13:39 +03:00
Babaev
2df43d876c
Отключение звука новых ролей (#1658) 2025-04-04 12:38:31 +03:00
Vigers Ray
10a4b6d369 Твич френдли, но не хардкод 2025-04-04 12:16:34 +03:00
banumbas
0a2ef6ec2b
Голографический карп Ghost Theme (#1624) 2025-04-03 00:10:00 +03:00
Babaev
d9c8d3beca
Апстрим локализации (#1604) 2025-04-02 21:53:12 +03:00
Vigers Ray
de5861add7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Resources/Changelog/ChangelogSunrise.yml
2025-04-02 21:51:29 +03:00