From 4acbb93a17376a2e45797f7d4386437e93e9b171 Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Sat, 11 Jan 2025 11:32:13 -0600 Subject: [PATCH 1/3] Removed Uranium, Incendiary, and Shuttle research Goodbye Research --- Resources/Prototypes/Research/arsenal.yml | 92 +++++++++---------- .../Entities/Structures/Machines/lathe.yml | 76 +++++++++------ 2 files changed, 94 insertions(+), 74 deletions(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index fb4af9818fa..75219ca9fab 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -18,27 +18,27 @@ # This is not roundstart since its a direct upgrade - WeaponCrusherGlaive -- type: technology - id: DraconicMunitions - name: research-technology-draconic-munitions - icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi - state: incendiarydisplay - discipline: Arsenal - tier: 1 - cost: 10000 - recipeUnlocks: - - BoxShotgunIncendiary - - MagazineRifleIncendiary - - MagazinePistolIncendiary - - MagazineLightRifleIncendiary - - SpeedLoaderMagnumIncendiary - - SpeedLoaderRifleHeavyIncendiary # Frontier - - MagazineShotgunIncendiary - - MagazineBoxPistolIncendiary - - MagazineBoxMagnumIncendiary - - MagazineBoxLightRifleIncendiary - - MagazineBoxRifleIncendiary +# - type: technology #Maintainer request #Frontier +# id: DraconicMunitions +# name: research-technology-draconic-munitions +# icon: +# sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi +# state: incendiarydisplay +# discipline: Arsenal +# tier: 1 +# cost: 10000 +# recipeUnlocks: +# - BoxShotgunIncendiary +# - MagazineRifleIncendiary +# - MagazinePistolIncendiary +# - MagazineLightRifleIncendiary +# - SpeedLoaderMagnumIncendiary +# - SpeedLoaderRifleHeavyIncendiary # Frontier +# - MagazineShotgunIncendiary +# - MagazineBoxPistolIncendiary +# - MagazineBoxMagnumIncendiary +# - MagazineBoxLightRifleIncendiary +# - MagazineBoxRifleIncendiary - type: technology id: WeaponizedLaserManipulation @@ -70,27 +70,27 @@ - MagazineBoxMagnumRubber # Frontier - MagazineBoxPistolRubber # Frontier - MagazineBoxRifleRubber # Frontier - -- type: technology - id: UraniumMunitions - name: research-technology-uranium-munitions - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: uranium - discipline: Arsenal - tier: 1 - cost: 7500 - recipeUnlocks: - - MagazineRifleUranium - - MagazinePistolUranium - - MagazineLightRifleUranium - - SpeedLoaderMagnumUranium - - SpeedLoaderRifleHeavyUranium # Frontier - - MagazineBoxPistolUranium - - MagazineBoxMagnumUranium - - MagazineBoxLightRifleUranium - - MagazineBoxRifleUranium - - BoxShotgunUranium + +#- type: technology #Maintainer request #Frontier +# id: UraniumMunitions +# name: research-technology-uranium-munitions +# icon: +# sprite: Objects/Materials/Sheets/other.rsi +# state: uranium +# discipline: Arsenal +# tier: 1 +# cost: 7500 +# recipeUnlocks: +# - MagazineRifleUranium +# - MagazinePistolUranium +# - MagazineLightRifleUranium +# - SpeedLoaderMagnumUranium +# - SpeedLoaderRifleHeavyUranium +# - MagazineBoxPistolUranium +# - MagazineBoxMagnumUranium +# - MagazineBoxLightRifleUranium +# - MagazineBoxRifleUranium +# - BoxShotgunUranium - type: technology id: AdvancedRiotControl @@ -180,9 +180,9 @@ - MagazineGrenadeEmpty - GrenadeFlash - GrenadeBlast - - ShuttleGunSvalinnMachineGunCircuitboard - - ShuttleGunPerforatorCircuitboard - - ShuttleGunFriendshipCircuitboard + # - ShuttleGunSvalinnMachineGunCircuitboard #Frontier + # - ShuttleGunPerforatorCircuitboard #Frontier + # - ShuttleGunFriendshipCircuitboard #Frontier technologyPrerequisites: - SalvageWeapons @@ -229,6 +229,6 @@ recipeUnlocks: - GrenadeEMP - PowerCageHigh - - ShuttleGunDusterCircuitboard + # - ShuttleGunDusterCircuitboard #Frontier technologyPrerequisites: - BasicShuttleArmament diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 5a227ee8ae2..af106d2096d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -497,6 +497,10 @@ idleState: icon runningState: icon staticRecipes: + - PowerCageRechargerCircuitboard + - PowerCageHigh + - PowerCageMedium + - PowerCageSmall - BoxLethalshot - BoxShotgunPractice - BoxShotgunSlug @@ -562,42 +566,40 @@ - HoloprojectorNfsd - ClothingBackpackElectropack dynamicRecipes: - - BoxShotgunIncendiary - - BoxShotgunUranium + #Maintainer request that uranium/incendiary rounds removed, shuttle guns moved to uplink + # - BoxShotgunIncendiary + # - BoxShotgunUranium - BoxShellTranquilizer - ExplosivePayload - FlashPayload - GrenadeBlast - GrenadeEMP - GrenadeFlash - - MagazineBoxLightRifleIncendiary - - MagazineBoxLightRifleUranium - - MagazineBoxMagnumIncendiary - - MagazineBoxMagnumUranium - - MagazineBoxPistolIncendiary - - MagazineBoxPistolUranium - - MagazineBoxRifleIncendiary - - MagazineBoxRifleUranium + # - MagazineBoxLightRifleIncendiary + # - MagazineBoxLightRifleUranium + # - MagazineBoxMagnumIncendiary + # - MagazineBoxMagnumUranium + # - MagazineBoxPistolIncendiary + # - MagazineBoxPistolUranium + # - MagazineBoxRifleIncendiary + # - MagazineBoxRifleUranium - MagazineGrenadeEmpty - - MagazineLightRifleIncendiary - - MagazineLightRifleUranium - - MagazinePistolIncendiary - - MagazinePistolUranium - - MagazineRifleIncendiary - - MagazineRifleUranium - - MagazineShotgunIncendiary + # - MagazineLightRifleIncendiary + # - MagazineLightRifleUranium + # - MagazinePistolIncendiary + # - MagazinePistolUranium + # - MagazineRifleIncendiary + # - MagazineRifleUranium + # - MagazineShotgunIncendiary - PortableRecharger - - PowerCageHigh - - PowerCageMedium - - PowerCageSmall - - ShuttleGunDusterCircuitboard - - ShuttleGunFriendshipCircuitboard - - ShuttleGunPerforatorCircuitboard - - ShuttleGunSvalinnMachineGunCircuitboard + # - ShuttleGunDusterCircuitboard + # - ShuttleGunFriendshipCircuitboard + # - ShuttleGunPerforatorCircuitboard + # - ShuttleGunSvalinnMachineGunCircuitboard - Signaller - SignalTrigger - - SpeedLoaderMagnumIncendiary - - SpeedLoaderMagnumUranium + # - SpeedLoaderMagnumIncendiary + # - SpeedLoaderMagnumUranium - TelescopicShield - TimerTrigger - Truncheon @@ -607,8 +609,8 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon - - SpeedLoaderRifleHeavyIncendiary - - SpeedLoaderRifleHeavyUranium + # - SpeedLoaderRifleHeavyIncendiary + # - SpeedLoaderRifleHeavyUranium - type: entity id: MercenaryTechFab @@ -832,6 +834,24 @@ - MagazineBoxPistolRubber - MagazineBoxRifleRubber - MagazineShotgunBeanbag + - type: EmagLatheRecipes + emagStaticRecipes: + - MagazineBoxLightRifleIncendiary + - MagazineBoxLightRifleUranium + - MagazineBoxMagnumIncendiary + - MagazineBoxMagnumUranium + - MagazineBoxPistolIncendiary + - MagazineBoxPistolUranium + - MagazineBoxRifleIncendiary + - MagazineBoxRifleUranium + - MagazineGrenadeEmpty + - MagazineLightRifleIncendiary + - MagazineLightRifleUranium + - MagazinePistolIncendiary + - MagazinePistolUranium + - MagazineRifleIncendiary + - MagazineRifleUranium + - MagazineShotgunIncendiary - type: entity id: MercenaryTechFabHacked From 62e4e316655bedb8864028fbd41a295293c78c68 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 18 Jan 2025 01:24:42 +0200 Subject: [PATCH 2/3] Update arsenal.yml --- Resources/Prototypes/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 28d25488f1b..f5c3ad08003 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -231,4 +231,4 @@ - PowerCageHigh # - ShuttleGunDusterCircuitboard # Frontier technologyPrerequisites: - - BasicShuttleArmament \ No newline at end of file + - BasicShuttleArmament From cde06d4f7efe956546606bfd2aca7c91dda59a82 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 18 Jan 2025 01:26:21 +0200 Subject: [PATCH 3/3] Update lathe.yml --- .../Prototypes/_NF/Entities/Structures/Machines/lathe.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index b8d86f6d037..83b8395b397 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -573,9 +573,6 @@ - GrenadeEMP - GrenadeFlash - PortableRecharger - - PowerCageHigh - - PowerCageMedium - - PowerCageSmall - Signaller - SignalTrigger - TelescopicShield