]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Gun Inhand Sprite Fixes (#38294)
authorSeam_Less <kai.julian.watson@gmail.com>
Mon, 16 Jun 2025 22:03:14 +0000 (15:03 -0700)
committerGitHub <noreply@github.com>
Mon, 16 Jun 2025 22:03:14 +0000 (18:03 -0400)
* cobra, viper, pulse pistol

* c20 and wt550

* l6 + attributions

21 files changed:
Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png
Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png
Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-left.png
Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-right.png
Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-left.png
Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-right.png
Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-left.png
Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-right.png
Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png
Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png
Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png
Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png
Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png
Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png
Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png
Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png
Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json

index ec7a57e2aa42d5c6e5518b858c4770485b1cf570..b5c4f10b339dac92d4e1f47c37271807c5ea477a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png differ
index c65dfdd7f441047282d6263fb97b975d84ec548a..8aa9acf43fc49bf2f165f0d31bba7487fb00ed33 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png differ
index b2c7e52a7022c6a8f6924a93058a734bf0c56ad5..02a12ea09843f66be56cdbc70354186a2d3bacb0 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-left.png differ
index 7a48b32a649b3d7272bdb2cd8c25a2dc99ce9628..4b5b9655cabe72d1b5d176f06d984c5ff197bb4a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-right.png differ
index 4b0e50c2b3929dfdf29d727c0e95a0f960f4a674..953ebd630264d54a538f5bcc997e02445b1c98bf 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/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, Inhands modified by Seam_Lesss (Github)",
   "size": {
     "x": 32,
     "y": 32
index 5bbca8145b497f46ef2f8fa1ed4feb5b8d4c79e9..ff711b9c01be90ca8624946c93afc63fd6f4e026 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-left.png differ
index 9a8c51b0f9155c681f14e9775f473def1c773e3b..cd669ea293880bc18322ef6bc58d3372f6d1bdb5 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-right.png differ
index 24ef4fba476b88f295f6ec21dea01e046875aea3..dc5f5b559669f3928d8788f3736764ab641be33b 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-left.png differ
index 824bf4ceb4e0cf01224338bc14c46c33a7fe193b..2df0f7129b3901c8ab74daf1fa813da79f605e7f 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-right.png differ
index f0a41ab20d37e7aa3b8daa37b2715c02d6457f7d..3ef8cec9bd40b921e77a4d95de8dab87cdd72f4f 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from pireamaineach at https://github.com/tgstation/tgstation/pull/43407/commits/b92e11e94466be5bcb465b781decf83764401ac1",
+    "copyright": "Taken/modified from pireamaineach at https://github.com/tgstation/tgstation/pull/43407/commits/b92e11e94466be5bcb465b781decf83764401ac1, Inhands modified by Seam_Lesss (Github)",
     "size": {
         "x": 32,
         "y": 32
index c5742e680e34993765dfd236c21e0c5e04d2b882..9a477b4e9e86d67d4921e01e8bcd72861d31cb33 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png differ
index 63a774659619510f7c7fa4b24cff0509e0883c92..c1dbb0353c40362c9dd2073d238cb1f5f8a8e171 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png differ
index 1a9491cc701a7e35212e9998714ee8fad54d100e..d5b82d18cfd29d1448b43e28c7888ca0da648be1 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png differ
index 7340d6c907b1f2eed80f0fcecce7152ddc50e709..afe79fa63779cdef9aed783b845756c22caa1655 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png differ
index 6ac14bfc8f66ecf2b01ecf9054e2f05075f5c1d9..270c54ea50466efd94c38cd9f3f0bb681c7b751a 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3, Inhands modified by Seam_Lesss (Github)",
     "size": {
         "x": 32,
         "y": 32
index 19b587bfa516356f69acd41bb32f96f0b1af3a17..118ccba12a25b85de594d16ca4c469cdc7c8e3de 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png differ
index 0b2339a43bf371e8063e8c77ed0c58e1a9c725ee..2f358e4cfb8f6a6ecec09f298ccff435fc2d5af7 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png differ
index 2ff87fa291730a2ad12dee0e7fc817b97ca851dc..60466c4d2f97a8d31f9965853348c95545effcfc 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, Inhands modified by Seam_Lesss (Github)",
     "size": {
         "x": 32,
         "y": 32
index 7aae1442fa668b12f22b105932b5a8ba4359718c..678381d3e7025d0e4ddb817d18a812edeb769cf8 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png differ
index cbd5194862369cda4475238db7e0f4463ac4b2b9..e2bc096fbc2389b93f9e5d34e504d66e7ec02ebf 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png differ
index 66f9e56c3bce11345f6da96aa29ca3c57b5c5bbf..f5a433a323f77f81a6f696c662ac75bc15fcf70c 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/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide (copy of Atreides), and sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide (copy of Atreides), and sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111, Inhands modified by Seam_Lesss (Github)",
   "size": {
     "x": 32,
     "y": 32