Vigers Ray 6e8e359a66 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Resources/Locale/en-US/_strings/flash/components/flash-immunity-component.ftl # Resources/Locale/en-US/_strings/tiles/tiles.ftl # Resources/Prototypes/Actions/changeling.yml # Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml # Resources/Prototypes/Entities/Structures/Furniture/chairs.yml # Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml # Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/Stacks/floor_tile_stacks.yml # Resources/Prototypes/Tiles/floors.yml # Resources/Textures/Objects/Tiles/tile.rsi/meta.json # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json # Resources/Textures/Tiles/xeno_flooring.png # Resources/Textures/Tiles/xeno_maint.png # Resources/Textures/Tiles/xeno_steel.png		2025-06-16 01:51:55 +03:00
..
_RMC14
_Sunrise	Расширение функционала зависимости работок от работок (#2372)	2025-06-16 01:21:26 +03:00
Accents
Access	Merge remote-tracking branch 'space-wizards/master'	2025-05-27 03:41:41 +03:00
Actions	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
AlertLevels	Рефактор системы автодоступов (#2237)	2025-05-29 10:28:57 +03:00
Alerts	Merge remote-tracking branch 'space-wizards/master'	2025-06-04 17:17:06 +03:00
Anomaly
AppearanceCustomization	Station AI customizations (#34501)	2025-05-13 01:50:43 -07:00
Atmospherics	Цены на газ (#1932)	2025-04-27 23:37:17 +03:00
Body	Merge remote-tracking branch 'space-wizards/master'	2025-05-27 03:41:41 +03:00
Catalog	Merge remote-tracking branch 'space-wizards/master'	2025-06-14 20:37:34 +03:00
Chemistry
Codewords	Split codewords into its own system (#37928)	2025-06-05 19:19:41 -04:00
Damage	Merge remote-tracking branch 'space-wizards/master'	2025-06-14 20:37:34 +03:00
Datasets	Merge remote-tracking branch 'space-wizards/master'	2025-05-27 03:41:41 +03:00
Decals	Exo Station - Upstream Playtest Version (#33144)	2025-06-15 12:10:22 -07:00
Device	Xenoborgs part 1 (#36830)	2025-04-23 19:38:10 -07:00
DeviceLinking	Add disposal signalers (#37535)	2025-05-21 22:18:57 -04:00
Entities	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
EntityLists/Tools
Flavors	Add corgium (#37951)	2025-06-14 11:07:48 +02:00
GameRules	мини реворк революции	2025-06-13 05:03:48 +03:00
GhostRoleRaffles
Guidebook
Hydroponics	Merge remote-tracking branch 'space-wizards/master'	2025-05-04 23:13:12 +03:00
InventoryTemplates	Merge remote-tracking branch 'space-wizards/master'	2025-06-14 20:37:34 +03:00
Loadouts	Merge remote-tracking branch 'space-wizards/master'	2025-06-04 13:39:57 +03:00
LootTables	Merge remote-tracking branch 'space-wizards/master'	2025-05-27 03:41:41 +03:00
Magic	Merge remote-tracking branch 'space-wizards/master'	2025-06-04 13:39:57 +03:00
Maps	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
Mood
NPCs	Merge remote-tracking branch 'space-wizards/master'	2025-05-27 03:41:41 +03:00
Objectives	Merge remote-tracking branch 'space-wizards/master'	2025-06-09 22:00:17 +03:00
Palettes
Parallaxes	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
Polymorphs	Merge remote-tracking branch 'space-wizards/master'	2025-06-14 20:37:34 +03:00
Procedural	Merge remote-tracking branch 'space-wizards/master'	2025-06-04 13:39:57 +03:00
RCD	Парамедик не антаг, но с мониторингом. РСУ получили новые шлюзы (#2166)	2025-05-27 01:36:16 +03:00
Reagents	Merge remote-tracking branch 'space-wizards/master'	2025-06-14 20:37:34 +03:00
Recipes	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
Research	Метатель гранат СБ (#2317)	2025-06-12 21:48:36 +03:00
Roles	мини реворк революции	2025-06-13 05:03:48 +03:00
Shaders	Merge remote-tracking branch 'space-wizards/master'	2025-06-04 13:39:57 +03:00
Shuttles
SoundCollections	Merge remote-tracking branch 'space-wizards/master'	2025-05-27 03:41:41 +03:00
Species	Merge remote-tracking branch 'space-wizards/master'	2025-05-27 03:41:41 +03:00
Stacks	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
StatusIcon	Фикс ерророк (#2312)	2025-06-11 05:38:56 +03:00
Store	Merge remote-tracking branch 'space-wizards/master'	2025-04-28 01:29:55 +03:00
StoryGen
Tiles	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
Traits	Merge remote-tracking branch 'space-wizards/master'	2025-06-04 13:39:57 +03:00
Vampire
Voice	Merge remote-tracking branch 'space-wizards/master'	2025-05-27 03:41:41 +03:00
Wires
World
XenoArch	Артефакты-предметы, смешной хаос и не только (#2263)	2025-06-02 22:11:30 +03:00
ai_factions.yml	Merge remote-tracking branch 'space-wizards/master'	2025-04-28 01:29:55 +03:00
audio.yml
bar_signs.yml
borg_types.yml	Rework janitor borg and remove Fixtures from puddles. (#2217)	2025-05-26 23:48:42 +03:00
contraband_severities.yml
edge_spreaders.yml
explosion.yml	Merge remote-tracking branch 'space-wizards/master'	2025-04-17 23:48:59 +03:00
floor_trap.yml
fonts.yml
game_presets.yml	нерф метеоритов	2025-04-13 20:19:36 +03:00
holidays.yml
hud.yml
item_size.yml
lobbyscreens.yml
name_identifier_groups.yml	Merge remote-tracking branch 'space-wizards/master'	2025-04-28 01:29:55 +03:00
ore.yml	New sprites for Coal and Gold ore crabs, new Bananium ore crab and Bananium rock anomaly. (#37787)	2025-05-29 18:16:20 -07:00
radio_channels.yml	Merge remote-tracking branch 'space-wizards/master'	2025-04-28 01:29:55 +03:00
round_announcements.yml
secret_weights.yml
silicon-laws.yml	Xenoborgs part 1 (#36830)	2025-04-23 19:38:10 -07:00
status_effects.yml
tags.yml	Merge remote-tracking branch 'space-wizards/master'	2025-06-14 20:37:34 +03:00
themes.yml	Ashen hud item status slot fix (#31411)	2025-04-22 14:40:58 -04:00
threats.yml
tool_qualities.yml
typing_indicator.yml	fix upstream	2025-05-27 05:33:07 +03:00
weather.yml
whitelists.yml
wizardsDenWhitelists.yml