Merge branch 'master' into nfsd-detective-clothing-options-change

Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml

@@ -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

Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml

@@ -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

Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml

@@ -415,7 +415,6 @@
     prototypes:
     - CutterMachine
     - SalvageTechfabNF
-    - ScienceTechFab
     - ServiceTechFab
     - EngineeringTechFab
     - Autolathe
@@ -722,7 +721,6 @@
     - SurveillanceWirelessCameraMonitorCircuitboard
     # Boards
     - SalvageTechFabCircuitboardNF
-    - ScienceTechFabCircuitboard
     - ServiceTechFabCircuitboard
     - EngineeringTechFabCircuitboard
     - AmmoTechFabCircuitboard

Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml

@@ -247,7 +247,6 @@
     # Lathes
     - CircuitImprinterMachineCircuitboard
     - ExosuitFabricatorMachineCircuitboard
-    - ScienceTechFabCircuitboard
     - ProtolatheMachineCircuitboard
     - AutolatheMachineCircuitboard
     - FlatpackerMachineCircuitboard
@@ -288,7 +287,6 @@
     - MachineArtifactAnalyzerFlatpack
     - MachineAnomalyVesselFlatpack
     - MachineAPEFlatpack
-    - ScienceTechFabFlatpack
     - MachineArtifactCrusherFlatpack
     - ComputerResearchAndDevelopmentFlatpack
     - ResearchAndDevelopmentServerFlatpack

Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml

@@ -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

Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml

@@ -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

Resources/_NF/migration.yml

@@ -176,3 +176,8 @@ VehicleJanicart: NFVehicleJanicart
 
 # 2024-12-22 Barrels 
 CrateSpaceCleaner: ChemicalBarrelSpaceCleaner
+
+# 2024-12-27 Useless
+ScienceTechFab: UnfinishedMachineFrame
+ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard
+ScienceTechFabFlatpack: ProtolatheFlatpack