Merge pull request #34 from SpicyDarkFox/master

своеборазные фиксы
Lost-Paradise-Project · Aug 26, 2024 · a9e71ea · a9e71ea
2 parents 3a02af7 + 647a483
commit a9e71ea
Show file tree

Hide file tree

Showing 18 changed files with 114 additions and 100 deletions.
diff --git a/Resources/Locale/ru-RU/_LostParadise/Supermatter/Supermatter.ftl b/Resources/Locale/ru-RU/_LostParadise/Supermatter/Supermatter.ftl
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1714,7 +1714,7 @@
   id: LPPUplinkGlaive
   name: Кроваво красная глефа
   description: Модифицированная версия глефы, усовершенствованная каким-то больным утилизатором...
-  icon: { sprite: /Textures/LPP/Objects/Weapons/Melee/syndie_glaive.rsi, state: icon }
+  icon: { sprite: /Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi, state: icon }
   productEntity: LPPWeaponSyndieGlaive
   cost:
     Telecrystal: 8
@@ -1725,7 +1725,7 @@
   id: LPPUplinkupgrwebbing
   name: разгрузочный жилет "Хомяк"
   description: Комплект из карманов, сумок и прочей лабуды предоставляет кучу места для ваших всевозможных вещей, что вы сюда запихнёте. Выглядит крайне громоздко однако.
-  icon: { sprite: /Textures/LPP/Clothing/Belt/upgrwebbing.rsi, state: icon }
+  icon: { sprite: /Textures/_LostParadise/Clothing/Belt/upgrwebbing.rsi, state: icon }
   productEntity: LPPClothingBeltMaximumWebbing
   cost:
     Telecrystal: 2
@@ -1736,7 +1736,7 @@
   id: LPPUplinkAcientHardsuitSyndie
   name: древний скафандр Синдиката
   description: Очень странная модель скафандра Ядерных Оперативников, явно нестандартной конфигурации
-  icon: { sprite: /Textures/LPP/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon }
+  icon: { sprite: /Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon }
   productEntity: LPPClothingOuterHardsuitAcientSyndie
   cost:
     Telecrystal: 11
@@ -1747,7 +1747,7 @@
   id: LPPUplinkEcbow
   name: мини арбалет синдиката
   description: Любимое оружие агентов из далёких времён. Выстрел сразу же поражает цель, роняя моментально вашу цель на короткое время. Хоть оно и не требуется боеприпасов для стрельбы, однако самому оружию требуется перезарядка для повторного выстрела.
-  icon: { sprite: /Textures/LPP/Objects/Weapons/Guns/Battery/ecbow.rsi, state: icon }
+  icon: { sprite: /Textures/_LostParadise/Objects/Weapons/Guns/Battery/ecbow.rsi, state: icon }
   productEntity: LPPWeaponEnergyCrossbow
   cost:
     Telecrystal: 10
@@ -1763,4 +1763,4 @@
   cost:
     Telecrystal: 2
   categories:
-    - UplinkArmor
+    - UplinkArmor
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1059,6 +1059,7 @@
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     layers:
     - state: scatterlaser
+      shader: unshaded
   - type: GatheringProjectile
   - type: Projectile
     DeleteOnCollide: false
@@ -1133,7 +1134,7 @@
       params:
         volume: 5
   - type: Sprite
-    sprite: LPP/Objects/Weapons/Guns/Projectiles/battlecutter.rsi
+    sprite: _LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi
     layers:
     - state: ion
       shader: unshaded
@@ -1163,11 +1164,11 @@
     types:
       Heat: 1
   muzzleFlash:
-    sprite: LPP/Objects/Weapons/Guns/projectiles/ailaser.rsi
+    sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi
     state: AILaser_3
   travelFlash:
-    sprite: LPP/Objects/Weapons/Guns/projectiles/ailaser.rsi
+    sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi
     state: AILaser_2
   impactFlash:
-    sprite: LPP/Objects/Weapons/Guns/projectiles/ailaser.rsi
-    state: AILaser_1
+    sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi
+    state: AILaser_1
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -244,6 +244,7 @@
   parent: BaseLathe
   name: protolathe
   description: Converts raw materials into useful objects.
+  noSpawn: false
   components:
   - type: Sprite
     sprite: Structures/Machines/protolathe.rsi
@@ -1418,4 +1419,4 @@
   - type: MaterialStorage
     whitelist:
       tags:
-        - PrizeTicket
+        - PrizeTicket
diff --git a/Resources/Prototypes/_LostParadise/Action/ai.yml b/Resources/Prototypes/_LostParadise/Action/ai.yml
@@ -2,6 +2,7 @@
   id: AIEyeCamShootAction
   name: stun shot
   description: destabilizing shot in some point
+  noSpawn: true
   components:
   - type: WorldTargetAction
     icon: _LostParadise/Actions/AI/camerashoot.png
@@ -15,6 +16,7 @@
   id: AIEyeCamAction
   name: AI cameras
   description: Can jump on target cameras.
+  noSpawn: true
   components:
   - type: InstantAction
     icon: _LostParadise/Actions/AI/camera.png
@@ -27,6 +29,7 @@
   id: AIEyeAction
   name: AI Eye
   description: Puts you in to the AI Eye form, allowing you to float about the station's cameras.
+  noSpawn: true
   components:
   - type: InstantAction
     icon: _LostParadise/Actions/AI/eye.png
@@ -52,6 +55,7 @@
   id: AIToggleArmNuke
   name: Nuke Arm/Disarm
   description: Toggles the AI's nuke.
+  noSpawn: true
   components:
   - type: InstantAction
     icon:
