Vigers Ray 5cdc18e0bd Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Resources/Locale/en-US/_strings/nutrition/components/examinable-hunger-component.ftl # Resources/Locale/en-US/_strings/nutrition/components/examineable-hunger-component.ftl # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml		2025-02-20 17:43:06 +03:00
..
Marker	Proto-kinetic crusher (#16277)	2023-05-14 13:15:18 +10:00
Melee	Added a component that lets ranged weapons make melee attacks. (#29484)	2025-02-20 18:52:28 +11:00
Misc	Replace obsolete FromMap calls with ToCoordinates (#35304)	2025-02-20 23:03:42 +11:00
Ranged	Merge remote-tracking branch 'space-wizards/master'	2025-02-19 13:16:37 +03:00