Merge remote-tracking branch 'origin/master'

Lost-Paradise-Project · Aug 28, 2024 · bcd7bc7 · bcd7bc7
2 parents 65a2dd6 + 2ba9efe
commit bcd7bc7
Show file tree

Hide file tree

Showing 119 changed files with 1,082 additions and 139 deletions.
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -31,28 +31,8 @@
   - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/atmospherics.rsi
-    layers:
-    - state: icon
-    - state: icon-unshaded
-      shader: unshaded
-    - state: light-overlay
-      visible: false
-      shader: unshaded
-      map: [ "light" ]
-  - type: HandheldLight
-    addPrefix: false
-  - type: ToggleableLightVisuals
-    spriteLayer: light
-    clothingVisuals:
-      head:
-      - state: equipped-head-light
-        shader: unshaded
   - type: Clothing
-    clothingVisuals:
-      head:
-      - state: equipped-head
-      - state: equipped-head-unshaded
-        shader: unshaded
+    sprite: Clothing/Head/Hardsuits/atmospherics.rsi
   - type: PointLight
     color: "#adffe6"
   - type: PressureProtection

diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -36,13 +36,13 @@
       thresholds:
         - trigger:
             !type:DamageTrigger
-            damage: 80
+            damage: 160
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
         - trigger:
             !type:DamageTrigger
-            damage: 40 #This is probably enough damage before it breaks
+            damage: 80 #This is probably enough damage before it breaks
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
@@ -150,13 +150,13 @@
       thresholds:
         - trigger:
             !type:DamageTrigger
-            damage: 60
+            damage: 120
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
         - trigger:
             !type:DamageTrigger
-            damage: 30 #Weaker shield
+            damage: 60 #Weaker shield
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
@@ -206,13 +206,13 @@
       thresholds:
         - trigger:
             !type:DamageTrigger
-            damage: 40
+            damage: 80
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
         - trigger:
             !type:DamageTrigger
-            damage: 20 #Very weak shield
+            damage: 40 #Very weak shield
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
@@ -259,13 +259,13 @@
       thresholds:
         - trigger:
             !type:DamageTrigger
-            damage: 40
+            damage: 80
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
         - trigger:
             !type:DamageTrigger
-            damage: 20
+            damage: 40
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
@@ -344,7 +344,7 @@
       thresholds:
         - trigger:
             !type:DamageTrigger
-            damage: 40
+            damage: 80
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
@@ -433,13 +433,13 @@
       thresholds:
         - trigger:
             !type:DamageTrigger
-            damage: 180
+            damage: 360
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
         - trigger:
             !type:DamageTrigger
-            damage: 100
+            damage: 200
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
@@ -512,13 +512,13 @@
       thresholds:
         - trigger:
             !type:DamageTrigger
-            damage: 100
+            damage: 200
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
         - trigger:
             !type:DamageTrigger
-            damage: 70
+            damage: 140
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
@@ -7,7 +7,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 40
-        Structural: 30
+        Piercing: 50
+        Structural: 50
   - type: StaminaDamageOnCollide
-    damage: 35
+    damage: 40
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -414,11 +414,11 @@
     impactEffect: BulletImpactEffectKinetic
     damage:
       types:
-        Blunt: 25
-        Structural: 30
+        Blunt: 17
+        Structural: 45
   # Short lifespan
   - type: TimedDespawn
-    lifetime: 0.4
+    lifetime: 0.5
 
 - type: entity
   id: BulletKineticShuttle

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -71,6 +71,7 @@
       - CartridgeAntiMateriel
     capacity: 5
     proto: CartridgeAntiMateriel
+  - type: MultiHandedItem
 
 - type: entity
   name: musket

diff --git a/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/ERPMachine.yml b/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/ERPMachine.yml
@@ -64,3 +64,5 @@
     LPPClothingNeckCollarSpiked: 3
     LPPClothingMaskKinkyMuzzle: 3
     LPPClothingUniformboobasuit: 3
+    LPPClothingHeadHatMaid: 3
+    LPPOuterClothingGarfield: 1
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml
@@ -10,6 +10,7 @@
   - type: Clothing
     sprite: _LostParadise/Clothing/Head/Helmets/acienthelmsyndieeva.rsi
   - type: BreathMask
+  - type: EyeProtection
   - type: PointLight
     color: "green"
   - type: PressureProtection
