]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add new lizard horns, Demonic (#29022)
authorUbaser <134914314+UbaserB@users.noreply.github.com>
Mon, 17 Jun 2024 10:53:47 +0000 (20:53 +1000)
committerGitHub <noreply@github.com>
Mon, 17 Jun 2024 10:53:47 +0000 (13:53 +0300)
add

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

index 470af07361d0d54eba8886e58994e5fa86dda95c..d66d3cb9e649c94eea4244420276ee3baaf2aa69 100644 (file)
@@ -93,6 +93,9 @@ marking-LizardHornsMyrsore = Lizard Horns (Myrsore)
 marking-LizardHornsBighorn-horns_bighorn = Lizard Horns (Bighorn)
 marking-LizardHornsBighorn = Lizard Horns (Bighorn)
 
+marking-LizardHornsDemonic-horns_demonic = Lizard Horns (Demonic)
+marking-LizardHornsDemonic = Lizard Horns (Demonic)
+
 marking-LizardHornsKoboldEars-horns_kobold_ears = Lizard Ears (Kobold)
 marking-LizardHornsKoboldEars = Lizard Ears (Kobold)
 
index 5a52e09bf2d3d7e360d941f53e57f85035d20a27..19768f8dc236b6db112be75ca727ba1d1ded1f89 100644 (file)
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_bighorn
 
+- type: marking
+  id: LizardHornsDemonic
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_demonic
+
 - type: marking
   id: LizardHornsKoboldEars
   bodyPart: HeadTop
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_demonic.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_demonic.png
new file mode 100644 (file)
index 0000000..63181ea
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_demonic.png differ
index 3770a771d8ea1f46f2d3b7f747393d308bbabe5f..bb12e3bf0378971584e3b36a2e37f5055745cca1 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. 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. 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
       "name": "horns_bighorn",
       "directions": 4
     },
+    {
+      "name": "horns_demonic",
+      "directions": 4
+    },
     {
       "name": "horns_kobold_ears",
       "directions": 4