diff --git a/Resources/Locale/ru-RU/ss220/markings/reptilian.ftl b/Resources/Locale/ru-RU/ss220/markings/reptilian.ftl new file mode 100644 index 00000000000000..844a1566ee94e9 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/markings/reptilian.ftl @@ -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 = Унатх, правая ступня (Цветные Когти) \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml index 19768f8dc236b6..19a16b632c2ebd 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml @@ -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 @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/SS220/Entities/Mobs/Customization/Markings/reptilian.yml new file mode 100644 index 00000000000000..2209260c1e08de --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Mobs/Customization/Markings/reptilian.yml @@ -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 \ No newline at end of file diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/l_leg_claws.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/l_leg_claws.png new file mode 100644 index 00000000000000..015276febd97ac Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/l_leg_claws.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/meta.json b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/meta.json new file mode 100644 index 00000000000000..fd8546c429a9c0 --- /dev/null +++ b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/meta.json @@ -0,0 +1,519 @@ +{ + "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 . Modified by DaGo7393 (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "l_leg_claws", + "directions": 4 + }, + { + "name": "r_leg_claws", + "directions": 4 + }, + { + "name": "tail_large_primary", + "directions": 4 + }, + { + "name": "tail_large_secondary", + "directions": 4 + }, + { + "name": "tail_spikes_primary", + "directions": 4 + }, + { + "name": "tail_spikes_secondary", + "directions": 4 + }, + { + "name": "tail_dtiger_primary", + "directions": 4 + }, + { + "name": "tail_dtiger_secondary", + "directions": 4 + }, + { + "name": "tail_ltiger_primary", + "directions": 4 + }, + { + "name": "tail_ltiger_secondary", + "directions": 4 + }, + { + "name": "tail_ltiger_wagging_primary", + "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 + ], + [ + 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": "tail_ltiger_wagging_secondary", + "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 + ], + [ + 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": "tail_dtiger_wagging_primary", + "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 + ], + [ + 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": "tail_dtiger_wagging_secondary", + "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 + ], + [ + 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": "tail_spikes_wagging_primary", + "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 + ], + [ + 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": "tail_spikes_wagging_secondary", + "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 + ], + [ + 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 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/r_leg_claws.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/r_leg_claws.png new file mode 100644 index 00000000000000..c2cfd4acc4c9ff Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/r_leg_claws.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_dtiger_primary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_dtiger_primary.png new file mode 100644 index 00000000000000..735263b8ff89db Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_dtiger_primary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_dtiger_secondary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_dtiger_secondary.png new file mode 100644 index 00000000000000..c5fbffb7c4f0c9 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_dtiger_secondary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_dtiger_wagging_primary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_dtiger_wagging_primary.png new file mode 100644 index 00000000000000..917a80499481f2 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_dtiger_wagging_primary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_dtiger_wagging_secondary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_dtiger_wagging_secondary.png new file mode 100644 index 00000000000000..9b49975d097dc5 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_dtiger_wagging_secondary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_large_primary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_large_primary.png new file mode 100644 index 00000000000000..364aa10c56443d Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_large_primary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_large_secondary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_large_secondary.png new file mode 100644 index 00000000000000..f98edd93884bb8 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_large_secondary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_ltiger_primary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_ltiger_primary.png new file mode 100644 index 00000000000000..d393e5467e4ace Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_ltiger_primary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_ltiger_secondary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_ltiger_secondary.png new file mode 100644 index 00000000000000..61052adb511d5b Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_ltiger_secondary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_ltiger_wagging_primary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_ltiger_wagging_primary.png new file mode 100644 index 00000000000000..76ff17b8e177a9 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_ltiger_wagging_primary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_ltiger_wagging_secondary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_ltiger_wagging_secondary.png new file mode 100644 index 00000000000000..9b49975d097dc5 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_ltiger_wagging_secondary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_spikes_primary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_spikes_primary.png new file mode 100644 index 00000000000000..67b0550a33c1e0 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_spikes_primary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_spikes_secondary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_spikes_secondary.png new file mode 100644 index 00000000000000..2370ba1d59ff43 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_spikes_secondary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_spikes_wagging_primary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_spikes_wagging_primary.png new file mode 100644 index 00000000000000..31c8109afd7f9f Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_spikes_wagging_primary.png differ diff --git a/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_spikes_wagging_secondary.png b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_spikes_wagging_secondary.png new file mode 100644 index 00000000000000..d785a241448055 Binary files /dev/null and b/Resources/Textures/SS220/Mobs/Customization/reptilian.rsi/tail_spikes_wagging_secondary.png differ