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 23.01.2025 #1761

Merged
merged 29 commits into from
Jan 23, 2025
Merged

Merge Upstream 23.01.2025 #1761

merged 29 commits into from
Jan 23, 2025

Conversation

ss220app[bot]
Copy link

@ss220app ss220app bot commented Jan 23, 2025

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

Changelog

🆑 ParadiseSS13
tweak: Метеоры теперь появляются на краю карты (за пределами зоны строительства), вместо того чтобы быть настолько близко, что могут обходить спутники-щиты.
tweak: Емагнутые спутники-щиты теперь умнее и сбивают симулированные метеоры.
fix: Спутники-щиты, находящиеся в ящике, теперь сообщают местоположение ящика на карте управления, вместо угла карты.
tweak: Увеличена длина отображения flavor text при осмотре персонажей.
tweak: Повышена стоимость Mantis Blades в меню предателя (Traitor Uplink).
tweak: Снижена сила удара у Mantis Blades Синдиката и Нанотрейзен.
tweak: Удалены Mantis Blades из меню ядерного оперативника (Nuclear Uplink).
tweak: Предотвращено появление Mantis Blades в Syndicate Surplus Crate.
tweak: Mantis Blades больше не могут быть выбраны со скидкой.
add: Администраторы теперь могут легко создавать случайных персонажей для событий из числа экипажа с помощью Create Antagonist.
add: Добавлено дополнительное освещение в примерочной базы Синдиката в космосе.
fix: Внешнее освещение на базе Синдиката в космосе теперь подключено к АПЦ.
fix: Космическая база Синдиката теперь имеет вариант игрового автомата Claw Game, который не требует кредитов или аккаунта.
fix: Зависшие эффекты огня и ветра теперь действительно устранены.
fix: Режим строительства атмосферы (buildmode atmos) больше не будет иногда некорректно указывать параметры воздуха.
fix: Другие изменения атмосферы, которые ранее иногда могли не работать, теперь исправлены.
fix: Спрей больше не открывает два меню одновременно.
fix: Команда aheal больше не вызывает паузы на сервере.
tweak: Увеличена защита от радиации в MODsuit для парамедиков.
del: Удалены некоторые старые галлюцинации, подробности можно найти в PR.
tweak: Обновлены названия и описания, связанные с блюспейсом.
tweak: Обновлено множество лоровых описаний брони.
add: Зловещая активность Синдиката ощущается по всему сектору! Теперь почти все руины в космосе содержат некоторое количество экипировки, ранее доступной только в депо. Депо больше не гарантируется в каждом раунде, так что тщательно исследуйте все руины, чтобы найти добычу Синдиката.
/:cl:

Summary by Sourcery

Update movement to use movement loops.

New Features:

  • Implement movement loops to manage timed movement.
  • Add new movement procs to the move_manager datum.
  • Add new signals for movement events.

Tests:

  • Update tests to account for new movement system.

FunnyMan3595 and others added 23 commits January 20, 2025 19:03
* [s] Fixes an issue with dynamic spawning

* shit quick fix
* Add one-click for event roles.

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Review fix.

* Update code/modules/admin/verbs/one_click_antag.dm

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Update code/modules/admin/verbs/one_click_antag.dm

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Update code/modules/admin/verbs/one_click_antag.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

---------

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Even the Syndicate needs light

* Fixes Claw Game and added more lights

* Let's try this again

* UpdatePath hook deployed - Thanks Warriorstar

* I have zero idea how this happened

* Fixed an issue with APC being in the wrong Area

* Reverts Delta mapchange

* Let's try this again

* Had to manually change the mapfile in the end...
…radiseSS13#27925)

* migrates door remotes + removes unused airlock var

* remove janikey do_after bar

* me stoopid

* initializes + remove extra line

---------

Co-authored-by: Toastical <toast@toaster.com>
* override attack_self on subtype

* whoops

* New to Initialize

* linter?

---------

Co-authored-by: Toastical <toast@toaster.com>
* Initial Change

