Skip to content
This repository was archived by the owner on Jul 8, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
088ba33
LabAPI Update (#435)
louis1706 Feb 11, 2025
0269f15
LabAPI Update 14.0.3 (#439)
louis1706 Feb 18, 2025
953288a
9.6.0-beta3
louis1706 Feb 18, 2025
bab5695
this will need to be revert
louis1706 Feb 18, 2025
6c751ff
push_nuget not working for LabAPI
louis1706 Feb 18, 2025
857edae
Fixing RoundEnd Patch
louis1706 Feb 19, 2025
925ee34
Adding CustomRole::Gravity
louis1706 Feb 19, 2025
478df81
Remove Testing Log
louis1706 Feb 19, 2025
7abb724
fix: Command events fix (#444)
VALERA771 Feb 23, 2025
3f6bea2
fix: Fixing UnlockingGenerator
louis1706 Feb 23, 2025
35ee723
Fix RoundEnd completelly
louis1706 Feb 23, 2025
6f63c3e
fix: Hurting event NRE fix (#443)
VALERA771 Feb 25, 2025
838b1d9
Merge branch 'dev' into LabAPI
louis1706 Mar 5, 2025
cde782f
9.6.0-beta4
louis1706 Mar 5, 2025
3226454
this will required to be revert
louis1706 Mar 7, 2025
586d1f0
fix: InteractingDoorEvent::CanInteract (#463)
louis1706 Apr 5, 2025
841a5ce
Fixed Error & InteractingScp330 IL Code
louis1706 Apr 5, 2025
8df2572
TODO: Fix THE CRASH ISSUE
louis1706 Apr 5, 2025
21560f6
Fix Consumed Event - doubt
louis1706 Apr 5, 2025
aaa01b9
Fix & Small change on UsingAndCancellingItemUse
louis1706 Apr 6, 2025
ba6d2ce
Fix an issue where HashSetPool was never return
louis1706 Apr 6, 2025
bf437c5
Fix IL CODE error & remove debug
louis1706 Apr 6, 2025
c59de13
Add warning in case of missing PrefabType
louis1706 Apr 6, 2025
a284315
Capybara Toy
louis1706 Apr 6, 2025
4a807e4
remove using
louis1706 Apr 7, 2025
883218f
Fix SpawningRagdoll not setting NetworkInfo
louis1706 Apr 7, 2025
e3c3cc2
Fix Ragdoll Scale & ConsumingEvent
louis1706 Apr 7, 2025
9125258
Missing NetworkInfo.Scale Argument
louis1706 Apr 7, 2025
154feb6
Fix: Door.Get(GameObject)
louis1706 Apr 7, 2025
6ae1304
TantrumHazard is always null
louis1706 Apr 7, 2025
73726f7
9.6.0-beta5
louis1706 Apr 7, 2025
c577619
Update EXILED_DLL_ARCHIVER_URL for LabAPI
louis1706 Apr 7, 2025
7567702
fix: use basegame validation for CustomInfo (#452)
obvEve Apr 19, 2025
ae03b8b
feat: Custom limits for armor & virtual dmg for customweapon (#477)
SlejmUr Apr 21, 2025
fb2971f
fix: activating warhead panel event fix (#504)
VALERA771 Apr 25, 2025
804e0e8
Merge branch 'dev' into LabAPI
louis1706 Apr 25, 2025
45efde7
Fix Error (from Conflict)
louis1706 Apr 25, 2025
6974b0f
Fix doc error
louis1706 Apr 25, 2025
8d66cc9
Fix few error
louis1706 Apr 25, 2025
da34f22
refactor!: update to 14.1 (#508)
louis1706 Apr 27, 2025
48bf790
9.6.0-beta6
louis1706 Apr 27, 2025
0f28a9a
SNOWBALL DO NOT EXIST
louis1706 Apr 27, 2025
907d728
fix: ChangingCamera event (#511)
BoltonDev Apr 27, 2025
aeeb8e3
fix: useless fix now & prevent crash (#512)
BoltonDev Apr 27, 2025
b4893c2
fix: EndingRound event IsAllowed (#513)
BoltonDev Apr 27, 2025
7e15573
bump: 9.6.0-beta7
BoltonDev Apr 27, 2025
cc624de
fix: few fixes (#514)
BoltonDev Apr 27, 2025
3e46db6
fix: command type invalid
BoltonDev Apr 28, 2025
ca4e4c8
fix: landing event
BoltonDev Apr 28, 2025
07d8557
fix: EscapingPocketDimension event
BoltonDev Apr 28, 2025
5a599ff
fix: Handcuffing / RemovingHandcuff events
BoltonDev Apr 28, 2025
a15d85a
fix: sentvalidcommand event
BoltonDev Apr 28, 2025
219ba2b
fix: some fixes for 14.1 (#516)
BoltonDev Apr 28, 2025
b53111a
bump: 9.6.0-beta8
BoltonDev Apr 28, 2025
184c51f
fix: fix AutoUpdater Directory finder (#515)
MikeSus1 Apr 28, 2025
76677ef
fix: custom weapons not doing default damage when set to below 0 (#518)
TtroubleTT Apr 29, 2025
c90beb6
Workflow fix (#3)
VALERA771 May 16, 2025
5223ad8
Fixing Error & Removing Property that will not be implmented
louis1706 May 18, 2025
03be3d1
EffectType.Scp1344Detected
louis1706 May 18, 2025
45ed8a3
Update labapi.yml
BoltonDev May 18, 2025
2a1fd40
Update labapi.yml
BoltonDev May 18, 2025
0a85ead
TextToy Implementation API
louis1706 May 18, 2025
e34def0
chore: remove hub (doesn't exist anymore)
BoltonDev May 18, 2025
a002194
fix: update exmod -> exslmod & bump: 9.6.0
BoltonDev May 18, 2025
5de8d8b
fix: missing some change
BoltonDev May 18, 2025
4f8927d
missing hub
BoltonDev May 18, 2025
0e3d4b2
Merge branch 'dev' into LabAPI
BoltonDev May 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions .github/workflows/labapi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: Exiled Dev CI

on:
push:
branches:
- LabAPI
pull_request:
branches:
- LabAPI
workflow_dispatch:

defaults:
run:
working-directory: ./EXILED

env:
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/LabAPI.zip
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
EXILED_DLL_ARCHIVER_URL: https://github.com/ExSLMod-Team/EXILED-DLL-Archiver/releases/download/v1.8.2/EXILED-DLL-Archiver.exe

jobs:

build:

runs-on: windows-latest
# Prevent double running for push & pull_request events from the main repo
if: github.event_name != 'push' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name

steps:

- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v4.0.1

- name: Setup Nuget
uses: nuget/setup-nuget@v2

- uses: actions/checkout@v4.1.7

- name: Get references
shell: pwsh
run: |
Invoke-WebRequest -Uri ${{ env.EXILED_REFERENCES_URL }} -OutFile ${{ github.workspace }}/EXILED/References.zip
Expand-Archive -Path References.zip -DestinationPath ${{ env.EXILED_REFERENCES_PATH }}

- name: Build
env:
EXILED_REFERENCES: ${{ env.EXILED_REFERENCES_PATH }}
shell: pwsh
run: |
./build.ps1 -BuildNuGet
$File = (Get-ChildItem -Path . -Include 'ExMod.Exiled.*.nupkg' -Recurse).Name
Out-File -FilePath ${{ github.env }} -InputObject "PackageFile=$File" -Encoding utf-8 -Append

- name: Upload nuget package
uses: actions/upload-artifact@v4
with:
name: ${{ env.PackageFile }}
path: EXILED/${{ env.PackageFile }}

- name: Get references
shell: pwsh
run: |
Invoke-WebRequest -Uri ${{ env.EXILED_DLL_ARCHIVER_URL }} -OutFile ${{ github.workspace }}/EXILED/EXILED-DLL-Archiver.exe

- name: Packaging results as tar.gz
shell: pwsh
run: ./packaging.ps1

- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: Build Result
path: EXILED/bin/Release/Exiled.tar.gz

6 changes: 3 additions & 3 deletions EXILED/EXILED.props
Original file line number Diff line number Diff line change
Expand Up @@ -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) == ''">9.5.2</Version>
<Version Condition="$(Version) == ''">9.6.0</Version>
<!-- Enables public beta warning via the PUBLIC_BETA constant -->
<PublicBeta>false</PublicBeta>

Expand All @@ -25,8 +25,8 @@

<Copyright>Copyright © $(Authors) 2020 - $([System.DateTime]::Now.ToString("yyyy"))</Copyright>
<RepositoryType>Git</RepositoryType>
<RepositoryUrl>https://github.com/ExMod-Team/EXILED</RepositoryUrl>
<PackageProjectUrl>https://github.com/ExMod-Team/EXILED</PackageProjectUrl>
<RepositoryUrl>https://github.com/ExSLMod-Team/EXILED</RepositoryUrl>
<PackageProjectUrl>https://github.com/ExSLMod-Team/EXILED</PackageProjectUrl>
<PackageLicenseExpression>CC-BY-SA-3.0</PackageLicenseExpression>

<DefineConstants Condition="$(PublicBeta) == 'true'">$(DefineConstants);PUBLIC_BETA</DefineConstants>
Expand Down
20 changes: 20 additions & 0 deletions EXILED/Exiled.API/Enums/AdminToyType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,25 @@ public enum AdminToyType
/// Speaker toy.
/// </summary>
Speaker,

/// <summary>
/// Capybara toy.
/// </summary>
Capybara,

/// <summary>
/// InvisibleInteractable toy.
/// </summary>
InvisibleInteractableToy,

/// <summary>
/// Camera Object toy.
/// </summary>
CameraToy,

/// <summary>
/// Text toy.
/// </summary>
TextToy,
}
}
14 changes: 14 additions & 0 deletions EXILED/Exiled.API/Enums/CameraType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ public enum CameraType
Hcz173ContChamber,
[System.Obsolete("This Camera no longer exist.")]
Hcz173Hallway,
[System.Obsolete("This Camera no longer exist.")]
HczCurve,
HczJunkMain,
HczJunkHallway,
Expand All @@ -137,6 +138,19 @@ public enum CameraType
HczWarheadPortElevator,
HczMicroHIDLab,
HczPipesMain,
HczScp127Lab,
HczScp127Containment,
HczServersUpperStorage,
HczLowerServerStorage,
HczServerStaircase,
#endregion

#region custom
EzArmCameraToy,
EzCameraToy,
HczCameraToy,
LczCameraToy,
SzCameraToy,
#endregion
}
}
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/DamageType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -269,5 +269,10 @@ public enum DamageType
/// Damage caused by <see cref="ItemType.Snowball"/>.
/// </summary>
SnowBall,

/// <summary>
/// Damage caused by <see cref="ItemType.GunSCP127"/>.
/// </summary>
Scp127,
}
}
19 changes: 19 additions & 0 deletions EXILED/Exiled.API/Enums/DoorType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,20 @@ public enum DoorType
/// <summary>
/// Represents the HID_UPPER door.
/// </summary>
[Obsolete("This Door has been renamed too HID_LAB.")]
HIDUpper,

/// <summary>
/// Represents the HID_LAB door.
/// </summary>
#pragma warning disable CS0618
HIDLab = HIDUpper,
#pragma warning restore CS0618

/// <summary>
/// Represents the HID_LOWER door.
/// </summary>
[Obsolete("This Door has been removed from the game.")]
HIDLower,

/// <summary>
Expand Down Expand Up @@ -320,5 +329,15 @@ public enum DoorType
/// Represents the ESCAPE_FINAL door.
/// </summary>
EscapeFinal,

/// <summary>
/// Represents the Elevator door for <see cref="ElevatorGroup.ServerRoom"/>.
/// </summary>
ElevatorServerRoom,

/// <summary>
/// Represents the HCZ_127_LAB door.
/// </summary>
Hcz127Lab,
}
}
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/EffectType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -283,5 +283,10 @@ public enum EffectType
/// </summary>
[Obsolete("Only availaible for Christmas and AprilFools.")]
Snowed,

/// <summary>
/// <see cref="CustomPlayerEffects.Scp1344Detected"/>.
/// </summary>
Scp1344Detected,
}
}
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/ElevatorType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,10 @@ public enum ElevatorType : byte
/// Light Containment Zone checkpoint B elevator.
/// </summary>
LczB,

/// <summary>
/// Heavy Containment Zone ServerRoom elevator.
/// </summary>
ServerRoom,
}
}
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/FirearmType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,10 @@ public enum FirearmType
/// Represents the <see cref="ItemType.GunA7"/>.
/// </summary>
A7,

/// <summary>
/// Represents the <see cref="ItemType.GunSCP127"/>.
/// </summary>
Scp127,
}
}
4 changes: 2 additions & 2 deletions EXILED/Exiled.API/Enums/GeneratorState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ namespace Exiled.API.Enums
public enum GeneratorState : byte
{
/// <summary>
/// Generator is locked.
/// Generator is doing nothing.
/// </summary>
None = 1,
None = 0,

/// <summary>
/// Generator is unlocked.
Expand Down
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/GlassType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,10 @@ public enum GlassType
/// Represents the window in <see cref="RoomType.HczTestRoom"/>.
/// </summary>
TestRoom,

/// <summary>
/// Represents the window in <see cref="RoomType.Hcz127"/>.
/// </summary>
Scp127,
}
}
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/LockerType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,10 @@ public enum LockerType
/// SCP-1853 pedestal.
/// </summary>
Scp1853Pedestal,

/// <summary>
/// SCP-127 pedestal.
/// </summary>
Scp127Pedestal,
}
}
36 changes: 36 additions & 0 deletions EXILED/Exiled.API/Enums/PrefabType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -336,5 +336,41 @@ public enum PrefabType

