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

Merge upstream 22.09.2024 #1540

Merged
merged 7 commits into from
Sep 22, 2024
Merged

Merge upstream 22.09.2024 #1540

merged 7 commits into from
Sep 22, 2024
+154 −237

Commits on Sep 20, 2024

  1. Offering ghost no longer runtime (ParadiseSS13#26853) 

    Co-authored-by: Adrer <[email protected]>
    @Adrer
    Adrer and Adrer committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    7639848 View commit details
    Browse the repository at this point in the history

  2. Makes Indestructible Titanium Walls Into an Indestructible Wall Subty… 

    …pe (ParadiseSS13#26565)

* creation

* update

* Update code/game/turfs/simulated/walls_indestructible.dm

Co-authored-by: warriorstar-orion <[email protected]>
Signed-off-by: CRUNCH <[email protected]>

---------

Signed-off-by: CRUNCH <[email protected]>
Co-authored-by: warriorstar-orion <[email protected]>
    @Fordoxia @warriorstar-orion
    Fordoxia and warriorstar-orion committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    7a399ac View commit details
    Browse the repository at this point in the history

  3. NanoMap Auto-Update (Fri Sep 20 01:34:36 UTC 2024) (ParadiseSS13#26537) 

    Co-authored-by: NanoMap Generation <[email protected]>
    @paradisess13 @actions-user
    paradisess13[bot] and actions-user committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    7262bfb View commit details
    Browse the repository at this point in the history

  4. [FIX] Now properly remove/add machines to the RNC console when (un)li… 

    …nked (ParadiseSS13#26815)

* Now properly remove/add machines to the rdconsole when (un)linked

* Remove unused variable

---------

Co-authored-by: Adrer <[email protected]>
    @Adrer
    Adrer and Adrer committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    1d32faf View commit details
    Browse the repository at this point in the history

  5. modsuit magboots save you from singulo hammer (ParadiseSS13#26858)

    @Qwertytoforty
    Qwertytoforty committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    6c2210a View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. Updates chat selectors (ParadiseSS13#26863)

    @Burzah
    Burzah committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    aae804e View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. Merge https://github.com/ParadiseSS13/Paradise

    @Legendaxe
    Legendaxe committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    0bc3533 View commit details
    Browse the repository at this point in the history