* To infinity and beyond

* down to 259
* Adds conical spells from TG

* Remove testing stuff

* Errant whitespace

* Fix levels
…7698)

* Port /tg/ move manager, drift and jetpack components.

* don't add go through newtonian movement if not moved to a turf

* various cleans for blood drifts and mob speed

* fix slow meteors

* why on fuck's earth aren't speedbikes vehicles

* style lint

* also wtf

* okay i'm an idiot

* fix meaty ore speed and blood decal double stepping

* fix not unbuckling pulled object occupants

* don't bother dealing with immovable rods just yet

* exclude bubblegum and vetus from move manager for now

* fix issues related to null weightless blood icons

* reset blood icon state properly

* fuck it, we'll deal with mobs when basic mobs happen

* break infinite loop in decal splat
* when the space is blue

* Update bio_chip_fluff.dm

* Update wormhole_jaunter.dm

* Update magazines.dm

* Update bags.dm

* Update magazines.dm

* Update dance_machine.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update closets.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
* armor

* Update code/modules/clothing/head/helmet.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/head/helmet.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/head/helmet.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/head/helmet.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/head/helmet.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/suits/armor_suits.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/head/helmet.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/head/helmet.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/suits/armor_suits.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/suits/armor_suits.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/suits/armor_suits.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/suits/armor_suits.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/suits/armor_suits.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/suits/armor_suits.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/suits/armor_suits.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/clothing/suits/armor_suits.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
* Scatter depot loot to the solar winds.

* make zoo spawners guaranteed

* INFINITY also used for spawn_all_loot, whoops

* move abandoned sec shuttle spawner to locked crate

* Can't use spawn_all_loot and nested lists together

* Reduce pixel offset on mech transport spawn scatter

* set updatepaths script number

* incorporate changes from ParadiseSS13#27398 and remove old spawners

* some numbers tweaking

* pct -> %

* move briefcase from common to rare for ruins

* lower loot budget from 1800 -> 1700
Copy link

sourcery-ai bot commented Jan 23, 2025

Reviewer's Guide by Sourcery

This pull request refactors the movement and space drift systems, updates meteor and space debris spawning logic, enhances admin tools for event character creation, revises syndicate loot distribution, and fixes various bugs. Key changes include the introduction of new movement loop datums, improved spawning logic for meteors, enhanced admin capabilities for creating event characters, and adjustments to syndicate loot availability.

Sequence diagram for the new movement system

sequenceDiagram
    participant Client
    participant Move
    participant MoveLoop
    participant GLOB.move_manager

    Client->>Move: Move(new_loc, direct)
    Move->>Move: Check pre-move conditions
    Move->>GLOB.move_manager: Process movement
    GLOB.move_manager->>MoveLoop: Create movement loop
    MoveLoop->>Move: Execute movement
    Move-->>Client: Return movement result
Loading

Class diagram for updated movement components

classDiagram
    class MoveLoop {
        +direction: int
        +delay: int
        +lifetime: int
        +process()
        +stop()
    }

    class MovableAtom {
        +glide_size: int
        +Move()
        +Process_Spacemove()
        +newtonian_move()
    }

    class JetpackComponent {
        +stabilize: bool
        +configure_jetpack()
        +allow_thrust()
    }

    MovableAtom --> MoveLoop
    MovableAtom --> JetpackComponent
Loading

Flow diagram for meteor spawning logic

graph TD
    A[Start Spawn] --> B{Check Edge Location}
    B -->|Valid| C[Create Meteor]
    B -->|Invalid| D[Try New Location]
    C --> E[Set Trajectory]
    E --> F[Initialize Movement]
    F --> G[Start Movement Loop]
    D --> B
Loading

File-Level Changes

Change Details Files
Refactored movement and space drift systems to improve performance and maintainability.
  • Introduced new movement loop datums to handle various movement types.
  • Replaced old movement functions like walk() with new movement loop systems.
  • Implemented a new subsystem for handling space drift, separating it from general movement.
  • Added new components for handling jetpack and drift mechanics.
