From: TaralGit <76408146+TaralGit@users.noreply.github.com>
Date: Mon, 1 May 2023 22:53:40 +0000 (+0300)
Subject: bulletproof and reflective armor (#15693)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e4b234c6cd57abf3f3727465cdcb3beb9ed8f0b3;p=space-station-14.git

bulletproof and reflective armor (#15693)

* bulletproof and reflective armor

* bulletproof update

* bulletproof correction

* fix meta

---------

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
---

diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png
index 453708a972..4d206ab3cd 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/icon.png
index 731ea8a76c..6f6f2eb077 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-left.png
index 7ee9db9c0f..8149b328de 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-right.png
index 10f2098625..130976812d 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json
index 659ed1dddf..c7a0afcae3 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json
@@ -1,26 +1,26 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png
index 71a1c3d91f..8151218513 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png
index 56cb38edf6..2c2e17abe2 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png
index c105f00781..9e127ae459 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png
index 487ce456f5..199daf7fe4 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
index 659ed1dddf..3f816376c7 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
@@ -1,26 +1,26 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified by Taral from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }