diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs index b364b83312..73644be53d 100644 --- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs +++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs @@ -87,21 +87,21 @@ public sealed partial class ResearchConsoleMenu : FancyWindow if (_technologyDatabase == null) return; + // WD EDIT START - in order to make all tier 3 techologies accessible at the same time + // var disciplineText = Loc.GetString("research-discipline-none"); + // var disciplineColor = Color.Gray; + // if (_technologyDatabase.MainDiscipline != null) + // { + // var discipline = _prototype.Index(_technologyDatabase.MainDiscipline); + // disciplineText = Loc.GetString(discipline.Name); + // disciplineColor = discipline.Color; + // } - var disciplineText = Loc.GetString("research-discipline-none"); - var disciplineColor = Color.Gray; - if (_technologyDatabase.MainDiscipline != null) - { - var discipline = _prototype.Index(_technologyDatabase.MainDiscipline); - disciplineText = Loc.GetString(discipline.Name); - disciplineColor = discipline.Color; - } - - var msg = new FormattedMessage(); - msg.AddMarkup(Loc.GetString("research-console-menu-main-discipline", - ("name", disciplineText), ("color", disciplineColor))); - MainDisciplineLabel.SetMessage(msg); - + // var msg = new FormattedMessage(); + // msg.AddMarkup(Loc.GetString("research-console-menu-main-discipline", + // ("name", disciplineText), ("color", disciplineColor))); + // MainDisciplineLabel.SetMessage(msg); + // WD EDIT END TierDisplayContainer.Children.Clear(); foreach (var disciplineId in _technologyDatabase.SupportedDisciplines) { diff --git a/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs b/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs index b48d8256b7..f8c6512266 100644 --- a/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs +++ b/Content.Shared/Research/Prototypes/TechDisciplinePrototype.cs @@ -44,5 +44,5 @@ public sealed partial 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; // WD from 3 to 4 in order to make all tier 3 techologies accessible at the same time } diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-105.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-105.ftl index 3bbc6ff86b..3a8249164e 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-105.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-105.ftl @@ -1,5 +1,5 @@ -ent-BorgModuleResque = модуль кибернетического лечения - .desc = модуль кибернетического лечения +ent-BorgModuleResque = модуль кибернетической скорой помощи + .desc = модуль кибернетической скорой помощи ent-BorgModuleDefibrillator = модуль кибернетического дефибриллятора .desc = модуль кибернетического дефибриллятора ent-BorgModuleAdvancedTreatment = модуль кибернетического лечения diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 749e8abf3c..9f13df52bb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -676,6 +676,7 @@ - BorgModuleClowning - BorgModuleDefibrillator - BorgModuleAdvancedTreatment + - BorgModuleResque # WD - RipleyHarness - RipleyLArm - RipleyRArm diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index b19693c7f2..c5076d7611 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -168,7 +168,7 @@ state: full discipline: Arsenal tier: 2 - cost: 10500 + cost: 10000 # WD from 10500 to 10000 recipeUnlocks: - PowerCageRechargerCircuitboard - PowerCageSmall @@ -191,7 +191,7 @@ state: icon discipline: Arsenal tier: 3 - cost: 10000 + cost: 15000 # WD from 10000 to 15000 recipeUnlocks: - ClothingHandsGlovesMagneticAdvanced diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 12eddc8bdc..f028cbd5fd 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -99,6 +99,19 @@ - BiofabricatorMachineCircuitboard - BiomassReclaimerMachineCircuitboard +- type: technology + id: MechanizedTreatment + name: research-technology-mechanized-treatment + icon: + sprite: Mobs/Silicon/chassis.rsi + state: medical + discipline: CivilianServices + tier: 1 # WD from 2 to 1 + cost: 10000 + recipeUnlocks: + - BorgModuleAdvancedTreatment + - BorgModuleDefibrillator + # Tier 2 - type: technology @@ -145,19 +158,6 @@ - HandheldCrewMonitor - BorgModuleResque -- type: technology - id: MechanizedTreatment - name: research-technology-mechanized-treatment - icon: - sprite: Mobs/Silicon/chassis.rsi - state: medical - discipline: CivilianServices - tier: 2 - cost: 10000 - recipeUnlocks: - - BorgModuleAdvancedTreatment - - BorgModuleDefibrillator - - type: technology id: AdvancedCleaning name: research-technology-advanced-cleaning @@ -204,6 +204,8 @@ - WeaponSprayNozzle - ClothingBackpackWaterTank +# Tier 3 + - type: technology id: BluespaceCargoTransport name: research-technology-bluespace-cargo-transport @@ -211,13 +213,11 @@ sprite: Structures/cargo_telepad.rsi state: display discipline: CivilianServices - tier: 2 + tier: 3 # WD from 2 to 3 cost: 15000 recipeUnlocks: - CargoTelepadMachineCircuitboard -# Tier 3 - - type: technology id: QuantumFiberWeaving name: research-technology-quantum-fiber-weaving @@ -226,7 +226,7 @@ state: icon discipline: CivilianServices tier: 3 - cost: 10000 + cost: 15000 # WD from 10000 to 15000 recipeUnlocks: - ClothingShoesBootsSpeed @@ -238,7 +238,7 @@ state: beakerbluespace discipline: CivilianServices tier: 3 - cost: 10000 + cost: 15000 # WD from 10000 to 15000 recipeUnlocks: - BluespaceBeaker - SyringeBluespace diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index cb605e5246..b3116e8efb 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -135,7 +135,7 @@ state: base discipline: Experimental tier: 3 - cost: 10000 + cost: 15000 # WD from 10000 to 15000 recipeUnlocks: - WeaponForceGun - WeaponTetherGun @@ -148,6 +148,6 @@ state: icon discipline: Experimental tier: 3 - cost: 10000 + cost: 15000 # WD from 10000 to 15000 recipeUnlocks: - DeviceQuantumSpinInverter diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 13e9c792ab..2e8b7eb40e 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -207,7 +207,7 @@ state: microreactor discipline: Industrial tier: 3 - cost: 10000 + cost: 15000 # WD from 10000 to 15000 recipeUnlocks: - PowerCellMicroreactor technologyPrerequisites: