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
..
Materials	Респрайт аплинка и телекристаллов (#2246)	2025-06-02 22:00:11 +03:00
consumable_stacks.yml	Localizable craftmenu (#32339)	2025-05-01 10:21:16 -04:00
engineering_stacks.yml	Localizable craftmenu (#32339)	2025-05-01 10:21:16 -04:00
floor_tile_stacks.yml	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
medical_stacks.yml	Localizable craftmenu (#32339)	2025-05-01 10:21:16 -04:00
power_stacks.yml	Localizable craftmenu (#32339)	2025-05-01 10:21:16 -04:00
science_stacks.yml	Fix crafting steps with modular machine parts (#38299)	2025-06-12 22:21:57 -07:00