Skip to content

Commit

Permalink
Vulpkanin mask and helmet custom sprites (#517)
Browse files Browse the repository at this point in the history
* First batch buuuuuuuuuuh

So much stuff to redo

* gasmasks

* other important masks

* the rest of the one from that PR

* ert

* the smokeables

* changed smokeables sprite position

ye they looked goofy

* Remove paramed one

Doesn't fit anymore

* remove duplicate inventory comp

---------

Signed-off-by: Fluffiest Floofers <[email protected]>
  • Loading branch information
FluffiestFloof authored Dec 6, 2023
1 parent 2335418 commit f9df410
Show file tree
Hide file tree
Showing 163 changed files with 702 additions and 64 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -54,6 +54,10 @@
{
"name": "inhand-right-light",
"directions": 4
},
{
"name": "equipped-head-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -21,6 +21,10 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -21,6 +21,10 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 9 additions & 1 deletion Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -20,6 +20,14 @@
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -55,6 +55,10 @@
{
"name": "inhand-right-light",
"directions": 4
},
{
"name": "equipped-head-vulpkanin",
"directions": 4
}
]
}
10 changes: 9 additions & 1 deletion Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -36,6 +36,14 @@
{
"name": "on-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Loading

0 comments on commit f9df410

Please sign in to comment.