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.

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

Merge Upstream 12.01.2025 #1743

Merged
merged 5 commits into from
Jan 12, 2025
Merged

Merge Upstream 12.01.2025 #1743

merged 5 commits into from
Jan 12, 2025

Conversation

ss220app[bot]
Copy link

@ss220app ss220app bot commented Jan 12, 2025

This pull request merges upstream/master. Resolve possible conflicts manually and make sure all the changes are applied correctly.

Changelog

🆑 ParadiseSS13
fix: Теперь ночное освещение действительно экономит энергию.
add: Хирургический компьютер теперь показывает нужный инструмент для каждого этапа операции, а также отображает все активные операции у пациента.
/:cl:

Summary by Sourcery

Update canister pressure appearance logic and improve surgery computer information display. Reduce power usage of lights in nightshift mode.

Bug Fixes:

  • Fix night shift lighting power saving.
  • Surgical computer now shows the correct tool for each surgery step and displays all active surgeries on a patient.

Enhancements:

  • Improve canister pressure display logic.

warriorstar-orion and others added 4 commits January 12, 2025 10:08
…aradiseSS13#27916)

* Thngy

* Update code/modules/mob/living/silicon/ai/ai_mob.dm

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

---------

Signed-off-by: Burzah <[email protected]>
Co-authored-by: Burzah <[email protected]>
)

* Makes night shift actually save power

* Update code/modules/power/lights.dm

Co-authored-by: Mikhail G. <[email protected]>
Signed-off-by: DGamerL <[email protected]>

* Bit more power use

---------

Signed-off-by: DGamerL <[email protected]>
Co-authored-by: Mikhail G. <[email protected]>
…aradiseSS13#27755)

* draws the owl

* Add tgui code

* improve docs

* Update code/modules/surgery/surgery.dm

Co-authored-by: Burzah <[email protected]>
Signed-off-by: Luc <[email protected]>

* tgui bundle

* clean up

* Prettier run

---------

Signed-off-by: Luc <[email protected]>
Co-authored-by: Burzah <[email protected]>
Copy link

sourcery-ai bot commented Jan 12, 2025

Reviewer's Guide by Sourcery

This pull request merges the upstream/master branch, resolving conflicts and applying all changes. It includes several fixes and additions, notably changes to atmospherics canisters, surgical computers, and power usage by lights. Several global lists related to AIs were also updated.

State diagram for canister pressure levels

stateDiagram-v2
    [*] --> LOW_PRESSURE: pressure < 10
    LOW_PRESSURE --> NORMAL_PRESSURE: pressure >= 10
    NORMAL_PRESSURE --> HIGH_PRESSURE: pressure >= ONE_ATMOSPHERE
    HIGH_PRESSURE --> EXTREME_PRESSURE: pressure >= 15 * ONE_ATMOSPHERE
    note right of LOW_PRESSURE: Simplified from bitflags
    note right of EXTREME_PRESSURE: Highest pressure state
Loading

File-Level Changes

Change Details Files
Refactored atmospherics canister code to simplify pressure display logic.
  • Removed bitflag calculations for canister pressure display.
  • Introduced a new variable current_pressure_appearance to store the current pressure level for display.
  • Created a new function pressure_to_appearance() to determine the appropriate pressure level based on the canister's pressure.
  • Modified process_atmos() to call sync_pressure_appearance() to update the canister's icon based on its current pressure.
  • Removed the check_change() function and related variables.
  • Simplified update_icon_state() and update_overlays() functions to use the new current_pressure_appearance variable.
  • Added a call to update_appearance(UPDATE_NAME) in the rename_canister() proc to update the canister's name when it is renamed.
code/modules/atmospherics/machinery/portable/canister.dm
Improved surgical computer interface to display more information about ongoing surgeries.
  • Added the necessary tool for each surgery step to the surgical computer display.
  • Modified the surgical computer to display all active surgeries on a patient, including the next step for each surgery and its location.
  • Updated surgery step information to include the required tools.
  • Updated tool defines for surgery related tools.
code/modules/surgery/surgery.dm
tgui/packages/tgui/interfaces/OperatingComputer.js
code/game/machinery/computer/Operating.dm
code/modules/surgery/abstract_steps.dm
code/__DEFINES/tools_defines.dm
Adjusted power consumption for lights and updated AI-related global lists.
  • Reduced idle power consumption of lights to save energy during nightshift.
  • Updated several global lists related to AIs to use GLOB.ai_list instead of GLOB.mob_list or GLOB.alive_mob_list.
  • Updated several procs and functions to use GLOB.ai_list for AI interactions.
code/modules/power/lights.dm
code/modules/mob/living/silicon/ai/ai_mob.dm
code/modules/mob/new_player/new_player.dm
code/__HELPERS/unsorted.dm
code/controllers/subsystem/SSticker.dm
code/game/gamemodes/cult/runes.dm
code/game/objects/items/devices/enginepicker.dm
code/modules/events/communications_blackout.dm
code/modules/events/money_spam.dm
Updated atmospherics machinery to call update_icon after connecting or disconnecting.
  • Added calls to update_icon() after connecting or disconnecting portable atmospherics machinery.
code/modules/atmospherics/machinery/portable/portable_atmospherics.dm

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time. You can also use
    this command to specify where the summary should be inserted.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@github-actions github-actions bot added TGUI Кто-то решил потрогать интерфейсы. 🙏 Слияние с восходящим потоком Боже, храни Короля! Merge Conflict Ну блять... labels Jan 12, 2025
@ss220app ss220app bot added the 📜 CL валиден Этот чейнджлог будет успешно опубликован label Jan 12, 2025
Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have skipped reviewing this pull request. It seems to have been created by a bot (hey, ss220app[bot]!). We assume it knows what it's doing!

@github-actions github-actions bot removed the Merge Conflict Ну блять... label Jan 12, 2025
@Legendaxe Legendaxe merged commit c5e9a11 into master Jan 12, 2025
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🙏 Слияние с восходящим потоком Боже, храни Короля! 📜 CL валиден Этот чейнджлог будет успешно опубликован TGUI Кто-то решил потрогать интерфейсы.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants