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
..
Marker	Proto-kinetic crusher (#16277)	2023-05-14 13:15:18 +10:00
Melee	cleanup melee (#32486)	2024-10-14 16:40:59 +11:00
Misc	Use non-generic TryComp() for metadata & transform (#28133)	2024-05-20 22:40:35 -07:00
Ranged	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-12 02:27:31 +03:00