[TWEAK] Автоинъекторы и наборы#2585
Open
kerfus-owo wants to merge 14 commits intoAdventureTimeSS14:masterfrom
Open
[TWEAK] Автоинъекторы и наборы#2585kerfus-owo wants to merge 14 commits intoAdventureTimeSS14:masterfrom
kerfus-owo wants to merge 14 commits intoAdventureTimeSS14:masterfrom
Conversation
github-actions
bot
added
size/S
Status: Needs Review
Changes: Localization
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
WalkthroughОбновлены локализации и прототипы мединжекторов (hypospray): изменены русскоязычные отображаемые названия и описания; в прототипах и рецептах заменены и перераспределены реагенты (например, TranexamicAcid → ADTStypticPowder, Inaprovaline → Epinephrine, Ultravasculine → Diphenhydramine); увеличены объёмы у ряда пенов (maxVol/transferAmount 15→20); добавлены два новых автоинжектора (ADTSigynateAutoInjector, ADTPolypyryliumOligomersAutoInjector); обновлены спрайты/состояния текстур и содержимое аптечек. Possibly related PRs
Suggested labels
Suggested reviewers
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 5
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl`:
- Line 14: В тексте свойства .desc замените неверную капитализацию сложного
слова: поменяйте "Экспресс-Доза" на "Экспресс-доза" (обратите внимание на дефис
и строчную букву д) в строке, где определено .desc.
In `@Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml`:
- Around line 121-124: The YAML descriptions for the crisis, lacerinol, and
bruizine hypospray entries were not updated after the reagent changes; locate
the hypospray.yml entries for those items (the blocks containing ReagentId:
Epinephrine / DexalinPlus and their sibling reagent blocks) and update each
item’s description field to reference the new reagent names and effects instead
of the old substances. Ensure the description text for the entries named crisis,
lacerinol, and bruizine matches the current ReagentId values and reflects
correct quantities/effects for the new reagents.
- Around line 145-150: Наследуемое свойство transferAmount: 15 в ChemicalMedipen
заставляет ADTLacerAutoInjector и ADTBruizAutoInjector инъецировать по 15u, что
даёт остаток при увеличенном maxVol: 20; чтобы вернуть ожидаемое одноразовое
поведение, явно переопределите transferAmount в этих сущностях
(ADTLacerAutoInjector и ADTBruizAutoInjector) на 20 или установите
transferAmount равным maxVol, чтобы полная ёмкость инжектора вводилась за одну
операцию; также примените то же изменение к второй секции (аналогичным записям,
указанных в примечании).
In `@Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml`:
- Around line 233-236: Update the English "description" entries in hypospray.yml
to reflect the new reagent list: replace references to ultravasculine,
epinephrine, and tranexamic acid with the current reagents (Diphenhydramine and
Dylovene) and any changed quantities, ensuring the text accurately describes
effects/contents; check and update every description field for the hypospray
entries (including the other occurrence noted later) so the human-readable
descriptions match the ReagentId/Quantity blocks shown (e.g., the entries that
now list Diphenhydramine and Dylovene).
- Around line 423-424: В файле hypospray.yml у сущности PunctAutoInjector
суммарный объём реагентов в pen (Puncturase: 10 + ADTStypticPowder: 10 = 20)
превышает заданные лимиты maxVol и transferAmount (по 15), что приводит к потере
дозы; исправьте либо уменьшив количества реагентов в pen (например привести
сумму ≤ maxVol) либо увеличив поля maxVol и transferAmount до 20 в определении
PunctAutoInjector/pen, чтобы суммарный объём реагентов соответствовал
вместимости и переносу.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: 89a72682-c805-428b-8327-b87c5610b813
📒 Files selected for processing (6)
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftlResources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftlResources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.ymlResources/Prototypes/ADT/Recipes/Cooking/medical_recipes.ymlResources/Prototypes/Catalog/Fills/Items/firstaidkits.ymlResources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl
Outdated
Show resolved
Hide resolved
Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml
Show resolved
Hide resolved
Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml
Show resolved
Hide resolved
github-actions
bot
added
size/M
Changes: Sprites
Contributor
|
RSI Diff Bot; head commit 6473c41 merging into 24dcb9c Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi
|
…-owo/space_station_ADT into make-medipens-great-again
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
♻️ Duplicate comments (3)
Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml (1)
121-123:⚠️ Potential issue | 🟡 MinorСинхронизируйте
descriptionс обновлёнными реагентами.
ADTCrisisAutoInjector,ADTLacerAutoInjectorиADTBruizAutoInjectorуже используют новый состав, но тексты описаний всё ещё ссылаются на старые вещества.Also applies to: 151-152, 179-180
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml` around lines 121 - 123, The description texts for ADTCrisisAutoInjector, ADTLacerAutoInjector, and ADTBruizAutoInjector are out of date and still reference the old reagents; update each entity's description field to match the new reagent composition (e.g., include Epinephrine and DexalinPlus as shown in the ReagentId list) so the human-readable text accurately reflects the current reagents and quantities.Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml (2)
231-236:⚠️ Potential issue | 🟠 MajorСинхронизируйте
transferAmountс новым объёмом 20u.После увеличения состава до 20u эти инъекторы вводят не всю дозу за раз (
AntiPoisonMedipenнаследует 15u,PunctAutoInjectorявно имеет 15u), из-за чего остаётся хвост в шприце.💉 Предлагаемое исправление
- type: entity name: poison auto-injector parent: ChemicalMedipen id: AntiPoisonMedipen @@ + - type: Hypospray + solutionName: pen + transferAmount: 20 + onlyAffectsMobs: false + injectOnly: true @@ - type: Hypospray solutionName: pen - transferAmount: 15 + transferAmount: 20 onlyAffectsMobs: false injectOnly: trueAlso applies to: 419-424
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml` around lines 231 - 236, The transferAmount for hypospray-type injectors is still set to 15u while maxVol was increased to 20u; update the transferAmount value to 20 for the relevant prototypes so the full dose is injected (update the transferAmount field in the hypospray.yml entries for AntiPoisonMedipen and PunctAutoInjector and any other hypospray variants referenced around the other duplicate block at lines ~419-424 to match maxVol: 20 and ensure no leftover volume remains).
233-236:⚠️ Potential issue | 🟡 MinorОбновите
descriptionпод фактический состав реагентов.В этих блоках состав уже заменён, но английские
descriptionу соответствующих сущностей всё ещё описывают старые реагенты, что вводит в заблуждение при осмотре предмета.Also applies to: 282-283, 423-424
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml` around lines 233 - 236, Update the English description fields to match the actual reagents listed (e.g., the blocks that now contain "ReagentId: Diphenhydramine" and "ReagentId: Dylovene") so the item text reflects the current contents; locate the description keys associated with those reagent blocks (the same pattern around the ReagentId/Quantity entries at the shown locations and also at the other affected blocks referenced: lines 282-283 and 423-424) and edit the description strings to accurately describe Diphenhydramine and Dylovene instead of the old reagent names.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl`:
- Line 29: В поле .desc в файле hypospray.ftl исправьте форму слова: замените
«олигомер полипирилия» на «олигомеров полипирилия» так, чтобы строка .desc
теперь содержит «Экспресс-доза олигомеров полипирилия и кровоостанавливающей
пудры, предназначенная для применения в боевых условиях.»
In `@Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml`:
- Around line 242-245: The name field for the entity with id
ADTPolypyryliumOligomersAutoInjector is incorrect — update the YAML so the name
matches the id/state/description (e.g., change the name from "sigynate
auto-injector" to a matching label like "polypyrylium oligomers auto-injector"
or another consistent human-readable name) ensuring the name, id, and
description all refer to the same item.
---
Duplicate comments:
In `@Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml`:
- Around line 121-123: The description texts for ADTCrisisAutoInjector,
ADTLacerAutoInjector, and ADTBruizAutoInjector are out of date and still
reference the old reagents; update each entity's description field to match the
new reagent composition (e.g., include Epinephrine and DexalinPlus as shown in
the ReagentId list) so the human-readable text accurately reflects the current
reagents and quantities.
In `@Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml`:
- Around line 231-236: The transferAmount for hypospray-type injectors is still
set to 15u while maxVol was increased to 20u; update the transferAmount value to
20 for the relevant prototypes so the full dose is injected (update the
transferAmount field in the hypospray.yml entries for AntiPoisonMedipen and
PunctAutoInjector and any other hypospray variants referenced around the other
duplicate block at lines ~419-424 to match maxVol: 20 and ensure no leftover
volume remains).
- Around line 233-236: Update the English description fields to match the actual
reagents listed (e.g., the blocks that now contain "ReagentId: Diphenhydramine"
and "ReagentId: Dylovene") so the item text reflects the current contents;
locate the description keys associated with those reagent blocks (the same
pattern around the ReagentId/Quantity entries at the shown locations and also at
the other affected blocks referenced: lines 282-283 and 423-424) and edit the
description strings to accurately describe Diphenhydramine and Dylovene instead
of the old reagent names.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: 56a09af3-9508-4b64-b121-5b85fee8f1fb
⛔ Files ignored due to path filters (6)
Resources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/diphenhydramine.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/diphenhydramine_empty.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/polypyrylium_oligomers.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/polypyrylium_oligomers_empty.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/sigynate.pngis excluded by!**/*.png,!**/*.pngResources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/sigynate_empty.pngis excluded by!**/*.png,!**/*.png
📒 Files selected for processing (6)
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftlResources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftlResources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.ymlResources/Prototypes/ADT/Recipes/Cooking/medical_recipes.ymlResources/Prototypes/Entities/Objects/Specific/Medical/hypospray.ymlResources/Textures/ADT/Objects/Specific/Medical/medipen.rsi/meta.json
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl
Outdated
Show resolved
Hide resolved
Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml
Outdated
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml`:
- Around line 217-236: Update the description for ADTSigynateAutoInjector to
accurately reflect its contents and effect: edit the description field in the
hypospray.yml (the ADTSigynateAutoInjector entity) to mention both Sigynate and
Dermaline (referencing the reagents under SolutionContainerManager -> solutions
-> pen) and their combined purpose/effect (e.g., rapid sigynate dose with
dermaline component), so item inspection is not misleading.
In `@Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml`:
- Around line 430-431: Описание у PunctAutoInjector больше не соответствует
содержимому: ReagentId изменён на ADTStypticPowder и Quantity на 10, но текст
описания всё ещё ссылается на TranexamicAcid/старое количество; обновите поле
description для сущности PunctAutoInjector, заменив упоминания TranexamicAcid на
ADTStypticPowder и скорректировав указание количества на 10 (и, при
необходимости, любую сопутствующую формулировку эффекта/назначения, чтобы оно
соответствовало новому реагенту).
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: a5c16111-03b7-4936-a3be-3984d4077c8c
📒 Files selected for processing (3)
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftlResources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.ymlResources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
🚧 Files skipped from review as they are similar to previous changes (1)
- Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Medical/hypospray.ftl
Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/hypospray.yml
Show resolved
Hide resolved
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Описание PR
Почему / Баланс
Чейнджлог
🆑 Kerfus