Merge pull request #152 from BL02DL/master

Маленькие фиксы от Василисы
Lost-Paradise-Project · Sep 17, 2024 · 3c3a03e · 3c3a03e
2 parents d11f08b + 059ce49
commit 3c3a03e
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 10 deletions.
diff --git a/Resources/Locale/ru-RU/_LostParadise/update20.ftl b/Resources/Locale/ru-RU/_LostParadise/update20.ftl
@@ -35,7 +35,7 @@ ent-LPParbitermask = Трофейная маска
     .desc = Трофейная маска одного из известных охотников. От неё так и веет отчаянием
 ent-LPPBrasMat = Раздатчик бюстгальтеров
     .desc = Раздатчик, что дополняет образ пользователя и делает его неотразимым!
-ent-LPPC4Low = Слабая C4
+ent-LPPC4Low = C4Low
     .desc = Взрывпакет предназначенный для быстрого выламывания шлюзов или стен, но его взрыв довольно слабый в плане радиуса. Виднеется этикетка (ставьте прямо на объект)
 ent-LPPCargodrobeVard = Раздатчик продвинутой одежды снабжения
     .desc = Красивая одежда для персонала снабжения!

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -24,7 +24,7 @@
     ClothingOuterArmorPlateCarrier: 2 # DeltaV - moved body armour from SecDrobe to SecTech
     ClothingOuterArmorDuraVest: 2
     ClothingHeadHelmetBasic: 2 # DeltaV - added helmets to the SecTech. Another line of defense between the tide and your grey matter.
-    BreachingCharge: 8
+    # BreachingCharge: 8
     LPPWeaponEnergyGunSoleil: 2 #LPP
     LPPTelebaton: 3 #LPP
   # security officers need to follow a diet regimen!

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -275,6 +275,8 @@
     - Dropper
     - ClothingEyesGlassesChemical
     dynamicRecipes:
+      - LPPRCDFAPDevice
+      - LPPRCDFAPAmmo
       - PowerDrill
       - MiningDrill
       - AnomalyScanner
@@ -718,6 +720,7 @@
     idleState: icon
     runningState: icon
     staticRecipes:
+      - LPPC4Low
       - ClothingEyesHudSecurity
       - CombatKnife
       - Flash
@@ -911,6 +914,7 @@
     idleState: icon
     runningState: icon
     staticRecipes:
+      - LPPHypospray
       - Brutepack
       - Ointment
       - Gauze

diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
@@ -173,6 +173,10 @@
   tier: 2
   cost: 10000
   recipeUnlocks:
+    - LPPRCDFAPDevice
+    - LPPRCDFAPAmmo
+    - RCD
+    - RCDAmmo
     - WelderExperimental
     - PowerDrill
     - JawsOfLife

diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -190,8 +190,8 @@
 - type: entity
   parent: ClothingOuterHardsuitBase
   id: LPPClothingOuterHardsuitSecurityEng
-  name: security hardsuit
-  description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
+  name: скафандр полевого инженера
+  description: Специальный костюм, защищающий от воздействия опасных сред с низким давлением. Имеет дополнительный слой брони.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Hardsuits/SecEng.rsi

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Specific/Medical/hypospray.yml
@@ -1,6 +1,6 @@
 - type: entity
   parent: BaseItem
-  id: LPPhypospray
+  id: LPPHypospray
   name: гипоспрей 0.5
   description: Урезанная версия стерильного инъектора для быстрого введения лекарств пациентам. Слишком урезанная версия, но явно лучше шприцов. НЕ ДАВАТЬ В РУКИ ИНТЕРНАМ.
   components:

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/CombatUtility.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/CombatUtility.yml
@@ -0,0 +1,18 @@
+- type: entity
+  id: LPPCombatDefibrillator
+  parent: [ BaseDefibrillator, PowerCellSlotHighItem ]
+  name: боевой дефибриллятор
+  description: Быстро. Надёжно. Эффективно.
+  components:
+    - type: PowerCellDraw
+      useRate: 120
+    - type: Defibrillator
+      zapHeal:
+        types:
+          Asphyxiation: -80
+    - type: UseDelay
+    - type: ItemSlots
+      slots:
+        cell_slot:
+          name: power-cell-slot-component-slot-name-default
+          startingItem: PowerCellHigh
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Bombs/C4Low.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Bombs/C4Low.yml
@@ -23,8 +23,8 @@
     - Trigger
   - type: Explosive
     explosionType: DemolitionCharge
-    totalIntensity: 5
-    intensitySlope: 2
-    maxIntensity: 30
+    totalIntensity: 10
+    intensitySlope: 10
+    maxIntensity: 10
     canCreateVacuum: false
   - type: ExplodeOnTrigger
diff --git a/Resources/Prototypes/_LostParadise/Recipes/Lathes/hardsuitsrecipe.yml b/Resources/Prototypes/_LostParadise/Recipes/Lathes/hardsuitsrecipe.yml
@@ -238,8 +238,8 @@
     Plastic: 850
 
 - type: latheRecipe
-  id: LPPhypospray
-  result: LPPhypospray
+  id: LPPHypospray
+  result: LPPHypospray
   completetime: 20
   materials:
     Steel: 425