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.

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

engineering-update-thruster #2338

Merged
merged 10 commits into from
Dec 15, 2024
Merged

engineering-update-thruster #2338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fa007cd
new thrusters
Kirus59 Dec 9, 2024
329cf74
Merge remote-tracking branch 'kirus/Add-new-thrusters' into engineeri…
EstKemran Dec 9, 2024
b102ff7
engineering-update-thruster
EstKemran Dec 10, 2024
aab7919
fix-rotation-bag
EstKemran Dec 10, 2024
ad616b9
Merge branch 'master' into engineering-update-thruster
EstKemran Dec 12, 2024
1d1e61e
fix
EstKemran Dec 12, 2024
cd86a78
Merge branch 'engineering-update-thruster' of https://github.com/EstK…
EstKemran Dec 12, 2024
aa3d5ce
fix
EstKemran Dec 12, 2024
14f87ed
Update electronics.yml
EstKemran Dec 12, 2024
de8e3f6
Update lathe.yml
EstKemran Dec 12, 2024
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
8 changes: 8 additions & 0 deletions ...cale/ru-RU/ss220/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ent-ThrusterShuntingMachineCircuitboard = маневровый ракетный двигатель (машинная плата)
.desc = { ent-BaseMachineCircuitboard.desc }
ent-ThrusterBigLeftMachineCircuitboard = большой ракетный двигатель (левый) (машинная плата)
.desc = { ent-BaseMachineCircuitboard.desc }
ent-ThrusterBigRightMachineCircuitboard = большой ракетный двигатель (правый) (машинная плата)
.desc = { ent-BaseMachineCircuitboard.desc }
ent-ThrusterBigCenterMachineCircuitboard = большой ракетный двигатель (середина) (машинная плата)
.desc = { ent-BaseMachineCircuitboard.desc }
27 changes: 27 additions & 0 deletions Resources/Locale/ru-RU/ss220/prototypes/entities/structures/shuttles/thrusters.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
ent-ThrusterShunting = маневровый ракетный двигатель
.desc = { ent-BaseThruster.desc }
ent-ThrusterShuntingFrame = каркас маневрового ракетного двигателя
.desc = { ent-BaseThruster.desc }
ent-DebugThrusterShunting = { ent-ThrusterShunting }
.desc = { ent-BaseThruster.desc }

ent-ThrusterBigLeft = большой ракетный двигатель (левый)
.desc = { ent-BaseThruster.desc }
ent-ThrusterBigLeftUnanchored = { ent-ThrusterBigLeft }
.desc = { ent-BaseThruster.desc }
ent-DebugThrusterBigLeft = { ent-ThrusterBigLeft }
.desc = { ent-BaseThruster.desc }

ent-ThrusterBigRight = большой ракетный двигатель (правый)
.desc = { ent-BaseThruster.desc }
ent-ThrusterBigRightUnanchored = { ent-ThrusterBigRight }
.desc = { ent-BaseThruster.desc }
ent-DebugThrusterBigRight = { ent-ThrusterBigRight }
.desc = { ent-BaseThruster.desc }

ent-ThrusterBigCenter = большой ракетный двигатель (середина)
.desc = { ent-BaseThruster.desc }
ent-ThrusterBigCenterUnanchored = { ent-ThrusterBigCenter }
.desc = { ent-BaseThruster.desc }
ent-DebugThrusterBigCenter = { ent-ThrusterBigCenter }
.desc = { ent-BaseThruster.desc }
6 changes: 6 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,12 @@
- PowerCageRechargerCircuitboard
- EmitterCircuitboard
- ThrusterMachineCircuitboard
# SS220 engineering-update-thruster begin
- ThrusterShuntingMachineCircuitboard
- ThrusterBigLeftMachineCircuitboard
- ThrusterBigRightMachineCircuitboard
- ThrusterBigCenterMachineCircuitboard
# SS220 engineering-update-thruster end
- GyroscopeMachineCircuitboard
- MiniGravityGeneratorCircuitboard
- Thermoelectricgenerator #ss220 thermoelectric generator board
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Research/industrial.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@
recipeUnlocks:
- ShuttleConsoleCircuitboard
- ThrusterMachineCircuitboard
# SS220 engineering-update-thruster begin
- ThrusterShuntingMachineCircuitboard
- ThrusterBigLeftMachineCircuitboard
- ThrusterBigRightMachineCircuitboard
- ThrusterBigCenterMachineCircuitboard
# SS220 engineering-update-thruster end
- GyroscopeMachineCircuitboard
- MiniGravityGeneratorCircuitboard

Expand Down
47 changes: 47 additions & 0 deletions Resources/Prototypes/SS220/Entities/Objects/Devices/Circuitboards/Machine/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,50 @@
Manipulator: 1
Steel: 5
Gold: 1

- type: entity
id: ThrusterShuntingMachineCircuitboard
parent: BaseMachineCircuitboard
name: shunting thruster machine board
components:
- type: MachineBoard
prototype: ThrusterShunting
stackRequirements:
Capacitor: 1
Steel: 2
- type: Tag
tags:
- ThrusterShuntingMachineCircuitboard

- type: entity
id: ThrusterBigLeftMachineCircuitboard
parent: BaseMachineCircuitboard
name: big thruster machine board (left)
components:
- type: MachineBoard
prototype: ThrusterBigLeft
stackRequirements:
Capacitor: 2
Steel: 3

- type: entity
id: ThrusterBigRightMachineCircuitboard
parent: BaseMachineCircuitboard
name: big thruster machine board (right)
components:
- type: MachineBoard
prototype: ThrusterBigRight
stackRequirements:
Capacitor: 2
Steel: 3

- type: entity
id: ThrusterBigCenterMachineCircuitboard
parent: BaseMachineCircuitboard
name: big thruster machine board (center)
components:
- type: MachineBoard
prototype: ThrusterBigCenter
stackRequirements:
Capacitor: 6
Steel: 10
Loading
Loading