]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
bulletproof and reflective armor (#15693)
authorTaralGit <76408146+TaralGit@users.noreply.github.com>
Mon, 1 May 2023 22:53:40 +0000 (01:53 +0300)
committerGitHub <noreply@github.com>
Mon, 1 May 2023 22:53:40 +0000 (18:53 -0400)
* bulletproof and reflective armor

* bulletproof update

* bulletproof correction

* fix meta

---------

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png
Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/icon.png
Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-left.png
Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-right.png
Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json
Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png
Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png
Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png
Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png
Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json

index 453708a972cdfde30af1af9903e0dec23cd4d02e..4d206ab3cdbb2aacf952cbb6fb2659b3c738d759 100644 (file)
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
index 731ea8a76c2f38777cd3be34b07881729e3abc5a..6f6f2eb077a8afdacfa1691950afd2592291a35b 100644 (file)
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
index 7ee9db9c0fcb16a7169c64266ae32dec866e5c8f..8149b328deb447455027bbd31df1ec209773262c 100644 (file)
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
index 10f2098625ffd6b147494dd7c973382152a5f47a..130976812dbee14e3052cd46ad34c81544b64980 100644 (file)
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
index 659ed1dddfd1d14febefe6154f4e0f9676dd8405..c7a0afcae33daa860c35354ab2f8ca878ce9481c 100644 (file)
@@ -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
+        }
+    ]
 }
index 71a1c3d91f5eec5d7700cacbd8787522c80713e6..81512185135281cfe088087f850d732431838ab5 100644 (file)
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
index 56cb38edf61755862d974755c3c03d45d2e9071c..2c2e17abe253a74a2214ce5188b2396369cb889a 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png differ
index c105f007814f5b84c5d08854b910b00cab3a1bcc..9e127ae45958757ed0bea7f9578a1630314eab53 100644 (file)
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
index 487ce456f54d6e19f82b06aa6c56545d0aa582df..199daf7fe409ebb434450f5ae05dd61b29594ad0 100644 (file)
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
index 659ed1dddfd1d14febefe6154f4e0f9676dd8405..3f816376c7ec96cbc3379e272e9432c1a3799316 100644 (file)
@@ -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
+        }
+    ]
 }