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

Remove the science tech fab #2624

Merged
merged 5 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
Expand Up @@ -34,24 +34,6 @@
amount: 2
defaultPrototype: Beaker

- type: entity
id: ScienceTechFabCircuitboard
parent: BaseMachineCircuitboard
name: science techfab machine board
description: A machine printed circuit board for a science techfab
components:
- type: Sprite
state: science
- type: MachineBoard
prototype: ScienceTechFab
requirements: # Frontier
MatterBin: 2 # Frontier stackRequirements<requirements
Manipulator: 2 # Frontier stackRequirements<requirements
tagRequirements:
GlassBeaker:
amount: 2
defaultPrototype: Beaker

- type: entity
id: DeepFryerMachineCircuitboard
parent: BaseMachineCircuitboard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
ResearchAndDevelopmentServerFlatpack: 4294967295 # Infinite
ComputerResearchAndDevelopmentFlatpack: 4294967295 # Infinite
BlueprintLithographFlatpack: 4294967295 # Infinite
ScienceTechFabFlatpack: 4294967295 # Infinite
EngineeringTechFabFlatpack: 4294967295 # Infinite
SalvageTechfabNFFlatpack: 4294967295 # Infinite
ScrapProcessorFlatpack: 4294967295 # Infinite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,6 @@
prototypes:
- CutterMachine
- SalvageTechfabNF
- ScienceTechFab
- ServiceTechFab
- EngineeringTechFab
- Autolathe
Expand Down Expand Up @@ -722,7 +721,6 @@
- SurveillanceWirelessCameraMonitorCircuitboard
# Boards
- SalvageTechFabCircuitboardNF
- ScienceTechFabCircuitboard
- ServiceTechFabCircuitboard
- EngineeringTechFabCircuitboard
- AmmoTechFabCircuitboard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@
# Lathes
- CircuitImprinterMachineCircuitboard
- ExosuitFabricatorMachineCircuitboard
- ScienceTechFabCircuitboard
- ProtolatheMachineCircuitboard
- AutolatheMachineCircuitboard
- FlatpackerMachineCircuitboard
Expand Down Expand Up @@ -288,7 +287,6 @@
- MachineArtifactAnalyzerFlatpack
- MachineAnomalyVesselFlatpack
- MachineAPEFlatpack
- ScienceTechFabFlatpack
- MachineArtifactCrusherFlatpack
- ComputerResearchAndDevelopmentFlatpack
- ResearchAndDevelopmentServerFlatpack
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,15 +250,6 @@
layers:
- state: science_ape

- type: entity
parent: ExosuitFabricatorFlatpack
id: ScienceTechFabFlatpack
name: science techfab flatpack
description: A flatpack used for constructing a science techfab.
components:
- type: Flatpack
entity: ScienceTechFab

- type: entity
parent: ExosuitFabricatorFlatpack
id: MachineArtifactCrusherFlatpack
Expand Down
92 changes: 0 additions & 92 deletions Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,98 +15,6 @@
containers:
- blueprint

- type: entity
parent: [ BlueprintReceiverBase, BaseLatheLube ]
id: ScienceTechFab
name: science techfab
description: Prints equipment for use by the epistemics department.
components:
- type: Sprite
netsync: false
sprite: Structures/Machines/techfab.rsi
layers:
- state: icon
map: ["enum.LatheVisualLayers.IsRunning"]
- state: sci
- state: unlit
shader: unshaded
map: ["enum.PowerDeviceVisualLayers.Powered"]
- state: inserting
map: ["enum.MaterialStorageVisualLayers.Inserting"]
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Machine
board: ScienceTechFabCircuitboard
- type: Lathe
idleState: icon
runningState: icon
staticRecipes:
# Shared lathe recipes
## Basic tools
- Wirecutter
- Screwdriver
- Welder
- Wrench
- CrowbarGreen
- Multitool
- FlashlightLantern
- AppraisalTool
- HandLabeler
- Signaller
- ClothingMaskWeldingGas
## Basic storage
- ToolboxArtisticNF
- ToolboxElectricalNF
- ToolboxMechanicalNF
- ToolboxEmergencyNF
## Basic parts
- CableStack
- LightTube
- LedLightTube
- SodiumLightTube
- ExteriorLightTube
- LightBulb
- LedLightBulb
- ConveyorBeltAssembly
- PowerCellSmall
- PowerCellMedium
## Basic electronics
- SignalTimerElectronics
- CellRechargerCircuitboard
- BorgChargerCircuitboard
- WeaponCapacitorRechargerCircuitboard
- AirTank
# Science techfab
## Tools
- NodeScanner
dynamicRecipes:
# Shared lathe recipes
## Advanced tools
- WelderExperimental
- JawsOfLife
- PowerDrill
- JetpackVoid
- PowerCellHigh
#- PowerCellHyperNF
- PowerCellMicroreactor
- BluespaceBeaker
- VialBluespace
- CryostasisBeaker
- ClothingBackpackHolding
- ClothingBackpackSatchelHolding
- ClothingBackpackDuffelHolding
- ClothingBackpackMessengerHolding
- ChemicalPayload
- Bucket
- MopItem
- SprayBottle
- FireExtinguisher
- CableStack
- CableMVStack
- CableHVStack
- ClothingOuterHardsuitBasic
- ClothingOuterHardsuitRd

- type: entity
parent: [ BlueprintReceiverBase, BaseLatheLube ]
id: ServiceTechFab
Expand Down
5 changes: 5 additions & 0 deletions Resources/_NF/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,8 @@ VehicleJanicart: NFVehicleJanicart

# 2024-12-22 Barrels
CrateSpaceCleaner: ChemicalBarrelSpaceCleaner

# 2024-12-27 Useless
ScienceTechFab: UnfinishedMachineFrame
ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard
ScienceTechFabFlatpack: ProtolatheFlatpack
Loading