From 7eebfefec20caf588c2025040a86a4b69f726827 Mon Sep 17 00:00:00 2001
From: Crazzy_pingvin <Crazzy_pingvin@mail.ru>
Date: Fri, 1 Nov 2024 01:18:13 +0300
Subject: [PATCH] RepairLore_v8

---
 .../Prototypes/Corvax/Lore/Noocraty/nooc.yml  |  2 +-
 .../Prototypes/Corvax/Lore/Petr/petr.yml      |  7 +--
 .../Prototypes/Corvax/Lore/SNK/ai_snk.yml     | 14 +++--
 Resources/Prototypes/Corvax/Lore/SNK/snk.yml  | 54 ++-----------------
 .../Prototypes/Corvax/Lore/Umpor/umpor.yml    |  3 +-
 5 files changed, 15 insertions(+), 65 deletions(-)

diff --git a/Resources/Prototypes/Corvax/Lore/Noocraty/nooc.yml b/Resources/Prototypes/Corvax/Lore/Noocraty/nooc.yml
index 6c388814115..ad037d52c30 100644
--- a/Resources/Prototypes/Corvax/Lore/Noocraty/nooc.yml
+++ b/Resources/Prototypes/Corvax/Lore/Noocraty/nooc.yml
@@ -2696,7 +2696,7 @@
       - id: NoocGlovesVis
       - id: NoocGlovesVis
       - id: NoocBelt
-      - id: NooceBelt
+      - id: NoocBelt
       - id: NoocSatchels
       - id: NoocSatchels
       - id: NoocCloak
diff --git a/Resources/Prototypes/Corvax/Lore/Petr/petr.yml b/Resources/Prototypes/Corvax/Lore/Petr/petr.yml
index 14a0796c644..4740d840bd6 100644
--- a/Resources/Prototypes/Corvax/Lore/Petr/petr.yml
+++ b/Resources/Prototypes/Corvax/Lore/Petr/petr.yml
@@ -356,7 +356,7 @@
   - type: AccessReader
     access: [[ "PetrAccess" ]]
   - type: CommunicationsConsole
-    title: "Призрак Коммунизма"
+    title: "Ghost-of-Communism-stamp"
     color: "#670c0c"
     canShuttle: false
     global: true #announce to everyone they're about to fuck shit up
@@ -3119,8 +3119,9 @@
   - Passive
   - PetsNT
   - Zombie
-  - Revolutionary
   - Noocraty
   - NoocratyBot
+  - UmporBot
+  - Umpor
   friendly:
-  - PetrGjlgjkmyfz
\ No newline at end of file
+  - Revolutionary
\ No newline at end of file
diff --git a/Resources/Prototypes/Corvax/Lore/SNK/ai_snk.yml b/Resources/Prototypes/Corvax/Lore/SNK/ai_snk.yml
index b4da44be304..9fa5081e4f9 100644
--- a/Resources/Prototypes/Corvax/Lore/SNK/ai_snk.yml
+++ b/Resources/Prototypes/Corvax/Lore/SNK/ai_snk.yml
@@ -44,8 +44,6 @@
 - type: htnCompound
   id: MeleeAttackTargetCompoundBotSNK
   preconditions:
-    - !type:KeyExistsPrecondition
-      key: Target
   branches:
     # Move to melee range and hit them
     - tasks:
@@ -491,7 +489,7 @@
   name: Радист СНК
   suffix: Бот, СНК, безОруж, бег
   parent: MobSNK
-  id: MobSNKrad
+  id: MobSNKRad
   components:
   - type: Loadout
     prototypes:
@@ -501,7 +499,7 @@
   name: Радист СНК
   suffix: Бот, СНК, безОруж, стоп
   parent: MobSNKStop
-  id: MobSNKradStop
+  id: MobSNKRadStop
   components:
   - type: Loadout
     prototypes:
