-
Notifications
You must be signed in to change notification settings - Fork 130
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
Conversation
…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]>
Reviewer's Guide by SourceryThis 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 levelsstateDiagram-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
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
There was a problem hiding this 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!
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:
Enhancements: