]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss...
authorHitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Mon, 7 Jul 2025 22:09:10 +0000 (18:09 -0400)
committerHitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Mon, 7 Jul 2025 22:09:10 +0000 (18:09 -0400)
commit83f15bfada5ebc2fe293fbf8d8eb8d4c20c5ea2b
treef776f8d59585fa280667d33a1a20f17fbbda7a9f
parentab7a64e3b3d2dfb4ee84588f306b754ba52f27a0
parent6eec2c5c511df3e9981fe7f4a19b7bb8666028d5
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo
Resources/Prototypes/Entities/Objects/Devices/pda.yml
Resources/Prototypes/Loadouts/loadout_groups.yml