@@ -509,8 +507,8 @@
 #-------------Вооружён бегающий---------------  
 - type: entity
   suffix: Бот, СНК, Оруж, бег
-  parent: MobSNKrad
-  id: MobSNKradWeapon
+  parent: MobSNKRad
+  id: MobSNKRadWeapon
   components:
   - type: RechargeBasicEntityAmmo
     rechargeCooldown: 2
@@ -531,8 +529,8 @@
 #-------------Вооружён ждущий--------------- 
 - type: entity
   suffix: Бот, СНК, Оруж, стоп
-  parent: MobSNKradWeapon
-  id: MobSNKradWeaponStop
+  parent: MobSNKRadWeapon
+  id: MobSNKRadWeaponStop
   components:
   - type: HTN
     rootTask:
diff --git a/Resources/Prototypes/Corvax/Lore/SNK/snk.yml b/Resources/Prototypes/Corvax/Lore/SNK/snk.yml
index 2329c32b65b..fa7d4398212 100644
--- a/Resources/Prototypes/Corvax/Lore/SNK/snk.yml
+++ b/Resources/Prototypes/Corvax/Lore/SNK/snk.yml
@@ -140,7 +140,6 @@
     state: icon
   - type: Item
     sprite: Corvax/Lore/SNK/Equipment/snk_back_std.rsi
-    state: icon
     size: Huge
   - type: Clothing
     quickEquip: false
@@ -820,56 +819,6 @@
   - type: Clothing
     sprite: Corvax/Lore/SNK/Equipment/snk_belt_sol.rsi
   - type: Storage
-    whitelist:
-      tags:
-        - CigPack
-        - Taser
-        - Powerdrill
-        - Wirecutter
-        - Crowbar
-        - Screwdriver
-        - Flashlight
-        - Wrench
-        - GeigerCounter
-        - Flare
-        - CableCoil
-        - CigPack
-        - Radio
-        - HolofanProjector
-        - Multitool
-        - AppraisalTool
-        - JawsOfLife
-        - GPS
-        - MagazinePistolHighCapacity
-        - CombatKnife
-        - Sidearm
-        - Brutepack
-        - Ointment
-        - Bloodpack
-        - Gauze
-        - EmergencyMedipen
-        - Multitool
-        - SNKPistolPist
-        - SNKMagazine
-        - SNKPistolRifle
-        - Paper
-      components:
-        - Stunbaton
-        - FlashOnTrigger
-        - SmokeOnTrigger
-        - Flash
-        - Handcuff
-        - RangedMagazine
-        - Ammo
-        - SprayPainter
-        - NetworkConfigurator
-        - RCD
-        - RCDAmmo
-        - Welder
-        - PowerCell
-        - Geiger
-        - TrayScanner
-        - GasAnalyzer
   - type: Appearance
 
 - type: entity
@@ -1172,6 +1121,9 @@
     count: 7
     spread: 20
 #-------------------------------------------энергошарики-----------------------
+- type: Tag
+  id: SNKElectro
+
 - type: entity
   id: SNKElectro
   name: Электрошары
diff --git a/Resources/Prototypes/Corvax/Lore/Umpor/umpor.yml b/Resources/Prototypes/Corvax/Lore/Umpor/umpor.yml
index 9d059e2ed97..ba3ffb74d08 100644
--- a/Resources/Prototypes/Corvax/Lore/Umpor/umpor.yml
+++ b/Resources/Prototypes/Corvax/Lore/Umpor/umpor.yml
@@ -334,7 +334,6 @@
     storedRotation: -90
   - type: ActivatableUI
     key: enum.HealthAnalyzerUiKey.Key
-    closeOnHandDeselect: false
   - type: UserInterface
     interfaces:
       enum.HealthAnalyzerUiKey.Key:
@@ -3135,7 +3134,7 @@
   - Dragon
   friendly:
   - UmporBot
-  - Umpo
+  - Umpor
   
 - type: npcFaction
   id: Umpor