diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml index c5290530170..daa4d705516 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml @@ -9,7 +9,7 @@ species: Vulpkanin - type: Hunger - type: Carriable # Carrying system from nyanotrasen. - - type: Inventory # Allows vulps to wear properly shaped helmets and shite + - type: Inventory # Allows vulps to wear properly shaped helmets speciesId: vulpkanin - type: Thirst - type: Icon diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json index 2c29e1db67b..fe9f38cad4d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..96a6860b618 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..34a731b4d6e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json index 2c29e1db67b..fe9f38cad4d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..431c0794d0d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..f349642f766 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json index 2c29e1db67b..fe9f38cad4d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..2c3913a1273 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..3a88455d2d3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json index 2c29e1db67b..fe9f38cad4d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..5baf8b13d62 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..2d3145ae712 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json index 2c29e1db67b..fe9f38cad4d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..0dc49205397 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..85a5df6c3a4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vulpkanin.png new file mode 100644 index 00000000000..04d0a81524d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json index 1faf3aa6d0c..b0b6e0a2b03 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -54,6 +54,10 @@ { "name": "inhand-right-light", "directions": 4 + }, + { + "name": "equipped-head-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..a00e2ce75f2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json index 120d4d77238..87620766275 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/basic.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/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..3a48de05d6a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json index a470e009443..83e8e1a7881 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.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 | vulpkanin versions taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 and edited by Floofers", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json index 7bea2d1a865..4dae2c687da 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.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 | vulpkanin versions taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..f6da4a56154 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..ee912af170e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json index 7bea2d1a865..4dae2c687da 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering.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 | vulpkanin versions taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..110bf0cdbd0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..dc92fca2f69 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json index 7bea2d1a865..d168108fdf3 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/medical.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..471bdb6e3a2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..f7edf7fc2e6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json index 7bea2d1a865..4dae2c687da 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/rd.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 | vulpkanin versions taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..f063e6e28e6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..debc649e106 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json index 7bea2d1a865..d168108fdf3 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/salvage.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..8a26351824f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..fd306c94c5f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json index 7bea2d1a865..40c5c72b114 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security-red.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 | vulpkanin versions taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 and edited by Floofers", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..9c2d9c505ac Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..5815f633691 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json index d77d41281ca..ff0110eb46d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Alekshhh for SS14", + "copyright": "Made by Alekshhh for SS14 | vulpkanin versions made by Floofers", "size": { "x": 32, "y": 32 @@ -20,6 +20,14 @@ { "name": "on-equipped-HELMET", "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..2fa6eef37bb Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..b0b5d950fb1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json index 7bea2d1a865..40c5c72b114 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security.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 | vulpkanin versions taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 and edited by Floofers", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..4cda5d072db Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..9f6f2058954 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-vulpkanin.png new file mode 100644 index 00000000000..64b43450f43 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json index 663b0129d56..35a6a87bfdc 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original by Emisse, modified by EmoGarbage404", + "copyright": "Original by Emisse, modified by EmoGarbage404 | vulpkanin version made by Floofers", "size": { "x": 32, @@ -55,6 +55,10 @@ { "name": "inhand-right-light", "directions": 4 + }, + { + "name": "equipped-head-vulpkanin", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json index 7bea2d1a865..d168108fdf3 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/wizard.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..221f9b02009 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..3b256eff87b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..16c2c48bfc0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/meta.json index ce6a86ea762..3b63122f2f9 100644 --- a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/fb2d71495bfe81446159ef528534193d09dd8d34, sprite repaletted by Flareguy for space-station-14", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/fb2d71495bfe81446159ef528534193d09dd8d34, sprite repaletted by Flareguy for space-station-14 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..b7625492dd3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json index 2e66e1d8357..3c406ff57cd 100644 --- a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d modified by Floofers", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..c4e6351d9d8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json index 2e66e1d8357..3c406ff57cd 100644 --- a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d modified by Floofers", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..669368c2bbc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json index 2e66e1d8357..3c406ff57cd 100644 --- a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d modified by Floofers", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..be3734842f1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json index a470e009443..4427c7fb519 100644 --- a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/ihvoid.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..f10c9173fff Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json index 5463bcbfd23..61c8ce163c2 100644 --- a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit)", + "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit) | vulpkanin version made by Floofers", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..00ba0d43cd8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json index a470e009443..4427c7fb519 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..c63759a064b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json index a470e009443..4427c7fb519 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..5a06dac6f94 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json index a470e009443..4427c7fb519 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/general.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..c9c0d6c90eb Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json index a470e009443..4427c7fb519 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..17a9bfdbd3a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json index a470e009443..4427c7fb519 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..be2125f5354 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json index a470e009443..e830cae2823 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/security.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..43e99670fd6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json index a470e009443..4427c7fb519 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..5f7368e432b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vulpkanin.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 920a78a535b..702e66d8a33 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/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -13,6 +13,10 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..4c6ce58ca34 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json index e52e61ea702..39eb54f44c8 100644 --- a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.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, icon by лазік#7305", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, icon by лазік#7305 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "up-inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/up-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/up-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..d6c8799127e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/up-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..cab90cf1701 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json index e52e61ea702..39eb54f44c8 100644 --- a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.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, icon by лазік#7305", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, icon by лазік#7305 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "up-inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/up-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/up-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..b6749f98606 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/up-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..46e451b3c9d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json index e52e61ea702..39eb54f44c8 100644 --- a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/paintedwelding.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, icon by лазік#7305", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, icon by лазік#7305 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -36,6 +36,14 @@ { "name": "up-inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/up-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/up-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..34296974d11 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/up-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/welding.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..701775a2226 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/welding.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json index 90730cb2d00..3a84e3148e0 100644 --- a/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/welding.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -44,6 +44,14 @@ { "name": "up-inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Welding/welding.rsi/up-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/up-equipped-HELMET-vulpkanin.png new file mode 100644 index 00000000000..39c534f5643 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/welding.rsi/up-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..d317cba50ef Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json index a5350e89999..f854b187ff8 100644 --- a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/breath.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. equipped-MASK-secdog modified from equipped-MASK-dog by TJohnson.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-MASK-secdog modified from equipped-MASK-dog by TJohnson. | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -69,6 +69,14 @@ { "name": "equipped-MASK-kangaroo", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..d8ae1134fb4 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..38ea9a62c84 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json index 61285267dfb..e0c34b6bf36 100644 --- a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/clown.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -25,6 +25,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..070974034fd Binary files /dev/null and b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json b/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json index 96e7181a21b..47f05831e64 100644 --- a/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14", + "copyright": "Made by brainfood1183 (github) for ss14 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -13,6 +13,10 @@ { "name": "equipped-MASK", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..488c0387a72 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/meta.json b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json index c46db45e2ad..1044faad0fb 100644 --- a/Resources/Textures/Clothing/Mask/ert.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14", + "copyright": "Made by Nimfar11 (GitHub) for Space Station 14 | vulpkanin version made by Floofers", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..fba0ec9b2b3 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/meta.json b/Resources/Textures/Clothing/Mask/gas.rsi/meta.json index 61285267dfb..e0c34b6bf36 100644 --- a/Resources/Textures/Clothing/Mask/gas.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gas.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -25,6 +25,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..141a7cc981e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json index 2e57ae21510..88b0205a809 100644 --- a/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gasatmos.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..d13d3212c08 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json index 2e57ae21510..88b0205a809 100644 --- a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gascaptain.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..9d85ba2f06b Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json index 2e57ae21510..88b0205a809 100644 --- a/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gascentcom.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..91da2da7c7f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json index ff664dffd4c..4df8afe2cbc 100644 --- a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gasexplorer.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 | vulpkanin version edited by Floofers", "size": { "x": 32, "y": 32 @@ -25,6 +25,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..b9395a9026c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json index ff664dffd4c..2c31518709e 100644 --- a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassecurity.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -25,6 +25,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..a7c913dc1ea Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json index c5a4ced1200..e655ee74e46 100644 --- a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassyndicate.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -27,6 +27,16 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5 ] + ] } ] } diff --git a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..9bde35f041f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json index 3c25ce69062..9621b18fe9e 100644 --- a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/italian_moustache.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/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..687ac3aed36 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json index ce7886d06c2..accb21053d1 100644 --- a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medical.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -63,6 +63,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..99c32056408 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..d317cba50ef Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json index 9a2ea46c4ce..f57d9f0466a 100644 --- a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by LinkUyx#6557", + "copyright": "Sprited by LinkUyx#6557 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -53,6 +53,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..d8ae1134fb4 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..cdcebb8231e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json index 0fe84a690dd..521eccdc118 100644 --- a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version edited by Floofers", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..cf3d8629a3c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/meta.json b/Resources/Textures/Clothing/Mask/mime.rsi/meta.json index a6a68336716..e8866a81c7b 100644 --- a/Resources/Textures/Clothing/Mask/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/mime.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "equipped-MASK-hamster", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..8de17b9d3a9 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json b/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json index a1e3d6e7333..d8db67ac448 100644 --- a/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/muzzle.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 | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 - } + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..95d236c98b1 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json b/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json index be28392cdb4..da51268a11b 100644 --- a/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/33f7c1ef477fa67db5dda48078b469ab59aa7997", + "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/33f7c1ef477fa67db5dda48078b469ab59aa7997 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..528fa82fc81 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json index 93af52132fe..430a8b5076f 100644 --- a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034 | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..da36b185231 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json index 32b7b1acf31..314f4c8f4fb 100644 --- a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi", + "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -13,6 +13,10 @@ { "name": "equipped-MASK", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..c0dda91a723 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json index 32b7b1acf31..578339cf3d4 100644 --- a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi", + "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 edited by Floofers", "size": { "x": 32, "y": 32 @@ -13,6 +13,10 @@ { "name": "equipped-MASK", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..a326b5db4ad Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json b/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json index ca8bcd1bc1c..182ca0ebbae 100644 --- a/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sexyclown.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/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -13,6 +13,10 @@ { "name": "equipped-MASK", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..54828c8bd6d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json index ca8bcd1bc1c..3428cd43031 100644 --- a/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sexymime.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/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -13,6 +13,10 @@ { "name": "equipped-MASK", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..71f2c83018a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json index ff664dffd4c..6e2a3c8cd47 100644 --- a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sterile.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 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -25,6 +25,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..4e0309f0118 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..23cfef31d15 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/meta.json b/Resources/Textures/Clothing/Mask/swat.rsi/meta.json index 1eebf87c72b..8f314ed93d3 100644 --- a/Resources/Textures/Clothing/Mask/swat.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/swat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/RemieRichards/-tg-station/blob/f8c05e21694cd3cb703e40edc5cfc375017944b1/icons/obj/clothing/masks.dmi", + "copyright": "Taken from tgstation at commit https://github.com/RemieRichards/-tg-station/blob/f8c05e21694cd3cb703e40edc5cfc375017944b1/icons/obj/clothing/masks.dmi | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..ceea1e2e99d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/meta.json index 21312feb7b7..8d6da16f6ff 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Adapted from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "copyright": "Adapted from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -177,6 +177,56 @@ 0.1 ] ] + }, + { + "name": "unlit-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..fc81b838cb9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/lit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/lit-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..f4e26718057 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/lit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/meta.json index 435e9748b16..cd4355ac147 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.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/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", "size": { "x": 32, "y": 32 @@ -177,6 +177,56 @@ 0.1 ] ] + }, + { + "name": "unlit-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..bd01ccf61ff Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..60c0c634f6f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json index 00fcb768fbe..0d4fd176a04 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.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/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -177,6 +177,56 @@ 0.1 ] ] + }, + { + "name": "unlit-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..9e6a86b142a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..4a3544c8fac Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json index c219407953d..6b6687d88c1 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.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/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -165,6 +165,56 @@ 0.1 ] ] + }, + { + "name": "unlit-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..b9ab1e483f2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..4a3544c8fac Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json index c219407953d..6b6687d88c1 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.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/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -165,6 +165,56 @@ 0.1 ] ] + }, + { + "name": "unlit-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..b9ab1e483f2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..bc72d5c2e83 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json index 00fcb768fbe..0d4fd176a04 100644 --- a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.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/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", "size": { "x": 32, "y": 32 @@ -177,6 +177,56 @@ 0.1 ] ] + }, + { + "name": "unlit-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "lit-equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK-vulpkanin.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK-vulpkanin.png new file mode 100644 index 00000000000..806e5c41605 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK-vulpkanin.png differ