Merge pull request #137 from FrisKisDr/fire

Мелкие исправления новакидов
AdventureTimeSS14 · Nov 20, 2023 · 05667da · 05667da
2 parents 1d6fcba + c844257
commit 05667da
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 3 deletions.
diff --git a/Resources/Audio/ADT/ERT/ert_firesquad.ogg b/Resources/Audio/ADT/ERT/ert_firesquad.ogg
diff --git a/Resources/Audio/ADT/ERT/ert_heavy.ogg b/Resources/Audio/ADT/ERT/ert_heavy.ogg
diff --git a/Resources/Audio/ADT/ERT/ert_no.ogg b/Resources/Audio/ADT/ERT/ert_no.ogg
diff --git a/Resources/Audio/ADT/ERT/ert_send.ogg b/Resources/Audio/ADT/ERT/ert_send.ogg
diff --git a/Resources/Audio/ADT/ERT/ert_yes.ogg b/Resources/Audio/ADT/ERT/ert_yes.ogg
diff --git a/Resources/Audio/ADT/ERT/protection_send.ogg b/Resources/Audio/ADT/ERT/protection_send.ogg
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -583,6 +583,13 @@ Entries:
   id: 55609 #костыль отображения в Обновлениях
   time: '2023-11-15T07:40:00.0000000+00:00'
 
+- author: Friskis
+  changes:
+  - {message: Новакидов не ослепляет вспышка и сварка, type: Fix}
+  - {message: Новакиды теперь наносят урон ожогами в рукопашном, type: Fix}
+  id: 55610 #костыль отображения в Обновлениях
+  time: '2023-11-20T07:40:00.0000000+00:00'
+
 - author: Шрёдингер
   changes:
   - {message: Респрайты всех вещмешков от Празата., type: Tweak}
@@ -597,3 +604,4 @@ Entries:
   - {message: Добавлена плюшевая игрушка Азалии (MrBro), type: Add}
   id: 55611 #костыль отображения в Обновлениях
   time: '2023-11-20T04:20:00.0000000+00:00'
+
diff --git a/Resources/Prototypes/ADT/Novakid/Mobs/Species/novakid.yml b/Resources/Prototypes/ADT/Novakid/Mobs/Species/novakid.yml
@@ -14,7 +14,7 @@
   - type: Thirst
   - type: PointLight
     color: "#ffffff"
-    energy: 0.4
+    energy: 0.6
   - type: Icon
     sprite: ADT/Mobs/Novakid/parts.rsi
     state: full_m
@@ -43,7 +43,7 @@
     animation: WeaponArcPunch
     damage:
       types:
-        Piercing: 5
+        Heat: 5
   - type: Temperature
     heatDamageThreshold: 450
     coldDamageThreshold: 193  #starting temperature damage treshold
@@ -54,7 +54,9 @@
         Cold : 0.5 #per second, scales with temperature & other constants
     heatDamage:
       types:
-        Heat : 0.2 #per second, scales with temperature & other constants
+        Heat : 0.2 #per second, scales with temperature & other constants.
+  - type: FlashImmunity
+  - type: EyeProtection
   - type: MovementSpeedModifier
     baseWalkSpeed : 2.5
     baseSprintSpeed : 4.5

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -138,6 +138,9 @@
         Radiation: 0
         Caustic: 0.75
   - type: GroupExamine
+  - type: ClothingSpeedModifier # Понижение скорости 
+    walkModifier: 0.7
+    sprintModifier: 0.7
 
 - type: entity
   parent: ClothingOuterArmorHeavy