немного фиксов

Lost-Paradise-Project · Nov 10, 2024 · 60793e9 · 60793e9
1 parent 791feb2
commit 60793e9
Show file tree

Hide file tree

Showing 19 changed files with 16 additions and 97 deletions.
diff --git a/Resources/Prototypes/CharacterItemGroups/securityGroups.yml b/Resources/Prototypes/CharacterItemGroups/securityGroups.yml
@@ -179,6 +179,7 @@
       id: LoadoutMagazineMagnumSpare
     - type: loadout
       id: LoadoutMagazineMagnumRubberSpare
+    - type: loadout
       id: LoadoutSecuritySpeedLoaderSpecial
     - type: loadout
       id: LoadoutSecuritySpeedLoaderSpecialRubber

diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -7,7 +7,6 @@
   - type: ShowMindShieldIcons
   - type: ShowCriminalRecordIcons
 
-
 - type: entity
   parent: ClothingEyesBase
   id: ClothingEyesHudDiagnostic

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -282,8 +282,8 @@
   - type: SiliconLawProvider
     laws: SyndicateStatic
   - type: TTS # Corvax-TTS
-      voice: Vally
-    - type: IntrinsicRadioTransmitter
+    voice: Vally
+  - type: IntrinsicRadioTransmitter
     channels:
     - Binary
     - Syndicate

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -99,8 +99,8 @@
         type: InstrumentBoundUserInterface
       enum.HealthAnalyzerUiKey.Key:
         type: HealthAnalyzerBoundUserInterface
-    - key: enum.GasAnalyzerUiKey.Key
-      type: GasAnalyzerBoundUserInterface
+      enum.GasAnalyzerUiKey.Key:
+        type: GasAnalyzerBoundUserInterface
   - type: Tag
     tags:
     - DoorBumpOpener

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml
@@ -109,8 +109,8 @@
       path: /Audio/Animals/snake_hiss.ogg
   - type: Puller
     needsHands: false
-  - type: Arachne
-    cocoonDelay: 8
+  # - type: Arachne
+  #   cocoonDelay: 8
   - type: SolutionContainerManager
     solutions:
       melee:

diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Glasses/glasses.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Glasses/glasses.yml
@@ -93,7 +93,7 @@
     protectionTime: 5
 
 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowSecurityIcons]
   id: LPPClothingEyesGlassesContractor
   name: Contractor glasses
   description: Glasses, that provides protection from flashes and secure wearers eyes from wielding.
@@ -113,7 +113,6 @@
     damageContainers:
     - Biological
   - type: ShowSyndicateIcons
-  - type: ShowSecurityIcons
   - type: Armor
     modifiers:
       coefficients:

diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Hud/hud.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Hud/hud.yml
@@ -1,9 +1,8 @@
 - type: entity
+  parent: ShowSecurityIcons
   id: LPPShowSecurityIcons
   abstract: true
   noSpawn: true
-  components:
-  - type: ShowSecurityIcons
 
 - type: entity
   parent: [ClothingEyesBase, LPPShowSecurityIcons]
@@ -64,12 +63,11 @@
   - type: SolutionScanner
 
 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowSecurityIcons]
   id: LPPClothingEyesHudSecEng
   name: Security Engineer HUD
   description: The HUD model is a combination of an optical meson scanner and a security HUD. Protects the eyes.
   components:
-  - type: ShowSecurityIcons
   - type: Sprite
     sprite: _LostParadise/Clothing/Eyes/HUD/SecEngHUD.rsi
   - type: Clothing
@@ -81,7 +79,7 @@
     - HudSecurity
 
 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowSecurityIcons]
   id: LPPNPZEyehud
   name: NPZ HUD
   description: The HUD of the NPZ, with built-in additional elements such as protection from bright flashes, as well as, in connection with the latest cooperation measures between the NPZ and NT, the built-in database of NanoTraisen to identify ranks and criminals at the corporation's facilities.
@@ -90,7 +88,6 @@
     sprite: _LostParadise/Clothing/Eyes/HUD/upgHUD.rsi
   - type: Clothing
     sprite: _LostParadise/Clothing/Eyes/HUD/upgHUD.rsi
-  - type: ShowSecurityIcons
   - type: FlashImmunity
   - type: EyeProtection
     protectionTime: 5
diff --git a/Resources/Prototypes/_LostParadise/Shaders/shaders.yml b/Resources/Prototypes/_LostParadise/Shaders/shaders.yml
@@ -1,7 +1,7 @@
-- type: shader
-  id: ColorTint
-  kind: source
-  path: "/Textures/_LostParadise/Shaders/color_tint.swsl"
+# - type: shader
+#   id: ColorTint
+#   kind: source
+#   path: "/Textures/_LostParadise/Shaders/color_tint.swsl"
 
 - type: shader
   id: SeeingStatic

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
@@ -21,10 +21,6 @@
             "name": "on-inhand-right",
             "directions": 4
         },
-        {
-            "name": "off-inhand-right",
-            "directions": 4
-        },
         {
             "name": "off-equipped-HELMET",
             "directions": 4

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
@@ -77,14 +77,6 @@
       "name": "on-equipped-HELMET-reptilian",
       "directions": 4
     },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "equipped-HELMET-harpy",
-      "directions": 4
-    },
     {
       "name": "equipped-HELMET-vox",
       "directions": 4

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json
@@ -59,11 +59,6 @@
     },
     {
       "name": "on-equipped-HELMET-reptilian",
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
@@ -21,10 +21,6 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-equipped-HELMET-vulpkanin",
-      "directions": 4
-    },
     {
       "name": "off-equipped-HELMET-tajaran",
       "directions": 4
@@ -37,14 +33,6 @@
       "name": "off-equipped-HELMET-reptilian",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET-vox",
       "directions": 4
@@ -72,14 +60,6 @@
     {
       "name": "on-equipped-HELMET-reptilian",
       "directions": 4
-    },
-    {
-      "name": "on-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-right",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
@@ -41,10 +41,6 @@
       "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
-    {
-        "name": "on-equipped-HELMET",
-        "directions": 4
-    },
     {
       "name": "on-equipped-HELMET-vox",
       "directions": 4

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
@@ -60,10 +60,6 @@
     {
       "name": "on-equipped-HELMET-reptilian",
       "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
@@ -55,11 +55,7 @@
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
-        "directions": 4
-    },
-      {
-          "name": "off-equipped-HELMET-vox",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
@@ -54,14 +54,6 @@
             "name": "on-equipped-HELMET-reptilian",
             "directions": 4
         },
-        {
-            "name": "on-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "on-inhand-right",
-            "directions": 4
-        },
         {
             "name": "off-equipped-HELMET-vox",
             "directions": 4

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json
@@ -53,14 +53,6 @@
             "name": "on-equipped-HELMET-reptilian",
             "directions": 4
         },
-        {
-            "name": "on-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "on-inhand-right",
-            "directions": 4
-        },
         {
             "name": "off-equipped-HELMET-vox",
             "directions": 4

diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
@@ -18,10 +18,6 @@
       "name": "equipped-HELMET-vox",
       "directions": 4
     },
-    {
-      "name": "lighton-equipped-HELMET",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/...ces/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/meta.json b/...ces/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/meta.json
@@ -20,14 +20,6 @@
     {
       "name": "on-equipped-HELMET",
       "directions": 4
-    },
-    {
-      "name": "on-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-right",
-      "directions": 4
     }
   ]
 }