Skip to content

Самодельные инструменты v2.0 #2489

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.

Sign up for GitHub

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

Open
NekoSyndicateNihon wants to merge 9 commits into
base: master
Choose a base branch
from
+169 −2
Open

Самодельные инструменты v2.0 #2489

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5412d89
Добавлены 3 новых самодельных инструмента. Все инструменты по скорост…
NekoSyndicateNihon Feb 12, 2026
4e5ab26
Довёл инструменты до ума. Есть крафты и эффекты.
NekoSyndicateNihon Feb 12, 2026
fbee71e
Изменён регистр букв на нижний в названии самодельных инструментов
Feb 13, 2026
6e9b042
Update Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/ha…
NekoSyndicateNihon Feb 27, 2026
fd37ef9
Update Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml
NekoSyndicateNihon Feb 27, 2026
89c998a
Update Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml
NekoSyndicateNihon Feb 27, 2026
19db154
Update Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml
NekoSyndicateNihon Feb 27, 2026
2ea5bd7
Update Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml
NekoSyndicateNihon Feb 27, 2026
dc97cb1
Merge branch 'master' into handmadetools
Darkiich Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 82 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,85 @@
sprite: ADT/Objects/Tools/supermatter_scalpel.rsi
storedRotation: 90
- type : SupermatterImmune

Comment on lines 122 to +123
Copy link
Contributor

@coderabbitai coderabbitai bot Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Check the current state of the tools.yml file around lines 119-120
fd 'tools.yml' Resources/Prototypes/ADT/Entities/Objects/Tools/ --exec cat -n {} | sed -n "110,130p"

Repository: AdventureTimeSS14/space_station_ADT

Length of output: 672

🏁 Script executed:

#!/bin/bash
# Also check if SupermatterImmune component exists elsewhere in the project
rg -n "SupermatterImmune" Resources/Prototypes/ | head -20

Repository: AdventureTimeSS14/space_station_ADT

Length of output: 2169

🏁 Script executed:

#!/bin/bash
# Check the structure around the specific entity to understand context
fd 'tools.yml' Resources/Prototypes/ADT/Entities/Objects/Tools/ --exec cat -n {} | sed -n "100,135p"

Repository: AdventureTimeSS14/space_station_ADT

Length of output: 1141

Исправить формат YAML: убрать пробел перед двоеточием в type : SupermatterImmune

На строке 119 присутствует форматная ошибка — пробел перед двоеточием: - type : SupermatterImmune вместо - type: SupermatterImmune. Компонент SupermatterImmune корректно присутствует в коде и используется правильно, но требует соответствия YAML-стандартам (без пробела перед двоеточием), как это реализовано во всех остальных случаях в проекте.

🤖 Prompt for AI Agents 
In `@Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml` around lines 119 -
120, Fix the YAML key formatting for the SupermatterImmune component by removing
the space before the colon so the entry reads "- type: SupermatterImmune"
instead of "- type : SupermatterImmune"; update the offending line containing
"type : SupermatterImmune" to match the project's YAML style (no space before
the colon) ensuring consistency with other component entries.

#рукодельные инструменты

- type: entity
parent: BaseCrowbar
name: cамодельная монтировка
Copy link
Collaborator

@Red-Lis Red-Lis Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Почему в прототипах названия и описания на русском?
Тут должно быть на инглише, а локаль уже лежит в папке с ней

Copy link
Contributor Author

@NekoSyndicateNihon NekoSyndicateNihon Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Смысл от локализации, если это локально наша сборка? Можно и так написать спокойно

Copy link
Collaborator

@Red-Lis Red-Lis Feb 27, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Стандарт.
Так делали - так и будут делать.
Причин куча, но считай, что стандарт самое главное.
Мне правда лень расписывать всё.

Copy link
Contributor Author

@NekoSyndicateNihon NekoSyndicateNihon Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

а чей стандарт? Визардов?

Copy link
Collaborator

@Schrodinger71 Schrodinger71 Feb 27, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Стандарт данного форка, будьте добры пожалуйста придерживаться его

id: ADTHMCrowbar
description: А это надёжно?..
Copy link
Collaborator

@Red-Lis Red-Lis Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Оно же

components:
- type: Sprite
state: icon
- type: Item
storedSprite:
sprite: Objects/Tools/crowbar.rsi
state: storage
- type: MeleeWeapon
wideAnimationRotation: -100
damage:
types:
Blunt: 4
soundHit:
collection: MetalThud
- type: Prying
speedModifier: 0.4
Comment on lines +126 to +146
Copy link
Contributor

@coderabbitai coderabbitai bot Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

cd Resources/Prototypes/ADT/Entities/Objects/Tools && \
sed -n '125p;148p;167p;186p' tools.yml | od -c | head -20

Repository: AdventureTimeSS14/space_station_ADT

Length of output: 119

🏁 Script executed:

cd Resources/Prototypes/ADT/Entities/Objects/Tools && \
python3 << 'EOF'
with open('tools.yml', 'r', encoding='utf-8') as f:
    lines = f.readlines()
    target_lines = [124, 147, 166, 185]  # 0-indexed
    
