From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sat, 6 Jan 2024 07:07:09 +0000 (+1100) Subject: Large tail marking (#23551) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=14e15b44370afce24507c0835ebfead161472e74;p=space-station-14.git Large tail marking (#23551) * add * fix copyright * large --- diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl index b466ebade0..10b9e36dbe 100644 --- a/Resources/Locale/en-US/markings/reptilian.ftl +++ b/Resources/Locale/en-US/markings/reptilian.ftl @@ -25,6 +25,9 @@ marking-LizardHornsSimple = Lizard Horns marking-LizardTailSmooth-tail_smooth = Lizard Tail (Smooth) marking-LizardTailSmooth = Lizard Tail (Smooth) +marking-LizardTailLarge-tail_large = Lizard Tail (Large) +marking-LizardTailLarge = Lizard Tail (Large) + marking-LizardTailSpikes-tail_spikes = Lizard Tail (Spiky) marking-LizardTailSpikes = Lizard Tail (Spiky) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml index 1e2975bc9a..81827adb8d 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml @@ -126,6 +126,15 @@ - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_smooth +- type: marking + id: LizardTailLarge + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Reptilian] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: tail_large + - type: marking id: LizardTailSpikes bodyPart: Tail diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json index 604239f75f..763e212529 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 and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14.", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large is drawn by Ubaser.", "size": { "x": 32, "y": 32 @@ -11,6 +11,10 @@ "name": "tail_smooth_front", "directions": 4 }, + { + "name": "tail_large_front", + "directions": 4 + }, { "name": "tail_spikes_front", "directions": 4 @@ -27,6 +31,10 @@ "name": "tail_smooth_behind", "directions": 4 }, + { + "name": "tail_large_behind", + "directions": 4 + }, { "name": "tail_spikes_behind", "directions": 4 @@ -43,6 +51,10 @@ "name": "tail_smooth", "directions": 4 }, + { + "name": "tail_large", + "directions": 4 + }, { "name": "tail_spikes", "directions": 4 diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large.png new file mode 100644 index 0000000000..46cffce6d7 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large.png differ diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_behind.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_behind.png new file mode 100644 index 0000000000..ddeaeac18b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_behind.png differ diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_front.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_front.png new file mode 100644 index 0000000000..5198a6b5fa Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_front.png differ