Skip to content

Commit 431e389

Browse files
BoltonDevlouis1706VALERA771obvEveSlejmUr
authored
chore: update base game 14.1 (#527)
* LabAPI Update (#435) * No error for build * Fix Exiled * Fix RoundEnding * Now is fucking separated by default * CustomSubtitles * Missing IsCustomAnnouncement * Fix 3 patch & removal of CustomHealthStat * Fix UsingAndCancellingItemUse * Fix TogglingFlashlight * La Flemme ? * La flemme 2 * Fix ReservedSlotPatch * Fix PickingUpItem(PickingUpAmmo) * Fix Hurt event * Fix FlippingCoin & EscapingPocketDimension * Fix FailingEscapePocketDimension * EscapingAndEscaped fix patch * Fix UpgradingPlayer patch * Fix BeingObserved * Fix PlacingTantrum * Fix FinishingRecall * ChangingCamera (Not working) * putting again the event than i was lazzy to fix * Rework InteractingDoor Patch missing removing the Prefix part lol & SkillIssueFix * Remove useless using and warning disable * OUPS * if stupidity was me it's here (i am stupid) * Fixing Noclip with breakingchange * CustomHumeShieldStat * Fix InteractingGenerator * Fix ChangingCamera * Not finish * InteractingDoor swap CanInteract & IsAllowed back to normal * Player::Gravity * Gravity in wrong place * IHumeShieldRole for Human * Fix BlastDoors & add OpenBlastDoor * Fix SpawningRagdoll Scale & missing argument when modify * Now fix in LabAPI only * we will keep the funny Ragdoll scale * Fix Merge & Split Command * new workflow for LabAPI * LabAPI Update 14.0.3 (#439) * No error for build * Fix Exiled * Fix RoundEnding * Now is fucking separated by default * CustomSubtitles * Missing IsCustomAnnouncement * Fix 3 patch & removal of CustomHealthStat * Fix UsingAndCancellingItemUse * Fix TogglingFlashlight * La Flemme ? * La flemme 2 * Fix ReservedSlotPatch * Fix PickingUpItem(PickingUpAmmo) * Fix Hurt event * Fix FlippingCoin & EscapingPocketDimension * Fix FailingEscapePocketDimension * EscapingAndEscaped fix patch * Fix UpgradingPlayer patch * Fix BeingObserved * Fix PlacingTantrum * Fix FinishingRecall * ChangingCamera (Not working) * putting again the event than i was lazzy to fix * Rework InteractingDoor Patch missing removing the Prefix part lol & SkillIssueFix * Remove useless using and warning disable * OUPS * if stupidity was me it's here (i am stupid) * Fixing Noclip with breakingchange * CustomHumeShieldStat * Fix InteractingGenerator * Fix ChangingCamera * Not finish * InteractingDoor swap CanInteract & IsAllowed back to normal * Player::Gravity * Gravity in wrong place * IHumeShieldRole for Human * Fix BlastDoors & add OpenBlastDoor * Fix SpawningRagdoll Scale & missing argument when modify * Now fix in LabAPI only * we will keep the funny Ragdoll scale * Fix Merge & Split Command * new workflow for LabAPI * NW_Documentation * SCP:SL LabAPI 14.0.3 * Fix One IL Error Patch (2 remain from previous update) * use Specific build for LabAPI * Miss updating this file * 9.6.0-beta3 * this will need to be revert * push_nuget not working for LabAPI * Fixing RoundEnd Patch * Adding CustomRole::Gravity * Remove Testing Log * fix: Command events fix (#444) command fixes * fix: Fixing UnlockingGenerator * Fix RoundEnd completelly * fix: Hurting event NRE fix (#443) fix: one day i'll kill person who made this Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com> * 9.6.0-beta4 * this will required to be revert * fix: InteractingDoorEvent::CanInteract (#463) * Fix InteractingDoorEvent::CanInteract * Oupsy * Fixed Error & InteractingScp330 IL Code * TODO: Fix THE CRASH ISSUE * Fix Consumed Event - doubt * Fix & Small change on UsingAndCancellingItemUse * Fix an issue where HashSetPool was never return * Fix IL CODE error & remove debug * Add warning in case of missing PrefabType * Capybara Toy * remove using * Fix SpawningRagdoll not setting NetworkInfo * Fix Ragdoll Scale & ConsumingEvent * Missing NetworkInfo.Scale Argument * Fix: Door.Get(GameObject) * TantrumHazard is always null * 9.6.0-beta5 * Update EXILED_DLL_ARCHIVER_URL for LabAPI * fix: use basegame validation for CustomInfo (#452) * Validate using basegame * Update EXILED/Exiled.API/Features/Player.cs --------- Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com> * feat: Custom limits for armor & virtual dmg for customweapon (#477) * fix: activating warhead panel event fix (#504) fix: fix for activating warhead panel * Fix Error (from Conflict) * Fix doc error * Fix few error * refactor!: update to 14.1 (#508) * refactor!: update to 14.1 * fix: few patches fix * feat: new custom keycard logic * fix: ActivatingWarheadPanel event * fix: checkpoint sequence time * fix: Shot event * fix: DroppingCandy event * Fix last Error on Release Build * Update new PrefabType * fix: AnnouncingScpTermination event * fix: SpawningItem event error (require testing) * fix: Shot.cs fix * analysis error * Fix error * Fix build error * NW_Documentation * fix: announcing wave entrance * Reference new Room * Fix Build error * fix: fixes pickingup event * Nameless Skill Issue * fix: locker patch * fix: spawning room connector * CameraToy * Get CameraToy * Finish InteractableToy & fix doc * fix Error for build * Remove todo * fix: generator events * ElevatorType.ServerRoom * Fix a 2 hours loss * Fix NW moment * fix: interacting generator * fix: interacting locker event * fix: missing obstacle shot * fix: KeycardInteracting again * Fix SendingCassieMessage * fix: temp fix interacting door (need to refactor) * refactor: change the property * fix doc * extension for Scp127 & ServerRoom * FirearmType.Scp127 * AdminToyList * fix: camera weren't added * new CameraType * wrong doc * fix: interacting door event (improved) * Invalid Camera * Better doc * fix: interacting door (bolton issue) * FixDamagingWindow index * RemoveBreakingChange * Fix FailingEscapePocketDimensionEventArgs --------- Co-authored-by: Bolton <48883340+BoltonDev@users.noreply.github.com> Co-authored-by: VALERA771 <val.germanov@gmail.com> Co-authored-by: VALERA771 <72030575+VALERA771@users.noreply.github.com> * 9.6.0-beta6 * SNOWBALL DO NOT EXIST * fix: ChangingCamera event (#511) * fix: useless fix now & prevent crash (#512) * fix: EndingRound event IsAllowed (#513) fix: EndingRound event isallowed * bump: 9.6.0-beta7 * fix: few fixes (#514) * fix: keycard interacting * fix: EscapingEvent IsAllowed * fix: command type invalid * fix: landing event * fix: EscapingPocketDimension event * fix: Handcuffing / RemovingHandcuff events * fix: sentvalidcommand event * bump: 9.6.0-beta8 * fix: fix AutoUpdater Directory finder (#515) * Update Capybara.cs * Revert "Update Capybara.cs" This reverts commit 6ea4789. * fix autoupdater * ok now its fixed 100% * fix: custom weapons not doing default damage when set to below 0 (#518) * fix custom weapons not doing default damage when set to below 0 * make default damage -1 * Workflow fix (#3) * v9.5.2 * Update release.yml * Update main.yml * update nuget * update docs * update dev * Fixing Error & Removing Property that will not be implmented * EffectType.Scp1344Detected * Update labapi.yml * Update labapi.yml * TextToy Implementation API * chore: remove hub (doesn't exist anymore) * fix: update exmod -> exslmod & bump: 9.6.0 * fix: missing some change * missing hub --------- Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com> Co-authored-by: Yamato <louismonneyron5@yahoo.com> Co-authored-by: VALERA771 <72030575+VALERA771@users.noreply.github.com> Co-authored-by: Nameless <85962933+Misfiy@users.noreply.github.com> Co-authored-by: SlejmUr <slejmur@protonmail.com> Co-authored-by: VALERA771 <val.germanov@gmail.com> Co-authored-by: Mike <146554836+MikeSus1@users.noreply.github.com> Co-authored-by: TtroubleTT <121741230+TtroubleTT@users.noreply.github.com>
1 parent 9cb204f commit 431e389

204 files changed

Lines changed: 2496 additions & 2157 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ defaults:
1616
working-directory: ./EXILED
1717

1818
env:
19-
EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Dev.zip
19+
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/Dev.zip
2020
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
21-
EXILED_DLL_ARCHIVER_URL: https://github.com/ExMod-Team/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe
21+
EXILED_DLL_ARCHIVER_URL: https://github.com/ExSLMod-Team/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe
2222

2323
jobs:
2424

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
id-token: write
1313

1414
env:
15-
EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Master.zip
15+
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/Master.zip
1616
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
1717

1818
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.

‎.github/workflows/labapi.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: Exiled Dev CI
2+
3+
on:
4+
push:
5+
branches:
6+
- LabAPI
7+
pull_request:
8+
branches:
9+
- LabAPI
10+
workflow_dispatch:
11+
12+
defaults:
13+
run:
14+
working-directory: ./EXILED
15+
16+
env:
17+
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/LabAPI.zip
18+
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
19+
EXILED_DLL_ARCHIVER_URL: https://github.com/ExSLMod-Team/EXILED-DLL-Archiver/releases/download/v1.8.2/EXILED-DLL-Archiver.exe
20+
21+
jobs:
22+
23+
build:
24+
25+
runs-on: windows-latest
26+
# Prevent double running for push & pull_request events from the main repo
27+
if: github.event_name != 'push' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
28+
29+
steps:
30+
31+
- name: Setup .NET Core SDK
32+
uses: actions/setup-dotnet@v4.0.1
33+
34+
- name: Setup Nuget
35+
uses: nuget/setup-nuget@v2
36+
37+
- uses: actions/checkout@v4.1.7
38+
39+
- name: Get references
40+
shell: pwsh
41+
run: |
42+
Invoke-WebRequest -Uri ${{ env.EXILED_REFERENCES_URL }} -OutFile ${{ github.workspace }}/EXILED/References.zip
43+
Expand-Archive -Path References.zip -DestinationPath ${{ env.EXILED_REFERENCES_PATH }}
44+
45+
- name: Build
46+
env:
47+
EXILED_REFERENCES: ${{ env.EXILED_REFERENCES_PATH }}
48+
shell: pwsh
49+
run: |
50+
./build.ps1 -BuildNuGet
51+
$File = (Get-ChildItem -Path . -Include 'ExMod.Exiled.*.nupkg' -Recurse).Name
52+
Out-File -FilePath ${{ github.env }} -InputObject "PackageFile=$File" -Encoding utf-8 -Append
53+
54+
- name: Upload nuget package
55+
uses: actions/upload-artifact@v4
56+
with:
57+
name: ${{ env.PackageFile }}
58+
path: EXILED/${{ env.PackageFile }}
59+
60+
- name: Get references
61+
shell: pwsh
62+
run: |
63+
Invoke-WebRequest -Uri ${{ env.EXILED_DLL_ARCHIVER_URL }} -OutFile ${{ github.workspace }}/EXILED/EXILED-DLL-Archiver.exe
64+
65+
- name: Packaging results as tar.gz
66+
shell: pwsh
67+
run: ./packaging.ps1
68+
69+
- name: Upload artifacts
70+
uses: actions/upload-artifact@v4
71+
with:
72+
name: Build Result
73+
path: EXILED/bin/Release/Exiled.tar.gz
74+

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ defaults:
1313
working-directory: ./EXILED
1414

1515
env:
16-
EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Master.zip
16+
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/Master.zip
1717
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
1818

1919
jobs:

‎.github/workflows/push_nuget.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ defaults:
1010
working-directory: ./EXILED
1111

1212
env:
13-
EXILED_REFERENCES_URL: https://ExMod-Team.github.io/SL-References/Dev.zip
13+
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/LabAPI.zip
1414
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
1515

1616
jobs:

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ defaults:
1111
working-directory: ./EXILED
1212

1313
env:
14-
EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Dev.zip
14+
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/LabAPI.zip
1515
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
16-
EXILED_DLL_ARCHIVER_URL: https://github.com/ExMod-Team/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe
16+
EXILED_DLL_ARCHIVER_URL: https://github.com/ExSLMod-Team/EXILED-DLL-Archiver/releases/download/v1.8.1/EXILED-DLL-Archiver.exe
1717

1818
jobs:
1919
build:

‎EXILED/EXILED.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<PropertyGroup>
1717
<!-- This is the global version and is used for all projects that don't have a version -->
18-
<Version Condition="$(Version) == ''">9.5.2</Version>
18+
<Version Condition="$(Version) == ''">9.6.0</Version>
1919
<!-- Enables public beta warning via the PUBLIC_BETA constant -->
2020
<PublicBeta>false</PublicBeta>
2121

@@ -25,8 +25,8 @@
2525

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

3232
<DefineConstants Condition="$(PublicBeta) == 'true'">$(DefineConstants);PUBLIC_BETA</DefineConstants>

‎EXILED/Exiled.API/Enums/AdminToyType.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,25 @@ public enum AdminToyType
3232
/// Speaker toy.
3333
/// </summary>
3434
Speaker,
35+
36+
/// <summary>
37+
/// Capybara toy.
38+
/// </summary>
39+
Capybara,
40+
41+
/// <summary>
42+
/// InvisibleInteractable toy.
43+
/// </summary>
44+
InvisibleInteractableToy,
45+
46+
/// <summary>
47+
/// Camera Object toy.
48+
/// </summary>
49+
CameraToy,
50+
51+
/// <summary>
52+
/// Text toy.
53+
/// </summary>
54+
TextToy,
3555
}
3656
}

