опять фиксы х4

Lost-Paradise-Project · Sep 4, 2024 · 5a98fb8 · 5a98fb8
1 parent 0db44f5
commit 5a98fb8
Show file tree

Hide file tree

Showing 37 changed files with 139 additions and 69 deletions.
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/door_remote.yml
@@ -14,3 +14,20 @@
     - type: Access
       groups:
         - AllAccess
+
+- type: entity
+  parent: DoorRemoteDefault
+  id: DoorRemoteCC
+  name: Пульт ЦК
+  suffix: Cenctom
+  components:
+    - type: Sprite
+      layers:
+        - state: door_remotebase
+        - state: door_remotelightscolour
+          color: "#2eba22"
+        - state: door_remotescreencolour
+          color: "#22871a"
+    - type: Access
+      groups:
+        - CentCom
diff --git a/Resources/Prototypes/_LostParadise/Research/arsenal.yml b/Resources/Prototypes/_LostParadise/Research/arsenal.yml
@@ -0,0 +1,18 @@
+- type: technology
+  id: LPPRoboticsSecurity
+  name: research-technology-robotics-security
+  icon:
+    sprite: Objects/Misc/handcuffs.rsi
+    state: handcuff
+  discipline: Arsenal
+  tier: 1
+  cost: 7000
+  recipeUnlocks:
+  - LPPBorgModuleAresst
+  - LPPBattleBorgModule
+  - LPPLeftArmBorgSecurity
+  - LPPRightArmBorgSecurity
+  - LPPLeftLegBorgSecurity
+  - LPPRightLegBorgSecurity
+  - LPPHeadBorgSecurity
+  - LPPTorsoBorgSecurity
diff --git a/Resources/Prototypes/_LostParadise/Research/civilianservices.yml b/Resources/Prototypes/_LostParadise/Research/civilianservices.yml
@@ -0,0 +1,19 @@
+# Tier 1
+
+- type: technology
+  id: LPPRoboticsCivilanServices
+  name: research-technology-robotics-erotic
+  icon:
+    sprite: _LostParadise/Objects/Fun/ERP/whips.rsi
+    state: icon
+  discipline: CivilianServices
+  tier: 2
+  cost: 15000
+  recipeUnlocks:
+  - LPPLeftArmBorgErotic
+  - LPPRightArmBorgErotic
+  - LPPLeftLegBorgErotic
+  - LPPRightLegBorgErotic
+  - LPPHeadBorgErotic
+  - LPPTorsoBorgErotic
+  - LPPERPModuleBorg
diff --git a/Resources/Prototypes/_LostParadise/Research/experimental.yml b/Resources/Prototypes/_LostParadise/Research/experimental.yml
@@ -9,6 +9,12 @@
   tier: 2
   cost: 12000
   recipeUnlocks:
+    - LPPLeftArmBorgScience
+    - LPPRightArmBorgScience
+    - LPPLeftLegBorgScience
+    - LPPRightLegBorgScience
+    - LPPHeadBorgScience
+    - LPPTorsoBorgScience
     - BorgModuleArtifact
     - BorgModuleAnomaly
 

diff --git a/Resources/Prototypes/_LostParadise/Research/industrial.yml b/Resources/Prototypes/_LostParadise/Research/industrial.yml
@@ -60,3 +60,22 @@
   cost: 7500
   recipeUnlocks:
   - WeaponCutterAdv
+
+# Tier 2
+- type: technology
+  id: LPPRoboticsIndustrial
+  name: research-technology-robotics-mining
+  icon:
+    sprite: Objects/Weapons/Melee/survival_knife.rsi
+    state: icon
+  discipline: Industrial
+  tier: 2
+  cost: 15000
+  recipeUnlocks:
+    - LPPLeftArmBorgMining
+    - LPPRightArmBorgMining
+    - LPPLeftLegBorgMining
+    - LPPRightLegBorgMining
+    - LPPHeadBorgMining
+    - LPPTorsoBorgMining
+    - BorgModuleMining
diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/ReverseEngineering/syndicate.rsi/meta.json b/Resources/Textures/Nyanotrasen/Clothing/Head/ReverseEngineering/syndicate.rsi/meta.json
@@ -17,6 +17,10 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "combat-equipped-HELMET",
+      "directions": 4
+    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4

diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
@@ -28,6 +28,15 @@
     {
       "name": "silver"
     },
+    {
+      "name": "adamantine"
+    },
+    {
+      "name": "copper"
+    },
+    {
+      "name": "ammonia"
+    },
     {
       "name": "titanium"
     },

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
@@ -22,6 +22,12 @@
     {
       "name": "envelope_torn_overlay"
     },
+    {
+      "name": "paper_stamp-notary"
+    },
+    {
+      "name": "paper_stamp-void"
+    },
     {
       "name": "folder-base"
     },

diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
@@ -26,6 +26,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "red-crowbar"
+    },
     {
       "name": "red-icon"
     },

diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "wrench"
+    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json
@@ -16,6 +16,21 @@
     {
       "name": "frame"
     },
