diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 948f6a6d3..e8e84f705 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -48,7 +48,7 @@ jobs: shell: pwsh run: | ./build.ps1 -BuildNuGet - $File = (Get-ChildItem -Path . -Include 'EXILEDOFFICIAL.*.nupkg' -Recurse).Name + $File = (Get-ChildItem -Path . -Include 'EXILED-OFFICIAL.*.nupkg' -Recurse).Name Out-File -FilePath ${{ github.env }} -InputObject "PackageFile=$File" -Encoding utf-8 -Append - name: Upload nuget package diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 91eb17208..929ef4169 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,7 +46,7 @@ jobs: shell: pwsh run: | ./build.ps1 -BuildNuGet - $File = (Get-ChildItem -Path . -Include 'EXILEDOFFICIAL.*.nupkg' -Recurse).Name + $File = (Get-ChildItem -Path . -Include 'EXILED-OFFICIAL.*.nupkg' -Recurse).Name Out-File -FilePath ${{ github.env }} -InputObject "PackageFile=$File" -Encoding utf-8 -Append - name: Upload artifacts diff --git a/.github/workflows/push_nuget.yml b/.github/workflows/push_nuget.yml index cd320b2f9..d45971d95 100644 --- a/.github/workflows/push_nuget.yml +++ b/.github/workflows/push_nuget.yml @@ -41,7 +41,7 @@ jobs: shell: pwsh run: | ./build.ps1 -BuildNuGet - $File = (Get-ChildItem -Path . -Include 'EXILEDOFFICIAL.*.nupkg' -Recurse).Name + $File = (Get-ChildItem -Path . -Include 'EXILED-OFFICIAL.*.nupkg' -Recurse).Name Out-File -FilePath ${{ github.env }} -InputObject "PackageFile=$File" -Encoding utf-8 -Append - name: Push NuGet diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5af50d116..5230704fe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: shell: pwsh run: | ./build.ps1 - $File = (Get-ChildItem -Path . -Include 'EXILEDOFFICIAL.*.nupkg' -Recurse).Name + $File = (Get-ChildItem -Path . -Include 'EXILED-OFFICIAL.*.nupkg' -Recurse).Name Out-File -FilePath ${{ github.env }} -InputObject "PackageFile=$File" -Encoding utf-8 -Append - name: Get references diff --git a/EXILED/EXILED.props b/EXILED/EXILED.props index c88237eaa..c496e96ba 100644 --- a/EXILED/EXILED.props +++ b/EXILED/EXILED.props @@ -15,7 +15,7 @@ - 8.12.1 + 8.12.2 false diff --git a/EXILED/Exiled.Events/Patches/Events/Item/KeycardInteracting.cs b/EXILED/Exiled.Events/Patches/Events/Item/KeycardInteracting.cs index e26ef525d..2797da097 100644 --- a/EXILED/Exiled.Events/Patches/Events/Item/KeycardInteracting.cs +++ b/EXILED/Exiled.Events/Patches/Events/Item/KeycardInteracting.cs @@ -168,8 +168,9 @@ private static IEnumerable Transpiler(IEnumerable.Pool.Return(newInstructions); } - private static bool CheckPermissions(BaseKeycardPickup keycard, DoorPermissions permissions) + private static bool CheckPermissions(BaseKeycardPickup keycard, DoorVariant door) { + DoorPermissions permissions = door.RequiredPermissions; if (permissions.RequiredPermissions == KeycardPermissions.None) { return true; diff --git a/EXILED/Exiled/Exiled.nuspec b/EXILED/Exiled/Exiled.nuspec index 91e669fae..f02ef6b38 100644 --- a/EXILED/Exiled/Exiled.nuspec +++ b/EXILED/Exiled/Exiled.nuspec @@ -2,7 +2,7 @@ - EXILEDOFFICIAL + EXILED-OFFICIAL ExMod-Team $version$ ExMod-Team @@ -12,7 +12,7 @@ https://github.com/ExMod-Team/EXILED/blob/master/LICENSE https://github.com/ExMod-Team/EXILED - images\Exiled_Icon.jpg + images\Exiled_Icon.png Plugin framework for SCP: Secret Laboratory. @@ -51,7 +51,7 @@ - + diff --git a/EXILED/assets/Exiled_Icon.png b/EXILED/assets/Exiled_Icon.png new file mode 100644 index 000000000..47fe0c9ac Binary files /dev/null and b/EXILED/assets/Exiled_Icon.png differ