Merge branch 'master' into dependabot/nuget/EXILED/Lib.Harmony-2.3.3

.github/workflows/dev.yml

@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - dev
+      - scpsl14
   pull_request:
     branches:
       - dev
+      - scpsl14
   workflow_dispatch:
 
 defaults:

.github/workflows/pull_request_opened.yml

@@ -1,29 +1,38 @@
-name: Labeler
+name: Pull Request CI
 
 on:
-  - pull_request_target
+  pull_request_target:
+    branches:
+      - '**'
 
 defaults:
   run:
     working-directory: ./EXILED
 
 jobs:
   set-labels:
+    name: Set Labels
     permissions:
       contents: read
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - name: Labeler
-      uses: actions/labeler@v5.0.0
+    - uses: actions/labeler@v5.0.0
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         configuration-path: .github/labeler.yml
         sync-labels: true
   assign-author:
+    name: Assign Author
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
-
     steps:
       - uses: toshimaru/auto-author-assign@v2.1.1
+  validate-pr-title:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/push_nuget.yml

@@ -10,7 +10,7 @@ defaults:
     working-directory: ./EXILED
 
 env:
-  EXILED_REFERENCES_URL: https://ExMod-Team.github.io/SL-References/Master.zip
+  EXILED_REFERENCES_URL: https://ExMod-Team.github.io/SL-References/Dev.zip
   EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
 
 jobs:

.gitignore

@@ -373,4 +373,7 @@ NuGet.config
 _site/
 
 # JSON Schemas
-JSON/
+JSON/
+
+# Mac DS_Store
+.DS_Store

EXILED/EXILED.props

@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup Condition="$(BaseProperties) == '' OR $(BaseProperties) == 'true'">
-    <Authors>Exiled Official</Authors>
+    <Authors>ExMod Team</Authors>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(BuildProperties) == '' OR $(BuildProperties) == 'true'">
@@ -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.14.1</Version>
+    <Version Condition="$(Version) == ''">9.0.0</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 

EXILED/Exiled.API/Enums/AdminToyType.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="AdminToyType.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// <copyright file="AdminToyType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------
@@ -27,5 +27,10 @@ public enum AdminToyType
         /// ShootingTarget toy.
         /// </summary>
         ShootingTarget,
+
+        /// <summary>
+        /// Speaker toy.
+        /// </summary>
+        Speaker,
     }
 }

EXILED/Exiled.API/Enums/AmmoType.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="AmmoType.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// <copyright file="AmmoType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------

EXILED/Exiled.API/Enums/AuthenticationType.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="AuthenticationType.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// <copyright file="AuthenticationType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------

EXILED/Exiled.API/Enums/BloodType.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="BloodType.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// <copyright file="BloodType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------

EXILED/Exiled.API/Enums/CameraType.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="CameraType.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// <copyright file="CameraType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------
@@ -68,9 +68,6 @@ public enum CameraType
         HczElevSysB,
         HczHallway,
         HczThreeWay,
-        HczServersBottom,
-        HczServersStairs,
-        HczServersTop,
         HczTeslaGate,
         HczTestroomBridge,
         HczTestroomMain,
@@ -124,6 +121,19 @@ public enum CameraType
         Hcz173ContChamber,
         Hcz173Hallway,
         HczCurve,
+        HczJunkMain,
+        HczJunkHallway,
+        HczCornerDeep,
+        HczDSS08,
+        HczMicroHIDStairs,
+        HczPipesHallway,
+        HczWarheadStarboardElevator,
+        HczMicroHIDMain,
+        HczWarheadTopElevators,
+        HczWarheadConnector,
+        HczWarheadPortElevator,
+        HczMicroHIDLab,
+        HczPipesMain,
         #endregion
     }
 }

EXILED/Exiled.API/Enums/ConfigType.cs

@@ -1,6 +1,6 @@
-// -----------------------------------------------------------------------
-// <copyright file="ConfigType.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// -----------------------------------------------------------------------
+// <copyright file="ConfigType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------

EXILED/Exiled.API/Enums/DamageType.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="DamageType.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// <copyright file="DamageType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------
@@ -120,6 +120,11 @@ public enum DamageType
         /// </summary>
         SeveredHands,
 
+        /// <summary>
+        /// Damage caused by severed eyes.
+        /// </summary>
+        SeveredEyes,
+
         /// <summary>
         /// Damage caused by a custom source.
         /// </summary>
