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.

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

TwoColoredReptilianTails&LegClaws #2145

Merged
merged 6 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 12 additions & 0 deletions Resources/Locale/ru-RU/ss220/markings/reptilian.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
marking-LizardRLegClaws = Унатх, правая ступня (Цветные Когти)
marking-LizardLLegClaws = Унатх, левая ступня (Цветные Когти)
marking-LizardTailSpikes-tail_spikes_primary = Унатх, хвост
marking-LizardTailSpikes-tail_spikes_secondary = Оттенок
marking-LizardTailLarge-tail_large_primary = Унатх, хвост
marking-LizardTailLarge-tail_large_secondary = Оттенок
marking-LizardTailLTiger-tail_ltiger_primary = Унатх, хвост
marking-LizardTailLTiger-tail_ltiger_secondary = Оттенок
marking-LizardTailDTiger-tail_dtiger_primary = Унатх, хвост
marking-LizardTailDTiger-tail_dtiger_secondary = Оттенок
marking-LizardLLegClaws-l_leg_claws = Унатх, левая ступня (Цветные Когти)
marking-LizardRLegClaws-r_leg_claws = Унатх, правая ступня (Цветные Когти)
Original file line number Diff line number Diff line change
Expand Up @@ -142,36 +142,52 @@
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Reptilian]
# ss220-twocolored-tails-start
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_large
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_large_primary
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_large_secondary
# ss220-twocolored-tails-end

- type: marking
id: LizardTailSpikes
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Reptilian]
# ss220-twocolored-tails-start
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_spikes
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_spikes_primary
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_spikes_secondary
# ss220-twocolored-tails-end

- type: marking
id: LizardTailLTiger
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Reptilian]
# ss220-twocolored-tails-start
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_ltiger
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_ltiger_primary
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_ltiger_secondary
# ss220-twocolored-tails-end

- type: marking
id: LizardTailDTiger
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Reptilian]
# ss220-twocolored-tails-start
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_dtiger
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_dtiger_primary
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_dtiger_secondary
# ss220-twocolored-tails-end

- type: marking
id: LizardSnoutRound
Expand Down Expand Up @@ -346,34 +362,47 @@
markingCategory: Tail
speciesRestriction: []
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_smooth_wagging_primary
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_smooth_wagging_secondary
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_smooth_wagging_primary
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_smooth_wagging_secondary

- type: marking
id: LizardTailSpikesAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
# ss220-twocolored-tails-start
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_spikes_wagging
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_spikes_wagging_primary
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_spikes_wagging_secondary
# ss220-twocolored-tails-end


- type: marking
id: LizardTailLTigerAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
# ss220-twocolored-tails-start
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_ltiger_wagging
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_ltiger_wagging_primary
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_ltiger_wagging_secondary
# ss220-twocolored-tails-end

- type: marking
id: LizardTailDTigerAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
# ss220-twocolored-tails-start
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_dtiger_wagging
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_dtiger_wagging_primary
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: tail_dtiger_wagging_secondary
# ss220-twocolored-tails-end
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt

- type: marking
id: LizardRLegClaws
bodyPart: RFoot
markingCategory: Legs
speciesRestriction: [Reptilian]
sprites:
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: r_leg_claws

- type: marking
id: LizardLLegClaws
bodyPart: LFoot
markingCategory: Legs
speciesRestriction: [Reptilian]
sprites:
- sprite: SS220/Mobs/Customization/reptilian.rsi
state: l_leg_claws
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading