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
..
Controllers	Ensure large entities don't get stuck on conveyor belt corners (#37466)	2025-06-15 11:36:18 +02:00
CollisionGroup.cs	Merge remote-tracking branch 'space-wizards/master'	2025-05-27 03:41:41 +03:00
JointVisualsComponent.cs	Roundstart Grappling Gun (#31737)	2024-09-01 22:33:25 -06:00
PreventCollideComponent.cs	Update trivial components to use auto comp states (#20539)	2023-09-28 16:20:29 -07:00
SharedPreventCollideSystem.cs	Update trivial components to use auto comp states (#20539)	2023-09-28 16:20:29 -07:00