Skip to content

[pull] master from ExMod-Team:master#22

Open
pull[bot] wants to merge 139 commits into
R2kip:masterfrom
ExMod-Team:master
Open

[pull] master from ExMod-Team:master#22
pull[bot] wants to merge 139 commits into
R2kip:masterfrom
ExMod-Team:master

Conversation

@pull

@pull pull Bot commented Dec 26, 2025

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

louis1706 and others added 25 commits December 20, 2025 17:33
* FixMarshmallowManFF

* fix DamageType.Marshmallow

* new stuff added by NW
* FoundPosition event

* Add marshmallow man events

* Rewrite Yamato's prefix as transpiler

* simplify marshmallow event patches, add IL comments

* Fix Marshmallow creation and add parameters to Cackle

also fix patch I borked from last commit lol

* unobsolete EffectType.Marshmallow
…ustomDamageHandler (#696)

* fix: CacklingEventArgs & PunchingEventArgs

* fix: BugFix for FixMarshmallowManFF

* fix: finish fix for FixMarshmallowManFF

* minor doc fix

---------

Co-authored-by: @Someone <45270312+Someone-193@users.noreply.github.com>
* added customroles get command

* added multiple players logic, registered the command, removed PlayerCommandSender check

* fixed everything requested

* simplify

* Make it actually work lol (+ look nicer)

---------

Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com>
Co-authored-by: @Someone <45270312+Someone-193@users.noreply.github.com>
Fix: MarshmallowMan-Again-again
…fix formatting in custom roles Get command (#701)

fixes
* fix: Scp914.Activating Event

* Improve Index for futur update
- Yamato brain is sometime smouth (or all the time ?)
mastertest

i prefer ubuntu

This reverts commit 2d74773.

mastertest

remove mastertest
This reverts commit a882de1.

doc: Damage Handlers change
@pull pull Bot locked and limited conversation to collaborators Dec 26, 2025
@pull pull Bot added the ⤵️ pull label Dec 26, 2025
Saskyc and others added 28 commits May 9, 2026 21:02
…n converting between Pickup and Item. (#804)

* Changes to ReadPickupInfoBefore to include more information.

* fix: Build Error

---------

Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com>
…h warning to prevent crashes (#825)

* fix: no more crash

* docs: update warn text
* misc: obsolete HasFlagFast

* this was faster

---------

Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com>
* feat: spawning grenade effect event

* fix: respect DynamicPatching

* fix: position change
feat: PrefabHelper HczOneSided / HczTwoSided / HczBreakableDoor
* one shot

* fix doc

* d
* fix: respect CustomWeapon ClipSize and preserve ammo on drop (#817)

* fix(CustomItems): re-assert CustomWeapon ClipSize capacity in OnAcquired instead of on every reload
* update

* reorder

* feat: add support of displaying another armor on player

* misc: small docs change to be more *accurate*

* Improve the code

* unfinish commit for valera to start event

* fix: Patch and Setter

* fix: HasFlagFast

* feat: ChangingWearables event

* revert: revert changes in Exiled.Example.Commands.Test.cs

* oups

---------

Co-authored-by: VALERA771 <val.germanov@gmail.com>
Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com>
…nes` & fix issue that it's was called too early (#826)
* Revert "fix: Error"

This reverts commit e2d55f0.

* Revert "fix: Toys.Create Wrapper"

This reverts commit 8fd6801.

* 9.14.1 changes + refactor prefab registration

* re-add support for OneSided and TwoSided
* Fix?

* Fix

* semantics
…r) (#839)

fix: flashbang no longer flashes teammates with friendly fire off

The LifeIdentifier check that was added for NW bug #2811 inlined the
old `!PreviousOwner.CompareLife(player.ReferenceHub)` condition but
dropped the negation, turning `!=` into `==`.

UniqueLifeIdentifier is a global per-life counter, so it only matches
when `player` is the thrower himself, never for teammates. With `==`
the second half of the condition is false for every teammate, the
`continue` never runs, and they all get flashed even with FF disabled.

Flipping it back to `!=` restores the teammate skip while keeping the
LifeIdentifier intent for the NW fix.
* refactor: CustomScpTermination

* for new cassie update

* fix: Remove breaking change

---------

Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.