Skip to content
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

Приколы атмоса #329

Merged
merged 5 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
ent-ADTGasPipeHalf = { ent-GasPipeBase }
.suffix = Половинная
.suffix = Половинная, ADT
.desc = { ent-GasPipeBase.desc }
ent-ADTGasPipeStraight = { ent-GasPipeBase }
.suffix = Прямая
.suffix = Прямая, ADT
.desc = { ent-GasPipeBase.desc }
ent-ADTGasPipeBend = { ent-GasPipeBase }
.suffix = Угловая
.suffix = Угловая, ADT
.desc = { ent-GasPipeBase.desc }
ent-ADTGasPipeTJunction = { ent-GasPipeBase }
.suffix = Т-образная
.suffix = Т-образная, ADT
.desc = { ent-GasPipeBase.desc }
ent-ADTGasPipeFourway = { ent-GasPipeBase }
.suffix = Четверная
.suffix = Четверная, ADT
.desc = { ent-GasPipeBase.desc }
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/research/technologies.ftl
Flopochka marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
research-technology-compact-technologies = Технологии сжатия материи
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: entity
parent: GasPipeHalf
id: ADTGasPipeHalf
suffix: Half
suffix: Half, ADT
components:
- type: Transform
anchored: false
Expand All @@ -14,7 +14,7 @@
- type: entity
parent: GasPipeStraight
id: ADTGasPipeStraight
suffix: Straight
suffix: Straight, ADT
components:
- type: Transform
anchored: false
Expand All @@ -27,7 +27,7 @@
- type: entity
parent: GasPipeBend
id: ADTGasPipeBend
suffix: Bend
suffix: Bend, ADT
components:
- type: Transform
anchored: false
Expand All @@ -40,7 +40,7 @@
- type: entity
parent: GasPipeTJunction
id: ADTGasPipeTJunction
suffix: TJunction
suffix: TJunction, ADT
components:
- type: Transform
anchored: false
Expand All @@ -53,7 +53,7 @@
- type: entity
parent: GasPipeFourway
id: ADTGasPipeFourway
suffix: Fourway
suffix: Fourway, ADT
components:
- type: Transform
anchored: false
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/ADT/Recipes/Lathes/misc.yml
Flopochka marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- type: latheRecipe
id: StorageCanister
result: StorageCanister
category: Atmos
completetime: 3
materials:
Steel: 3000
15 changes: 15 additions & 0 deletions Resources/Prototypes/ADT/Research/industrial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,18 @@
cost: 15000
recipeUnlocks:
- ADTIndustrialSMESMachineCircuitboard

- type: technology
id: ADTCompactTechnologies
name: research-technology-compact-technologies
icon:
sprite: Objects/Tools/rcd.rsi
state: icon
discipline: Industrial
tier: 2
cost: 10000
recipeUnlocks:
- RPD
- RPDAmmo
- RCD
- RCDAmmo
5 changes: 5 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Flopochka marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
unlitIdleState: unlit
unlitRunningState: unlit-building
staticRecipes:
- StorageCanister #ADT tweak
- Wirecutter
- Igniter
- Signaller
Expand Down Expand Up @@ -309,6 +310,10 @@
- Igniter
- HandHeldMassScanner
- PowerCellMicroreactor
- RCD #ADT Tweak
- RCDAmmo #ADT Tweak
- RPDAmmo #ADT Tweak
- RPD #ADT Tweak
- PowerCellHigh
- WeaponPistolCHIMP
- ClothingMaskWeldingGas
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
components:
- GasTank
- type: StaticPrice
price: 1000
price: 250 #ADT Tweak
Flopochka marked this conversation as resolved.
Show resolved Hide resolved
- type: AccessReader
access: [["Atmospherics"], ["Engineering"], ["Research"]]
- type: Lock
Expand Down
Loading