From 10f1a532a83c7e89ba4e9678ae8857d09e404e08 Mon Sep 17 00:00:00 2001 From: Sh1ntra Date: Tue, 14 Jan 2025 18:28:48 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20"=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= =?UTF-8?q?=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= =?UTF-8?q?=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 68049964c43c151443e0bb19d2d7fc0443a75c09. --- .../Entities/Structures/Machines/lathe.yml | 24 +++++++-------- Resources/Prototypes/Research/arsenal.yml | 30 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 19cd76801fc..f599b6c31c3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -458,18 +458,18 @@ - LauncherSyringe - MiniSyringe # End DeltaV additions - #- BoxSmokeKS23 # Corvax-Frontier - #- BoxFlashbangKS23 # Corvax-Frontier - #- BoxBeanbagKS23 # Corvax-Frontier - #- BoxLethalshotKS23 # Corvax-Frontier - #- MagazineBoxVector22Incendiary #Corvax-Frontier - #- MagazineBoxVector22Uranium #Corvax-Frontier - #- MagazineVector22Incendiary #Corvax-Frontier - #- MagazineVector22Uranium #Corvax-Frontier - #- MagazineBoxVector45Incendiary #Corvax-Frontier - #- MagazineBoxVector45Uranium #Corvax-Frontier - #- MagazineVector45Incendiary #Corvax-Frontier - #- MagazineVector45Uranium #Corvax-Frontier + - BoxSmokeKS23 # Corvax-Frontier + - BoxFlashbangKS23 # Corvax-Frontier + - BoxBeanbagKS23 # Corvax-Frontier + - BoxLethalshotKS23 # Corvax-Frontier + - MagazineBoxVector22Incendiary #Corvax-Frontier + - MagazineBoxVector22Uranium #Corvax-Frontier + - MagazineVector22Incendiary #Corvax-Frontier + - MagazineVector22Uranium #Corvax-Frontier + - MagazineBoxVector45Incendiary #Corvax-Frontier + - MagazineBoxVector45Uranium #Corvax-Frontier + - MagazineVector45Incendiary #Corvax-Frontier + - MagazineVector45Uranium #Corvax-Frontier - type: entity id: ProtolatheHyperConvection diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 639196f5e8d..92c60a78c21 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -74,12 +74,12 @@ - MagazineBoxMagnumRubber # Frontier - MagazineBoxPistolRubber # Frontier - MagazineBoxRifleRubber # Frontier - #- BoxSmokeKS23 # Corvax-Frontier - #- BoxFlashbangKS23 # Corvax-Frontier - #- MagazineBoxVector22Practice #CorvaxFrontier - #- MagazineVector22Practice #CorvaxFrontier - #- MagazineBoxVector45Practice #CorvaxFrontier - #- MagazineVector45Practice #CorvaxFrontier + - BoxSmokeKS23 # Corvax-Frontier + - BoxFlashbangKS23 # Corvax-Frontier + - MagazineBoxVector22Practice #CorvaxFrontier + - MagazineVector22Practice #CorvaxFrontier + - MagazineBoxVector45Practice #CorvaxFrontier + - MagazineVector45Practice #CorvaxFrontier - type: technology id: UraniumMunitions @@ -257,14 +257,14 @@ tier: 3 cost: 30000 recipeUnlocks: - #- ShuttleShotgunMachineCircuitboard - #- ShuttleGunAntiMaterialMachineCircuitboard - #- ShuttleLightRifleGunMachineCircuitboard - #- ShuttleSMGRifleMachineCircuitboard - #- ShuttleMagnumRifleMachineCircuitboard - #- ShuttleShotgunShellsBox - #- ShuttleSmgRifleAmmoBox - #- ShuttleRifleAmmoBox - #- ShuttleMagnumRifleAmmoBox + - ShuttleShotgunMachineCircuitboard + - ShuttleGunAntiMaterialMachineCircuitboard + - ShuttleLightRifleGunMachineCircuitboard + - ShuttleSMGRifleMachineCircuitboard + - ShuttleMagnumRifleMachineCircuitboard + - ShuttleShotgunShellsBox + - ShuttleSmgRifleAmmoBox + - ShuttleRifleAmmoBox + - ShuttleMagnumRifleAmmoBox technologyPrerequisites: - BasicShuttleArmament