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

Added Slime analogue of cat ears for slimepeople #795

Merged
merged 4 commits into from
Feb 1, 2023
Merged

Added Slime analogue of cat ears for slimepeople #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba30694
added slime analogue of sponsor cat-ears
mhamsterr Feb 1, 2023
5ccfffa
Update slime.yml
mhamsterr Feb 1, 2023
1e9f307
Update Resources/Locale/ru-RU/corvax/markings/slime_cat.ftl
mhamsterr Feb 1, 2023
6a27935
Combine Corvax/Mobs/Customization/Markings/slime_cat_parts.yml and Co…
mhamsterr Feb 1, 2023
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
19 changes: 19 additions & 0 deletions Resources/Locale/ru-RU/corvax/markings/slime_cat.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
marking-SlimeCatEars = Кошачьи ушки из слизи
marking-SlimeCatTail = Кошачий хвост из слизи
marking-SlimeCatTail-slime_tail_cat_wag = Кошачий хвост из слизи
marking-SlimeCatEars-ears_slime_cat_outer = Наружное ухо
marking-SlimeCatEars-ears_slime_cat_inner = Внутреннее ухо
marking-SlimeCatTailStripes = Кошачий хвост из слизи (Полосатый)
marking-SlimeCatTailStripes-slime_tail_cat_wag_stripes_prime = Первичные полосы
marking-SlimeCatTailStripes-slime_tail_cat_wag_stripes_second = Вторичные полосы
marking-SlimeCatEars-ears_slime_cat_outer = Наружное ухо
marking-SlimeCatEars-ears_slime_cat_inner = Внутреннее ухо
marking-SlimeCatEarsStubby = Короткие ушки из слизи
marking-SlimeCatEarsStubby-ears_slime_stubby_outer = Наружное ухо
marking-SlimeCatEarsStubby-ears_slime_stubby_inner = Внутреннее ухо
marking-SlimeCatEarsCurled = Завитые ушки из слизи
marking-SlimeCatEarsCurled-ears_slime_curled_outer = Наружное ухо
marking-SlimeCatEarsCurled-ears_slime_curled_inner = Внутреннее ухо
marking-SlimeCatEarsTorn = Рассечённые ушки из слизи
marking-SlimeCatEarsTorn-ears_slime_torn_outer = Наружное ухо
marking-SlimeCatEarsTorn-ears_slime_torn_inner = Внутреннее ухо
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/corvax/markings/slime_fox.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
marking-SlimeFoxEars = Лисьи ушки из слизи
marking-SlimeFoxEars-ears_slime_fox_outer = Наружное ухо
marking-SlimeFoxEars-ears_slime_fox_inner = Внутреннее ухо
69 changes: 69 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/slime_cat_parts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
- type: marking
id: SlimeCatEars # Literally, why not?
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [SlimePerson]
sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
state: ears_slime_cat_outer
- sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
state: ears_slime_cat_inner

- type: marking
id: SlimeCatTail # Again, why not?
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [SlimePerson]
sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
state: slime_tail_cat_wag # Corvax-Sponsors

- type: marking
id: SlimeCatEarsStubby
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [SlimePerson]
sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
state: ears_slime_stubby_outer
- sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
state: ears_slime_stubby_inner

- type: marking
id: SlimeCatEarsCurled
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [SlimePerson]
sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
state: ears_slime_curled_outer
- sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
state: ears_slime_curled_inner

- type: marking
id: SlimeCatEarsTorn
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [SlimePerson]
sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
state: ears_slime_torn_outer
- sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
state: ears_slime_torn_inner

- type: marking
id: SlimeCatTailStripes
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [SlimePerson]
sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
state: slime_tail_cat_wag_stripes_prime
- sprite: Corvax/Mobs/Customization/slime_cat_parts.rsi
state: slime_tail_cat_wag_stripes_second
11 changes: 11 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/slime_fox_parts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: marking
id: SlimeFoxEars # if cat ears from slime can exist, then why fox ears cannot?
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [SlimePerson]
sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/slime_fox_parts.rsi
state: ears_slime_fox_outer
- sprite: Corvax/Mobs/Customization/slime_fox_parts.rsi
state: ears_slime_fox_inner
8 changes: 8 additions & 0 deletions Resources/Prototypes/Species/slime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
Hair: MobSlimeMarkingFollowSkin
FacialHair: MobSlimeMarkingFollowSkin
Chest: MobSlimeTorso
HeadTop: MobHumanoidAnyMarking # Corvax Sponsors
Tail: MobHumanoidAnyMarking # Corvax Sponsors
Eyes: MobHumanoidEyes
LArm: MobSlimeLArm
RArm: MobSlimeRArm
Expand All @@ -37,6 +39,12 @@
FacialHair:
points: 1
required: false
Tail: # :despair:
points: 1 # Corvax Sponsors
required: false
HeadTop: # :skull:
points: 1 # Corvax Sponsors
required: false
Legs:
points: 2
required: false
Expand Down
Binary file added ...Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_cat_inner.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 ...Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_cat_outer.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 ...tures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_curled_inner.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 ...tures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_curled_outer.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 ...tures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_stubby_inner.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 ...tures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_stubby_outer.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 ...extures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_torn_inner.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 ...extures/Corvax/Mobs/Customization/slime_cat_parts.rsi/ears_slime_torn_outer.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.
233 changes: 233 additions & 0 deletions Resources/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Reworked from /Resources/cat_parts.rsi and Corvax/Resources/cat_parts.rsi by &H13;#4495",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "ears_slime_curled_inner",
"directions": 4
},
{
"name": "ears_slime_curled_outer",
"directions": 4
},
{
"name": "ears_slime_stubby_inner",
"directions": 4
},
{
"name": "ears_slime_stubby_outer",
"directions": 4
},
{
"name": "ears_slime_torn_inner",
"directions": 4
},
{
"name": "ears_slime_torn_outer",
"directions": 4
},
{
"name": "slime_tail_cat_wag_stripes_prime",
"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
]
]
},
{
"name": "slime_tail_cat_wag_stripes_second",
"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
]
]
},
{
"name": "ears_slime_cat_outer",
"directions": 4
},
{
"name": "ears_slime_cat_inner",
"directions": 4
},
{
"name": "slime_tail_cat",
"directions": 4
},
{
"name": "slime_tail_cat_wag",
"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
]
]
}
]
}
Binary file added ...urces/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat.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 ...s/Textures/Corvax/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag.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 ...vax/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag_stripes_prime.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 ...ax/Mobs/Customization/slime_cat_parts.rsi/slime_tail_cat_wag_stripes_second.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 ...Textures/Corvax/Mobs/Customization/slime_fox_parts.rsi/ears_slime_fox_inner.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 ...Textures/Corvax/Mobs/Customization/slime_fox_parts.rsi/ears_slime_fox_outer.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.
19 changes: 19 additions & 0 deletions Resources/Textures/Corvax/Mobs/Customization/slime_fox_parts.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Reworked from Corvax/Mobs/Customization/fox_parts.rsi by &H13;#4495",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "ears_slime_fox_inner",
"directions": 4
},
{
"name": "ears_slime_fox_outer",
"directions": 4
}
]
}