[Prefab(912031041, "ElevatorChamberNuke")]
ElevatorChamberNuke,

[Prefab(3087007600, "CapybaraToy")]
CapybaraToy,

[Prefab(3539746802, "Sinkhole")]
Sinkhole,

[Prefab(1548138668, "AutoRagdoll")]
AutoRagdoll,

[Prefab(1323017091, "ElevatorChamberCargo")]
ElevatorChamberCargo,

[Prefab(359728307, "InvisibleInteractableToy")]
InvisibleInteractableToy,

[Prefab(1824808402, "EzArmCameraToy")]
EzArmCameraToy,

[Prefab(3375932423, "EzCameraToy")]
EzCameraToy,

[Prefab(144958943, "HczCameraToy")]
HczCameraToy,

[Prefab(2026969629, "LczCameraToy")]
LczCameraToy,

[Prefab(1548138668, "SzCameraToy")]
SzCameraToy,

[Prefab(2842703865, "KeycardPickup_Chaos")]
KeycardPickupChaos,

[Prefab(162530276, "TextToy")]
TextToy,
}
}
10 changes: 10 additions & 0 deletions EXILED/Exiled.API/Enums/RoomType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -328,5 +328,15 @@ public enum RoomType
/// Entrance Zone's straight hall with Dr.L's and conference room 9b locked room.
/// </summary>
EzSmallrooms,

