]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
[Sprites/Fix] In hand for BlueSpace beaker & CMO's equipped cloak (#28719)
authorMureixloI <132683811+MureixloI@users.noreply.github.com>
Fri, 9 Aug 2024 12:02:26 +0000 (15:02 +0300)
committerGitHub <noreply@github.com>
Fri, 9 Aug 2024 12:02:26 +0000 (22:02 +1000)
* [Fix] CMO's equipped cloak

* [Fix] CMO's equipped cloak

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker

Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json

index eb9216dea1eb407523e06c92d0cf984a229494d8..5ce495c15702e0e6b22280e6630cde043dbb5532 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png differ
index fde00d61167e3a07c4010ec728683d162e1f14b4..afe57c8d17cb67e85875fccb7a3f8c245749f15c 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, fixed by @mishutka09",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..c6e2bcb
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..0b278ee
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-right.png differ
index 54a2e31b01629fe2d3d6a5a0971fac881a3b4ca9..28207bc250c380f343177b6e3b638dee0360a361 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93, sprites in hands by @mishutka09",
   "size": {
     "x": 32,
     "y": 32
           0.1
         ]
       ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }