]> 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>
Sat, 28 Jun 2025 19:25:23 +0000 (15:25 -0400)
committerHitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Sat, 28 Jun 2025 19:25:23 +0000 (15:25 -0400)
commitcb9e2d93236dde50106737efe68e44f10dde1178
tree4031bfe9bb2e83deb8f9a6b7e192ba7145df68c2
parent9ffa1a7f7bec4727551e97559aadb7053437d358
parent97f0bab5b8ad12b5c62e00de32b1eee30d5a4e6a
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo
Merged master into branch
Resources/Prototypes/Entities/Clothing/Head/hats.yml
Resources/Prototypes/Entities/Objects/Devices/pda.yml
Resources/Prototypes/Loadouts/loadout_groups.yml
Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
Resources/Prototypes/Recipes/Lathes/clothing.yml