Skip to content

Commit dbc5df0

Browse files
committed
Update Error and TT file
1 parent 913509f commit dbc5df0

8 files changed

Lines changed: 106 additions & 50 deletions

File tree

EXILED/Exiled.API/Enums/EffectType.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,5 +288,10 @@ public enum EffectType
288288
/// <see cref="CustomPlayerEffects.Scp1344Detected"/>.
289289
/// </summary>
290290
Scp1344Detected,
291+
292+
/// <summary>
293+
/// <see cref="CustomPlayerEffects.Scp1576"/>.
294+
/// </summary>
295+
Scp1576,
291296
}
292297
}

EXILED/Exiled.API/Enums/PrefabType.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,5 +372,14 @@ public enum PrefabType
372372

373373
[Prefab(162530276, "TextToy")]
374374
TextToy,
375+
376+
[Prefab(4046276968, "Spawnable Unsecured Pryable GateDoor")]
377+
SpawnableUnsecuredPryableGateDoor,
378+
379+
[Prefab(2332883846, "CullableParentToy")]
380+
CullableParentToy,
381+
382+
[Prefab(3938583646, "WaypointToy")]
383+
WaypointToy,
375384
}
376385
}

EXILED/Exiled.API/Extensions/EffectTypeExtension.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public static class EffectTypeExtension
7676
{ EffectType.PitDeath, typeof(PitDeath) },
7777
{ EffectType.Blurred, typeof(Blurred) },
7878
{ EffectType.Scp1344Detected, typeof(Scp1344Detected) },
79+
{ EffectType.Scp1576, typeof(Scp1576) },
7980
#pragma warning disable CS0618
8081
{ EffectType.Marshmallow, typeof(MarshmallowEffect) },
8182
{ EffectType.BecomingFlamingo, typeof(BecomingFlamingo) },

EXILED/Exiled.API/Features/Map.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static class Map
5858
/// Gets a value indicating whether decontamination phase is in the light containment zone.
5959
/// </summary>
6060
public static DecontaminationState DecontaminationState =>
61-
DecontaminationController.Singleton.NetworkDecontaminationOverride is DecontaminationController.DecontaminationStatus.Disabled ?
61+
DecontaminationController.Singleton.DecontaminationOverride is DecontaminationController.DecontaminationStatus.Disabled ?
6262
DecontaminationState.Disabled : (DecontaminationState)DecontaminationController.Singleton._nextPhase;
6363

6464
/// <summary>
@@ -92,9 +92,9 @@ public static int Seed
9292
/// </summary>
9393
public static bool IsDecontaminationEnabled
9494
{
95-
get => DecontaminationController.Singleton.NetworkDecontaminationOverride == DecontaminationController.DecontaminationStatus.None;
95+
get => DecontaminationController.Singleton.DecontaminationOverride == DecontaminationController.DecontaminationStatus.None;
9696
set =>
97-
DecontaminationController.Singleton.NetworkDecontaminationOverride = value
97+
DecontaminationController.Singleton.DecontaminationOverride = value
9898
? DecontaminationController.DecontaminationStatus.None
9999
: DecontaminationController.DecontaminationStatus.Disabled;
100100
}
@@ -182,7 +182,7 @@ public static void ShowHint(string message, float duration = 3f)
182182
/// <summary>
183183
/// Forces the light containment zone decontamination process.
184184
/// </summary>
185-
public static void StartDecontamination() => DecontaminationController.Singleton.ForceDecontamination();
185+
public static void StartDecontamination() => DecontaminationController.Singleton.FinishDecontamination();
186186

187187
/// <summary>
188188
/// Turns on all lights in the facility.

EXILED/Exiled.API/Features/Player.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,11 @@ public ScpSpawnPreferences.SpawnPreferences ScpPreferences
610610
/// <summary>
611611
/// Gets a value indicating whether the player is jumping.
612612
/// </summary>
613-
public bool IsJumping => Role is FpcRole fpc && fpc.FirstPersonController.FpcModule.Motor.IsJumping;
613+
public bool IsJumping
614+
{
615+
get => Role is FpcRole fpc && fpc.FirstPersonController.FpcModule.Motor.JumpController.IsJumping;
616+
set => _ = Role is FpcRole fpc ? fpc.FirstPersonController.FpcModule.Motor.JumpController.IsJumping = value : _ = value;
617+
}
614618

