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.

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

Turtlenecks for command #2276

Merged
merged 5 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,48 @@
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi
- type: Clothing
sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi
sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtCapTurtleneck
name: captain's turtleneck
description: True captain's turtleneck.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpskirt/cap_turtleneck.rsi
- type: Clothing
sprite: Corvax/Clothing/Uniforms/Jumpskirt/cap_turtleneck.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtHoPTurtleneck
name: head's of personal turtleneck
description: Turtleneck of papers god.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpskirt/hop_turtleneck.rsi
- type: Clothing
sprite: Corvax/Clothing/Uniforms/Jumpskirt/hop_turtleneck.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtHoSBlack
name: head's of security black skirt
description: Main villain's skirt.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpskirt/hos_black.rsi
- type: Clothing
sprite: Corvax/Clothing/Uniforms/Jumpskirt/hos_black.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtRDFormal
name: research director's formal skirt
description: Evil genius skirt.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_formal.rsi
- type: Clothing
sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_formal.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,47 @@
sprite: Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi
- type: Clothing
sprite: Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitCapTurtleneck
name: captain's turtleneck
description: True captain's turtleneck.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpsuit/cap_turtleneck.rsi
- type: Clothing
sprite: Corvax/Clothing/Uniforms/Jumpsuit/cap_turtleneck.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitHoPTurtleneck
name: head's of personal turtleneck
description: Turtleneck of papers god.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpsuit/hop_turtleneck.rsi
- type: Clothing
sprite: Corvax/Clothing/Uniforms/Jumpsuit/hop_turtleneck.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitHoSBlack
name: head's of security black suit
description: Main villain's suit.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpsuit/hos_black.rsi
- type: Clothing
sprite: Corvax/Clothing/Uniforms/Jumpsuit/hos_black.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitRDFormal
name: research director's formal suit
description: Evil genius suit.
components:
- type: Sprite
sprite: Corvax/Clothing/Uniforms/Jumpsuit/rd_formal.rsi
- type: Clothing
sprite: Corvax/Clothing/Uniforms/Jumpsuit/rd_formal.rsi
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.
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": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by KingFroozy (github) for space station 14",
"copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by KingFroozy (github) for space station 14, resprited from https://github.com/space-syndicate/space-station-14/pull/2143 by Deenkaide (github)",
lzk228 marked this conversation as resolved.
Show resolved Hide resolved
"size": {
"x": 32,
"y": 32
Expand Down
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.
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": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by Hanzdegloekr (github) for space station 14",
"copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by Hanzdegloekr (github) for space station 14, resprited from https://github.com/space-syndicate/space-station-14/pull/2143 by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
Expand Down
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.
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/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4, monkey made by brainfood1183 (github) for ss14",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4, monkey made by brainfood1183 (github) for ss14, edited by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
Expand Down
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": "Derived from beestation qmturtleneck sprite from beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/a11e7468ca552cfc97c9164c69ccdafff09e794c and modified by Emisse for Space Station 14, Resprited by MureixloL",
"copyright": "Derived from beestation qmturtleneck sprite from beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/a11e7468ca552cfc97c9164c69ccdafff09e794c and modified by Emisse for Space Station 14, Resprited by MureixloL, edited by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/icon.png
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/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14, resprited from https://github.com/space-syndicate/space-station-14/pull/2143 by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
Expand Down
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.
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": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by KingFroozy (github) for space station 14, resprited and fix digi sprites by DreamlyJack",
"copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by KingFroozy (github) for space station 14, resprited and fix digi sprites by DreamlyJack, edited by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
Expand Down
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": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by Hanzdegloker (github) for space station 14",
"copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by Hanzdegloker (github) for space station 14, resprited from https://github.com/space-syndicate/space-station-14/pull/2143 by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
Expand All @@ -17,6 +17,10 @@
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-reptilian",
"directions": 4
},
{
"name": "inhand-left",
Expand Down
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, monkey made by SonicHDC (github) for ss14",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by SonicHDC (github) for ss14, edited by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Derived from qmturtleneck sprite from beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/a11e7468ca552cfc97c9164c69ccdafff09e794c and modified by Emisse for Space Station 14, Resprited by MureixloL, fix digi sprited by DreamlyJack",
"copyright": "Derived from qmturtleneck sprite from beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/a11e7468ca552cfc97c9164c69ccdafff09e794c and modified by Emisse for Space Station 14, Resprited by MureixloL, fix digi sprited by DreamlyJack, edited by Deenkaide (github) for ss14",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/icon.png
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/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083), resprited from https://github.com/space-syndicate/space-station-14/pull/2143 by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "resprited from https://github.com/space-syndicate/space-station-14/pull/2143 by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "resprited from https://github.com/space-syndicate/space-station-14/pull/2143 by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "resprited from https://github.com/space-syndicate/space-station-14/pull/782 by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "resprited from https://github.com/space-syndicate/space-station-14/pull/2143 by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "resprited from https://github.com/space-syndicate/space-station-14/pull/2143 by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-reptilian",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "resprited from https://github.com/space-syndicate/space-station-14/pull/2143 by Deenkaide (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-reptilian",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Loading