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

Kobold floppy ear #20929

Merged
merged 3 commits into from
Oct 13, 2023
Merged

Kobold floppy ear #20929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f20bb5
adds floppy kobold ears for reptilians
Sadie-silly Oct 9, 2023
fc9bb84
bug fixes
Sadie-silly Oct 11, 2023
46f7fcf
fixed a silly little mistake
Sadie-silly Oct 11, 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
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/markings/reptilian.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,6 @@ marking-LizardHornsBighorn = Lizard Horns (Bighorn)

marking-LizardHornsKoboldEars-horns_kobold_ears = Lizard Ears (Kobold)
marking-LizardHornsKoboldEars = Lizard Ears (Kobold)

marking-LizardHornsFloppyKoboldEars-horns_floppy_kobold_ears = Lizard Ears (Floppy Kobold)
marking-LizardHornsFloppyKoboldEars = Lizard Ears (Floppy Kobold)
9 changes: 9 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,3 +271,12 @@
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_kobold_ears

- type: marking
id: LizardHornsFloppyKoboldEars
bodyPart: HeadSide
markingCategory: HeadSide
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this intended to be HeadSide? Does making it HeadSide allow, for example, another HeadTop item to be selected in addition to this marking?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, a couple people were asking me to have it be HeadSide so that they could use it with the horns.

speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_floppy_kobold_ears
Binary file added ...es/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears.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.
6 changes: 5 additions & 1 deletion Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@
{
"name": "r_leg_tiger",
"directions": 4
}
},
{
"name": "horns_floppy_kobold_ears",
"directions": 4
}
]
}