@@ -67,6 +71,7 @@
   id: ActionAIShowCommunications
   name: Communications Interface
   description: View a communications interface.
+  noSpawn: true
   components:
   - type: InstantAction
     icon: _LostParadise/Actions/AI/announcement.png
@@ -77,6 +82,7 @@
   id: ActionAiShowCriminalRecords
   name: Criminal Records Interface
   description: View a criminal records interface.
+  noSpawn: true
   components:
   - type: InstantAction
     icon: Corvax/Interface/AdminActions/monitoring.png # Corvax-Resprite
@@ -89,6 +95,7 @@
 - type: entity
   id: ActionOpenCloseRemote
   name: Open targeted door
+  noSpawn: true
   components:
   - type: EntityTargetAction
     icon: _LostParadise/Actions/AI/door.png
@@ -101,6 +108,7 @@
 - type: entity
   id: ActionToggleBolts
   name: Toggle bolts on door
+  noSpawn: true
   components:
   - type: EntityTargetAction
     icon: _LostParadise/Actions/AI/door_bolt.png
@@ -113,6 +121,7 @@
 - type: entity
   id: ActionToggleEmergencyAccess
   name: Toggle emergency on door
+  noSpawn: true
   components:
   - type: EntityTargetAction
     icon: _LostParadise/Actions/AI/door_emergency.png

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/machineboard.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/machineboard.yml
@@ -1,3 +1,67 @@
+# - type: entity
+#   id: LPPProtolatheENGMachineCircuitboard
+#   parent: BaseMachineCircuitboard
+#   name: инженерный протолат (машинная плата)
+#   description: Плата для создания инженерного протолата.
+#   components:
+#     - type: MachineBoard
+#       prototype: LPPprotolatheENG
+#       stackRequirements:
+#         MatterBin: 2
+#         Manipulator: 2
+#       tagRequirements:
+#         GlassBeaker:
+#           amount: 2
+#           defaultPrototype: Beaker
+#
+# - type: entity
+#   id: LPPProtolatheRnDMachineCircuitboard
+#   parent: BaseMachineCircuitboard
+#   name: научный протолат (машинная плата)
+#   description: Плата для создания научного протолата.
+#   components:
+#     - type: MachineBoard
+#       prototype: LPPprotolatheRnD
+#       stackRequirements:
+#         MatterBin: 2
+#         Manipulator: 2
+#       tagRequirements:
+#         GlassBeaker:
+#           amount: 2
+#           defaultPrototype: Beaker
+#
+# - type: entity
+#   id: LPPProtolatheSUPMachineCircuitboard
+#   parent: BaseMachineCircuitboard
+#   name: протолат снабжения (машинная плата)
+#   description: Плата для создания протолата снабжения.
+#   components:
+#     - type: MachineBoard
+#       prototype: LPPSupProtolathe
+#       stackRequirements:
+#         MatterBin: 2
+#         Manipulator: 2
+#       tagRequirements:
+#         GlassBeaker:
+#           amount: 2
+#           defaultPrototype: Beaker
+#
+# - type: entity
+#   id: LPPProtolatheServiceMachineCircuitboard
+#   parent: BaseMachineCircuitboard
+#   name: сервисный протолат (машинная плата)
+#   description: Плата для создания сервисного протолата.
+#   components:
+#     - type: MachineBoard
+#       prototype: LPPServiceProtolathe
+#       stackRequirements:
+#         MatterBin: 2
+#         Manipulator: 2
+#       tagRequirements:
+#         GlassBeaker:
+#           amount: 2
+#           defaultPrototype: Beaker
+#
 - type: entity
   id: LPPSpaceForgeBoard
   parent: BaseMachineCircuitboard

diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
@@ -13,6 +13,12 @@
     {
       "name": "icon-flash"
     },
+    {
+      "name": "icon-unshaded"
+    },
+    {
+      "name": "light-overlay"
+    },
     {
       "name": "on-inhand-left",
       "directions": 4

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon-flash"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
@@ -43,7 +43,7 @@
       "directions": 4
     },
     {
-      "name": "equipped-OUTERCLOTHING-hapry",
+      "name": "equipped-OUTERCLOTHING-harpy",
       "directions": 4
     }
   ]

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json
@@ -18,11 +18,11 @@
       "name": "equipped-OUTERCLOTHING-vulpkanin",
       "directions": 4
     },
-     {
+    {
       "name": "equipped-OUTERCLOTHING-tajaran",
       "directions": 4
     },
-     {
+    {
       "name": "equipped-OUTERCLOTHING-reptilian",
       "directions": 4
     },
@@ -37,7 +37,7 @@
     {
       "name": "inhand-right",
       "directions": 4
-    }},
+    },
     {
       "name": "equipped-OUTERCLOTHING-harpy",
       "directions": 4

diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json
@@ -318,6 +318,15 @@
         ]
       ]
     },
+    {
+        "name": "scatterlaser",
+        "delays": [
+          [
+            0.060000002,
+            0.060000002
+          ]
+        ]
+     },
     {
       "name": "impact_xray",
       "delays": [

diff --git a/...rces/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/scatterlaser.png b/...rces/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/scatterlaser.png
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
@@ -576,6 +576,12 @@
     },
     {
       "name": "representative_door"
+    },
+    {
+        "name": "sec_engi"
+    },
+    {
+        "name": "sec_eng_door"
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/sec_eng_door.png b/Resources/Textures/Structures/Storage/closet.rsi/sec_eng_door.png
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/sec_engi.png b/Resources/Textures/Structures/Storage/closet.rsi/sec_engi.png