615619
/// <summary>
616620
/// Gets the player's IP address.

EXILED/Exiled.API/Features/Toys/Capybara.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ internal Capybara(CapybaraToy capybaraToy)
3838
/// </summary>
3939
public bool Collidable
4040
{
41-
get => Base.Network_collisionsEnabled;
42-
set => Base.Network_collisionsEnabled = value;
41+
get => Base.NetworkCollisionsEnabled;
42+
set => Base.NetworkCollisionsEnabled = value;
4343
}
4444
}
4545
}

EXILED/Exiled.Loader/AutoUpdateFiles.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ public static class AutoUpdateFiles
1717
/// <summary>
1818
/// Gets which SCP: SL version generated Exiled.
1919
/// </summary>
20-
public static readonly Version RequiredSCPSLVersion = new(14, 1, 0, 1);
20+
public static readonly Version RequiredSCPSLVersion = new(14, 1, 0, 3);
2121
}
2222
}

EXILED/docs/articles/SCPSLRessources/NW_Documentation.md

Lines changed: 79 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ Last Update (14.1.0.1)
156156
- [HitboxType](#hitboxtype)
157157
- [HolidayType](#holidaytype)
158158
- [HotkeysTranslation](#hotkeystranslation)
159-
- [HttpQueryMode](#httpquerymode)
160159
- [IcomText](#icomtext)
161160
- [IconType](#icontype)
162161
- [IndicatorType](#indicatortype)
@@ -198,6 +197,7 @@ Last Update (14.1.0.1)
198197
- [MixerChannel](#mixerchannel)
199198
- [Mode](#mode)
200199
- [Mode](#mode)
200+
- [Mode](#mode)
201201
- [ModifierMode](#modifiermode)
202202
- [Modules](#modules)
203203
- [MsgType](#msgtype)
@@ -234,7 +234,6 @@ Last Update (14.1.0.1)
234234
- [PopupState](#popupstate)
235235
- [PortMapper](#portmapper)
236236
- [PrimitiveFlags](#primitiveflags)
237-
- [ProcessCreationFlags](#processcreationflags)
238237
- [RaClipBoardType](#raclipboardtype)
239238
- [RadioCommand](#radiocommand)
240239
- [RadioRangeLevel](#radiorangelevel)
@@ -251,6 +250,7 @@ Last Update (14.1.0.1)
251250
- [RoleChangeReason](#rolechangereason)
252251
- [RoleSpawnFlags](#rolespawnflags)
253252
- [RoleTypeId](#roletypeid)
253+
- [RoomLevelName](#roomlevelname)
254254
- [RoomName](#roomname)
255255
- [RoomShape](#roomshape)
256256
- [RootCullablePriority](#rootcullablepriority)
@@ -322,6 +322,10 @@ Last Update (14.1.0.1)
322322
- [UISetting](#uisetting)
323323
- [UnconnectedMessageType](#unconnectedmessagetype)
324324
- [UpdateMessageFlags](#updatemessageflags)
325+
- [UpdateType](#updatetype)
326+
- [UpdateType](#updatetype)
327+
- [UpdateType](#updatetype)
328+
- [UpdateType](#updatetype)
325329
- [UrgencyLevel](#urgencylevel)
326330
- [UserResponseMode](#userresponsemode)
327331
- [ValidationError](#validationerror)
@@ -2440,19 +2444,6 @@ Last Update (14.1.0.1)
24402444

24412445
</details>
24422446

2443-
### HttpQueryMode
2444-
2445-
<details><summary><b>HttpQueryMode</b></summary>
2446-
2447-
```
2448-
[0] = HttpClient
2449-
[1] = HttpProxy
2450-
[2] = UnityWebRequest
2451-
[3] = UnityWebRequestDispatcher
2452-
```
2453-
2454-
</details>
2455-
24562447
### IcomText
24572448

24582449
<details><summary><b>PlayerRoles.Voice.IntercomDisplay+IcomText</b></summary>
@@ -2943,6 +2934,7 @@ Last Update (14.1.0.1)
29432934

29442935
```
29452936
[1] = FriendlyFire
2937+
[2] = DisabledAchievements
29462938
```
29472939

29482940
</details>
@@ -3145,6 +3137,17 @@ Last Update (14.1.0.1)
31453137

31463138
### Mode
31473139

3140+
<details><summary><b>ManagedHttp+Mode</b></summary>
3141+
3142+
```
3143+
[0] = HttpClient
3144+
[1] = UnityWebRequest
3145+
```
3146+
3147+
</details>
3148+
3149+
### Mode
3150+
31483151
<details><summary><b>InventorySystem.Items.Firearms.Extensions.ViewmodelReloadOnlyLayerExtension+Mode</b></summary>
31493152

31503153
```
@@ -3719,33 +3722,6 @@ Last Update (14.1.0.1)
37193722

37203723
</details>
37213724

3722-
### ProcessCreationFlags
3723-
3724-
<details><summary><b>_Scripts.Utils.StartExternalProcess+ProcessCreationFlags</b></summary>
3725-
3726-
```
3727-
[0] = NONE
3728-
[1] = DEBUG_PROCESS
3729-
[2] = DEBUG_ONLY_THIS_PROCESS
3730-
[4] = CREATE_SUSPENDED
3731-
[8] = DETACHED_PROCESS
3732-
[16] = CREATE_NEW_CONSOLE
3733-
[512] = CREATE_NEW_PROCESS_GROUP
3734-
[1024] = CREATE_UNICODE_ENVIRONMENT
3735-
[2048] = CREATE_SEPARATE_WOW_VDM
3736-
[4096] = CREATE_SHARED_WOW_VDM
3737-
[65536] = INHERIT_PARENT_AFFINITY
3738-
[262144] = CREATE_PROTECTED_PROCESS
3739-
[524288] = EXTENDED_STARTUPINFO_PRESENT
3740-
[4194304] = CREATE_SECURE_PROCESS
3741-
[16777216] = CREATE_BREAKAWAY_FROM_JOB
3742-
[33554432] = CREATE_PRESERVE_CODE_AUTHZ_LEVEL
3743-
[67108864] = CREATE_DEFAULT_ERROR_MODE
3744-
[134217728] = CREATE_NO_WINDOW
3745-
```
3746-
3747-
</details>
3748-
37493725
### RaClipBoardType
37503726

37513727
<details><summary><b>RemoteAdmin.Communication.RaClipboard+RaClipBoardType</b></summary>
@@ -3999,6 +3975,18 @@ Last Update (14.1.0.1)
39993975

40003976
</details>
40013977

3978+
### RoomLevelName
3979+
3980+
<details><summary><b>MapGeneration.Rooms.RoomLevelName</b></summary>
3981+
3982+
```
3983+
[0] = Main
3984+
[1] = NukeSilo
3985+
[2] = Hcz049Sublevel
3986+
```
3987+
3988+
</details>
3989+
40023990
### RoomName
40033991

40043992
<details><summary><b>MapGeneration.RoomName</b></summary>
@@ -5290,6 +5278,55 @@ Last Update (14.1.0.1)
52905278

52915279
</details>
52925280

5281+
### UpdateType
5282+
5283+
<details><summary><b>UserSettings.ServerSpecific.SSDropdownSetting+UpdateType</b></summary>
5284+
5285+
```
5286+
[0] = None
5287+
[1] = Selection
5288+
[2] = Options
5289+
```
5290+
5291+
</details>
5292+
5293+
### UpdateType
5294+
5295+
<details><summary><b>UserSettings.ServerSpecific.SSPlaintextSetting+UpdateType</b></summary>
5296+
5297+
```
5298+
[0] = None
5299+
[1] = Clear
5300+
[2] = Text
5301+
[3] = Settings
5302+
```
5303+
5304+
</details>
5305+
5306+
### UpdateType
5307+
5308+
<details><summary><b>UserSettings.ServerSpecific.SSSliderSetting+UpdateType</b></summary>
5309+
5310+
```
5311+
[0] = None
5312+
[1] = Value
5313+
[2] = Constraints
5314+
```
5315+
5316+
</details>
5317+
5318+
### UpdateType
5319+
5320+
<details><summary><b>UserSettings.ServerSpecific.SSTwoButtonsSetting+UpdateType</b></summary>
5321+
5322+
```
5323+
[0] = None
5324+
[1] = Value
5325+
[2] = Options
5326+
```
5327+
5328+
</details>
5329+
52935330
### UrgencyLevel
52945331

52955332
<details><summary><b>Christmas.Scp2536.UrgencyLevel</b></summary>

0 commit comments

Comments
 (0)