]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Large tail marking (#23551)
authorUbaser <134914314+UbaserB@users.noreply.github.com>
Sat, 6 Jan 2024 07:07:09 +0000 (18:07 +1100)
committerGitHub <noreply@github.com>
Sat, 6 Jan 2024 07:07:09 +0000 (18:07 +1100)
* add

* fix copyright

* large

Resources/Locale/en-US/markings/reptilian.ftl
Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large.png [new file with mode: 0644]
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_behind.png [new file with mode: 0644]
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_front.png [new file with mode: 0644]

index b466ebade0a62188eef8224b86a8447ef1081d91..10b9e36dbed6ceffe7bd7431831a400517e08815 100644 (file)
@@ -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)
 
index 1e2975bc9aa89b805e69a2447a0109c95bdc3732..81827adb8d7b46150eb0df7e45503d8b7072710a 100644 (file)
   - 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
index 604239f75f85c94c31e95cebdb303933c79b105d..763e21252956aadee022f9d321026bbff7dfdd95 100644 (file)
@@ -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
       "name": "tail_smooth_front",
       "directions": 4
     },
+    {
+      "name": "tail_large_front",
+      "directions": 4
+    },
     {
       "name": "tail_spikes_front",
       "directions": 4
       "name": "tail_smooth_behind",
       "directions": 4
     },
+    {
+      "name": "tail_large_behind",
+      "directions": 4
+    },
     {
       "name": "tail_spikes_behind",
       "directions": 4
       "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 (file)
index 0000000..46cffce
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 (file)
index 0000000..ddeaeac
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 (file)
index 0000000..5198a6b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_front.png differ