]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Two-Tone lizard snouts (#27143)
authorKittenColony <149278380+KittenColony@users.noreply.github.com>
Sun, 21 Apr 2024 06:18:33 +0000 (18:18 +1200)
committerGitHub <noreply@github.com>
Sun, 21 Apr 2024 06:18:33 +0000 (00:18 -0600)
snouts

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/snout_splotch_primary.png [new file with mode: 0644]
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_splotch_secondary.png [new file with mode: 0644]

index cfc44a4ba213b94552d260adf0e6f781ade93f52..ddd0eae62fe37a9214f0af3d8cb008d844cae408 100644 (file)
@@ -100,4 +100,8 @@ marking-LizardChestUnderbelly-body_underbelly = Lizard Chest (Underbelly)
 marking-LizardChestUnderbelly = Lizard Chest (Underbelly)
 
 marking-LizardChestBackspikes-body_backspikes = Lizard Back spikes (Four)
-marking-LizardChestBackspikes = Lizard Back spikes (Four)
\ No newline at end of file
+marking-LizardChestBackspikes = Lizard Back spikes (Four)
+
+marking-LizardSnoutSplotch = Lizard Snout (Splotch)
+marking-LizardSnoutSplotch-snout_splotch_primary = Muzzle
+marking-LizardSnoutSplotch-snout_splotch_secondary = Snoot
\ No newline at end of file
index d1ed51013a2dd03836605c4cde25f4c11f60930b..b7d9266327dba83af0fdf808b0a07c588933c537 100644 (file)
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: snout_sharp
 
+- type: marking
+  id: LizardSnoutSplotch
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: snout_splotch_primary
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: snout_splotch_secondary
+
 - type: marking
   id: LizardChestTiger
   bodyPart: Chest
index 8eaac10cd94b27909c3732ea4485e6afa7c209fa..de7b26ad6c9bb4cb795c86d02815af2775c656a3 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. Large drawn by Ubaser. Wagging tail by SonicDC.",
+  "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 drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github)",
   "size": {
     "x": 32,
     "y": 32
        {
          "name": "body_backspikes",
          "directions": 4
-       }
+       },
+    {
+      "name": "snout_splotch_primary",
+      "directions": 4
+    },
+    {
+      "name": "snout_splotch_secondary",
+      "directions": 4
+    }
   ]
 }
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_splotch_primary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_splotch_primary.png
new file mode 100644 (file)
index 0000000..0098822
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_splotch_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_splotch_secondary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_splotch_secondary.png
new file mode 100644 (file)
index 0000000..5a982ed
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/snout_splotch_secondary.png differ