Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss...

author Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>

Mon, 7 Jul 2025 22:09:10 +0000 (18:09 -0400)

committer Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>

Mon, 7 Jul 2025 22:09:10 +0000 (18:09 -0400)
author Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Mon, 7 Jul 2025 22:09:10 +0000 (18:09 -0400)
committer Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Mon, 7 Jul 2025 22:09:10 +0000 (18:09 -0400)
diff --cc Resources/Prototypes/Entities/Objects/Devices/pda.yml
Simple merge
diff --cc Resources/Prototypes/Loadouts/loadout_groups.yml
Simple merge
author	Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
	Mon, 7 Jul 2025 22:09:10 +0000 (18:09 -0400)
committer	Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
	Mon, 7 Jul 2025 22:09:10 +0000 (18:09 -0400)
		1	2
Resources/Prototypes/Entities/Objects/Devices/pda.yml	patch \|	diff1 \|	diff2 \|	blob \| history
Resources/Prototypes/Loadouts/loadout_groups.yml	patch \|	diff1 \|	diff2 \|	blob \| history