]> 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:28 +0000 (22:25 +1000)
committerMaxSMokeSkaarj <vnazarov@smokeofanarchy.ru>
Fri, 10 Oct 2025 12:25:28 +0000 (22:25 +1000)
commit6e5b8d8e6fe15985b4d13ec28d5088e7b39a2ec6
tree1291d39c2698946db176ccde49d99821b91c1dbd
parent30b1f8eb1dd20b4cdae17f5037789a92f3548865
Reapply "Merge branch 'master' of ssh://github/space-wizards/space-station-14"

This reverts commit d019806fd376e399b689e10c8c3c488a9ca6c8a5.
19 files changed:
Content.Client/PAI/PAISystem.cs [deleted file]
Content.Server/PAI/PAISystem.cs
Content.Server/Revenant/EntitySystems/RevenantSystem.cs
Content.Server/Store/Systems/StoreSystem.cs
Content.Shared/PAI/PAIComponent.cs
Content.Shared/PAI/SharedPAISystem.cs [deleted file]
Content.Shared/Revenant/Components/RevenantComponent.cs
Content.Shared/Revenant/SharedRevenant.cs
Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs [new file with mode: 0644]
Resources/Changelog/Maps.yml
Resources/Locale/en-US/materials/materials.ftl
Resources/Maps/plasma.yml
Resources/Prototypes/Actions/revenant.yml
Resources/Prototypes/Actions/types.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
Resources/Prototypes/Entities/Objects/Fun/pai.yml
Resources/Prototypes/Objectives/thief.yml