VigersRay 31b256cce8 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Entities/Mobs/Species/arachnid.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Mobs/Species/moth.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Traits/disabilities.yml # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json # Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json		2024-07-24 20:36:22 +03:00
..
Commands	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
Components	Планетарная тюрьма (#187)	2024-07-12 04:21:12 +03:00
Events	Replace Matrix3 with System.Numerics.Matrix3x2 (#27443)	2024-06-02 14:07:41 +10:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-24 20:36:22 +03:00
DockingConfig.cs	Fix some docking configs (#17012)	2023-06-01 10:48:44 +10:00
DroneConsoleComponent.cs	Salvage magnet revamp (#23119)	2024-01-04 14:25:32 +11:00