Machine parts tiers #328
Machine parts tiers #328
Conversation
… salvage loot spawner (space-wizards#23752)"" This reverts commit 2c218c7. # Conflicts: # Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml # Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
This reverts commit a9e89ab. # Conflicts: # Content.Server/Kitchen/Components/MicrowaveComponent.cs # Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs # Resources/Maps/Test/test_teg.yml
This reverts commit b3014e6. # Conflicts: # Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
… loot spawner (space-wizards#23752)" This reverts commit df1d8c3. # Conflicts: # Resources/Prototypes/XenoArch/Effects/normal_effects.yml # Resources/migration.yml
…izards#23202)" This reverts commit c3f81bf. # Conflicts: # Content.Server/Lathe/Components/LatheHeatProducingComponent.cs # Content.Server/Lathe/LatheSystem.cs # Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Recipes/Lathes/electronics.yml
This reverts commit e7e7974. # Conflicts: # Content.Shared/Radiation/Components/RadiationSourceComponent.cs # Resources/Prototypes/Recipes/Lathes/electronics.yml
|
RSI Diff Bot; head commit 287d239 merging into 58e132c Resources/Textures/Objects/Misc/stock_parts.rsi
Resources/Textures/Objects/Power/power_cells.rsi
Resources/Textures/Structures/Power/cell_recharger.rsi
Resources/Textures/Structures/Machines/ore_processor_industrial.rsi
|
…pace-wizards#23202)"" This reverts commit 1344105. # Conflicts: # Content.Server/Lathe/LatheSystem.cs
This reverts commit 9e8944e.
…ocessor (space-wizards#23202)""" This reverts commit 874fc9c.
|
А турбозарядник-то за что( Он удобен не только что быстрее заряжает, а то, что он заряжает и батарейки и оружие |
|
Я думаю можно будет его оставить и задебаффать, чтобы своей универсальностью он платил скоростью зарядки меньшей, чем можно с деталями т3 если бы улучшали обычные |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…eam/space-station-14 into machine-parts-tiers # Conflicts: # Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs # Resources/Locale/ru-RU/kitchen/components/microwave-component.ftl # Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml
…eam/space-station-14 into machine-parts-tiers
|
Убирая конфликты на примере микроволновки заметил, что часть фиксов и нововведений в системе были удалены. Поаккуратней надо ревёртать пр-ы. |
…-station-14 into machine-parts-tiers
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Вернёмся к деталям позже, а на пока закрываю. |
О запросе слияния
Возвращены тиры деталей
Почему / Баланс
Обсуждено с миленом
Медиа
Чейнджлог
🆑 RevengenRAt