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

Adds salvage magnet board to the circuit imprinter #31996

Merged
merged 4 commits into from
Sep 10, 2024
Merged

Adds salvage magnet board to the circuit imprinter #31996

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0787cd7
Adds salvage magnet board to lathe as default recipe, changes board s…
PJBot May 9, 2024
2a8f71e
Adds the salvage magnet board to the QM's locker, science cannot be t…
ArtisticRoomba Sep 9, 2024
87ff071
Merge branch 'refs/heads/master' into salvage-magnet-board
ArtisticRoomba Sep 10, 2024
84a8b8f
my body is a machine that turns commits pushed to the wrong branch in…
ArtisticRoomba Sep 10, 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
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
- id: CargoSaleComputerCircuitboard
- id: CargoShuttleComputerCircuitboard
- id: CargoShuttleConsoleCircuitboard
- id: SalvageMagnetMachineCircuitboard
- id: CigPackGreen
prob: 0.50
- id: ClothingHeadsetAltCargo
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,8 @@
name: salvage magnet machine board
description: A machine printed circuit board for a salvage magnet.
components:
- type: Sprite
state: supply
- type: MachineBoard
prototype: SalvageMagnet
stackRequirements:
Expand Down
1 change: 1 addition & 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 @@ -446,6 +446,7 @@
- SpaceHeaterMachineCircuitBoard
- CutterMachineCircuitboard
- StationAnchorCircuitboard
- SalvageMagnetMachineCircuitboard
dynamicRecipes:
- ThermomachineFreezerMachineCircuitBoard
- HellfireFreezerMachineCircuitBoard
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/electronics.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,3 +983,13 @@
materials:
Steel: 100
Glass: 500

- type: latheRecipe
id: SalvageMagnetMachineCircuitboard
ArtisticRoomba marked this conversation as resolved.
Show resolved Hide resolved
result: SalvageMagnetMachineCircuitboard
category: Circuitry
completetime: 10
materials:
Steel: 300
Glass: 500
Gold: 100
Loading