Merge remote-tracking branch 'origin/master'

Lost-Paradise-Project · Sep 6, 2024 · 4f88d35 · 4f88d35
2 parents 5cbcd56 + 8a13f0f
commit 4f88d35
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 4 deletions.
diff --git a/Resources/Locale/ru-RU/deltav/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/ru-RU/deltav/prototypes/catalog/fills/crates/vending-crates.ftl
@@ -1,2 +1,2 @@
-ent-CrateVendingMachineRestockPrideFilled = Ящик для пополнения запасов Pride-O-Mat
-    .desc = Содержит ящик для пополнения запасов для мата Pride-O-Mat.
+ent-CrateVendingMachineRestockPrideFilled = Ящик для пополнения запасов РКНмат
+    .desc = Содержит ящик для пополнения запасов для мата РКНмат
diff --git a/.../Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/machines/vending_machines.ftl b/.../Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/machines/vending_machines.ftl
@@ -1,4 +1,4 @@
-ent-VendingMachinePride = Прайд-О-Мат
-    .desc = Торговый автомат, содержащий преступления.
+ent-VendingMachinePride = РКНмат
+    .desc = Торговый автомат, содержащий преступления и уголовные статьи.
 ent-VendingMachineCourierDrobe = Курьер-О-Мат
     .desc = Ни солнечные вспышки, ни метеориты, ни плазменный огонь, ни космическая пустота не помешают этим курьерам быстро завершить назначенную им доставку.
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml
@@ -35,3 +35,20 @@
     sprite: _LostParadise/Clothing/Belt/flamingo.rsi
   - type: Clothing
     sprite: _LostParadise/Clothing/Belt/flamingo.rsi
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: LPPClothingBeltNPZWebbing
+  name: РПС НПЗ
+  description: Плотная дюратканевая РПС в расцветке войск НПЗ.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Belt/NPZ.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Belt/NPZ.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.85
+        Heat: 0.95
diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png
diff --git a/...xtures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png b/...xtures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png
diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png
diff --git a/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png b/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png
diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/equipped-BELT.png b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/icon.png
diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/inhand-left.png
diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/inhand-right.png
diff --git a/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Belt/NPZ.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Resprited by MegaDaimond",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}