/// <summary>
/// Heavy Containment Zone's SCP-330 room.
/// </summary>
Hcz127,

/// <summary>
/// Heavy Containment Zone's storage / server room.
/// </summary>
HczServerRoom,
}
}
2 changes: 1 addition & 1 deletion EXILED/Exiled.API/Exiled.API.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
</Reference>
<Reference Include="Assembly-CSharp-firstpass" HintPath="$(EXILED_REFERENCES)\Assembly-CSharp-firstpass.dll" Private="false" />
<Reference Include="CommandSystem.Core" HintPath="$(EXILED_REFERENCES)\CommandSystem.Core.dll" Private="false" />
<Reference Include="LabApi" HintPath="$(EXILED_REFERENCES)\LabApi.dll" Private="false" />
<Reference Include="Pooling" HintPath="$(EXILED_REFERENCES)\Pooling.dll" Private="false" />
<Reference Include="Mirror" HintPath="$(EXILED_REFERENCES)\Mirror.dll" Private="false" />
<Reference Include="NorthwoodLib" HintPath="$(EXILED_REFERENCES)\NorthwoodLib.dll" Private="false" />
<Reference Include="PluginAPI" HintPath="$(EXILED_REFERENCES)\PluginAPI.dll" Private="false" />
<Reference Include="Unity.TextMeshPro" HintPath="$(EXILED_REFERENCES)\Unity.TextMeshPro.dll" Private="false" />
<Reference Include="UnityEngine" HintPath="$(EXILED_REFERENCES)\UnityEngine.dll" Private="false" />
<Reference Include="UnityEngine.CoreModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.CoreModule.dll" Private="false" />
Expand Down
1 change: 1 addition & 0 deletions EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public static class DamageTypeExtensions
{ ItemType.Jailbird, DamageType.Jailbird },
{ ItemType.GunFRMG0, DamageType.Frmg0 },
{ ItemType.GunA7, DamageType.A7 },
{ ItemType.GunSCP127, DamageType.Scp127 },
};

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion EXILED/Exiled.API/Extensions/DoorTypeExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ public static bool IsGate(this DoorType door) => door is DoorType.GateA or DoorT
/// <param name="door">The door to be checked.</param>
/// <returns>Returns whether the <see cref="DoorType"/> is an elevator.</returns>
public static bool IsElevator(this DoorType door) => door is DoorType.ElevatorGateA or DoorType.ElevatorGateB
or DoorType.ElevatorLczA or DoorType.ElevatorLczB or DoorType.ElevatorNuke or DoorType.ElevatorScp049;
or DoorType.ElevatorLczA or DoorType.ElevatorLczB or DoorType.ElevatorNuke or DoorType.ElevatorScp049 or DoorType.ElevatorServerRoom;
}
}
1 change: 1 addition & 0 deletions EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public static class EffectTypeExtension
{ EffectType.SeveredEyes, typeof(SeveredEyes) },
{ EffectType.PitDeath, typeof(PitDeath) },
{ EffectType.Blurred, typeof(Blurred) },
{ EffectType.Scp1344Detected, typeof(Scp1344Detected) },
#pragma warning disable CS0618
{ EffectType.Marshmallow, typeof(MarshmallowEffect) },
{ EffectType.BecomingFlamingo, typeof(BecomingFlamingo) },
Expand Down
2 changes: 2 additions & 0 deletions EXILED/Exiled.API/Extensions/ItemExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ public static int GetMaxAmmo(this FirearmType item)
ItemType.GunCom45 => FirearmType.Com45,
ItemType.GunFRMG0 => FirearmType.FRMG0,
ItemType.ParticleDisruptor => FirearmType.ParticleDisruptor,
ItemType.GunSCP127 => FirearmType.Scp127,
_ => FirearmType.None,
};