for line_num in target_lines:
    line = lines[line_num]
    if 'name:' in line:
        # Extract the name value
        name_part = line.split('name:')[1].strip()
        print(f"Line {line_num + 1}: {line.strip()}")
        # Check first character
        if name_part:
            first_char = name_part[0]
            print(f"  First char: '{first_char}' U+{ord(first_char):04X}")
            if first_char == 'c':
                print(f"  → This is LATIN LOWERCASE C (U+0063)")
            elif first_char == 'с':
                print(f"  → This is CYRILLIC LOWERCASE C (U+0441)")
        print()
EOF

Repository: AdventureTimeSS14/space_station_ADT

Length of output: 491

Исправить латинскую букву c на кириллическую с во всех названиях инструментов.

Все четыре сущности (строки 125, 148, 167, 186) используют латинскую букву c (U+0063) вместо кириллической с (U+0441). Это создаёт смешанный скрипт в названиях и может вызвать проблемы с поиском и фильтрацией.

Исправления 
-  name: cамодельная монтировка
+  name: самодельная монтировка
-  name: cамодельные кусачки
+  name: самодельные кусачки
-  name: cамодельная отвёртка
+  name: самодельная отвёртка
-  name: cамодельный гаечный ключ
+  name: самодельный гаечный ключ
🤖 Prompt for AI Agents 
In `@Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml` around lines 123 -
143, The tool entity names contain a Latin 'c' (U+0063) instead of a Cyrillic
'с' (U+0441); locate each tool entity's name field (for example the value
"cамодельная монтировка" and the other three tool name values) and replace the
Latin 'c' with the Cyrillic 'с' so the names use only Cyrillic characters;
verify the id strings (e.g., ADTHMCrowbar) remain unchanged and run a search for
any other occurrences of the Latin 'c' in tool name values to correct them
consistently.



- type: entity
parent: Wirecutter
name: cамодельные кусачки
Copy link
Collaborator

@Red-Lis Red-Lis Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Опять

id: ADTHMWirecutter
description: Это кусачки или щипчики?
Copy link
Collaborator

@Red-Lis Red-Lis Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Опять

components:
- type: MeleeWeapon
damage:
types:
Piercing: 0
- type: Tool
qualities:
- Cutting
speedModifier: 0.4
# ADT add
Copy link
Collaborator

@Red-Lis Red-Lis Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Это папка ADT
Зачем комент, что это добавление от нас?
Типо похуй, но в наших же папках нет смысла оставлять

- type: Construction
graph: ADTHandmadeWirecutterGraph
node: HandmadeWirecutter

- type: entity
parent: Screwdriver
name: cамодельная отвёртка
Copy link
Collaborator

@Red-Lis Red-Lis Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Опять

id: ADTHMScrewdriver
description: Оно точно не сломается
Copy link
Collaborator

@Red-Lis Red-Lis Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

И опять

components:
- type: MeleeWeapon
damage:
types:
Piercing: 0
- type: Tool
qualities:
- Screwing
speedModifier: 0.4
#ADT add
- type: Construction
graph: ADTHandmadeScrewdriver
node: HandmadeScrewdriver

- type: entity
parent: Wrench
name: cамодельный гаечный ключ
id: ADTHMWrench
description: Слабое и не надёжное
components:
- type: MeleeWeapon
damage:
types:
Blunt: 2
- type: Tool
qualities:
- Anchoring
speedModifier: 0.4
- type: Construction
graph: ADTHandmadeWrench
node: HandmadeWrench

59 changes: 57 additions & 2 deletions Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/handmade_tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#Crowbar
- type: constructionGraph
id: ADTHandmadeCrowbarGraph
start: start
Expand All @@ -7,7 +8,61 @@
- to: HandmadeCrowbar
steps:
- material: MetalRod
amount: 3
amount: 2
doAfter: 1
- node: HandmadeCrowbar
entity: Crowbar
entity: ADTHMCrowbar
#Wirecutter
- type: constructionGraph
id: ADTHandmadeWirecutterGraph
start: start
graph:
- node: start
edges:
- to: HandmadeWirecutter
steps:
- material: MetalRod
amount: 2
doAfter: 1
- material: Steel
amount: 1
doAfter: 1
- node: HandmadeWirecutter
entity: ADTHMWirecutter
Copy link
Contributor

@coderabbitai coderabbitai bot Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Исправить entity в финальных нодах графов.

На Line 31, Line 49 и Line 67 указаны ADTHMWirecutter / ADTHMScrewdriver / ADTHMWrench, но в прототипах инструментов используются id формата ADTHandMade*. В текущем виде крафт может создавать не те сущности или не резолвить прототип.

