Merge pull request #282 from Pinkbat5/newhorns

Nubby Lizard Horns
impstation · Sep 18, 2024 · 2cefa76 · 2cefa76
2 parents 8a0ac6d + d28595a
commit 2cefa76
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl
@@ -90,6 +90,9 @@ marking-LizardHornsAyrshire = Lizard Horns (Ayrshire)
 marking-LizardHornsMyrsore-horns_myrsore = Lizard Horns (Myrsore)
 marking-LizardHornsMyrsore = Lizard Horns (Myrsore)
 
+marking-LizardHornsNubby-horns_nubby = Lizard Horns (Nubby)
+marking-LizardHornsNubby = Lizard Horns (Nubby)
+
 marking-LizardHornsBighorn-horns_bighorn = Lizard Horns (Bighorn)
 marking-LizardHornsBighorn = Lizard Horns (Bighorn)
 

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -285,6 +285,15 @@
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_myrsore
 
+- type: marking
+  id: LizardHornsNubby
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_nubby
+
 - type: marking
   id: LizardHornsBighorn
   bodyPart: HeadTop

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_nubby.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_nubby.png
diff --git 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. Nubby modified from Ayrshire by Pinkbat5. 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
@@ -577,6 +577,10 @@
       "name": "horns_myrsore",
       "directions": 4
     },
+    {
+      "name": "horns_nubby",
+      "directions": 4
+    },
     {
       "name": "horns_bighorn",
       "directions": 4
@@ -618,4 +622,4 @@
       "directions": 4
     }
   ]
-}
+}