]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Reapply "Merge branch 'master' of ssh://github/space-wizards/space-station-14"
authorMaxSMokeSkaarj <vnazarov@smokeofanarchy.ru>
Fri, 10 Oct 2025 12:25:26 +0000 (22:25 +1000)
committerMaxSMokeSkaarj <vnazarov@smokeofanarchy.ru>
Fri, 10 Oct 2025 12:25:26 +0000 (22:25 +1000)
commit30b1f8eb1dd20b4cdae17f5037789a92f3548865
treefda99c2be9fffc4bb50f43bd18704a7b9103f82f
parent02aa3cb3d14c4fbc7cbf7b3e57874243e2b3dda8
Reapply "Merge branch 'master' of ssh://github/space-wizards/space-station-14"

This reverts commit bf4ee1f7035efd49efc041b63054c503cee9662d.
15 files changed:
Content.IntegrationTests/Tests/Helpers/TestListenerComponent.cs [new file with mode: 0644]
Content.IntegrationTests/Tests/Helpers/TestListenerSystem.cs [new file with mode: 0644]
Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
Content.IntegrationTests/Tests/Movement/SlippingTest.cs
Content.Shared/Armor/SharedArmorSystem.cs
Content.Shared/Bed/Sleep/SleepingSystem.cs
Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs
Content.Shared/Flash/SharedFlashSystem.cs
Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs
Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Reagents/narcotics.yml
Resources/Prototypes/Recipes/Lathes/Packs/security.yml
Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml [new file with mode: 0644]
Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml