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 12.09.2024 #1500

Merged
merged 16 commits into from
Sep 12, 2024
Merged

Merge Upstream 12.09.2024 #1500

merged 16 commits into from
Sep 12, 2024

Commits on Sep 10, 2024

  1. Fixes stacks, attempt 2 (ParadiseSS13#26633) 

    * this is hell pain

* fixes merge issues when cutting up various items

* adds early return to attackby
    @chuga-git
    chuga-git committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    f57ebfa View commit details
    Browse the repository at this point in the history

  2. Re-weighted secondary goals. (ParadiseSS13#26586)

    @FunnyMan3595
    FunnyMan3595 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    6c2d43e View commit details
    Browse the repository at this point in the history

  3. add option to disable end of round sound (ParadiseSS13#26014) 

    * add option to disable end of round sound

* fix sleep position

* add EOR sound to enable/disable preferences

* invert logic so that existing players don't mute the sound

* fix inconsistent mute/hear variable

---------

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

  4. fix: Unintentional night-shift despite disabled in configuration. (Pa… 

    …radiseSS13#26659)
    @warriorstar-orion
    warriorstar-orion committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    fbcdb23 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Fixes for mech crusher (ParadiseSS13#26741) 

    * E

* forgor this

* forgor this thing too

* add icons

* Update work_tools.dm

Signed-off-by: MLGTASTICa <[email protected]>

* Update code/modules/research/designs/mechfabricator_designs.dm

Co-authored-by: 1080pCat <[email protected]>
Signed-off-by: MLGTASTICa <[email protected]>

* Update code/game/mecha/equipment/tools/work_tools.dm

Co-authored-by: 1080pCat <[email protected]>
Signed-off-by: MLGTASTICa <[email protected]>

* my beloved , gone.

* misinput!!!

* Update code/game/mecha/equipment/tools/work_tools.dm

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

* Review compliance

* Update work_tools.dm

* Update work_tools.dm

* more fixes

* Update work_tools.dm

---------

Signed-off-by: MLGTASTICa <[email protected]>
Co-authored-by: 1080pCat <[email protected]>
Co-authored-by: warriorstar-orion <[email protected]>
    @MLGTASTICa @1080pCat @warriorstar-orion
    3 people committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    80fbaf5 View commit details
    Browse the repository at this point in the history

  2. Patches resprite (ParadiseSS13#26626)

    @AyIong
    AyIong committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    0ab96c5 View commit details
    Browse the repository at this point in the history

  3. Debug logs an admin log about things taking too long to del (Paradise… 

    …SS13#26748)
    @lewcc
    lewcc committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    3d0e8f7 View commit details
    Browse the repository at this point in the history

  4. refactor: dead signals removal (ParadiseSS13#26704)

    @warriorstar-orion
    warriorstar-orion committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    9f8c2c2 View commit details
    Browse the repository at this point in the history

  5. refactor: remove CanPass height arg (ParadiseSS13#26700)

    @warriorstar-orion
    warriorstar-orion committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    9a5db8f View commit details
    Browse the repository at this point in the history

  6. [FIX] Red engineering ERT suits have their species sprites back. (Par… 

    …adiseSS13#26603)

* [FIX] Red engineering ERT suits have their species sprites back

* woops sorry AA.
    @1080pCat
    1080pCat committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    0579912 View commit details
    Browse the repository at this point in the history

  7. Gas Meter Resprite (ParadiseSS13#26625) 

    * Deletes old Gas Meter sprites

Bye bye!

* Resprites Gas Meter - edit of SmArtKar's TG version

- Credit to SmArtKar for original TG sprite.
    @ATP-Engineer
    ATP-Engineer committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    19536aa View commit details
    Browse the repository at this point in the history

  8. Update hierophant_loot.dm (ParadiseSS13#26634)

    @XFirebirdX
    XFirebirdX committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    4f6641c View commit details
    Browse the repository at this point in the history

  9. [FIX] Cult Shadow Shackles can now cuff people who are missing an arm. ( 

    ParadiseSS13#26707)

* Copies the requirements from handcuff code

* This proc is never implemented

* Removes unused procs
    @Daylight2
    Daylight2 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    965b42b View commit details
    Browse the repository at this point in the history

  10. fix: remove two unused vardecls (ParadiseSS13#26756)

    @warriorstar-orion
    warriorstar-orion committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    716428d View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into merge-upstream

    @AyIong
    AyIong committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    c4280df View commit details
    Browse the repository at this point in the history

  12. Bring back removed signals

    @AyIong
    AyIong committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    f95e015 View commit details
    Browse the repository at this point in the history