From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Sun, 20 Apr 2025 05:57:01 +0000 (-0500) Subject: Aquatic tail and back fin markings for lizards (#33219) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d7c244293c6d89a4f5294cfcf6807e94cdaf0f49;p=space-station-14.git Aquatic tail and back fin markings for lizards (#33219) * shark tail and back fin for lizards * credit me --- diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl index d66d3cb9e6..c5b843109e 100644 --- a/Resources/Locale/en-US/markings/reptilian.ftl +++ b/Resources/Locale/en-US/markings/reptilian.ftl @@ -38,6 +38,9 @@ marking-LizardTailLTiger = Lizard Tail (Light Tiger Stripes) marking-LizardTailDTiger-tail_dtiger = Lizard Tail (Dark Tiger Stripes) marking-LizardTailDTiger = Lizard Tail (Dark Tiger Stripes) +marking-LizardTailAquatic-tail_aquatic = Lizard Tail (Aquatic) +marking-LizardTailAquatic = Lizard Tail (Aquatic) + marking-LizardSnoutRound-snout_round = Lizard Snout (Round) marking-LizardSnoutRound = Lizard Snout (Round) @@ -108,6 +111,9 @@ marking-LizardChestUnderbelly = Lizard Chest (Underbelly) marking-LizardChestBackspikes-body_backspikes = Lizard Back spikes (Four) marking-LizardChestBackspikes = Lizard Back spikes (Four) +marking-LizardChestFin-body_fin = Lizard Fin +marking-LizardChestFin = Lizard Fin + marking-LizardSnoutSplotch = Lizard Snout (Splotch) marking-LizardSnoutSplotch-snout_splotch_primary = Muzzle marking-LizardSnoutSplotch-snout_splotch_secondary = Snoot diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml index 19768f8dc2..0891109136 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml @@ -173,6 +173,15 @@ - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_dtiger +- type: marking + id: LizardTailAquatic + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Reptilian] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: tail_aquatic + - type: marking id: LizardSnoutRound bodyPart: Snout @@ -339,6 +348,15 @@ - sprite: Mobs/Customization/reptilian_parts.rsi state: body_backspikes +- type: marking + id: LizardChestFin + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Reptilian] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: body_fin + # Animated - type: marking id: LizardTailSmoothAnimated @@ -377,3 +395,12 @@ sprites: - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_dtiger_wagging + +- type: marking + id: LizardTailAquaticAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: tail_aquatic_wagging diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_fin.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_fin.png new file mode 100644 index 0000000000..b352e302cd Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_fin.png differ diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json index bb12e3bf03..bb2a784f4c 100644 --- a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json @@ -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. Back fin by alzore_ (Discord), Aquatic tail modified from smooth tail by alzore_ (discord). 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 @@ -27,6 +27,10 @@ "name": "tail_ltiger_front", "directions": 4 }, + { + "name": "tail_aquatic_front", + "directions": 4 + }, { "name": "tail_smooth_behind_primary", "directions": 4 @@ -55,6 +59,10 @@ "name": "tail_ltiger_behind", "directions": 4 }, + { + "name": "tail_aquatic_behind", + "directions": 4 + }, { "name": "tail_smooth_primary", "directions": 4 @@ -83,6 +91,10 @@ "name": "tail_ltiger", "directions": 4 }, + { + "name": "tail_aquatic", + "directions": 4 + }, { "name": "tail_smooth_wagging_primary", "directions": 4, @@ -473,6 +485,84 @@ ] ] }, + { + "name": "tail_aquatic_wagging", + "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": "snout_round", "directions": 4 @@ -605,6 +695,10 @@ "name": "body_backspikes", "directions": 4 }, + { + "name": "body_fin", + "directions": 4 + }, { "name": "snout_splotch_primary", "directions": 4 @@ -618,4 +712,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_aquatic.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_aquatic.png new file mode 100644 index 0000000000..ba8ac972e1 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_aquatic.png differ diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_aquatic_behind.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_aquatic_behind.png new file mode 100644 index 0000000000..167b3074de Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_aquatic_behind.png differ diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_aquatic_front.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_aquatic_front.png new file mode 100644 index 0000000000..1d6df8b5b8 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_aquatic_front.png differ diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_aquatic_wagging.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_aquatic_wagging.png new file mode 100644 index 0000000000..eba724cf50 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_aquatic_wagging.png differ