+    {
+      "name": "extinguisher-mini"
+    },
+    {
+      "name": "extinguisher_empty"
+    },
+    {
+      "name": "extinguisher_mini"
+    },
+    {
+      "name": "extinguisher_full"
+    },
+    {
+      "name": "extinguisher_closed"
+    },
     {
       "name": "open"
     }

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
@@ -1458,6 +1458,24 @@
                 ]
             ]
         },
+        {
+            "name": "direction_lawyer",
+            "directions": 4,
+            "delays": [
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "nine",
             "delays": [

diff --git a/Resources/Textures/Structures/cryostorage.rsi/meta.json b/Resources/Textures/Structures/cryostorage.rsi/meta.json
@@ -17,8 +17,8 @@
       "delays": [
                 [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05],
                 [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05],
-                [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05],
-                [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05]
+                [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05],
+                [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05]
       ]
     }
   ]

diff --git a/...urces/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/astra.rsi/Астра.txt b/...urces/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/astra.rsi/Астра.txt
diff --git a/...Paradise/Objects/Consumable/Smokeables/Cigarettes/baltic-channel.rsi/балтийский канал.txt b/...Paradise/Objects/Consumable/Smokeables/Cigarettes/baltic-channel.rsi/балтийский канал.txt
diff --git a/...aradise/Objects/Consumable/Smokeables/Cigarettes/blue-lady-slim.rsi/голубая леди слим.txt b/...aradise/Objects/Consumable/Smokeables/Cigarettes/blue-lady-slim.rsi/голубая леди слим.txt
diff --git a/...ures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/blue-sky.rsi/голубое небо.txt b/...ures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/blue-sky.rsi/голубое небо.txt
diff --git a/...ces/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/cosmos.rsi/космос.txt b/...ces/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/cosmos.rsi/космос.txt
diff --git a/...Paradise/Objects/Consumable/Smokeables/Cigarettes/critical-luck.rsi/критическая удача.txt b/...Paradise/Objects/Consumable/Smokeables/Cigarettes/critical-luck.rsi/критическая удача.txt
diff --git a/...ostParadise/Objects/Consumable/Smokeables/Cigarettes/dromedar-crush.rsi/дромедар краш.txt b/...ostParadise/Objects/Consumable/Smokeables/Cigarettes/dromedar-crush.rsi/дромедар краш.txt
diff --git a/...Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/dromedar.rsi/дромедар.txt b/...Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/dromedar.rsi/дромедар.txt
diff --git a/...adise/Objects/Consumable/Smokeables/Cigarettes/gentleman-of-luck.rsi/Джентльмен удачи.txt b/...adise/Objects/Consumable/Smokeables/Cigarettes/gentleman-of-luck.rsi/Джентльмен удачи.txt
diff --git a/...ostParadise/Objects/Consumable/Smokeables/Cigarettes/gentleman-of-luck.rsi/примечание.txt b/...ostParadise/Objects/Consumable/Smokeables/Cigarettes/gentleman-of-luck.rsi/примечание.txt
diff --git a/...s/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/landtag.rsi/ландтаг.txt b/...s/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/landtag.rsi/ландтаг.txt
diff --git a/..._LostParadise/Objects/Consumable/Smokeables/Cigarettes/liberty-spirit.rsi/Дух свободы.txt b/..._LostParadise/Objects/Consumable/Smokeables/Cigarettes/liberty-spirit.rsi/Дух свободы.txt
diff --git a/...Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/marbrolo.rsi/марброло.txt b/...Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/marbrolo.rsi/марброло.txt
diff --git a/.../Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/maximus.rsi/максимус.txt b/.../Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/maximus.rsi/максимус.txt
diff --git a/..._LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/closed.png b/..._LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/closed.png
diff --git a/...radise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/equipped-BELT.png b/...radise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/equipped-BELT.png
diff --git a/...Paradise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/inhand-left.png b/...Paradise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/inhand-left.png
diff --git a/...aradise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/inhand-right.png b/...aradise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/inhand-right.png
diff --git a/...s/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/meta.json b/...s/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/meta.json
diff --git a/...s/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/open.png b/...s/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/open.png
diff --git a/.../_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/trash.png b/.../_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/trash.png
diff --git a/...tures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/winchester.rsi/винчестер.txt b/...tures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/winchester.rsi/винчестер.txt
diff --git a/Resources/Textures/_LostParadise/Objects/Misc/Fluffy/Floppy-Energ.rsi/энергетик Фруппи.txt b/Resources/Textures/_LostParadise/Objects/Misc/Fluffy/Floppy-Energ.rsi/энергетик Фруппи.txt
diff --git a/Resources/Textures/_LostParadise/Objects/Misc/Fluffy/Floppy-apple.rsi/Фруппи Яблочный.txt b/Resources/Textures/_LostParadise/Objects/Misc/Fluffy/Floppy-apple.rsi/Фруппи Яблочный.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,9 @@ @@
         {
           "name": "icon"
         },
+        {
+          "name": "red-crowbar"
+        },
         {
           "name": "red-icon"
         },
@@ Expand Down @@