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

Nubby Lizard Horns #282

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Nubby Lizard Horns #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddb09a2
Adds nubby lizard horns
Pinkbat5 Sep 16, 2024
d28595a
added credits
Pinkbat5 Sep 18, 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
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 @@ -90,6 +90,9 @@ marking-LizardHornsAyrshire = Lizard Horns (Ayrshire)
marking-LizardHornsMyrsore-horns_myrsore = Lizard Horns (Myrsore)
marking-LizardHornsMyrsore = Lizard Horns (Myrsore)

marking-LizardHornsNubby-horns_nubby = Lizard Horns (Nubby)
marking-LizardHornsNubby = Lizard Horns (Nubby)

marking-LizardHornsBighorn-horns_bighorn = Lizard Horns (Bighorn)
marking-LizardHornsBighorn = Lizard Horns (Bighorn)

Expand Down
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 @@ -285,6 +285,15 @@
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_myrsore

- type: marking
id: LizardHornsNubby
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_nubby

- type: marking
id: LizardHornsBighorn
bodyPart: HeadTop
Expand Down
Binary file added Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_nubby.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.
8 changes: 6 additions & 2 deletions Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore, Bighorn and Demonic are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2",
"copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore, Bighorn and Demonic are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Nubby modified from Ayrshire by Pinkbat5. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -577,6 +577,10 @@
"name": "horns_myrsore",
"directions": 4
},
{
"name": "horns_nubby",
"directions": 4
},
{
"name": "horns_bighorn",
"directions": 4
Expand Down Expand Up @@ -618,4 +622,4 @@
"directions": 4
}
]
}
}
Loading