diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs index ec5af2a15c9..f1941c580e2 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs @@ -64,7 +64,7 @@ public sealed partial class ArtifactComponent : Component /// The base amount of research points for each artifact node. /// [DataField("pointsPerNode"), ViewVariables(VVAccess.ReadWrite)] - public int PointsPerNode = 5000; + public int PointsPerNode = 6500; /// /// Research points which have been "consumed" from the theoretical max value of the artifact. @@ -77,7 +77,7 @@ public sealed partial class ArtifactComponent : Component /// Used for calculating the research point value of an artifact node. /// [DataField("pointDangerMultiplier"), ViewVariables(VVAccess.ReadWrite)] - public float PointDangerMultiplier = 1.35f; + public float PointDangerMultiplier = 1.5f; /// /// The sound that plays when an artifact is activated diff --git a/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs b/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs index 76eb8092add..cc80cc2e3d8 100644 --- a/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs +++ b/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Prototypes; +using Robust.Shared.Prototypes; using Robust.Shared.Utility; namespace Content.Shared.Research.Prototypes; @@ -44,5 +44,5 @@ public sealed class TechDisciplinePrototype : IPrototype /// Purchasing this tier of technology causes a server to become "locked" to this discipline. /// [DataField("lockoutTier")] - public int LockoutTier = 3; + public int LockoutTier = 4; } diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index d8b7bed593f..837a82f7141 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -8,7 +8,7 @@ state: icon discipline: Arsenal tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - WeaponProtoKineticAccelerator # These are roundstart but not replenishable for salvage @@ -23,7 +23,7 @@ state: incendiarydisplay discipline: Arsenal tier: 1 - cost: 10000 + cost: 8500 recipeUnlocks: - ShellShotgunIncendiary - CartridgePistolIncendiary @@ -44,7 +44,7 @@ state: payload-explosive-armed discipline: Arsenal tier: 1 - cost: 7500 + cost: 6000 recipeUnlocks: - Signaller - SignalTrigger @@ -62,7 +62,7 @@ state: icon discipline: Arsenal tier: 1 - cost: 7500 + cost: 6000 recipeUnlocks: - WeaponLaserCarbine @@ -74,7 +74,7 @@ state: beanbag discipline: Arsenal tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - ShellShotgunBeanbag - CartridgePistolRubber @@ -95,7 +95,7 @@ state: practice discipline: Arsenal tier: 1 - cost: 2000 + cost: 1000 recipeUnlocks: - ShellShotgunPractice - MagazineBoxPistolPractice @@ -115,7 +115,7 @@ state: icon discipline: Arsenal tier: 2 - cost: 10000 + cost: 8500 recipeUnlocks: - WeaponLaserCannon @@ -127,7 +127,7 @@ state: icon discipline: Arsenal tier: 2 - cost: 10000 + cost: 8500 recipeUnlocks: - WeaponXrayCannon @@ -139,7 +139,7 @@ state: icon discipline: Arsenal tier: 2 - cost: 8000 + cost: 6000 recipeUnlocks: - Truncheon - TelescopicShield @@ -155,7 +155,7 @@ state: icon discipline: Arsenal tier: 3 - cost: 15000 + cost: 12000 recipeUnlocks: - WeaponTaser @@ -167,6 +167,6 @@ state: icon discipline: Arsenal tier: 3 - cost: 15000 + cost: 12000 recipeUnlocks: - WeaponAdvancedLaser diff --git a/Resources/Prototypes/Research/biochemical.yml b/Resources/Prototypes/Research/biochemical.yml index b8c3d805792..02a7f6d66ab 100644 --- a/Resources/Prototypes/Research/biochemical.yml +++ b/Resources/Prototypes/Research/biochemical.yml @@ -8,7 +8,7 @@ state: beakerlarge discipline: Biochemical tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - LargeBeaker - Dropper @@ -25,7 +25,7 @@ state: saw discipline: Biochemical tier: 1 - cost: 2500 #this is useless so heavy decrease + cost: 1000 #this is useless so heavy decrease recipeUnlocks: - Scalpel - Retractor @@ -42,7 +42,7 @@ state: icon discipline: Biochemical tier: 1 - cost: 7500 + cost: 6000 recipeUnlocks: - CryostasisBeaker - StasisBedMachineCircuitboard @@ -55,7 +55,7 @@ state: medical discipline: Biochemical tier: 1 - cost: 7500 + cost: 6000 recipeUnlocks: - BorgModuleDiagnosis - BorgModuleTreatment @@ -69,7 +69,7 @@ state: icon discipline: Biochemical tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - VaccinatorMachineCircuitboard - DiagnoserMachineCircuitboard @@ -84,7 +84,7 @@ state: pod-on discipline: Biochemical tier: 2 - cost: 7500 + cost: 6000 recipeUnlocks: - CryoPodMachineCircuitboard @@ -96,7 +96,7 @@ state: industrial-working discipline: Biochemical tier: 2 - cost: 10000 + cost: 8500 recipeUnlocks: - ChemMasterMachineCircuitboard - ChemDispenserMachineCircuitboard @@ -114,7 +114,7 @@ state: scanner discipline: Biochemical tier: 2 - cost: 10000 + cost: 8500 recipeUnlocks: - HandheldCrewMonitor @@ -128,7 +128,7 @@ state: beakerbluespace discipline: Biochemical tier: 3 - cost: 10000 + cost: 8500 recipeUnlocks: - BluespaceBeaker - SyringeBluespace @@ -142,7 +142,7 @@ state: pod_0 discipline: Biochemical tier: 3 - cost: 15000 + cost: 12000 recipeUnlocks: - CloningPodMachineCircuitboard - MedicalScannerMachineCircuitboard diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 92087750944..78cbd3b3550 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -8,7 +8,7 @@ state: mop discipline: CivilianServices tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - MopItem - Holoprojector @@ -24,7 +24,7 @@ state: icon discipline: CivilianServices tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - UniformPrinterMachineCircuitboard @@ -36,7 +36,7 @@ state: seedextractor discipline: CivilianServices tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - BorgModuleGardening - BorgModuleHarvesting @@ -51,7 +51,7 @@ state: hamtr discipline: CivilianServices tier: 1 - cost: 7500 + cost: 3500 recipeUnlocks: - HamtrHarness - HamtrLArm @@ -71,7 +71,7 @@ state: juicer1 discipline: CivilianServices tier: 1 - cost: 7500 + cost: 6000 recipeUnlocks: #remove all of these once we have more kitchen equipment - MicrowaveMachineCircuitboard - ReagentGrinderMachineCircuitboard @@ -87,7 +87,7 @@ state: cameracase discipline: CivilianServices tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - SurveillanceCameraRouterCircuitboard - SurveillanceCameraWirelessRouterCircuitboard @@ -105,7 +105,7 @@ state: television discipline: CivilianServices tier: 1 - cost: 7500 + cost: 6000 recipeUnlocks: - ComputerTelevisionCircuitboard - SynthesizerInstrument @@ -125,7 +125,7 @@ state: janitor discipline: CivilianServices tier: 2 - cost: 5000 + cost: 3500 recipeUnlocks: - BorgModuleLightReplacer - BorgModuleCleaning @@ -139,7 +139,7 @@ state: advmop discipline: CivilianServices tier: 2 - cost: 10000 + cost: 8500 recipeUnlocks: - AdvMopItem - MegaSprayBottle @@ -154,7 +154,7 @@ state: display discipline: CivilianServices tier: 2 - cost: 5000 + cost: 3500 recipeUnlocks: - FatExtractorMachineCircuitboard - SheetifierMachineCircuitboard @@ -167,7 +167,7 @@ state: honker discipline: CivilianServices tier: 2 - cost: 7500 + cost: 6000 recipeUnlocks: - HonkerHarness - HonkerLArm @@ -187,7 +187,7 @@ state: icon discipline: CivilianServices tier: 2 - cost: 10000 + cost: 8500 recipeUnlocks: - WeaponSprayNozzle - ClothingBackpackWaterTank @@ -202,6 +202,6 @@ state: display discipline: CivilianServices tier: 3 - cost: 15000 + cost: 12000 recipeUnlocks: - CargoTelepadMachineCircuitboard diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index 5c6e499849e..8a790e53871 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -1,4 +1,4 @@ -# Tier 1 +# Tier 1 - type: technology id: BasicRobotics @@ -8,7 +8,7 @@ state: drone discipline: Experimental tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - ProximitySensor - Drone @@ -22,7 +22,7 @@ state: icon discipline: Experimental tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - AnomalyScanner - AnomalyLocator @@ -39,7 +39,7 @@ state: display discipline: Experimental tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - NodeScanner - BorgModuleArtifact @@ -54,7 +54,7 @@ state: display discipline: Experimental tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - TechDiskComputerCircuitboard @@ -66,7 +66,7 @@ state: icon discipline: Experimental tier: 1 - cost: 7500 + cost: 6000 recipeUnlocks: - ClothingShoesBootsMag @@ -80,7 +80,7 @@ state: advanced_matter_bin discipline: Experimental tier: 2 - cost: 10000 + cost: 8500 recipeUnlocks: - AdvancedCapacitorStockPart - AdvancedMatterBinStockPart @@ -94,7 +94,7 @@ state: display discipline: Experimental tier: 2 - cost: 5000 + cost: 3500 recipeUnlocks: - TraversalDistorterMachineCircuitboard @@ -106,7 +106,7 @@ state: base discipline: Experimental tier: 2 - cost: 10000 + cost: 8500 recipeUnlocks: - WeaponPistolCHIMP technologyPrerequisites: @@ -120,7 +120,7 @@ state: icon discipline: Experimental tier: 2 - cost: 7500 + cost: 6000 recipeUnlocks: - RPED @@ -134,7 +134,7 @@ state: super_matter_bin discipline: Experimental tier: 3 - cost: 15000 + cost: 12000 recipeUnlocks: - SuperCapacitorStockPart - SuperMatterBinStockPart @@ -148,7 +148,7 @@ state: base discipline: Experimental tier: 3 - cost: 60000 + cost: 45000 recipeUnlocks: - WeaponForceGun - WeaponTetherGun diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 58ff346e0ef..9789b52c52a 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -1,4 +1,4 @@ -# Tier 1 +# Tier 1 - type: technology id: SalvageEquipment @@ -8,7 +8,7 @@ state: handdrill discipline: Industrial tier: 1 - cost: 7500 + cost: 6000 recipeUnlocks: - MiningDrill - BorgModuleMining @@ -22,7 +22,7 @@ state: medium discipline: Industrial tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - PowerCellMedium @@ -34,7 +34,7 @@ state: panel discipline: Industrial tier: 1 - cost: 7500 + cost: 6000 recipeUnlocks: - WallmountSubstationElectronics - WallmountGeneratorElectronics @@ -48,7 +48,7 @@ state: icon discipline: Industrial tier: 1 - cost: 7500 + cost: 6000 recipeUnlocks: - ProtolatheMachineCircuitboard - AutolatheMachineCircuitboard @@ -63,7 +63,7 @@ state: portgen0 discipline: Industrial tier: 1 - cost: 7500 + cost: 6000 recipeUnlocks: - PortableGeneratorPacmanMachineCircuitboard - PortableGeneratorSuperPacmanMachineCircuitboard @@ -81,7 +81,7 @@ state: freezerOff discipline: Industrial tier: 1 - cost: 7500 + cost: 6000 recipeUnlocks: - BorgModuleGasAnalyzer - ThermomachineFreezerMachineCircuitBoard @@ -97,7 +97,7 @@ state: base discipline: Industrial tier: 2 - cost: 5000 + cost: 3500 recipeUnlocks: - WeaponGrapplingGun - BorgModuleGrapplingGun @@ -110,7 +110,7 @@ state: icon discipline: Industrial tier: 2 - cost: 10000 + cost: 8500 recipeUnlocks: - RCD - RCDAmmo @@ -124,7 +124,7 @@ state: base discipline: Industrial tier: 2 - cost: 10000 + cost: 8500 recipeUnlocks: - ShuttleConsoleCircuitboard - RadarConsoleCircuitboard @@ -140,7 +140,7 @@ state: ripley discipline: Industrial tier: 2 - cost: 7500 + cost: 6000 recipeUnlocks: - RipleyHarness - RipleyLArm @@ -159,7 +159,7 @@ state: icon discipline: Industrial tier: 2 - cost: 5000 + cost: 3500 recipeUnlocks: - HolofanProjector - PortableScrubberMachineCircuitBoard @@ -172,7 +172,7 @@ state: high discipline: Industrial tier: 2 - cost: 7500 + cost: 6000 recipeUnlocks: - PowerCellHigh technologyPrerequisites: @@ -186,7 +186,7 @@ state: icon discipline: Industrial tier: 2 - cost: 10000 + cost: 8500 recipeUnlocks: - WelderExperimental - PowerDrill @@ -203,7 +203,7 @@ state: holding discipline: Industrial tier: 3 - cost: 15000 + cost: 12000 recipeUnlocks: - ClothingBackpackHolding - ClothingBackpackSatchelHolding