-
Notifications
You must be signed in to change notification settings - Fork 132
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
Conversation
* [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
Reviewer's Guide by SourceryThis 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 systemsequenceDiagram
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
Class diagram for updated movement componentsclassDiagram
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
Flow diagram for meteor spawning logicgraph 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
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!
25f976b
to
10959e3
Compare
![:neckbeard: :neckbeard:](https://github.githubassets.com/images/icons/emoji/neckbeard.png)
!build_rust |
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/28030
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:
Tests: