forked from space-wizards/space-station-14
-
-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1658 from hivehum/big-tail-gaming
giant snake tails from harmony
- Loading branch information
Showing
22 changed files
with
806 additions
and
0 deletions.
There are no files selected for viewing
This file contains 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,15 @@ | ||
| marking-LizardTailSnake = Snake Tail | ||
| marking-LizardTailSnake-tail_snake_primary = Primary color | ||
| marking-LizardTailSnake-tail_snake_secondary = Under Tone color | ||
| marking-LizardTailSnakeStripe = Snake Tail (Striped) | ||
| marking-LizardTailSnakeStripe-tail_snake_primary = Primary color | ||
| marking-LizardTailSnakeStripe-tail_snake_secondary = Stripes color | ||
| marking-LizardTailSnakeUnder = Snake Tail (Under) | ||
| marking-LizardTailSnakeUnder-tail_snake_primary = Primary color | ||
| marking-LizardTailSnakeUnder-tail_snake_secondary = Under Tone color | ||
| marking-LizardTailSnakeDual = Snake Tail (Dual) | ||
| marking-LizardTailSnakeDual-tail_snake_primary = Primary color | ||
| marking-LizardTailSnakeDual-tail_snake_secondary = End color |
91 changes: 91 additions & 0 deletions
91
Resources/Prototypes/_CD/Entities/Mobs/Customization/Markings/reptilian.yml
This file contains 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 @@ | ||
| # Snake Tails | ||
|
|
||
| - type: marking | ||
| id: LizardTailSnake | ||
| bodyPart: Tail | ||
| markingCategory: Tail | ||
| speciesRestriction: [Reptilian] | ||
| sprites: | ||
| - sprite: _CD/Mobs/Customization/snaketail.rsi | ||
| state: tail_snake_primary | ||
| - sprite: _CD/Mobs/Customization/snaketail.rsi | ||
| state: tail_snake_secondary | ||
|
|
||
| - type: marking | ||
| id: LizardTailSnakeStripe | ||
| bodyPart: Tail | ||
| markingCategory: Tail | ||
| speciesRestriction: [Reptilian] | ||
| sprites: | ||
| - sprite: _CD/Mobs/Customization/snaketailstripe.rsi | ||
| state: tail_snake_primary | ||
| - sprite: _CD/Mobs/Customization/snaketailstripe.rsi | ||
| state: tail_snake_secondary | ||
|
|
||
| - type: marking | ||
| id: LizardTailSnakeUnder | ||
| bodyPart: Tail | ||
| markingCategory: Tail | ||
| speciesRestriction: [Reptilian] | ||
| sprites: | ||
| - sprite: _CD/Mobs/Customization/snaketailunder.rsi | ||
| state: tail_snake_primary | ||
| - sprite: _CD/Mobs/Customization/snaketailunder.rsi | ||
| state: tail_snake_secondary | ||
|
|
||
| - type: marking | ||
| id: LizardTailSnakeDual | ||
| bodyPart: Tail | ||
| markingCategory: Tail | ||
| speciesRestriction: [Reptilian] | ||
| sprites: | ||
| - sprite: _CD/Mobs/Customization/snaketaildual.rsi | ||
| state: tail_snake_primary | ||
| - sprite: _CD/Mobs/Customization/snaketaildual.rsi | ||
| state: tail_snake_secondary | ||
|
|
||
| # Animated Snake Tails | ||
|
|
||
| - type: marking | ||
| id: LizardTailSnakeAnimated | ||
| bodyPart: Tail | ||
| markingCategory: Tail | ||
| speciesRestriction: [] | ||
| sprites: | ||
| - sprite: _CD/Mobs/Customization/snaketail.rsi | ||
| state: tail_snake_wag_primary | ||
| - sprite: _CD/Mobs/Customization/snaketail.rsi | ||
| state: tail_snake_wag_secondary | ||
|
|
||
| - type: marking | ||
| id: LizardTailSnakeStripeAnimated | ||
| bodyPart: Tail | ||
| markingCategory: Tail | ||
| speciesRestriction: [] | ||
| sprites: | ||
| - sprite: _CD/Mobs/Customization/snaketailstripe.rsi | ||
| state: tail_snake_wag_primary | ||
| - sprite: _CD/Mobs/Customization/snaketailstripe.rsi | ||
| state: tail_snake_wag_secondary | ||
|
|
||
| - type: marking | ||
| id: LizardTailSnakeUnderAnimated | ||
| bodyPart: Tail | ||
| markingCategory: Tail | ||
| speciesRestriction: [] | ||
| sprites: | ||
| - sprite: _CD/Mobs/Customization/snaketailunder.rsi | ||
| state: tail_snake_wag_primary | ||
| - sprite: _CD/Mobs/Customization/snaketailunder.rsi | ||
| state: tail_snake_wag_secondary | ||
|
|
||
| - type: marking | ||
| id: LizardTailSnakeDualAnimated | ||
| bodyPart: Tail | ||
| markingCategory: Tail | ||
| speciesRestriction: [] | ||
| sprites: | ||
| - sprite: _CD/Mobs/Customization/snaketaildual.rsi | ||
| state: tail_snake_wag_primary | ||
| - sprite: _CD/Mobs/Customization/snaketaildual.rsi | ||
| state: tail_snake_wag_secondary |
175 changes: 175 additions & 0 deletions
175
Resources/Textures/_CD/Mobs/Customization/snaketail.rsi/meta.json
This file contains 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,175 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "Taken from https://github.com/Bubberstation/Bubberstation/commit/e9e0683c6e34512c125cef1a4c69976258ebfdce and adjusted by Github KittenColony / Discord kittencolony (297865728374210561) and again modified by alzore_ (discord). Wag animation by alzore_ (discord)", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "tail_snake_primary", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "tail_snake_secondary", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "tail_snake_wag_primary", | ||
| "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 | ||
| ], | ||
| [ | ||
| 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 | ||
| ] | ||
| ] | ||
| }, | ||
| { | ||
| "name": "tail_snake_wag_secondary", | ||
| "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 | ||
| ], | ||
| [ | ||
| 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 | ||
| ] | ||
| ] | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+898 Bytes
Resources/Textures/_CD/Mobs/Customization/snaketail.rsi/tail_snake_primary.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
+846 Bytes
Resources/Textures/_CD/Mobs/Customization/snaketail.rsi/tail_snake_secondary.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
+4.76 KB
Resources/Textures/_CD/Mobs/Customization/snaketail.rsi/tail_snake_wag_primary.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
+3.75 KB
...rces/Textures/_CD/Mobs/Customization/snaketail.rsi/tail_snake_wag_secondary.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.