Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corvax monkeys clothing fix #2315

Merged
merged 6 commits into from
Jun 24, 2024
Merged

Corvax monkeys clothing fix #2315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e3547b
cap_turtleneck.rsi
Ko4ergaPunk Jun 21, 2024
cd08ad5
jumpskirts
Ko4ergaPunk Jun 21, 2024
3fb4c75
jumpsuit
Ko4ergaPunk Jun 21, 2024
7828a58
meta fix
Ko4ergaPunk Jun 21, 2024
7ee2342
Merge branch 'master' into Monkeys-Corvax-jumpsuits
Ko4ergaPunk Jun 22, 2024
0f816f2
meta fix
Ko4ergaPunk Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added ...othing/Uniforms/Jumpskirt/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/meta.json
View file
Open in desktop
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/2fea0a59470c476cf3f927833d3918d89cbe6af8",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey by Ko4erga (discord)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Binary file added ...thing/Uniforms/Jumpskirt/centcom_official.rsi/equipped-INNERCLOTHING-monkey.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/centcom_official.rsi/meta.json
View file
Open in desktop
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/2fea0a59470c476cf3f927833d3918d89cbe6af8",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey by Ko4erga (discord)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Binary file added .../Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json
View file
Open in desktop
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/2fea0a59470c476cf3f927833d3918d89cbe6af8 and inhand modified by emisse",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and inhand modified by emisse, monkey by Ko4erga (discord)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Binary file added ...orvax/Clothing/Uniforms/Jumpskirt/rainbow.rsi/equipped-INNERCLOTHING-monkey.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/rainbow.rsi/meta.json
View file
Open in desktop
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/2fea0a59470c476cf3f927833d3918d89cbe6af8",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey by Ko4erga (discord)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Binary file modified .../Clothing/Uniforms/Jumpskirt/rd_classical.rsi/equipped-INNERCLOTHING-monkey.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...x/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi/equipped-INNERCLOTHING-monkey.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by github:DreamlyJack(624946166152298517)",
"copyright": "Sprited by github:DreamlyJack(624946166152298517), monkey by Ko4erga (discord)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Binary file added ...lothing/Uniforms/Jumpsuit/centcom_admiral.rsi/equipped-INNERCLOTHING-monkey.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi/meta.json
View file
Open in desktop
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 Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec, digi made by kuro(388673708753027083)",
"copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec, digi made by kuro(388673708753027083), monkey by Ko4erga (discord)",
"size": {
"x": 32,
"y": 32
Expand All @@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-digi",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Binary file added ...g/Uniforms/Jumpsuit/centcom_officer_black.rsi/equipped-INNERCLOTHING-monkey.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/centcom_officer_black.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "haZZLO, digi made by kuro(388673708753027083)",
"copyright": "haZZLO, digi made by kuro(388673708753027083), monkey by Ko4erga (discord)",
"size": {
"x": 32,
"y": 32
Expand All @@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-digi",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Binary file added ...s/Corvax/Clothing/Uniforms/Jumpsuit/disco.rsi/equipped-INNERCLOTHING-monkey.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/disco.rsi/meta.json
View file
Open in desktop
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/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, digi made by kuro(388673708753027083)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, digi made by kuro(388673708753027083), monkey by Ko4erga(discord)",
"size": {
"x": 32,
"y": 32
Expand All @@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-digi",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
2 changes: 1 addition & 1 deletion Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/hos_black.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"name": "equipped-INNERCLOTHING-reptilian",
"directions": 4
},
{
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
Expand Down
Binary file added ...res/Corvax/Clothing/Uniforms/Jumpsuit/kim.rsi/equipped-INNERCLOTHING-monkey.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Corvax/Clothing/Uniforms/Jumpsuit/kim.rsi/meta.json
View file
Open in desktop
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/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4, digi made by kuro(388673708753027083)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4, digi made by kuro(388673708753027083), monkey by Ko4erga (discord)",
"size": {
"x": 32,
"y": 32
Expand All @@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-digi",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Loading