code/controllers/subsystem/movement/movement_types.dm
code/controllers/subsystem/movement/SSmovement.dm
code/controllers/subsystem/movement/SSspacedrift.dm
code/datums/move_manager.dm
code/datums/components/drift.dm
code/datums/components/jetpack_component.dm
Updated meteor and space debris spawning logic to improve game balance and performance.
  • Changed meteor spawning to occur at the edge of the map instead of near shield satellites.
  • Improved logic for space debris movement and interaction with the environment.
code/game/objects/effects/meteors.dm
code/modules/events/dust.dm
code/modules/events/immovable_rod.dm
Enhanced admin tools and event character creation capabilities.
  • Added functionality for admins to create event characters randomly from the crew.
  • Improved one-click antagonist creation with new options for event characters.
code/modules/admin/verbs/one_click_antag.dm
code/modules/admin/topic.dm
Revised syndicate loot and space ruin loot distribution.
  • Removed Mantis Blades from Nuclear Uplink and adjusted their availability in other contexts.
  • Reorganized syndicate loot spawners and added new loot pools for space ruins.
code/datums/uplink_items/uplink_general.dm
code/game/objects/effects/spawners/random/pool/space_loot.dm
code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm
Fixed various bugs and improved game mechanics.
  • Fixed issues with shield satellites reporting incorrect positions.
  • Resolved problems with stuck fire and wind effects.
  • Improved buildmode atmos functionality to correctly set air parameters.
code/modules/station_goals/shield.dm
code/controllers/subsystem/SSair.dm
code/modules/mob/mob_movement.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. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the 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 exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

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 Merge Conflict Ну блять... 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🎸 Инструменты Мы выдаем себя за реальное сообщество разработчиков. 🙏 Слияние с восходящим потоком Боже, храни Короля! labels Jan 23, 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 added 💾 Изменение конфига Ф-ф-фуриор...? 🔉 Звук Услада для ушей. Кибериада Этот ПР изменил что-то на Кибериаде (BoxStation) Керберос Этот ПР изменил что-то на Керберосе (DeltaStation) Цереброн Этот ПР изменил что-то на Цереброне (MetaStation) TGUI Кто-то решил потрогать интерфейсы. 💿 SQL Надо править БД. labels Jan 23, 2025
@github-actions github-actions bot added 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. and removed Merge Conflict Ну блять... :neckbeard: Документация Улучшения и дополнения в документации 💾 Изменение конфига Ф-ф-фуриор...? 🔉 Звук Услада для ушей. Кибериада Этот ПР изменил что-то на Кибериаде (BoxStation) Керберос Этот ПР изменил что-то на Керберосе (DeltaStation) Цереброн Этот ПР изменил что-то на Цереброне (MetaStation) TGUI Кто-то решил потрогать интерфейсы. 💿 SQL Надо править БД. labels Jan 23, 2025
@m-dzianishchyts
Copy link
Collaborator

!build_rust

@m-dzianishchyts m-dzianishchyts added the 📃 Требуется изменение WIKI Эти изменения необходимо внести на нашу WIKI. label Jan 23, 2025
@ss220app ss220app bot added 📜 CL валиден Этот чейнджлог будет успешно опубликован and removed 📜 CL невалиден Этот чейнджлог не пройдет валидацию перед публикацией. Исправить или удалить, если не требуется labels Jan 23, 2025
@m-dzianishchyts m-dzianishchyts merged commit 7157a80 into master Jan 23, 2025
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎸 Инструменты Мы выдаем себя за реальное сообщество разработчиков. 📃 Требуется изменение WIKI Эти изменения необходимо внести на нашу WIKI. 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🙏 Слияние с восходящим потоком Боже, храни Короля! 📜 CL валиден Этот чейнджлог будет успешно опубликован 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один.
Projects
None yet
Development

Successfully merging this pull request may close these issues.