@@ -33,7 +34,7 @@
   id: LPPClothingHeadHelmetHunter
   noSpawn: true
   name: шлем древнего скафандра Охотника (защитный)
-  description: Крайне комфорнтый шлем, что позволяет вам защититься от морозной погоды. он в защитном.
+  description: Крайне комфорнтый шлем, что позволяет вам защититься от морозной погоды. он в защитном режиме.
   components:
   - type: Sprite
     sprite: _LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi
@@ -88,3 +89,31 @@
         Radiation: 0.8
   - type: TemperatureProtection
     coefficient: 0.005
+
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: LPPClothingHeadHelmetScienceNPZ
+  noSpawn: true
+  name: шлем научного скафандра НПЗ
+  description: Шлем от скафандра, довольно полезен и имеет встроенный функционал, по типу определения жидкостей и защиту от сварки.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Hardsuits/NPZsciense/head.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Hardsuits/NPZsciense/head.rsi
+  - type: BreathMask
+  - type: EyeProtection
+  - type: SolutionScanner
+  - type: PressureProtection
+    highPressureMultiplier: 0.08
+    lowPressureMultiplier: 10000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95
+        Radiation: 0.3
+  - type: TemperatureProtection
+    coefficient: 0.005
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml
@@ -100,7 +100,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: LPPClothingHeadHatMaid
-  name: ободок горничной
+  name: чепчик горничной
   description: Элемент одежды, который является неотъемлимой частью любой элитной горничной.
   components:
   - type: Sprite

diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/helmet.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/helmet.yml
@@ -109,3 +109,20 @@
         Slash: 0.6
         Piercing: 0.6
         Heat: 0.8
+
+- type: entity
+  parent: ClothingHeadBase
+  id: LPPClothingHeadHelmetNPZ
+  name: шлем НПЗ
+  description: Крепкий шлем из кевлара и пластали, защитит от мелкокалиберной пули, а так же шрапнели.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.85
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml
@@ -11,6 +11,7 @@
     sprite: _LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi
     equipSound: /Audio/Mecha/mechmove03.ogg
     unequipSound: /Audio/Mecha/mechmove03.ogg
+  - type: FlashImmunity
   - type: Armor
     modifiers:
       coefficients:
@@ -29,7 +30,7 @@
   id: LPPClothingMaskHunter
   noSpawn: true
   name: шлем скафандра охотника (походный)
-  description: Крайне комфорнтый шлем, что позволяет вам защититься от морозной погоды. Он в походном режиме
+  description: Крайне комфорнтый шлем, что позволяет вам защититься от морозной погоды. Он в походном режиме.
   components:
   - type: Sprite
     sprite: _LostParadise/Clothing/Mask/winterhuntermask.rsi

diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml
@@ -340,3 +340,21 @@
   - type: Construction
     graph: Muzzle
     node: muzzle
+
+- type: entity
+  parent: ClothingMaskGas
+  id: LPPClothingBalaclavawide
+  name: балаклава с широким вырезом для глаз
+  description: Почувствуйте себя крайне тактикульным с этой кевларовой балаклавой, что защитит всё ваше лицо, кроме глаз, так что рекомендуется испоьзовать очки для защиты глаз от страйкбольных шариков (От реальных пуль вряд ли спасёт).
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Mask/widebalaclava.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Mask/widebalaclava.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/cloaks.yml
@@ -204,4 +204,14 @@
   description: Плащ для пафосного скидывания, чтобы показать всем ваши медали и ордена!
   components:
     - type: Sprite
-      sprite: _LostParadise/Clothing/Neck/NPZ/upgneckadmiral.rsi
+      sprite: _LostParadise/Clothing/Neck/NPZ/upgneckadmiral.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: LPPCloakJapaneese
+  suffix: СПОНСОР
+  name: накидка в японском стиле
+  description: Kore yon deru hito wa bakadayo.
+  components:
+    - type: Sprite
+      sprite: _LostParadise/Clothing/Neck/Cloaks/Monorich.rsi
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/scarf.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/scarf.yml
@@ -2,6 +2,7 @@
   parent: ClothingNeckBase
   id: LPPClothingWindyScarf
   name: windy scarf
+  suffix: СПОНСОР
   description: Cool scarf for cool people
   components:
   - type: Sprite