Skip to content

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

Open
pull[bot] wants to merge 33 commits intoR2kip:masterfrom
ExMod-Team:master
Open

[pull] master from ExMod-Team:master#22
pull[bot] wants to merge 33 commits intoR2kip:masterfrom
ExMod-Team:master

Conversation

@pull
Copy link

@pull pull bot commented Dec 26, 2025

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
louis1706 and others added 3 commits December 27, 2025 22:15
* fix: FixEffectOrder

* more fix

* ReceivingEffectEventArgs::Intensity

* change Duration to TimeLeft the real Duration of the Effect

* Remove Debug line

* fix: use TimeLeft for Duration

* better method for it

* Trying this option

* doc: updated
* Adds a event that is called after player stops talking with 1576

* Simplify initialization of TransmissionEnded event.

* should be no more warnings when build

* Apply suggestions from code review

Co-authored-by: @Someone <45270312+Someone-193@users.noreply.github.com>

* added the suggestions to make it more exiled like

* Moved to Player Handler

* Update Scp1576TransmissionEnded.cs

Change comments

---------

Co-authored-by: @Someone <45270312+Someone-193@users.noreply.github.com>
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.

6 participants