-
Notifications
You must be signed in to change notification settings - Fork 176
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Various changes I have needed #2153
Closed
Closed
Changes from all commits
Commits
Show all changes
345 commits
Select commit
Hold shift + click to select a range
a87cf97
Fix NW
louis1706 99bfa79
FUCK that so dumb
louis1706 90bcaff
nah, cringe logic
IRacle1 73d622f
:)
IRacle1 4474c5d
Merge branch 'dev' into Fix-Bug-than-Grenade-do-not-make-damage-corre…
louis1706 458f533
Merge branch 'dev' into Fix-DroppingScp330Event-Desync-client-candy
louis1706 c5b7d1a
Update Consuming.cs
louis1706 b7cafa7
fix
NotIntense 80d4a78
Update
NotIntense 5a493ed
Merge branch 'more-ability-extensions' into dev
joker-119 d308d09
Merge branch 'fix-room-position-methods' into dev
joker-119 d203b28
Merge branch 'small-inventory-fix' into dev
joker-119 c08c16d
Merge branch 'make-npcs-not-show-on-player-count' into dev
joker-119 564b6a4
u
IRacle1 fed2fac
Merge branch 'dev' into Fix-Bug-than-Grenade-do-not-make-damage-corre…
louis1706 8ccc2ed
Merge branch 'dev' into EnableEffect-should-have-intensity-argument
louis1706 73141ac
Fix
louis1706 3ffbd53
I will re add setter later when i found a good way to do them
louis1706 d02f8f9
Merge branch 'dev' into Scp079Role-fix
louis1706 528b425
Merge branch 'dev' into ReworkingScp079Transpiller
louis1706 24bd5e8
Merge branch 'dev' into Scp106ReworkTranspiller
louis1706 dd3d535
Revert "NetherCode"
louis1706 0cd64fe
will add this later
louis1706 e427dec
RemoveError
louis1706 d4cfa93
Remove Error
louis1706 2042b37
Update ZoneBlackoutEventArgs.cs
louis1706 d2908b4
Fix error
louis1706 68a0b25
Space
louis1706 d5a6008
Bruh
louis1706 7116059
No Fix
louis1706 800277d
Fix ILCode Error
louis1706 a12c6bd
Callvirt
louis1706 df6a951
No needed it's not bool Prefix
louis1706 3ec3d38
Failed instead of return
louis1706 32ed9dd
CanScp049SenseTutorial Patch
louis1706 f558661
miss register event
louis1706 fecc678
.
louis1706 7bf7574
Stuff I needed
joker-119 d5bd9e3
Fix typos
NaoUnderscore 82673ac
Merge branch 'dev' into EnableEffect-should-have-intensity-argument
louis1706 98c4b35
DecontaminationFeatures
louis1706 d20376e
it's also global when final
louis1706 0a5b883
Fix
louis1706 19d03bc
LazyFix
louis1706 ad7e5a5
0
louis1706 6d4431e
Obsolete
louis1706 49f3697
Merge branch 'dev' into dev
louis1706 4538343
better
IRacle1 9c9a321
Merge branch 'dev' into somechanges
IRacle1 3caacc9
Update DecontaminationState.cs
louis1706 b27326f
SendStaffMessage
louis1706 b237a59
Idk if this is needed
louis1706 342ed8a
things
joker-119 10f7f5a
Merge remote-tracking branch 'origin/dev' into dev
joker-119 b3e99fe
RemoveVersionChange and NpcPlayerCountInFavor
louis1706 fa9f125
autommatically find exiled version
louis1706 2a4de86
Merge branch 'dev' into AutomaticFind-ExiledVersion
Thundermaker300 1f4ec7a
Merge branch 'dev' into AutomaticFind-ExiledVersion
louis1706 f0f8aa5
Update CustomRole.cs
louis1706 b336974
Merge branch 'dev' into somechanges
louis1706 f0ba294
Fix Crash null string
louis1706 3dce27e
Fix ILError
louis1706 a5c6c30
Fix Skill Issue from someone else
louis1706 53da193
Obsolete value instead of deleting them
louis1706 7e9cbd6
doc
louis1706 28a3404
Merge branch 'dev' into dev
joker-119 2c984cf
Merge pull request #1 from louis1706/pr2153-PRRequest
joker-119 32a5102
Merge branch 'dev' into EnableEffect-should-have-intensity-argument
louis1706 26c6f66
Merge branch 'AutomaticFind-ExiledVersion' into Exiled8.3
louis1706 253e075
Merge branch 'LazyFix' into Exiled8.3
louis1706 f312d00
Merge branch 'dev' into DecontaminationAPI
louis1706 2ecbb4e
Merge branch 'DecontaminationAPI' into Exiled8.3
louis1706 6295a11
Merge branch 'EnableEffect-should-have-intensity-argument' into Exile…
louis1706 e49dc4f
Merge branch 'Fix-Bug-than-Grenade-do-not-make-damage-correctly' into…
louis1706 056adf9
Merge branch 'dev' into Fix-Bug-than-Grenade-do-not-make-damage-corre…
louis1706 2d985ba
Merge remote-tracking branch 'origin/Fix-DroppingScp330Event-Desync-c…
louis1706 0c356b3
Merge branch 'Scp106ReworkTranspiller' into Exiled8.3
louis1706 82a1cd9
Merge branch 'Scp079Role-fix' into Exiled8.3
louis1706 7548440
.
louis1706 1a6249e
DisableCustomConst
louis1706 31f955f
Merge branch 'Scp106ReworkTranspiller' into Exiled8.3
louis1706 2b1ab05
.
louis1706 12d5c7c
Merge branch 'dev' into SendStaffMessage
louis1706 d359369
.
louis1706 71cd44e
Merge branch 'Other-Transpiler-Fix' into Exiled8.3
louis1706 30aa880
Merge branch 'SendStaffMessage' into Exiled8.3
louis1706 9e0fda6
Merge branch 'DecontaminationAPI' into Exiled8.3
louis1706 12d6430
Fix
louis1706 bda1def
Merge branch 'Scp106ReworkTranspiller' into Exiled8.3
louis1706 4423850
Fix doc
louis1706 1314105
Merge branch 'EnableEffect-should-have-intensity-argument' into Exile…
louis1706 30af5cb
Merge branch 'dev' into dev
joker-119 c62e414
Merge branch 'Exiled8.3' into dev
louis1706 a357a4e
Merge pull request #62 from NotIntense/dev
louis1706 6f457a7
not needed
louis1706 d706541
Merge branch 'pr/2136' into Exiled8.3
louis1706 01a4c2d
Merge pull request #63 from IRacle1/somechanges
louis1706 1819df1
Merge branch 'Fix-Bug-than-Grenade-do-not-make-damage-correctly' into…
louis1706 9632cd7
Revert "Fix UsedItem event not being called (#2163)"
louis1706 babec0e
Merge branch 'revert-2163-UsedItemFixNotCall' into Exiled8.3
louis1706 bb19b8e
Merge branch 'dev' into somechanges
louis1706 f840f13
Fix
louis1706 2b73b47
Merge branch 'dev' into Scp106ReworkTranspiller
louis1706 3932aa3
Merge branch 'dev' into Scp049ReworkingTranspiler
louis1706 10d0f5f
.
louis1706 e08ae84
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 389af2d
Merge branch 'Fix-DroppingScp330Event-Desync-client-candy' into Exile…
louis1706 a01d702
Merge branch 'ReworkingScp079Transpiller' into Exiled8.3
louis1706 5e0dd78
Implement Scp0492.Conssumed
louis1706 497d1fd
Implement Scp0492.Conssumed
louis1706 1b95fe9
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 9b690c9
Few Fix
louis1706 09c36e0
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 ace9aac
Fix Item always being null
louis1706 da79ede
Merge branch 'dev' into Fix-CancelledItemEvent
louis1706 ddd2f98
Merge branch 'Fix-CancelledItemEvent' into Exiled8.3
louis1706 583faa4
.
louis1706 2fade3e
Merge branch 'Fix-CancelledItemEvent' into Exiled8.3
louis1706 568d1b5
FixCanScp049SenseTutorial
louis1706 be1f5cd
Merge branch 'Scp106ReworkTranspiller' into Exiled8.3
louis1706 235174b
Merge branch 'dev' into Exiled8.3
louis1706 e148162
Merge branch 'dev' into ReworkingScp079Transpiller
louis1706 5eb154b
Hurt
louis1706 5712ed8
Merge branch 'HurtedEvent' into Exiled8.3
louis1706 79f7305
SCP:SL 13.3
louis1706 317a62d
Doc (#2177)
louis1706 74f72ae
Merge branch 'Exiled8.3' into halloween-2023
louis1706 067db4e
SCP:SL 13.3
louis1706 9e630ef
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 ac5cb61
Merge branch 'Exiled8.3' into halloween-2023
louis1706 99e836c
Merge branch 'halloween-2023' of https://github.com/Exiled-Team/EXILE…
louis1706 82f8148
Merge branch 'Fix-YamatoSkillIssue' into Exiled8.3
louis1706 a516ef8
Merge branch 'FixCrashShowHint(null)' into Exiled8.3
louis1706 0d3861c
Merge branch 'ReworkingScp079Transpiller' into Exiled8.3
louis1706 0b398e3
Merge branch 'Exiled8.3' into halloween-2023
louis1706 1efab6d
Fix DisruptorHitreg.ServerPerformShot Transpiler
louis1706 960f16b
Merge branch 'Fix-DisruptorHitreg.ServerPerformShot-Transpiler' into …
louis1706 169ee71
Fix Scp330Interobject transpiler
louis1706 d195478
Merge branch 'Fix-Scp330Interobject-Transpiler' into halloween-2023
louis1706 36ecbf5
Fix FirearmRequest Received - Transpiler
louis1706 cf1f99a
Merge branch 'Fix-FirearmRequest-Received---Transpiler' into hallowee…
louis1706 3be4a6b
New API for SCP Halloween
louis1706 f7587cf
Updating Documentation Again
louis1706 9f904df
Fixing some part of the code
louis1706 877b5fa
Update Exiled.Events/Patches/Events/Player/Hurting.cs
louis1706 e82129f
Bruh
louis1706 0aca732
Merge branch 'HurtedEvent' of https://github.com/louis1706/EXILED int…
louis1706 9697b51
Merge branch 'HurtedEvent' into Exiled8.3
louis1706 64cd760
Merge branch 'dev' into Scp049ReworkingTranspiler
louis1706 90a7dbb
Fix
louis1706 4a378cf
Merge branch 'HurtedEvent' into Exiled8.3
louis1706 480b409
1st try
louis1706 bf05f0c
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 b8a6008
Fixed crash
louis1706 8ab7a47
Callvirt & Fix yamato moment
louis1706 b74ac56
Merge branch 'ReworkingScp079Transpiller' into Exiled8.3
louis1706 e400ece
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 b63a27d
Merge branch 'Exiled8.3' into halloween-2023
louis1706 43194fd
oups
louis1706 0ad71d2
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 3815b1e
.
louis1706 5a92957
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 e50d6c7
Fuck
louis1706 96a4680
Fix
louis1706 44eefac
Merge branch 'somechanges' of https://github.com/IRacle1/EXILED into …
louis1706 5a763d1
Merge branch 'dev' into somechanges
louis1706 b8502d0
Merge branch 'somechanges' into Exiled8.3
louis1706 03ef26f
Merge branch 'Exiled8.3' into halloween-2023
louis1706 14149ce
Adding Scp3114 Subroutine
louis1706 d43ada7
.
louis1706 147472e
Merge branch 'Exiled8.3' into halloween-2023
louis1706 531a919
.
louis1706 6618206
Missing features for halloween
louis1706 7838133
Update Version
louis1706 2484381
Flashlight can now contain Lantern
louis1706 6d2f45d
ChaosTargetCounter
Misfiy a2d4540
Merge branch 'pr/2179' into halloween-2023
louis1706 7fe79e3
Map::PrismaticCloud
louis1706 9fc5eb3
Network_chaosTargetCount
Misfiy 7745b36
Add Scp3114 to RoleExtensions
Thundermaker300 ce7742f
i fix this little doc
louis1706 8cc368c
DON'T MERGE it's not FINISH (#2180)
louis1706 c60f298
Merge branch 'pr/2179' into halloween-2023
louis1706 900902d
Fast fix light
louis1706 c65ca61
Bump Version
louis1706 9f4482a
fix playerstat (#2181)
IkaOverride 87271cd
Update RoundEnd.cs
Misaka-ZeroTwo 81cada5
Update EXILED.props
Misaka-ZeroTwo 11e1a29
Update RoundEnd.cs
Misaka-ZeroTwo 3bfda10
Update EXILED.props
Misaka-ZeroTwo 3459d32
fix
IRacle1 233eaed
Fixes (#2184)
IRacle1 2ca9c4a
Bump Version
louis1706 8fc8231
`MaxHealth` fix (#2185)
IRacle1 bf67f0f
WTF How that fix duration effect ??!!??
louis1706 8ed4804
Fix KickingEvent idk why it's could be null
louis1706 304ea8b
Scp3114DamageHandler is not ScpDamage ???!!!??
louis1706 b087428
Bump Version 8.3.6
louis1706 37f3966
Update doc
louis1706 136788a
Someone forgot about the marshmallows >:( (#2189)
Misfiy 2801667
Fix Marshmallow
louis1706 39a5f2f
Fix NRE
louis1706 9c1f6fd
Add SCP-3114 properties, fix documentation
Thundermaker300 37fe47b
Missing SilentDamage
louis1706 3a50b0d
Merge branch 'halloween-2023' of https://github.com/Exiled-Team/EXILE…
louis1706 51b7a1b
Merge branch 'dev' into dev
joker-119 1fb7c0b
Merge remote-tracking branch 'origin/halloween-2023' into dev
joker-119 61b9dc3
yes
joker-119 e95cbf8
Fix kicking event
Misaka-ZeroTwo 858ebae
Merge branch 'halloween-2023' of https://github.com/Exiled-Team/EXILE…
Misaka-ZeroTwo d6a805b
Version Bump
Misaka-ZeroTwo 146b0d5
Fix thanks IRacle
louis1706 81aeb5b
Fix documentation
louis1706 c0618e3
Add Get & Sets for the warningTimeSeconds method & adding more proper…
SnivyFilms c5041e8
Fix Rpc and WriteExtensions dictionary (#2199)
sanyae2439 f21540e
code style
Misaka-ZeroTwo c0689f0
whut
louis1706 d9832ab
Merge branch 'halloween-2023' of https://github.com/Exiled-Team/EXILE…
louis1706 2df7739
Fix stamina bug
louis1706 a31d69d
No ArgumentOutOfRangeException for this
louis1706 1476660
Merge branch 'halloween-2023' into dev
joker-119 d32fc89
fix Metal
louis1706 e01ff0b
Jailbird/firearm fix (#2187)
IRacle1 78a3c2e
Nw skill issue fixed jailbird crash (#2200)
louis1706 9acfb82
Documentation fix
Thundermaker300 2451f1f
Bump Version
louis1706 587e6bb
Fix Server.Host not being able to deal Damage with Grenade
louis1706 b315890
(there no change but it's will make it work when NW will make it corr…
louis1706 b03bbc4
Fix TryAddCandy
louis1706 c404084
Fix than ConfirmAcqusition need to be done after some tick
louis1706 b58705a
Bump Version
louis1706 476baa5
Map.IsHubertSky
louis1706 019760a
missing doc
louis1706 da06540
ItemType.AntiSCP207 was missing for Usable object
louis1706 006b1c8
Checking if player is connected
louis1706 11552a8
Fix TogglingFlashlight to work with Lantern
louis1706 cd645a8
Fixes (#2205)
IRacle1 156b4d5
Add Scp3114Role.VoiceLines and Scp3114Role.PlaySound()
Thundermaker300 b9a3edd
Merge branch 'halloween-2023' into dev
joker-119 834faf7
Merge branch 'dev' into dev
joker-119 fa1e061
yes
joker-119 f850a87
ok
joker-119 d8472cd
Merge branch 'dev-hal' into dev
joker-119 2f36afd
???
joker-119 8f6c0ed
Merge branch 'dev-joker' into dev-hal
joker-119 1ccd283
Merge branch 'dev-2' into dev-hal
joker-119 6119f36
yes
joker-119 b8a3213
Merge branch 'dev' into dev-joker
joker-119 e7e717d
Someone's an idiot
joker-119 0e8cd78
Someone else is also retarded
joker-119 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -291,7 +291,7 @@ public Quaternion Rotation | |||
/// <summary> | ||||
/// Gets a value indicating whether this pickup is spawned. | ||||
/// </summary> | ||||
public bool IsSpawned => NetworkServer.spawned.ContainsValue(Base.netIdentity); | ||||
public bool IsSpawned { get; internal set; } | ||||
|
||||
/// <summary> | ||||
/// Gets an existing <see cref="Pickup"/> or creates a new instance of one. | ||||
|
@@ -541,6 +541,7 @@ public void Spawn() | |||
if (!IsSpawned) | ||||
{ | ||||
NetworkServer.Spawn(GameObject); | ||||
IsSpawned = true; | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||
} | ||||
} | ||||
|
||||
|
@@ -571,6 +572,7 @@ public void UnSpawn() | |||
{ | ||||
if (IsSpawned) | ||||
{ | ||||
IsSpawned = false; | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||
NetworkServer.UnSpawn(GameObject); | ||||
} | ||||
} | ||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.