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

[Feature] Added More Slime People Markings #345

Merged
merged 11 commits into from
Dec 22, 2024
Merged

[Feature] Added More Slime People Markings #345

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9d29de0
Added Slime analogue of cat ears for slimepeople (#795)
mhamsterr Feb 1, 2023
76fc692
feat: added elf ears to slime people
Remuchi Dec 19, 2024
496ad9c
fix: move directories to lp folders
Remuchi Dec 19, 2024
8ff6d82
fix: marking limits for elf ears
Remuchi Dec 19, 2024
0e52e42
fix: fixed your goddamn rsi validator
Remuchi Dec 19, 2024
d9bdee1
fix: and another one
Remuchi Dec 19, 2024
c795f0a
fix: spare me
Remuchi Dec 19, 2024
23dfde3
Merge branch 'master' into feat/slimepeople-markings
Remuchi Dec 22, 2024
4db9645
fix: you've deleted it. great
Remuchi Dec 22, 2024
0c9008e
fix
Remuchi Dec 22, 2024
bccd125
Merge branch 'master' into feat/slimepeople-markings
BL02DL Dec 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
12 changes: 6 additions & 6 deletions Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Human, Oni]
speciesRestriction: [Human, Oni, SlimePerson]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_standard
Expand All @@ -13,7 +13,7 @@
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Human, Oni]
speciesRestriction: [Human, Oni, SlimePerson]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_wide
Expand All @@ -23,7 +23,7 @@
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Human, Oni]
speciesRestriction: [Human, Oni, SlimePerson]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_small
Expand All @@ -33,7 +33,7 @@
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Human, Oni]
speciesRestriction: [Human, Oni, SlimePerson]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_upwards
Expand All @@ -43,7 +43,7 @@
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Human, Oni]
speciesRestriction: [Human, Oni, SlimePerson]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_tall
Expand All @@ -63,7 +63,7 @@
bodyPart: HeadSide
markingCategory: HeadSide
forcedColoring: true
speciesRestriction: [Human, Oni]
speciesRestriction: [Human, Oni, SlimePerson]
sprites:
- sprite: Mobs/Customization/pointy_ears.rsi
state: pointy_ears_thin
Expand Down
12 changes: 12 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 @@ -22,6 +22,9 @@
Hair: MobSlimeMarkingFollowSkin
FacialHair: MobSlimeMarkingFollowSkin
Chest: MobSlimeTorso
HeadTop: MobHumanoidAnyMarking # Lost Paradise Sponsors
HeadSide: MobHumanoidAnyMarking # Lost Paradise Elf Ears
Tail: MobHumanoidAnyMarking # Lost Paradise Sponsors
Eyes: MobHumanoidEyes
LArm: MobSlimeLArm
RArm: MobSlimeRArm
Expand All @@ -41,6 +44,15 @@
FacialHair:
points: 1
required: false
Tail:
points: 1 # Lost Paradise Sponsors
required: false
HeadTop:
points: 1 # Lost Paradise Sponsors
required: false
HeadSide:
points: 1 # Lost Paradise Elf Ears
required: false
Chest:
points: 1
required: false
Expand Down
69 changes: 69 additions & 0 deletions Resources/Prototypes/_LostParadise/Entities/Mobs/Customization/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
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [SlimePerson]
sponsorOnly: true # Lost Paradise Sponsors
sprites:
- sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
state: ears_slime_cat_outer
- sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
state: ears_slime_cat_inner
Remuchi marked this conversation as resolved.
Show resolved Hide resolved

- type: marking
id: SlimeCatTail
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [SlimePerson]
sponsorOnly: true # Lost Paradise Sponsors
sprites:
- sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
state: slime_tail_cat_wag # Lost Paradise Sponsors

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

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

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

- type: marking
id: SlimeCatTailStripes
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [SlimePerson]
sponsorOnly: true # Lost Paradise Sponsors
sprites:
- sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
state: slime_tail_cat_wag_stripes_prime
- sprite: _LostParadise/Mobs/Customization/slime_cat_parts.rsi
state: slime_tail_cat_wag_stripes_second
11 changes: 11 additions & 0 deletions Resources/Prototypes/_LostParadise/Entities/Mobs/Customization/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
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [SlimePerson]
sponsorOnly: true # Lost Paradise Sponsors
sprites:
- sprite: _LostParadise/Mobs/Customization/slime_fox_parts.rsi
state: ears_slime_fox_outer
- sprite: _LostParadise/Mobs/Customization/slime_fox_parts.rsi
state: ears_slime_fox_inner
Remuchi marked this conversation as resolved.
Show resolved Hide resolved
0 ...me_cat_parts.rsi/ears_slime_cat_inner.png → ...me_cat_parts.rsi/ears_slime_cat_inner.png
View file
Open in desktop
File renamed without changes
0 ...me_cat_parts.rsi/ears_slime_cat_outer.png → ...me_cat_parts.rsi/ears_slime_cat_outer.png
View file
Open in desktop
File renamed without changes
0 ...cat_parts.rsi/ears_slime_curled_inner.png → ...cat_parts.rsi/ears_slime_curled_inner.png
View file
Open in desktop
File renamed without changes
0 ...cat_parts.rsi/ears_slime_curled_outer.png → ...cat_parts.rsi/ears_slime_curled_outer.png
View file
Open in desktop
File renamed without changes
0 ...cat_parts.rsi/ears_slime_stubby_inner.png → ...cat_parts.rsi/ears_slime_stubby_inner.png
View file
Open in desktop
File renamed without changes
0 ...cat_parts.rsi/ears_slime_stubby_outer.png → ...cat_parts.rsi/ears_slime_stubby_outer.png
View file
Open in desktop
File renamed without changes
0 ...e_cat_parts.rsi/ears_slime_torn_inner.png → ...e_cat_parts.rsi/ears_slime_torn_inner.png
View file
Open in desktop
File renamed without changes
0 ...e_cat_parts.rsi/ears_slime_torn_outer.png → ...e_cat_parts.rsi/ears_slime_torn_outer.png
View file
Open in desktop
File renamed without changes
0 ...stomization/slime_cat_parts.rsi/meta.json → ...stomization/slime_cat_parts.rsi/meta.json
View file
Open in desktop
File renamed without changes.
0 ...on/slime_cat_parts.rsi/slime_tail_cat.png → ...on/slime_cat_parts.rsi/slime_tail_cat.png
View file
Open in desktop
File renamed without changes
0 ...lime_cat_parts.rsi/slime_tail_cat_wag.png → ...lime_cat_parts.rsi/slime_tail_cat_wag.png
View file
Open in desktop
File renamed without changes
0 ....rsi/slime_tail_cat_wag_stripes_prime.png → ....rsi/slime_tail_cat_wag_stripes_prime.png
View file
Open in desktop
File renamed without changes
0 ...rsi/slime_tail_cat_wag_stripes_second.png → ...rsi/slime_tail_cat_wag_stripes_second.png
View file
Open in desktop
File renamed without changes
0 ...me_fox_parts.rsi/ears_slime_fox_inner.png → ...me_fox_parts.rsi/ears_slime_fox_inner.png
View file
Open in desktop
File renamed without changes
0 ...me_fox_parts.rsi/ears_slime_fox_outer.png → ...me_fox_parts.rsi/ears_slime_fox_outer.png
View file
Open in desktop
File renamed without changes
0 ...stomization/slime_fox_parts.rsi/meta.json → ...stomization/slime_fox_parts.rsi/meta.json
View file
Open in desktop
File renamed without changes.
Loading