@@ -250,4 +255,4 @@ public enum DamageType
         /// </summary>
         Marshmallow,
     }
-}
+}

EXILED/Exiled.API/Enums/DanceType.cs

@@ -1,6 +1,6 @@
-// -----------------------------------------------------------------------
-// <copyright file="DanceType.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// -----------------------------------------------------------------------
+// <copyright file="DanceType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------

EXILED/Exiled.API/Enums/DangerType.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="DangerType.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// <copyright file="DangerType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------

EXILED/Exiled.API/Enums/DecontaminationState.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="DecontaminationState.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// <copyright file="DecontaminationState.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------

EXILED/Exiled.API/Enums/DisruptorMode.cs

@@ -0,0 +1,30 @@
+// -----------------------------------------------------------------------
+// <copyright file="DisruptorMode.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Enums
+{
+    /// <summary>
+    /// Represents disruptor's fire modes.
+    /// </summary>
+    public enum DisruptorMode
+    {
+        /// <summary>
+        /// Unknown mode.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Single shot mode.
+        /// </summary>
+        Disintegrator,
+
+        /// <summary>
+        /// Triple shot mode.
+        /// </summary>
+        BurstFire,
+    }
+}

EXILED/Exiled.API/Enums/DoorBeepType.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="DoorBeepType.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// <copyright file="DoorBeepType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------

EXILED/Exiled.API/Enums/DoorLockType.cs

@@ -1,6 +1,6 @@
 // -----------------------------------------------------------------------
-// <copyright file="DoorLockType.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// <copyright file="DoorLockType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------

EXILED/Exiled.API/Enums/DoorType.cs

@@ -1,15 +1,14 @@
 // -----------------------------------------------------------------------
-// <copyright file="DoorType.cs" company="Exiled Team">
-// Copyright (c) Exiled Team. All rights reserved.
+// <copyright file="DoorType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------
 
 namespace Exiled.API.Enums
 {
     using Exiled.API.Features.Doors;
-
-    using static Interactables.Interobjects.ElevatorManager;
+    using Interactables.Interobjects;
 
     /// <summary>
     /// Unique identifier for the different types of doors.
@@ -133,11 +132,6 @@ public enum DoorType
         /// </summary>
         EscapeSecondary,
 
-        /// <summary>
-        /// Represents the SERVERS_BOTTOM door.
-        /// </summary>
-        ServersBottom,
-
         /// <summary>
         /// Represents the GATE_A door.
         /// </summary>
@@ -159,19 +153,24 @@ public enum DoorType
         HeavyContainmentDoor,
 
         /// <summary>
-        /// Represents the HID door.
+        /// Represents any heavy containment styled door.
+        /// </summary>
+        HeavyBulkDoor,
+
+        /// <summary>
+        /// Represents the HID_CHAMBER door.
         /// </summary>
-        HID,
+        HIDChamber,
 
         /// <summary>
-        /// Represents the HID_LEFT door.
+        /// Represents the HID_UPPER door.
         /// </summary>
-        HIDLeft,
+        HIDUpper,
 
         /// <summary>
-        /// Represents the HID_RIGHT door.
+        /// Represents the HID_LOWER door.
         /// </summary>
-        HIDRight,
+        HIDLower,
 
         /// <summary>
         /// Represents the INTERCOM door.
@@ -231,7 +230,12 @@ public enum DoorType
         /// <summary>
         /// Represents the Gate in the Checkpoint between EZ and HCZ.
         /// </summary>
-        CheckpointGate,
+        CheckpointGateA,
+
+        /// <summary>
+        /// Represents the Gate in the Checkpoint between EZ and HCZ.
+        /// </summary>
+        CheckpointGateB,
 
         /// <summary>
         /// Represents the Gate in the Checkpoint between EZ and HCZ.
@@ -269,7 +273,7 @@ public enum DoorType
         ElevatorGateB,
 
         /// <summary>
-        /// Represents the Elevator door for <see cref="ElevatorGroup.Nuke"/>.
+        /// Represents the Elevator door for <see cref="ElevatorGroup.Nuke01"/>.
         /// </summary>
         ElevatorNuke,
 
@@ -307,5 +311,10 @@ public enum DoorType
         /// Represents the New Gate where Scp173 spawn in the <see cref="RoomType.Hcz049"/>.
         /// </summary>
         Scp173NewGate,
+
+        /// <summary>
+        /// Represents the ESCAPE_FINAL door.
+        /// </summary>
+        EscapeFinal,
     }
 }