Vigers Ray 7c376e48f1 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml		2024-12-12 02:27:31 +03:00
..
Commands	Melee refactor (#10897)	2022-09-29 15:51:59 +10:00
Components	Fixed Tipped ammo not being Spent (#25167)	2024-02-13 16:40:15 -05:00
ItemStatus	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-12-12 02:27:31 +03:00
GunSpreadOverlay.cs	Resolve 'TransformComponent.MapPosition' is obsolete in content (#27939)	2024-05-12 10:31:54 -04:00