From 84aeb65bf809063632f72ddbbd0e9d6b6afe4ef0 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Tue, 2 Sep 2025 13:15:41 +0100 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=80=D1=82=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D0=B2=D0=BD=D1=8B=D0=B9=20=D0=BC=D0=BE=D0=BD=D0=B8=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=AD=D0=BA=D0=B8=D0=BF=D0=B0=D0=B6?= =?UTF-8?q?=D0=B0=20=D0=B2=20=D0=B8=D1=81=D1=81=D0=BB=D0=B5=D0=B4=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20(#3112)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_strings/_sunrise/research/technologies.ftl | 3 ++- .../ru-RU/_strings/research/technologies.ftl | 2 ++ .../Objects/Specific/Mech/Weapons/Gun/combat.yml | 5 ++++- .../Weapons/Guns/Projectiles/projectiles.yml | 3 ++- .../Objects/Weapons/Guns/Rifles/rifles.yml | 2 +- .../Objects/Specific/Medical/hypospray.yml | 6 ++++-- .../_Sunrise/Recipes/Lathes/Packs/medical.yml | 2 +- .../Prototypes/_Sunrise/Recipes/Lathes/medical.yml | 6 ++++-- Resources/Prototypes/_Sunrise/Research/medical.yml | 14 ++++++++++++++ 9 files changed, 34 insertions(+), 9 deletions(-) diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl index 948e409a54..f9d9554d3b 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl @@ -3,6 +3,7 @@ research-technology-basic-surgery = Базовая хирургия research-technology-basic-cyberlimbs = Базовые кибер-конечности research-technology-implant-extractor = Извлечение имплантов research-technology-advanced-surgery = Продвинутая хирургия +research-technology-hanheld-crew-monitor = Портативный мониторинг research-technology-mechanized-medical-treatment = Механизированное лечение research-technology-handcraft-nvd = Кустарные ПНВ research-technology-basic-nvd = Продвинутое ПНВ @@ -18,4 +19,4 @@ research-technology-science-cyberlimbs = Научные киберконечно research-technology-secmelee-cyberlimbs = Боевые киберконечности ближнего боя research-technology-secrange-cyberlimbs = Боевые киберконечности дальнего боя research-technology-nightvision-eyes = Импланты ночного видения -research-technology-thermalvision-eyes = Импланты теплового зрения \ No newline at end of file +research-technology-thermalvision-eyes = Импланты теплового зрения diff --git a/Resources/Locale/ru-RU/_strings/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/research/technologies.ftl index ed243075c3..90af0e33f9 100644 --- a/Resources/Locale/ru-RU/_strings/research/technologies.ftl +++ b/Resources/Locale/ru-RU/_strings/research/technologies.ftl @@ -17,6 +17,7 @@ research-technology-ripley-mkii = Рипли MK-II research-technology-clarke = Кларк research-technology-gygax = Гигакс research-technology-durand = Дюранд +research-technology-dual-wielding-technology = Технология многорукого боя research-technology-advanced-atmospherics = Продвинутые атмос-технологии research-technology-advanced-tools = Продвинутые инструменты research-technology-super-powercells = Супербатареи @@ -24,6 +25,7 @@ research-technology-bluespace-storage = Блюспейс-хранилище research-technology-portable-fission = Портативный распад research-technology-space-scanning = Сканирование космоса research-technology-excavation = Массовые раскопки +research-technology-optimized-microgalvanism = Оптимизированный микрогальванизм research-technology-biochemical-stasis = Биохимический стазис research-technology-mechanized-treatment = Механизированная подготовка research-technology-bluespace-chemistry = Блюспейс-химия diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml index 714b182853..b078646ae2 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml @@ -367,9 +367,12 @@ path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg - type: ProjectileBatteryAmmoProvider proto: BulletWeakRocket - fireCost: 125 + fireCost: 100 - type: Appearance - type: AmmoCounter + - type: Battery + maxCharge: 900 + startingCharge: 900 - type: entity id: WeaponMechCombatMissileRack6 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 17268079a8..e186913a97 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -819,7 +819,7 @@ - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi layers: - - state: frag + - state: smallfrag - type: ExplodeOnTrigger - type: Explosive explosionType: Default @@ -827,6 +827,7 @@ intensitySlope: 1 totalIntensity: 4 # 60 total damage to distribute over tiles maxTileBreak: 1 + canCreateVacuum: False - type: PointLight radius: 3.5 color: orange diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 429b58331e..3c869974dd 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -44,7 +44,7 @@ maxAngle: 16 angleIncrease: 1 angleDecay: 6 - fireRate: 5 + fireRate: 4 selectedMode: FullAuto availableModes: - SemiAuto diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml index 3475640872..02441887ce 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml @@ -137,9 +137,11 @@ maxVol: 30 reagents: - ReagentId: Ephedrine - Quantity: 20 + Quantity: 16 - ReagentId: Epinephrine - Quantity: 10 + Quantity: 8 + - ReagentId: Tricordrazine + Quantity: 6 - type: SolutionContainerVisuals maxFillLevels: 1 changeColor: false diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml index 961f2077a5..5a2f4a3e0c 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml @@ -1,7 +1,6 @@ - type: latheRecipePack id: MedicalStaticSunrise recipes: - - HandheldCrewMonitor # - ClothingHandsGlovesNitrileBlack # Sunrise-TODO: Не добавлять, пока не сделаете им уникальные для каждой волокна, ибо на момент комита тут все "нитриловые" # - ClothingHandsGlovesNitrileGreen # - ClothingHandsGlovesNitrileOrange @@ -22,6 +21,7 @@ - HyposprayMedical - AutoMenderBurn - AutoMenderBrute + - HandheldCrewMonitor - type: latheRecipePack id: SurgeryDynamicSunrise diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml index 3fe4bd2580..c0bf441a12 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml @@ -5,8 +5,10 @@ - Tools completetime: 4 materials: - Glass: 500 - Steel: 500 + Glass: 250 + Steel: 250 + Plastic: 400 + Gold: 100 - type: latheRecipe id: ScalpelAdvanced diff --git a/Resources/Prototypes/_Sunrise/Research/medical.yml b/Resources/Prototypes/_Sunrise/Research/medical.yml index 69fb229f4d..4ccdba510e 100644 --- a/Resources/Prototypes/_Sunrise/Research/medical.yml +++ b/Resources/Prototypes/_Sunrise/Research/medical.yml @@ -65,6 +65,20 @@ technologyPrerequisites: - SurgeryTech +- type: technology + id: HandheldCrewMonitorTech + name: research-technology-hanheld-crew-monitor + icon: + sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi + state: scanner + discipline: Biochemical + tier: 2 + cost: 9000 + recipeUnlocks: + - HandheldCrewMonitor + technologyPrerequisites: + - SurgeryTech + - type: technology id: CyberImplantsTech name: research-technology-basic-eye-implants