Merge branch 'master' into master

ExMod-Team · Oct 6, 2024 · 7f21479 · 7f21479
2 parents 30dcb74 + d968bea
commit 7f21479
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -15,7 +15,7 @@
 
   <PropertyGroup>
     <!-- This is the global version and is used for all projects that don't have a version -->
-    <Version Condition="$(Version) == ''">8.12.1</Version>
+    <Version Condition="$(Version) == ''">8.12.2</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 

diff --git 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<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             ListPool<CodeInstruction>.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
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
 
-    <id>EXILEDOFFICIAL</id>
+    <id>EXILED-OFFICIAL</id>
     <title>ExMod-Team</title>
     <version>$version$</version>
     <authors>ExMod-Team</authors>
@@ -12,7 +12,7 @@
     <repository type="Git" url="https://github.com/ExMod-Team/EXILED" />
     <licenseUrl>https://github.com/ExMod-Team/EXILED/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://github.com/ExMod-Team/EXILED</projectUrl>
-    <icon>images\Exiled_Icon.jpg</icon>
+    <icon>images\Exiled_Icon.png</icon>
     <description>Plugin framework for SCP: Secret Laboratory.</description>
 
     <dependencies>
@@ -51,7 +51,7 @@
     <!-- Project files -->
 
     <!-- Icon -->
-    <file src="..\assets\Exiled_Icon.jpg" target="images" />
+    <file src="..\assets\Exiled_Icon.png" target="images" />
   </files>
 
 </package>
diff --git a/EXILED/assets/Exiled_Icon.png b/EXILED/assets/Exiled_Icon.png