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
..
_Sunrise	Фикс атмосферы в космопорте	2025-06-13 10:50:46 +03:00
Dungeon	Random maints update to decal spawners (#37916)	2025-05-28 22:03:46 -07:00
Lavaland	Content changes required for physicsmap purge (#37878)	2025-05-28 19:38:47 +10:00
Misc	baby proof the terminal (#33281)	2024-11-22 23:50:41 +01:00
Nonstations	Dummy update (#2236)	2025-05-29 10:25:30 +03:00
Salvage	Buff savlage vault-medium-1's loot (#34732)	2025-01-28 23:26:56 -07:00
Shuttles	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
Test	Content changes required for physicsmap purge (#37878)	2025-05-28 19:38:47 +10:00
exo.yml	Exo Station - Upstream Playtest Version (#33144)	2025-06-15 12:10:22 -07:00