‎EXILED/Exiled.API/Enums/CameraType.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ public enum CameraType
123123
Hcz173ContChamber,
124124
[System.Obsolete("This Camera no longer exist.")]
125125
Hcz173Hallway,
126+
[System.Obsolete("This Camera no longer exist.")]
126127
HczCurve,
127128
HczJunkMain,
128129
HczJunkHallway,
@@ -137,6 +138,19 @@ public enum CameraType
137138
HczWarheadPortElevator,
138139
HczMicroHIDLab,
139140
HczPipesMain,
141+
HczScp127Lab,
142+
HczScp127Containment,
143+
HczServersUpperStorage,
144+
HczLowerServerStorage,
145+
HczServerStaircase,
146+
#endregion
147+
148+
#region custom
149+
EzArmCameraToy,
150+
EzCameraToy,
151+
HczCameraToy,
152+
LczCameraToy,
153+
SzCameraToy,
140154
#endregion
141155
}
142156
}

‎EXILED/Exiled.API/Enums/DamageType.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,5 +269,10 @@ public enum DamageType
269269
/// Damage caused by <see cref="ItemType.Snowball"/>.
270270
/// </summary>
271271
SnowBall,
272+
273+
/// <summary>
274+
/// Damage caused by <see cref="ItemType.GunSCP127"/>.
275+
/// </summary>
276+
Scp127,
272277
}
273278
}

0 commit comments

Comments
 (0)