diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index 5081d04dc5..c096534090 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -10,12 +10,13 @@ PosterLegitSMEpi: PosterLegitSafetyMothEpi PosterLegitSMPills: PosterLegitSafetyMothPills PosterLegitSMAnomalies: PosterLegitSafetyMothDelam PosterLegitSMGlimmer: PosterLegitSafetyMothGlimmer -EngineeringTechFab: Autolathe -EngineeringTechFabCircuitboard: AutolatheMachineCircuitboard +# Floof - re-added those 2 +# EngineeringTechFab: Autolathe +# EngineeringTechFabCircuitboard: AutolatheMachineCircuitboard +# ServiceTechFab: Autolathe +# ServiceTechFabCircuitboard: AutolatheMachineCircuitboard ScienceTechFab: Protolathe ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard -ServiceTechFab: Autolathe -ServiceTechFabCircuitboard: AutolatheMachineCircuitboard # 2023-10-05 FoodMothTomatoSauce: null diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 2011291092..8377f4b1d1 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -25,6 +25,7 @@ - id: ClothingLongcoatLO # Floofstation - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: CargoTechFabCircuitboard # Floof - port to EE if possible - type: entity id: LockerCaptainFilledHardsuit @@ -148,6 +149,7 @@ - id: ClothingHandsGlovesInspection # DeltaV - Add inspection gloves for HoP. - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: ServiceTechFabCircuitboard # Floof - port to ee if possible - type: entity id: LockerChiefEngineerFilledHardsuit @@ -177,6 +179,7 @@ - id: CEIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: EngineeringTechFabCircuitboard # Floofstation - port to ee if possible - type: entity id: LockerChiefEngineerFilled @@ -202,6 +205,7 @@ - id: RCDAmmo - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: EngineeringTechFabCircuitboard # Floofstation - port to ee if possible - type: entity id: LockerChiefMedicalOfficerFilledHardsuit diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml index f943c76ee0..7ea7a94a43 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml @@ -39,6 +39,9 @@ - PortableGeneratorSuperPacmanMachineCircuitboard # Delta V - Add additional boards - PortableGeneratorJrPacmanMachineCircuitboard # Delta V - Add additional boards - MedicalTechFabCircuitboard # Delta V - Add additional boards + - EngineeringTechFabCircuitboard # Floof - add techfab boards + - CargoTechFabCircuitboard # Floof - add techfab boards + - ServiceTechFabCircuitboard # Floof - add techfab boards - UniformPrinterMachineCircuitboard # Delta V - Add additional boards - ArtifactAnalyzerMachineCircuitboard # Delta V - Add additional boards rareChance: 0.1 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index a34af1c9d8..b9e82c645a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -146,6 +146,64 @@ - type: StealTarget stealGroup: MedicalTechFabCircuitboard +# THIS ENTIRE SECTION BELONGS TO FLOOF - port to EE if possible +# === + +- type: entity + id: EngineeringTechFabCircuitboard + parent: BaseMachineCircuitboard + name: engineering techfab machine board + description: A machine printed circuit board for an engineering techfab + components: + - type: Sprite + state: engineering + - type: MachineBoard + prototype: EngineeringTechFab + requirements: + MatterBin: 1 + Manipulator: 3 + tagRequirements: + GlassBeaker: + Amount: 1 + DefaultPrototype: Beaker + ExamineName: Glass Beaker + +- type: entity + id: CargoTechFabCircuitboard + parent: BaseMachineCircuitboard + name: cargo techfab machine board + description: A machine printed circuit board for a cargo techfab + components: + - type: Sprite + state: supply + - type: MachineBoard + prototype: CargoTechFab + requirements: + MatterBin: 3 + Manipulator: 1 + tagRequirements: + GlassBeaker: + Amount: 1 + DefaultPrototype: Beaker + ExamineName: Glass Beaker + +- type: entity + id: ServiceTechFabCircuitboard + parent: BaseMachineCircuitboard + name: service techfab machine board + description: A machine printed circuit board for a service techfab + components: + - type: Sprite + state: service + - type: MachineBoard + prototype: ServiceTechFab + requirements: + MatterBin: 2 + Manipulator: 2 + +# === +# Floof section end + - type: entity id: CircuitImprinterMachineCircuitboard parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 3722a954bb..d72045b1e5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -197,7 +197,6 @@ - HandheldStationMap - ClothingHeadHatWelding - ShockCollar # FloofStation - - CustomDrinkJug # FloofStation - LeashBasic # FloofStation - ShortLeash # FloofStation - type: EmagLatheRecipes @@ -494,6 +493,7 @@ - SolarTrackerElectronics - TurboItemRechargerCircuitboard - PowerComputerCircuitboard + - AlertsComputerCircuitboard # Floof - port to EE if possible - AutolatheHyperConvectionMachineCircuitboard - ProtolatheHyperConvectionMachineCircuitboard - CircuitImprinterHyperConvectionMachineCircuitboard @@ -821,6 +821,8 @@ - MagazineBoxSpecialPractice - SpeedLoaderSpecial - MagazinePistolSpecial + - HandheldGPSBasic # Floof - port to EE + - HandheldStationMap # Floof - port to EE dynamicRecipes: - BoxBeanbag - BoxShotgunIncendiary @@ -905,7 +907,18 @@ - MagazineBoxSpecialIncendiary - MagazineBoxSpecialUranium - MagazineBoxSpecialMindbreaker - - ClothingShoesBootsMagCom #Floof + - ClothingShoesBootsMagCom # Floof + # Floof section - port to EE later + - WeaponGrapplingGun # Floof + - JawsOfLife + - HandHeldMassScanner + - HoloprojectorField + - RadarConsoleCircuitboard + - SurveillanceCameraRouterCircuitboard + - SurveillanceCameraMonitorCircuitboard + - SurveillanceWirelessCameraMonitorCircuitboard + - SurveillanceCameraWirelessRouterCircuitboard + # Floof section end - type: MaterialStorage whitelist: tags: @@ -1027,6 +1040,8 @@ - Hemostat - ClothingEyesGlassesChemical - WhiteCane + - HandheldGPSBasic # Floof - port to EE + - HandheldStationMap # Floof - port to EE dynamicRecipes: - ChemicalPayload - CryostasisBeaker @@ -1036,11 +1051,242 @@ - ChemicalPayload # Nyano - SyringeCryostasis - HypoMini # Floof + # Floof section - port to EE later + - HandHeldMassScanner + - ClothingHeadHelmetInsulated + - CloningConsoleComputerCircuitboard + - CloningPodMachineCircuitboard + - MetempsychoticMachineCircuitboard + - MedicalScannerMachineCircuitboard + - VaccinatorMachineCircuitboard + - DiagnoserMachineCircuitboard + - StasisBedMachineCircuitboard + - CryoPodMachineCircuitboard + - BiomassReclaimerMachineCircuitboard + - BiofabricatorMachineCircuitboard + - ReagentGrinderIndustrialMachineCircuitboard + - FatExtractorMachineCircuitboard + - CrewMonitoringComputerCircuitboard + # Floof section end - type: Machine board: MedicalTechFabCircuitboard - type: StealTarget stealGroup: MedicalTechFabCircuitboard +# THIS ENTIRE SECTION BELONGS TO FLOOF - port to EE if possible +# === + +- type: entity + id: EngineeringTechFab + parent: Autolathe + name: engineering techfab + description: An improved version of the autolathe, capable of printing various tools used by engineers. + components: + - type: Sprite + sprite: Structures/Machines/techfab.rsi + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: engi + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: inserting + map: ["enum.MaterialStorageVisualLayers.Inserting"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Machine + board: EngineeringTechFabCircuitboard + - type: Lathe + idleState: icon + runningState: icon + # Static recipes are inherited from the autolathe. This only adds some dynamic ones. + dynamicRecipes: + # Machines and computers + - TurboItemRechargerCircuitboard + - SheetifierMachineCircuitboard + - PortableGeneratorPacmanMachineCircuitboard + - PortableGeneratorSuperPacmanMachineCircuitboard + - PortableGeneratorJrPacmanMachineCircuitboard + - AutolatheHyperConvectionMachineCircuitboard + - SolarControlComputerCircuitboard + - SolarTrackerElectronics # Actual solar panels are not manufacturable + - EmitterCircuitboard + # Atmos machines + - ThermomachineFreezerMachineCircuitBoard + - HellfireFreezerMachineCircuitBoard + - PortableScrubberMachineCircuitBoard + # Tools + - PowerCellHigh + - PowerCellMicroreactor + - SignallerAdvanced + - HolofanProjector + - HoloprojectorField + - WelderExperimental + - PowerDrill # Can make two of the three advanced tools - jaws of life are too OP to give them away + - WeaponParticleDecelerator + - ClothingMaskWeldingGas + - ClothingShoesBootsMagSci + # Routers and monitors + - PowerComputerCircuitboard + - AlertsComputerCircuitboard + - SurveillanceCameraRouterCircuitboard + - SurveillanceCameraMonitorCircuitboard + - SurveillanceWirelessCameraMonitorCircuitboard + - SurveillanceCameraWirelessRouterCircuitboard + - TelecomServerCircuitboard + # Shuttle building + - ShuttleConsoleCircuitboard + - RadarConsoleCircuitboard + - ThrusterMachineCircuitboard + - GyroscopeMachineCircuitboard + - MiniGravityGeneratorCircuitboard + - ShuttleGunKineticCircuitboard + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot + + +- type: entity + id: CargoTechFab + parent: Autolathe + name: logistics techfab + description: An improved version of the autolathe, capable of printing various tools used by salvage and cargo technicians. + components: + - type: Sprite + sprite: Structures/Machines/techfab.rsi + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: cargo + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: inserting + map: ["enum.MaterialStorageVisualLayers.Inserting"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Machine + board: CargoTechFabCircuitboard + - type: Lathe + idleState: icon + runningState: icon + # Static recipes are inherited from the autolathe. This only adds some dynamic ones. + dynamicRecipes: + # Weapons and tools + - WeaponGrapplingGun + - WeaponTetherGun + - WeaponForceGun + - WeaponProtoKineticAccelerator + - MiningDrill + - HandHeldMassScanner + # Shuttle building + - ShuttleConsoleCircuitboard + - RadarConsoleCircuitboard + - ThrusterMachineCircuitboard + - GyroscopeMachineCircuitboard + - MiniGravityGeneratorCircuitboard + - ShuttleGunKineticCircuitboard + # Machines and computers + - CargoTelepadMachineCircuitboard + - OreProcessorMachineCircuitboard + # NOTE: advanced tools, industrial ore processor, expeds board are not added here as those are the very few things epi provides for cargo + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot + + +- type: entity + id: ServiceTechFab + parent: BaseLatheLube + name: service techfab + description: A specialized techfab used for printing various quality-of-life tools. + components: + - type: Sprite + sprite: Structures/Machines/techfab.rsi + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: service + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: inserting + map: ["enum.MaterialStorageVisualLayers.Inserting"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Machine + board: ServiceTechFabCircuitboard + - type: Lathe + idleState: icon + runningState: icon + staticRecipes: + - HandheldStationMap + - ShockCollar + - CustomDrinkJug + - LeashBasic + - ShortLeash + - CellRechargerCircuitboard + - WeaponCapacitorRechargerCircuitboard + - Beaker + - LargeBeaker + - Syringe + - HandLabeler + - Signaller + - SprayBottle + - MopItem + - Bucket + - Holoprojector + dynamicRecipes: + # Tools + - ClothingShoesBootsSpeed + - BluespaceBeaker + - AdvMopItem + - WeaponSprayNozzle + - ClothingBackpackWaterTank + - MegaSprayBottle + # Machines and computers + - SeedExtractorMachineCircuitboard + - HydroponicsTrayMachineCircuitboard + - ReagentGrinderIndustrialMachineCircuitboard + - ComputerTelevisionCircuitboard + - SynthesizerInstrument + - DawInstrumentMachineCircuitboard + - MassMediaCircuitboard + - JukeboxCircuitBoard + - FatExtractorMachineCircuitboard + # Translators + - CanilunztTranslator + - BubblishTranslator + - NekomimeticTranslator + - DraconicTranslator + - SolCommonTranslator + - RootSpeakTranslator + - BasicGalaticCommonTranslatorImplanter + - MofficTranslator + - ArachnicTranslator + # Tiles + - FauxTileAstroGrass + - FauxTileMowedAstroGrass + - FauxTileJungleAstroGrass + - FauxTileAstroIce + - FauxTileAstroSnow + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot + +# === +# Floof section end + - type: entity parent: BaseLathe id: UniformPrinter diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index af258ad31b..4fc824b6a1 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -697,6 +697,16 @@ Steel: 100 Glass: 500 +# Floof +- type: latheRecipe + id: AlertsComputerCircuitboard + result: AlertsComputerCircuitboard + category: Circuitry + completetime: 4 + materials: + Steel: 100 + Glass: 500 + - type: latheRecipe id: CloningConsoleComputerCircuitboard result: CloningConsoleComputerCircuitboard @@ -976,11 +986,11 @@ Steel: 100 Glass: 500 Gold: 100 - + - type: latheRecipe id: JukeboxCircuitBoard result: JukeboxCircuitBoard completetime: 4 materials: Steel: 100 - Glass: 500 \ No newline at end of file + Glass: 500 diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 2e1e7f5b26..e48dd97662 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -87,6 +87,7 @@ recipeUnlocks: - ThermomachineFreezerMachineCircuitBoard - GasRecyclerMachineCircuitboard + - AlertsComputerCircuitboard # Floof - make atmos alerts computer manufacturable - type: technology id: RipleyAPLU