From b8f96b9b55e69c63f2df1102ef222bdacc63ae5f Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Tue, 11 Feb 2025 09:31:05 +0000 Subject: [PATCH] fix all the recipes --- .../Entities/Structures/Machines/lathe.yml | 3 ++- .../Nyanotrasen/Recipes/Lathes/devices.yml | 18 ------------------ .../Prototypes/Recipes/Lathes/Packs/cargo.yml | 2 ++ .../Recipes/Lathes/Packs/medical.yml | 1 + .../Recipes/Lathes/Packs/robotics.yml | 2 ++ .../Recipes/Lathes/Packs/security.yml | 2 +- .../Recipes/Lathes/Packs/service.yml | 2 ++ .../_DV/Recipes/Lathes/Packs/engineering.yml | 12 ++---------- .../_DV/Recipes/Lathes/Packs/epistemics.yml | 5 ++--- .../_DV/Recipes/Lathes/Packs/logistics.yml | 2 +- .../_DV/Recipes/Lathes/Packs/medical.yml | 10 ++++++++-- .../_DV/Recipes/Lathes/Packs/robotics.yml | 5 +++++ .../_DV/Recipes/Lathes/Packs/security.yml | 1 + .../_DV/Recipes/Lathes/Packs/shared.yml | 1 + Resources/Prototypes/_DV/Research/arsenal.yml | 6 ++++++ .../_Shitmed/Recipes/Lathes/Packs/medical.yml | 5 +++++ 16 files changed, 41 insertions(+), 36 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index ff8243a16e..0518148a9d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -322,6 +322,7 @@ - BorgModules - MechParts - MechEquipment + - Cybernetics # Shitmed change - type: EmagLatheRecipes # DeltaV emagDynamicPacks: - SecurityCybernetics # having sechud eyes is good for evil people @@ -484,7 +485,7 @@ - Chemistry - CyberneticsMedical # Shitmed change - Surgery # Shitmed change - - SyringeGuns # DeltaV + - MedicalDeltaV # DeltaV - type: Machine board: MedicalTechFabCircuitboard - type: StealTarget diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/devices.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/devices.yml index 8b95b9dfe2..2c0713a1ec 100644 --- a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/devices.yml @@ -6,21 +6,3 @@ Steel: 100 Glass: 100 Gold: 100 - -- type: latheRecipe - id: JetpackBlue - result: JetpackBlue - completetime: 10 - materials: - Steel: 8000 - Plastic: 8000 - Gold: 50 - -- type: latheRecipe - id: JetpackMini - result: JetpackMini - completetime: 10 - materials: - Steel: 4000 - Plastic: 4000 - Gold: 50 diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/cargo.yml b/Resources/Prototypes/Recipes/Lathes/Packs/cargo.yml index fc6ff6f290..66eefa8d55 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/cargo.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/cargo.yml @@ -26,6 +26,8 @@ - OreBagOfHolding - type: latheRecipePack + parent: + - LogisticsBoards # DeltaV id: CargoBoards recipes: - OreProcessorIndustrialMachineCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml index b50331cf64..2e00dfafe7 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml @@ -103,6 +103,7 @@ - type: latheRecipePack parent: - MedicalBoardsDeltaV # DeltaV + - MedicalBoardsShitmed # Shitmed change id: MedicalBoards recipes: - StasisBedMachineCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml index 98242c318b..d5dfd0e50f 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml @@ -31,6 +31,8 @@ ## Dynamic - type: latheRecipePack + parent: + - RoboticsDeltaV # DeltaV id: Robotics recipes: - ProximitySensor diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml index 195ba5ff2c..d808870469 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml @@ -127,7 +127,7 @@ - MagazinePistolSubMachineGunUranium - MagazineRifleIncendiary - MagazineRifleUranium - - MagazineShotgunBeanbag + #- MagazineShotgunBeanbag # DeltaV - made roundstart - MagazineShotgunIncendiary - SpeedLoaderMagnumIncendiary - SpeedLoaderMagnumUranium diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml index 3705c46e35..aad625cc78 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml @@ -52,6 +52,8 @@ - SynthesizerInstrument - type: latheRecipePack + parent: + - ServiceBoardsDeltaV # DeltaV id: ServiceBoards recipes: - BiofabricatorMachineCircuitboard diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml index 2027f8bce5..40ddd2bacc 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml @@ -1,19 +1,11 @@ ## Dynamic - type: latheRecipePack - id: Jetpacks - recipes: - - JetpackBlue - - JetpackMini - - JetpackVoid - -- type: latheRecipePack - parent: Jetpacks id: AtmosToolsDeltaV recipes: - FireExtinguisherBluespace - - PowerCellHyper - - RCDAmmo + - PowerCellHyper # RE + - RCDAmmo # RE - type: latheRecipePack id: EngineeringBoardsDeltaV diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/epistemics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/epistemics.yml index db30303eb8..3928c21bda 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/epistemics.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/epistemics.yml @@ -2,11 +2,10 @@ - type: latheRecipePack id: EpistemicsEquipment - recipes: - - CoreSilver + recipes: [] + #- CoreSilver # TODO golemancy - type: latheRecipePack id: EpistemicsBoards recipes: - ReverseEngineeringMachineCircuitboard - - MetempsychoticMachineCircuitboard diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/logistics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/logistics.yml index 4c2fbaff37..ae8b749e78 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/logistics.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/logistics.yml @@ -14,6 +14,6 @@ - WeaponCrusherGlaive - type: latheRecipePack - id: SalvageBoardsDeltaV + id: LogisticsBoards recipes: - SalvageExpeditionsComputerCircuitboard diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/medical.yml index 98ad519a38..6e3f27aa14 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/medical.yml @@ -9,6 +9,7 @@ ## Dynamic +# available in medfab and emagged protolathe - type: latheRecipePack id: SyringeGuns recipes: @@ -16,11 +17,16 @@ - MiniSyringe - type: latheRecipePack - id: MedicalRE + parent: SyringeGuns + id: MedicalDeltaV recipes: - - HandheldCrewMonitor + - HandheldCrewMonitor # RE - type: latheRecipePack id: MedicalBoardsDeltaV recipes: - CrewMonitoringComputerCircuitboard + - CloningConsoleComputerCircuitboard + - MedicalScannerMachineCircuitboard + - MetempsychoticMachineCircuitboard + - CloningPodMachineCircuitboard # RE diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml index b3d980b2b0..2ab6a83598 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml @@ -1,5 +1,10 @@ ## Dynamic +- type: latheRecipePack + id: RoboticsDeltaV + recipes: + - ClothingEyesHudDiagnostic + - type: latheRecipePack id: BorgModulesDeltaV recipes: diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/security.yml index 016100038d..f282d1fe56 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/security.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/security.yml @@ -22,6 +22,7 @@ - MagazinePistolSpecial - BoxBeanbag - BoxShellTranquilizer + - MagazineShotgunBeanbag - WeaponDisabler - type: latheRecipePack diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/shared.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/shared.yml index 50da7a71c5..cface7e297 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/shared.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/shared.yml @@ -4,3 +4,4 @@ id: EquipmentDeltaV recipes: - SignallerDeadMans + - JetpackVoid # RE diff --git a/Resources/Prototypes/_DV/Research/arsenal.yml b/Resources/Prototypes/_DV/Research/arsenal.yml index 4ed6202c92..2163efb28f 100644 --- a/Resources/Prototypes/_DV/Research/arsenal.yml +++ b/Resources/Prototypes/_DV/Research/arsenal.yml @@ -26,8 +26,10 @@ tier: 1 cost: 7500 recipeUnlocks: + # Uranium - MagazineRifleUranium - MagazinePistolUranium + - MagazinePistolSubMachineGunUranium - MagazineLightRifleUranium - SpeedLoaderMagnumUranium - MagazineBoxPistolUranium @@ -37,9 +39,11 @@ - BoxShotgunUranium - SpeedLoaderSpecialUranium - MagazineBoxSpecialUranium + # Incendiary - BoxShotgunIncendiary - MagazineRifleIncendiary - MagazinePistolIncendiary + - MagazinePistolSubMachineGunIncendiary - MagazineLightRifleIncendiary - SpeedLoaderMagnumIncendiary - MagazineShotgunIncendiary @@ -47,6 +51,8 @@ - MagazineBoxMagnumIncendiary - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary + - SpeedLoaderSpecialUranium + - MagazineBoxSpecialIncendiary - MagazineBoxSpecialHoly - type: technology diff --git a/Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/medical.yml index 2520d09a64..375976f908 100644 --- a/Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/medical.yml @@ -50,3 +50,8 @@ id: CyberneticsMedical recipes: - MedicalCyberneticEyes + +- type: latheRecipePack + id: MedicalBoardsShitmed + recipes: + - AutodocCircuitboard