-
Notifications
You must be signed in to change notification settings - Fork 592
Additional vox markings #5918
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
Open
dogey6565
wants to merge
9
commits into
ss14Starlight:starlight-dev
Choose a base branch
from
dogey6565:starlight-dev
base: starlight-dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Additional vox markings #5918
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
1f6f995
Additional vox markings
dogey6565 58b8e8a
Additional vox markings
dogey6565 5dceedc
Additional vox markings
dogey6565 cadcf0e
Update and rename vox.yml to vox.ftl
dogey6565 5b86594
Update meta.json
dogey6565 2f0871f
Update meta.json
dogey6565 2afaccd
Update meta.json
dogey6565 1c73aad
Merge branch 'starlight-dev' into starlight-dev
dogey6565 9722615
Merge branch 'starlight-dev' into starlight-dev
dogey6565 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| marking-VoxBeakColor-voxbeakcolor = Colorable Beak (Pointed) | ||
| marking-VoxBeakColor = Colorable Beak (Pointed) | ||
|
|
||
| marking-VoxBeakSquareCere-voxbeaksquarecolor = Colorable Beak (Square Cere) | ||
| marking-VoxBeakSquareCereColor = Colorable Beak (Square Cere) | ||
|
|
||
| marking-VoxBeakHookedColor-voxbeakhookedcolor = Colorable Beak (Hooked) | ||
| marking-VoxBeakHookedColor = Colorable Beak (Hooked) | ||
|
|
||
| marking-VoxBeakShavedColor-voxbeakshavedcolor = Colorable Beak (Shaved) | ||
| marking-VoxBeakShavedColor = Colorable Beak (Shaved) | ||
|
|
||
| marking-VoxShaggyTail-voxshaggytail = Vox Tail (Shaggy) | ||
| marking-VoxShaggyTail = Vox Tail (Shaggy) | ||
|
|
||
| marking-VoxPlumage-voxplumage = Vox Tail (Plumage) | ||
| marking-VoxPlumage = Vox Tail (Plumage) | ||
|
|
||
| marking-VoxColorableLeftLeg-leftleg = Colorable Left Leg | ||
| marking-VoxColorableLeftLeg = Colorable Left Leg | ||
|
|
||
| marking-VoxColorableRightLeg-rightleg = Colorable Right Leg | ||
| marking-VoxColorableRightLeg = Colorable Right Leg | ||
|
|
||
| marking-VoxColorableLeftArm-leftarm = Colorable Left Arm | ||
| marking-VoxColorableLeftArm = Colorable Left Arm | ||
|
|
||
| marking-VoxColorableRightArm-rightarm = Colorable Right Arm | ||
| marking-VoxColorableRightArm = Colorable Right Arm | ||
|
|
||
| marking-VoxColorableRightHand-righthand = Colorable Right Hand | ||
| marking-VoxColorableRightHand = Colorable Right Hand | ||
|
|
||
| marking-VoxColorableLeftHand-lefthand = Colorable Left Hand | ||
| marking-VoxColorableLeftHand = Colorable Left Hand | ||
|
|
||
| marking-VoxColorableLeftFoot-leftfoot = Colorable Left Foot | ||
| marking-VoxColorableLeftFoot = Colorable Left Foot | ||
|
|
||
| marking-VoxColorableRightFoot-rightfoot = Colorable Right Foot | ||
| marking-VoxColorableRightFoot = Colorable Right Foot | ||
|
|
||
| marking-VoxFeatheredLegLeft-leftlegfeathered = Feathered Left Leg | ||
| marking-VoxFeatheredLegLeft = Feathered Left Leg | ||
|
|
||
| marking-VoxFeatheredLegRight-rightlegfeathered = Feathered Right Leg | ||
| marking-VoxFeatheredLegRight = Feathered Right Leg | ||
144 changes: 144 additions & 0 deletions
144
Resources/Prototypes/_Starlight/Entities/Mobs/Customization/Marking/vox.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| - type: marking | ||
| id: VoxBeakColor | ||
| bodyPart: Snout | ||
| markingCategory: Snout | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: voxbeakcolor | ||
|
|
||
| - type: marking | ||
| # The cere is the base of the top part of the beak, the cere on this beak, is a square. | ||
| id: VoxBeakSquareCereColor | ||
| bodyPart: Snout | ||
| markingCategory: Snout | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: voxbeaksquarecolor | ||
|
|
||
| - type: marking | ||
| id: VoxBeakShavedColor | ||
| bodyPart: Snout | ||
| markingCategory: Snout | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: voxbeakshavedcolor | ||
|
|
||
| - type: marking | ||
| id: VoxBeakHookedColor | ||
| bodyPart: Snout | ||
| markingCategory: Snout | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: voxbeakhookedcolor | ||
|
|
||
| - type: marking | ||
| id: VoxColorableLeftHand | ||
| bodyPart: LHand | ||
| markingCategory: Arms | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: lefthand | ||
|
|
||
| - type: marking | ||
| id: VoxColorableRightHand | ||
| bodyPart: RHand | ||
| markingCategory: Arms | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: righthand | ||
|
|
||
| - type: marking | ||
| id: VoxColorableLeftFoot | ||
| bodyPart: LFoot | ||
| markingCategory: Legs | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: leftfoot | ||
|
|
||
| - type: marking | ||
| id: VoxColorableRightFoot | ||
| bodyPart: RFoot | ||
| markingCategory: Legs | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: rightfoot | ||
|
|
||
| - type: marking | ||
| id: VoxFeatheredLegLeft | ||
| bodyPart: LLeg | ||
| markingCategory: Legs | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: leftlegfeathered | ||
|
|
||
| - type: marking | ||
| id: VoxFeatheredLegRight | ||
| bodyPart: RLeg | ||
| markingCategory: Legs | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: rightlegfeathered | ||
|
|
||
| - type: marking | ||
| id: VoxColorableLeftArm | ||
| bodyPart: LArm | ||
| markingCategory: Arms | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: leftarm | ||
|
|
||
| - type: marking | ||
| id: VoxColorableRightArm | ||
| bodyPart: RArm | ||
| markingCategory: Arms | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: rightarm | ||
|
|
||
| - type: marking | ||
| id: VoxColorableRightLeg | ||
| bodyPart: RLeg | ||
| markingCategory: Legs | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: rightleg | ||
|
|
||
| - type: marking | ||
| id: VoxColorableLeftLeg | ||
| bodyPart: LLeg | ||
| markingCategory: Legs | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: leftleg | ||
|
|
||
| - type: marking | ||
| id: VoxShaggyTail | ||
| bodyPart: Tail | ||
| markingCategory: Tail | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: voxshaggytail | ||
|
|
||
| - type: marking | ||
| id: VoxPlumage | ||
| bodyPart: Tail | ||
| markingCategory: Tail | ||
| speciesRestriction: [Vox, NeoVox] | ||
| sprites: | ||
| - sprite: _Starlight/Mobs/Customization/vox.rsi | ||
| state: voxplumage |
Binary file added
BIN
+227 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/leftarm.png
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
BIN
+251 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/leftfoot.png
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
BIN
+265 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/lefthand.png
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
BIN
+295 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/leftleg.png
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
BIN
+341 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/leftlegfeathered.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions
91
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/meta.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "State based copyright", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "voxbeakcolor", | ||
| "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant, Flareguy, and TrixxedHeart.", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "voxbeakhookedcolor", | ||
| "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, beak_shaved/squarecere/hooked modified from beak by TrixxedHeart.", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "voxbeakshavedcolor", | ||
| "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, beak_shaved/squarecere/hooked modified from beak by TrixxedHeart.", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "voxbeaksquarecolor", | ||
| "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, beak_shaved/squarecere/hooked modified from beak by TrixxedHeart.", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "voxplumage", | ||
| "copyright": "Created by DogeyOT (Discord).", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "voxshaggytail", | ||
| "copyright": "Created by DogeyOT (Discord).", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "leftlegfeathered", | ||
| "copyright": "Created by DogeyOT (Discord).", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "rightlegfeathered", | ||
| "copyright": "Created by DogeyOT (Discord).", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "leftarm", | ||
| "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant, Flareguy, and TrixxedHeart.", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "leftfoot", | ||
| "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant, Flareguy, and TrixxedHeart.", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "lefthand", | ||
| "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant, Flareguy, and TrixxedHeart.", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "leftleg", | ||
| "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant, Flareguy, and TrixxedHeart.", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "rightarm", | ||
| "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant, Flareguy, and TrixxedHeart.", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "rightfoot", | ||
| "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant, Flareguy, and TrixxedHeart.", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "righthand", | ||
| "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant, Flareguy, and TrixxedHeart.", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "rightleg", | ||
| "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, modified by Bhijn, Errant, Flareguy, and TrixxedHeart.", | ||
| "directions": 4 | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+231 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/rightarm.png
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
BIN
+251 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/rightfoot.png
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
BIN
+277 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/righthand.png
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
BIN
+298 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/rightleg.png
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
BIN
+337 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/rightlegfeathered.png
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
BIN
+261 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/voxbeakcolor.png
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
BIN
+244 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/voxbeakhookedcolor.png
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
BIN
+245 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/voxbeakshavedcolor.png
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
BIN
+253 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/voxbeaksquarecolor.png
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
BIN
+294 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/voxfeatheredfeet.png
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
BIN
+482 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/voxplumage.png
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
BIN
+500 Bytes
Resources/Textures/_Starlight/Mobs/Customization/vox.rsi/voxshaggytail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
Use lowercase kebab-case for the Fluent IDs.
The IDs on Line 1 and Line 2, such as
marking-VoxBeakColor, contain uppercase letters and concatenated words. Apply the same conversion to every ID in this file. Update the corresponding marking lookup contract together so labels continue to resolve.As per path instructions, localization IDs must use
kebab-caseand must not contain capital letters.🤖 Prompt for AI Agents
Source: Path instructions