Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fetch upstream #2357

Merged
merged 23 commits into from
Dec 24, 2023
Merged

Fetch upstream #2357

merged 23 commits into from
Dec 24, 2023

Commits on Dec 21, 2023

  1. Update halloween.yml

    @Misaka-ZeroTwo
    Misaka-ZeroTwo committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    502919f View commit details
    Browse the repository at this point in the history

  2. Rename halloween.yml to xmas.yml

    @Misaka-ZeroTwo
    Misaka-ZeroTwo committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    a78d8eb View commit details
    Browse the repository at this point in the history

  3. Xmas update (#2339)

    @Misaka-ZeroTwo
    Misaka-ZeroTwo committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    84211dd View commit details
    Browse the repository at this point in the history

  4. Update RoundEnd.cs (#2341)

    @VALERA771
    VALERA771 committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    e77a6b4 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. Lots of new API (#2342) 

    * lots of new

new effects
956
559

* final

* fix

* idk

* Scp956Target

* Snowed

* doc

---------

Co-authored-by: Yamato <louismonneyron5@yahoo.com>
    @VALERA771 @louis1706
    VALERA771 and louis1706 committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    4d45347 View commit details
    Browse the repository at this point in the history

  2. DamageHandler and Flamingo (#2343) 

    * DamageHandler and Flamingo

* Update ItemExtension

* Missing Scp1507Damage

* Missing Item API
    @louis1706
    louis1706 committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    9c3973f View commit details
    Browse the repository at this point in the history

  3. Snow pile (#2346) 

    * snow pile

* list fix

---------

Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com>
    @VALERA771 @louis1706
    VALERA771 and louis1706 committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    4902db1 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2023

  1. SCP-1507 (#2340) 

    * scp-1507

* minor changes

* added role

* new

* IHumeShieldRole

* .

---------

Co-authored-by: Yamato <louismonneyron5@yahoo.com>
Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com>
    @VALERA771 @louis1706
    3 people committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    92e2a17 View commit details
    Browse the repository at this point in the history

  2. CustomWeaponFix (#2349) 

    * CustomWeaponFix

* Fix
    @louis1706
    louis1706 committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    b095edc View commit details
    Browse the repository at this point in the history

  3. More features and events for SCP-1507 (#2348) 

    * scp-1507

* minor changes

* added role

* new

* IHumeShieldRole

* .

* lots of new

* still something new

* Update Scp1507Role.cs

* Update Scp1507Role.cs

---------

Co-authored-by: Yamato <louismonneyron5@yahoo.com>
Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com>
    @VALERA771 @louis1706
    3 people committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    c7cf955 View commit details
    Browse the repository at this point in the history

  4. SCP-2536 (#2344) 

    * base 2536

* ev

* trying fix

* fix + new ev

* WhitelistedTeams

* doc change

---------

Co-authored-by: Yamato <louismonneyron5@yahoo.com>
Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com>
    @VALERA771 @louis1706
    3 people committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    44c1473 View commit details
    Browse the repository at this point in the history

  5. 8.4.4-beta.1

    @louis1706
    louis1706 committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    c751745 View commit details
    Browse the repository at this point in the history

  6. Fix nuget deps

    @NaoUnderscore
    NaoUnderscore committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    1a15e68 View commit details
    Browse the repository at this point in the history

  7. ooops (#2351)

    @VALERA771
    VALERA771 committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    6a7c983 View commit details
    Browse the repository at this point in the history

  8. Fix CustomItem

    @louis1706
    louis1706 committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    924c2c3 View commit details
    Browse the repository at this point in the history

  9. Fixing scp that can attack each other (#2352) 

    * Fixing scp that can attack each other

* Update IndividualFriendlyFire.cs
    @BoltonDev
    BoltonDev committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    6f8d6f6 View commit details
    Browse the repository at this point in the history

  10. bump

    Nao committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    a5a0638 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2023

  1. SpawnReason::ItemUsage

    @louis1706
    louis1706 committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    e9b6db4 View commit details
    Browse the repository at this point in the history

  2. Fix CustomItem::OnReloading(ev)

    @louis1706
    louis1706 committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    6e9d5c3 View commit details
    Browse the repository at this point in the history

  3. - (#2354) 

    Co-authored-by: Nao <60253860+NaoUnderscore@users.noreply.github.com>
    @VALERA771 @NaoUnderscore
    VALERA771 and NaoUnderscore committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    52b7aaf View commit details
    Browse the repository at this point in the history

  4. SpawnReasons::Vocalize (#2355) 

    * Update SpawnReason.cs

Added new SpawnReason for SCP-1507

* Update SpawnReason.cs

---------

Co-authored-by: Nao <60253860+NaoUnderscore@users.noreply.github.com>
    @InziDeveloperMode @NaoUnderscore
    InziDeveloperMode and NaoUnderscore committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    f16a62d View commit details
    Browse the repository at this point in the history

  5. Removed SpawnReason::Vocalize (#2356) 

    They pointed out to me that nw doesn't use "Vocalize" but uses "Revived"
    @InziDeveloperMode
    InziDeveloperMode committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    46e9baf View commit details
    Browse the repository at this point in the history

  6. Merge branch 'apis-rework' into xmas-2023

    @NaoUnderscore
    NaoUnderscore committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    1a81653 View commit details
    Browse the repository at this point in the history