Expand Down Expand Up @@ -220,6 +221,7 @@ public static int GetMaxAmmo(this FirearmType item)
FirearmType.Com45 => ItemType.GunCom45,
FirearmType.FRMG0 => ItemType.GunFRMG0,
FirearmType.ParticleDisruptor => ItemType.ParticleDisruptor,
FirearmType.Scp127 => ItemType.GunSCP127,
_ => ItemType.None,
};

Expand Down
1 change: 1 addition & 0 deletions EXILED/Exiled.API/Extensions/LockerExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public static class LockerExtensions
"RegularMedkitStructure" => LockerType.Medkit,
"AdrenalineMedkitStructure" => LockerType.Adrenaline,
"MicroHIDpedestal" => LockerType.MicroHid,
"SCP_127_Container" => LockerType.Scp127Pedestal,
_ => LockerType.Unknown,
};
}
Expand Down
2 changes: 1 addition & 1 deletion EXILED/Exiled.API/Extensions/RoomExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static bool IsCheckpoint(this RoomType room) => room is RoomType.LczCheck
/// <returns>Returns whether the <see cref="RoomType"/> contains any SCP.</returns>
public static bool IsScp(this RoomType room)
=> room is RoomType.Lcz173 or RoomType.Lcz330 or RoomType.Lcz914 or RoomType.Hcz049 or RoomType.Hcz079 or
RoomType.Hcz096 or RoomType.Hcz106 or RoomType.Hcz939;
RoomType.Hcz096 or RoomType.Hcz106 or RoomType.Hcz939 or RoomType.Hcz127;

/// <summary>
/// Converts the provided <see cref="FacilityZone"/> into the corresponding <see cref="ZoneType"/>.
Expand Down
Loading
Loading