From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Tue, 23 Jul 2024 02:18:32 +0000 (-0500) Subject: Minor vox headwear update (#30150) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=8376881cdf7385c66879f7ddce87467067dc5074;p=space-station-14.git Minor vox headwear update (#30150) * vox sprites minor updates * the tax * kid named paper sack --- diff --git a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..f5a8cf7c05 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json index a470e00944..cec1961dce 100644 --- a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox state by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..10f06b436d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json index ab1f7a4abf..c6887def72 100644 --- a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/0bb49b1a97488349ee89308ad6a0904066e1c6f3", + "copyright": "Taken from Beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/0bb49b1a97488349ee89308ad6a0904066e1c6f3. vox states by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..9e7eca032c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json index a470e00944..cec1961dce 100644 --- a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox state by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..4d8b97d11e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json index a42fdeb810..72965ccfe2 100644 --- a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser", + "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. vox state by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..ab6cf612af Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json index 920a78a535..04f0d87cf2 100644 --- a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. vox state by Flareguy", "size": { "x": 32, "y": 32 @@ -13,6 +13,10 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json index 5e4c46c868..d9cecd0392 100644 --- a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox states by Flareguy", "size": { "x": 32, "y": 32 @@ -24,6 +24,14 @@ "name": "on-equipped-HELMET", "directions": 4 }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + }, { "name": "off-inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..93ead059af Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..7518548bf2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..b8f85bb15a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/meta.json index 5868e6f365..2ef7973a39 100644 --- a/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation", + "copyright": "Taken from tgstation, equipped-HELMET-vox state by Flareguy", "size": { "x": 32, "y": 32 @@ -13,6 +13,10 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png index a7ebf25671..5294d0cde3 100644 Binary files a/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png and b/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png index d81e2314b6..9ab3ec3958 100644 Binary files a/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png and b/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png index 0255ed7b78..35b9ed4f97 100644 Binary files a/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png and b/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png differ