Merge Upstream 16.01.2025

[ss220app]

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

Note

Requires Wiki Update:
www.github.com/ParadiseSS13/Paradise/pull/27894
www.github.com/ParadiseSS13/Paradise/pull/27911

Changelog

🆑 ParadiseSS13
fix: Исправлена ошибка, из-за которой медицинские сканеры всегда показывали случайное время смерти.
add: Добавлены крупные и блюспейс-версии переносного воздушного насоса. Их нельзя найти на станции.
tweak: Теперь воздушные насосы могут достигать давления до 45 атмосфер (раньше было 10), что соответствует давлению в баллоне.
tweak: Воздушные насосы теперь изначально полностью заполнены воздухом.
tweak: Хранилище инженерного отряда быстрого реагирования (ERT) было расширено, оснащено стеллажами с ресурсами и содержит различное оборудование.
imageadd: Химические пожары получили обновлённые спрайты. Некоторые из них теперь имеют новые цвета.
tweak: Алгоритм покрытия метеорного щита был изменён: теперь он использует симуляцию метеоритов, падающих на станцию. Это означает, что 100% покрытия теперь обеспечивают (почти) полную защиту станции.
tweak: Компьютер управления спутника щита был полностью переработан и теперь отображает симуляцию покрытия в реальном времени.
tweak: Цель по покрытию метеорного щита теперь считается выполненной при достижении 75% покрытия. Для расчёта покрытия необходимо выполнить симуляцию с использованием компьютера управления.
tweak: Контейнеры со щитами для спутника стали дешевле (с 250 до 100) и теперь содержат больше щитов (с 3 до 4), чтобы компенсировать увеличившуюся сложность защиты.
/:cl:

Summary by Sourcery

Update the health scanner to display the correct time of death. Add large and bluespace versions of the portable air pump, which are not available on the station. Increase the maximum pressure of air pumps to 45 atm and pre-fill them with air. Expand the engineering ERT storage area with shelving and bluespace portable air pumps. Resprite chemical fires with new colors. Change the meteor shield coverage algorithm to simulate meteor impacts, requiring 75% coverage for completion. Redesign the shield satellite control computer to display real-time coverage simulation. Reduce the cost of shield sat crates from 250 to 100 and increase the number of shields from 3 to 4.

New Features:

• Add large and bluespace portable air pumps.
• Add real-time meteor shield coverage simulation to the shield satellite control computer.

Bug Fixes:

• Fix an issue where health scanners always displayed a random time of death.

Tests:

• Prevent fake meteors from triggering meteor alerts.

[sourcery-ai]

Reviewer's Guide by Sourcery

This pull request merges the upstream/master branch, resolving conflicts and applying all changes. It includes several fixes, additions, and tweaks related to health scanners, air pumps, chemical fires, the meteor shield, and its control computer. It also updates shield satellite control UI and underlying logic, and adjusts the cost and contents of shield sat crates.

Sequence diagram for meteor shield simulation

sequenceDiagram
    participant UI as Shield Control UI
    participant Computer as Shield Control Computer
    participant Goal as Station Shield Goal
    participant Meteor as Fake Meteor

    UI->>Computer: begin_test()
    Computer->>Goal: simulate_meteors()
    activate Goal
    loop 100 times
        Goal->>Meteor: spawn_meteor()
        Meteor->>Meteor: check_collision()
        alt Meteor hits shield
            Meteor->>Goal: update_coverage(success=true)
        else Meteor hits station
            Meteor->>Goal: update_coverage(success=false)
        end
    end
    Goal->>Computer: update_status()
    Computer->>UI: update_display()
    deactivate Goal

Loading

Class diagram for updated air pump types

classDiagram
    class obj_machinery_atmospherics_portable_pump {
        +name: string
        +volume: number
        +direction: number
        +target_pressure: number
        +Initialize()
        +update_icon_state()
        +update_overlays()
    }

    class obj_machinery_atmospherics_portable_pump_big {
        +name: string
        +volume: number = 5000
    }

    class obj_machinery_atmospherics_portable_pump_bluespace {
        +name: string
        +volume: number = 25000
        +update_icon_state()
    }

    obj_machinery_atmospherics_portable_pump <|-- obj_machinery_atmospherics_portable_pump_big
    obj_machinery_atmospherics_portable_pump <|-- obj_machinery_atmospherics_portable_pump_bluespace

    note for obj_machinery_atmospherics_portable_pump "Base portable air pump class"
    note for obj_machinery_atmospherics_portable_pump_big "Large capacity pump"
    note for obj_machinery_atmospherics_portable_pump_bluespace "Bluespace enhanced pump"

Loading

Class diagram for updated fire effect system

classDiagram
    class obj_effect_fire {
        +temperature: number
        +duration: number
        +application_stacks: number
        +base_icon_state: string
        +Initialize()
        +process()
        +update_icon_state()
    }

    class datum_reagent {
        +burn_temperature: number
        +burn_duration: number
        +fire_stack_applications: number
        +burn_color: string
    }

    obj_effect_fire ..> datum_reagent : uses properties

Loading

File-Level Changes

Change	Details	Files
Updated health scanners to correctly display time of death.	Fixed an issue where health scanners would always display a random time of death.	code/game/objects/items/devices/scanners.dm
Added new portable air pumps and adjusted existing pump behavior.	Added large and bluespace versions of portable air pumps. Increased the maximum pressure of air pumps to 45 atm. Set air pumps to start filled with air. Added bluespace portable air pumps to the engineering ERT storage area.	code/modules/atmospherics/machinery/portable/portable_pump.dm
Improved chemical fire sprites and added new colors.	Updated chemical fire sprites. Added new colors for some chemical fires.	code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm code/modules/reagents/chemistry/reagents/pyrotechnic.dm code/modules/reagents/chemistry/reagents_datum.dm
Redesigned the meteor shield system and its control computer.	Changed the meteor shield coverage algorithm to simulate meteor impacts. Overhauled the shield satellite control computer UI to display real-time coverage simulation. Set the meteor shield goal completion threshold to 75% coverage. Made shield sat crates cheaper and increased the number of shields they contain.	tgui/packages/tgui/interfaces/SatelliteControl.js code/modules/station_goals/shield.dm code/game/objects/effects/meteors.dm code/_onclick/hud/follow_alert.dm
Updated the portable scrubber overlays.	Updated the portable scrubber icon overlays to use "pscrubber" prefix.	code/modules/atmospherics/machinery/portable/scrubber.dm
Updated the DNA samplers crate name.	Changed the name of the DNA samplers crate.	code/modules/supply/supply_packs/pack_miscellaneous.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

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[sourcery-ai]

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!

[AyIong]

!rebuild_tgui

[AyIong]

!build_tgui

[AyIong]

!merge_upstream

[ss220app]

GitHub Actions can not push to the repository without "Allow edits and access to secrets by maintainers" checked.

[AyIong]

sadge