Предлагаемое исправление 
-  - node: HandmadeWirecutter
-    entity: ADTHMWirecutter
+  - node: HandmadeWirecutter
+    entity: ADTHandMadeWirecutter
@@
-  - node: HandmadeScrewdriver
-    entity: ADTHMScrewdriver
+  - node: HandmadeScrewdriver
+    entity: ADTHandMadeScrewdriver
@@
-  - node: HandmadeWrench
-    entity: ADTHMWrench
+  - node: HandmadeWrench
+    entity: ADTHandMadeWrench

Also applies to: 49-49, 67-67

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In
`@Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/handmade_tools.yml`
at line 31, The final nodes' entity IDs are incorrect: replace the values
ADTHMWirecutter, ADTHMScrewdriver, and ADTHMWrench with the prototype IDs that
follow the project's naming convention (ADTHandMade...); update the three
occurrences (the final node entries currently using ADTHM*) to the matching
ADTHandMade* IDs used by the tool prototypes so the graph resolves the correct
crafted entities.


#Screwdriver
- type: constructionGraph
id: ADTHandmadeScrewdriver
start: start
graph:
- node: start
edges:
- to: HandmadeScrewdriver
steps:
- material: MetalRod
amount: 1
doAfter: 1
- material: Steel
amount: 1
doAfter: 1
- node: HandmadeScrewdriver
entity: ADTHMScrewdriver

#Wrench
- type: constructionGraph
id: ADTHandmadeWrench
start: start
graph:
- node: start
edges:
- to: HandmadeWrench
steps:
- material: MetalRod
amount: 1
doAfter: 1
- material: Steel
amount: 1
doAfter: 1
- node: HandmadeWrench
entity: ADTHMWrench

24 changes: 24 additions & 0 deletions Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,30 @@
category: construction-category-tools
objectType: Item

- type: construction
id: HandmadeScrewdriver
graph: ADTHandmadeScrewdriver
startNode: start
targetNode: HandmadeScrewdriver
category: construction-category-tools
objectType: Item

- type: construction
id: HandmadeWirecutter
graph: ADTHandmadeWirecutterGraph
startNode: start
targetNode: HandmadeWirecutter
category: construction-category-tools
objectType: Item

- type: construction
id: HandmadeWrench
graph: ADTHandmadeWrench
startNode: start
targetNode: HandmadeWrench
category: construction-category-tools
objectType: Item

- type: construction
id: ADTBoneKnife
graph: ADTBKnife
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,5 @@
- state: equipped-BELT
- state: cover-equipped-BELT
color: "#968000"


Comment on lines +191 to +192
Copy link
Collaborator

@Schrodinger71 Schrodinger71 Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

тут тоже пустые строки новые

4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
- type: StaticPrice
price: 30


- type: entity
name: screwdriver
parent: BaseItem
Expand Down Expand Up @@ -88,6 +89,7 @@
- type: StaticPrice
price: 30


- type: entity
name: wrench
parent: BaseItem
Expand Down Expand Up @@ -129,6 +131,8 @@
- type: GuideHelp
guides:
- Construction
#ADT add
Copy link
Collaborator

@Red-Lis Red-Lis Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А это тут зачем?..
Как и пустые строки
Изменений же ноль

Copy link
Collaborator

@Schrodinger71 Schrodinger71 Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Видимо напутал что-то
а так да, стоит убрать


Comment on lines +134 to +135
Copy link
Contributor

@coderabbitai coderabbitai bot Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Комментарий #ADT add не соответствует принятому формату и не сопровождается изменениями.

Согласно гайдлайнам, изменения в официальном коде (вне /ADT/) должны быть помечены как # ADT-Tweak-Start / # ADT-Tweak-End (или # ADT-Tweak: для одиночных строк). Здесь #ADT add не следует этому формату. Кроме того, после комментария нет никакого фактического изменения — он выглядит как забытый маркер.

Если предполагалось добавить компонент Construction к базовому Wrench (по аналогии с BaseCrowbar в crowbars.yml, строки 39–43), то он отсутствует. Если нет — стоит удалить этот комментарий.

Предлагаемое исправление: удалить лишний комментарий 
   - type: GuideHelp
     guides:
     - Construction
-  `#ADT` add
-

As per coding guidelines: «Все изменения вне папок /ADT/ должны быть прокомментированы примерно так # ADT-Tweak-Start / # ADT-Tweak-End».

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
#ADT add
- type: GuideHelp
guides:
- Construction
🤖 Prompt for AI Agents 
In `@Resources/Prototypes/Entities/Objects/Tools/tools.yml` around lines 134 -
135, Remove or correct the stray comment marker "#ADT add" in tools.yml: either
delete it if no change was intended, or replace it with the proper ADT tweak
format ("# ADT-Tweak-Start"/"# ADT-Tweak-End" or "# ADT-Tweak:") and add the
corresponding code if you intended to attach a Construction component to the
base Wrench (mirror the pattern used for BaseCrowbar in crowbars.yml for the
Construction addition). Ensure the change uses the exact marker strings and, if
adding the Construction component, update the Wrench definition to include that
component consistently with the BaseCrowbar example.


- type: entity
name: multitool
Expand Down
Loading