Merge Upstream 30.01.2025 #1774
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![ss220app[bot]](https://avatars.githubusercontent.com/u/131299570?s=60&v=4){kind=small}
Co-authored-by: NanoMap Generation <action@github.com>
…floor. And phazons finally deal burn on the burn mode (ParadiseSS13#28042) * Mechas no longer get their attack cooldowns taken up by clicking the floor, and phazons finally deal burn on the burn mode * lewc cooldown timer review
* Verbose RunQueue errors. * Looser tracking * Add line numbers. * Point fingers at subsystems. * SSinput debugging, useless debugging cleanup
…8149) * Make wind not unpredictably break CI due to bad init. * Is THIS your card?
…rs (1 line lol) (ParadiseSS13#27844) * Add Office Chair to the Armrest system, tiny refactor of armrest system. * Implicit armrest null from DrSmail Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com> Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com> * Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com> * Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com> * Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com> * Yeah so I impulsively ported the entirety of this system without knowing what it did * Revert "Yeah so I impulsively ported the entirety of this system without knowing what it did" This reverts commit d4edb72. --------- Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com> Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
…7851) * Fix unmoving video cam feeds. This change refactor the screen-setting logic in camera consoles to its own method, and additionally calls that method whenever a video camera is moved, if that video camera's feed is being watched by a camera console. * Reduce follow lag and add stabilization to vidcams Extracts camera follow lag into a variable on video cameras called `update_viewer_cooldown_rate` and reduces it from 3 to 2 seconds. Additionally, adds another variable on video cameras called `update_viewer_stabilization_rate`, which updates all tuned-in camera consoles with the new position of the video camera a final time, so the feed remains centered on the camera. * Change video camera feed follow to use signals * Fix unmoving camera console feeds Makes camera consoles refresh their feeds every 2 seconds as long as they have active watchers. This fixes camera bugs, ERT cameras, video cameras (including the journalist's advanced video camera), and any other mobile cameras on a console's camera network. * Replace manual camera feed cooldown with process() Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> * Update Camera Console autodoc to reflect process() implementation --------- Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
…eSS13#28017) * fix some cases * forceMove * replace usr with user
* Changes from DGamerL review * Adds /sliced to foods i missed * Adds repath.txt * Swaps left and right in repath file * Remove slice path restriction for sliceable * More suggestions from code review by DGamerL
* Removes tourettes * Removes twitchblock
Co-authored-by: Toastical <toast@toaster.com>
* Buildable vendors. * Lint. * I think this is right? * It's already IN their hands. * Lint, re-check item after prompting for price. * Fixes. * Review fixes, working dissassembly again. * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Charlie Nolan <funnyman3595@gmail.com> * Restrict appearance to buildable vendor sprites. * tyop fix --------- Signed-off-by: Charlie Nolan <funnyman3595@gmail.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
PR fixes ParadiseSS13#28143 Adds a `stat` check lost in an earlier migration from `GLOB.alive_mob_list` to `GLOB.ai_list`, to ensure dead AIs aren't added to the list of announcers.
* Dynamic Traitor Cost Adjustment * Removes some old tips * Removed a file change that tried to sneak in
* Fix more chef bonks. * Lint
…ers/cautery so they deal burn when appropriate (ParadiseSS13#28141) * stay cool * Cautery is also weird like that too
Reviewer's Guide by SourceryThis pull request merges the upstream/master branch into the current branch. It includes a variety of bug fixes, tweaks, additions, and deletions, primarily focused on gameplay and functionality improvements. The changes span multiple areas of the codebase, including vending machines, admin tools, camera consoles, chairs, mice behavior, and more. Sequence diagram for custom vending machine item interactionsequenceDiagram
actor User
participant VM as Custom Vendor
participant POS as EFTPOS
User->>VM: Add item
alt No EFTPOS linked
VM-->>User: Error: Need to link POS first
else EFTPOS locked
VM-->>User: Standard vending interaction
else Item matches existing stack
VM->>VM: Add to existing record
VM-->>User: Success message
else New item
VM->>User: Prompt for price
User->>VM: Set price
VM->>VM: Create new record
VM->>VM: Store item
VM-->>User: Success message
end
Class diagram for updated vending product systemclassDiagram
class datum_data_vending_product {
+name: string
+price: number
+get_amount_full()
+get_amount_left()
+get_icon()
+get_icon_state()
+get_name()
+vend(turf)
}
class from_path {
+product_path: atom/movable
+amount: number
+max_amount: number
}
class physical {
+items: list
+display_name: string
+display_icon: icon
+display_icon_state: string
+on_deconstruct(turf)
}
datum_data_vending_product <|-- from_path
datum_data_vending_product <|-- physical
note for datum_data_vending_product "Base abstract class for vending products"
note for from_path "Traditional vending products spawned from paths"
note for physical "New system for physical items loaded into vendor"
Class diagram for custom vending machine systemclassDiagram
class vending {
+name: string
+locked(): bool
+get_vendor_account()
+item_interaction()
}
class custom_vendor {
+linked_pos: eftpos
+locked(): bool
+get_vendor_account()
+item_interaction()
}
class eftpos {
+linked_vendors: list
+linked_account
+transaction_locked: bool
}
vending <|-- custom_vendor
custom_vendor --> eftpos: links to
eftpos --> custom_vendor: tracks
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
github-actions
bot
added
Merge Conflict
ss220app
bot
added
the
📜 CL невалиден
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
ss220app
bot
added
📜 CL валиден
m-dzianishchyts
approved these changes
Jan 30, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request merges upstream/master. Resolve possible conflicts manually and make sure all the changes are applied correctly.
Changelog
🆑 ParadiseSS13
fix: Теневой захват снова работает как задумано.
fix: Исправлена ошибка, из-за которой мехи тратили время восстановления рукопашной атаки при клике по полу.
fix: Фазоны теперь действительно наносят ожоговый урон в режиме ожога.
tweak: Офисные стулья больше не накладываются друг на друга странным образом.
fix: Исправлена проблема с консолями камер, которые не следовали за движущимися камерами (например, видеокамеры, камеры ERT, жучки).
fix: Исправлено повторяющееся отображение кнопок способностей при удалении захваченных ксеноморфных органов.
fix: ИИ больше не телепортирует диски и семена из манипулятора ДНК растений в ядро при их извлечении.
tweak: Тюремный хлеб Синдиката теперь имеет те же питательные свойства, что и обычный, которые слегка ниже их прежних значений.
tweak: Убран синдром Туретта.
fix: Дистанционные пульты для дверей снова можно помещать в рюкзак.
fix: Исправлен неправильный спрайт газовой маски службы безопасности для таяран.
add: Добавлены пользовательские автоматы, которые можно настраивать для продажи и покупки. Повар и бармен могут приобрести набор для таких автоматов у своих автоматов, а сами автоматы могут быть построены так же, как стандартные автоматы, при помощи платы, но без необходимости в наборах для пополнения.
tweak: Админ-интерфейсы для редактирования переменных и вызова процедур теперь используют один общий выборщик значений, который позволяет выбирать объекты, кликая по ним.
fix: Исправлено принуждение мёртвых ИИ к объявлению о новых прибытиях.
fix: Байкеры теперь могут правильно тащить предметы, находясь в движении.
fix: Байкеры могут корректно использовать предметы в руках, сидя на байке.
fix: Предметы для хранения и ёмкости с реагентами больше не "бьются" об кухонные машины.
fix: Исправлено отображение давления в отчетах анализа газа без режима детализации.
fix: Мыши больше не будут есть кабели под настилами.
tweak: Горящие огнемёты и электрокоагуляторы теперь наносят ожоговый урон при физических атаках.
fix: Функция коагуляции требует горящих огнемётов или зажигалок.
/:cl:
Summary by Sourcery
Update vending machines to allow for custom vending products. Fix several bugs related to shadow grappling, mecha melee attacks, phazon damage, kitchen appliance interactions, office chair overlapping, camera consoles, xeno organ removal, AI item teleportation, door remotes, gas mask sprites, dead AI announcements, traitor tips, speedbike item usage, gas scan reports, and reagent dispensing. Add custom vending machines, improve admin UIs for variable editing and procedure calls, add more chargers to the brig, add fire alarms to various locations, prevent mice from eating cables through catwalks, make lit flamethrowers and cauteries deal burn damage, and require lit flamethrowers or lighters for cauterization.
New Features:
Bug Fixes:
Enhancements: