fish-station/Resources/Prototypes
Vigers Ray ce86bdb8ad Merge remote-tracking branch 'space-sunrise/master'
# Conflicts:
#	Content.Server/_Sunrise/StationGoal/StationGoalPaperSystem.cs
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Guidebook/species.yml
#	Resources/Prototypes/_Sunrise/AssaultOps/ghost_roles.yml
#	Resources/Prototypes/_Sunrise/Entities/Customization/Markings/human_tails.yml
#	Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml
2026-01-27 02:54:35 +01:00
..
_Fish Новый спрайты иконок ролей ЦК (#188) 2026-01-21 14:15:28 +03:00
_RMC14
_Starlight Merge remote-tracking branch 'space-sunrise/master' 2026-01-27 02:54:35 +01:00
_Sunrise Merge remote-tracking branch 'space-sunrise/master' 2026-01-27 02:54:35 +01:00
Accents Merge remote-tracking branch 'space-wizards/master' 2025-10-19 17:38:04 +02:00
Access ПТ | Исправил id-карту тюремного доктора (теперь снова получает доступы с других карт) (#3652) 2026-01-07 18:24:11 +03:00
Actions Merge remote-tracking branch 'space-sunrise/master' 2026-01-27 02:54:35 +01:00
AlertLevels
Alerts Merge remote-tracking branch 'space-wizards/master' 2025-12-26 04:19:27 +01:00
Anomaly
AppearanceCustomization Голографическая девочка в выбор кастомизации ИИ. (#2980) 2025-09-26 23:43:22 +03:00
Atmospherics Фиксы и доработка 12 калибра (#3764) 2026-01-21 23:58:34 +03:00
Body Merge remote-tracking branch 'space-sunrise/master' 2026-01-27 02:54:35 +01:00
Catalog Merge remote-tracking branch 'space-sunrise/master' 2026-01-27 02:54:35 +01:00
Chat
Chemistry Уменьшение количества редактирований файлов оффов (#3365) 2025-12-26 03:30:36 +03:00
Codewords
Damage Merge remote-tracking branch 'space-sunrise/master' 2025-12-29 18:37:56 +01:00
Datasets Merge remote-tracking branch 'space-wizards/master' 2025-12-26 04:19:27 +01:00
Decals
Device ыыыыы, месенжер макс, ихихяхя (#3789) 2026-01-26 22:44:54 +03:00
DeviceLinking Adding a random gate (#41627) 2025-12-14 19:15:22 +00:00
Entities Merge remote-tracking branch 'space-sunrise/master' 2026-01-27 02:54:35 +01:00
EntityLists/Tools Уменьшение количества редактирований файлов оффов (#3365) 2025-12-26 03:30:36 +03:00
Flavors Add 2 New Reagents (Felinase and Caninase) (#41136) 2025-10-31 01:02:43 +00:00
GameRules Merge remote-tracking branch 'space-sunrise/master' 2026-01-27 02:54:35 +01:00
GhostRoleRaffles Rebalance the Ghost Role Raffles (#33157) 2025-12-18 20:39:41 +00:00
Guidebook Merge remote-tracking branch 'space-sunrise/master' 2026-01-27 02:54:35 +01:00
Hydroponics Merge remote-tracking branch 'space-wizards/master' 2025-12-26 04:19:27 +01:00
InventoryTemplates Ручной экстрактор имплантов в Т2 РНД, Доработка режима революции (#3727) 2026-01-19 11:07:58 +03:00
Loadouts Add: Броня капитана (#3793) 2026-01-26 22:20:37 +00:00
LootTables
Magic Merge remote-tracking branch 'space-sunrise/master' 2025-12-29 18:37:56 +01:00
Maps Дев мапа под санрайз (#3566) 2025-12-31 13:52:42 +03:00
Mood
NPCs Merge remote-tracking branch 'space-wizards/master' 2025-12-26 04:19:27 +01:00
Nutrition
Objectives Merge remote-tracking branch 'space-sunrise/master' 2025-12-29 18:37:56 +01:00
Paintables Fix: Двойные/Тройные шлюзы (#3719) 2026-01-16 00:23:40 +03:00
Palettes
Parallaxes Ручной экстрактор имплантов в Т2 РНД, Доработка режима революции (#3727) 2026-01-19 11:07:58 +03:00
Polymorphs Merge remote-tracking branch 'space-wizards/master' 2025-09-27 03:54:27 +03:00
Procedural Респрайт некоторых рудокрабов, добавлены остальные виды пород (#3771) 2026-01-23 11:39:07 +00:00
RCD
Reagents Пираты и локаль (#3693) 2026-01-14 13:00:14 +00:00
Recipes Merge remote-tracking branch 'space-sunrise/master' 2026-01-27 02:54:35 +01:00
Research Фиксы прототипов всяких и локаль (#3527) 2025-12-28 17:54:12 +00:00
Roles Merge remote-tracking branch 'space-sunrise/master' 2026-01-27 02:54:35 +01:00
Shaders
SoundCollections Merge remote-tracking branch 'space-sunrise/master' 2025-12-29 18:37:56 +01:00
Species Фиксы и доработка 12 калибра (#3764) 2026-01-21 23:58:34 +03:00
Stacks Organize StackPrototype with inheritance (#38412) 2025-10-12 01:18:12 +00:00
StatusIcon Фиксы пиратов+ новый данж пиратов (#3589) 2026-01-03 16:48:38 +00:00
Store Fix "ыыыы" prototype edition (#3514) 2025-12-27 18:23:10 +00:00
StoryGen
Tiles Revert "Удаление тайлов топором" (#3513) 2025-12-25 20:51:38 +03:00
Traits Merge remote-tracking branch 'space-wizards/master' 2025-12-26 04:19:27 +01:00
Vampire
Voice Merge remote-tracking branch 'space-wizards/master' 2025-12-26 04:19:27 +01:00
Wires
World
XenoArch Merge remote-tracking branch 'space-wizards/master' 2025-12-26 04:19:27 +01:00
ai_factions.yml Пираты и локаль (#3693) 2026-01-14 13:00:14 +00:00
audio.yml
bar_signs.yml
borg_types.yml Фиксы (#3675) 2026-01-09 06:21:01 +03:00
chameleon.yml
contraband_severities.yml
edge_spreaders.yml
explosion.yml Fix "ыыыы" prototype edition (#3514) 2025-12-27 18:23:10 +00:00
floor_trap.yml
fonts.yml
game_presets.yml Фикс джоб лодаутов СБ при апстриме (#3542) 2025-12-29 15:36:35 +00:00
holidays.yml
hud.yml
item_size.yml
lobbyscreens.yml Сетевая подгрузка артов, анимаций и паралаксов. (#3646) 2026-01-07 06:40:08 +03:00
name_identifier_groups.yml
ore.yml Респрайт некоторых рудокрабов, добавлены остальные виды пород (#3771) 2026-01-23 11:39:07 +00:00
radio_channels.yml Add xenoborg modules, weapons, power cells, and recipes (#3416) 2025-12-25 20:37:49 +03:00
round_announcements.yml
secret_weights.yml [STAGING] Remove Wizard Roundstart Antag (#40983) 2025-10-25 17:47:52 -07:00
silicon-laws.yml Merge remote-tracking branch 'space-wizards/master' 2025-12-26 04:19:27 +01:00
status_effects.yml Merge remote-tracking branch 'space-wizards/master' 2025-12-26 04:19:27 +01:00
tags.yml Merge remote-tracking branch 'space-wizards/master' 2025-12-26 04:19:27 +01:00
themes.yml
threats.yml Доработка Ниндзи после copilot (#3787) 2026-01-26 19:51:04 +00:00
tool_qualities.yml Revert "Удаление тайлов топором" (#3513) 2025-12-25 20:51:38 +03:00
typing_indicator.yml Фиксы резоми (#3343) 2025-12-25 20:15:31 +03:00
weather.yml
whitelists.yml
wizardsDenWhitelists.yml