From: Seam_Less Date: Mon, 16 Jun 2025 22:03:14 +0000 (-0700) Subject: Gun Inhand Sprite Fixes (#38294) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=861d0fac71bf70672fdaca2a0d4579b32b3a629a;p=space-station-14.git Gun Inhand Sprite Fixes (#38294) * cobra, viper, pulse pistol * c20 and wt550 * l6 + attributions --- diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-left.png index ec7a57e2aa..b5c4f10b33 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_pistol.rsi/inhand-right.png index c65dfdd7f4..8aa9acf43f 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-left.png index b2c7e52a70..02a12ea098 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/inhand-right.png index 7a48b32a64..4b5b9655ca 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json index 4b0e50c2b3..953ebd6302 100644 --- a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-left.png index 5bbca8145b..ff711b9c01 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/wielded-inhand-right.png index 9a8c51b0f9..cd669ea293 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-left.png index 24ef4fba47..dc5f5b5596 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/inhand-right.png index 824bf4ceb4..2df0f7129b 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json index f0a41ab20d..3ef8cec9bd 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png index c5742e680e..9a477b4e9e 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png index 63a7746596..c1dbb0353c 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-left.png index 1a9491cc70..d5b82d18cf 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/inhand-right.png index 7340d6c907..afe79fa637 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json index 6ac14bfc8f..270c54ea50 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png index 19b587bfa5..118ccba12a 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png index 0b2339a43b..2f358e4cfb 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json index 2ff87fa291..60466c4d2f 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png index 7aae1442fa..678381d3e7 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png index cbd5194862..e2bc096fbc 100644 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json index 66f9e56c3b..f5a433a323 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json @@ -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