Lecter + Magazine Resprite (#34974)

* Full resprite of lecter and associated magazine

* Minor fixes

* More fixes

* fixed meta.json indentation

* More meta.json fixes

* Attribution fixes

* Update Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png
index ae29507b2ef2f1f78a4319c2f758b0eb56b20125..3c0c3e3217cd4afac25097de1c4c60eadbbded8b 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png
index e04d1254abc29615bd63d45d427c82baf6bdb946..7f501032572811f914fa5c6d3a433cfeada158d8 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json
index 17803dfbc776f981fbc51db474cbc51a74c7cb42..b31e570fabe0d5ff99b5ff2528d568c5b629f785 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "All sprites by https://github.com/august-sun.",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f, https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi",
     "states": [
         {
             "name": "base"

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png
index 6ff6195ef97e940196cd7f898666239988e53735..ddfa208e6bfc0f1d007a05e4cf5c9c8ab3363e8a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png
index b35d28afc92f97018e4b7c303b08ebe5ccbbf427..7bca53b45027351f13a724e584f347d157a5929a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png
index 50e11d47003d393d83e4b9d51d05459e923c13f8..51f66e6634665f7ed14600e5bf2ca5ace8c350af 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png
index 782b70ab55cfd4ff11cf381810fd37d6be7d7972..0003cc807e9635adae7cff475004ec9d4fe7a28d 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png
index e30d896202d3f6b8464d3674ee77f473f05c4f5e..b9197c0717dbb56a3fa637afde8ddac72bb7277e 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/bolt-open.png
index 0781d7099bbddbfd1c0cf7c36cfa51b95a872006..55fc78d5ddee7f3018500550a5a4d9a035f80c89 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/bolt-open.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
index 7e73d94ffa2ce457cba48ff86dd213181f594da7..d0f82cc57ec88014f142a18b614108799f43c455 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-SUITSTORAGE.png
index 7e73d94ffa2ce457cba48ff86dd213181f594da7..d0f82cc57ec88014f142a18b614108799f43c455 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-SUITSTORAGE.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png
index 482ef1fd1fb2c87de9ee45a1d9987bc723d5a841..129bebc43bce0c687b51e19dab892792d914c7da 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-left.png
index 27972c97f500054d5e88d1af644ff92921307c44..b64ce9a927f4f76b78b5f25fd4110d18110d5646 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-right.png
index d50518634cd8513233d28d2a70a3a2a477c5b980..8bac7ba395e8c44a63aa393af202c2bb6e463d69 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png
index 097bee452b921ed8fb2904f8f2030dc5fd1f4ea6..4002c82378ff153286d6cd6308307c722639a760 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
index c45db54aff5b1b64bde7d3578d00ceb00f9050fd..8bc8dfa99b84991d16f75b95489a9ee783bd48a7 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.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/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
+    "copyright": "Original sprite by Emisse (GitHub), all altered sprites by https://github.com/august-sun.",
     "size": {
         "x": 32,
         "y": 32

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png
index 42926b00f4705985591abade8f839204c0ee50f7..bd51d0cac39f670c5a316375f31a0d332f1a6c47 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png
index fd58fca837bd971fa8d12541b549e2925ad50069..6b3f4327019966a7bbdcee173ebb421e9e2b6a64 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png differ