From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Tue, 26 Sep 2023 02:24:09 +0000 (+1000)
Subject: 4 new Lizard Horn markings (#20496)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=527485f00daca7c5381c0210b984f543d498ddd6;p=space-station-14.git

4 new Lizard Horn markings (#20496)

* add images to .rsi

* Revert "add images to .rsi"

This reverts commit afa891ee9456c35dd88d5baa4269568286282955.

* add images to .rsi (for real now)

* other misc files
---

diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl
index a1dedc02a9..bd2725c350 100644
--- a/Resources/Locale/en-US/markings/reptilian.ftl
+++ b/Resources/Locale/en-US/markings/reptilian.ftl
@@ -72,3 +72,15 @@ marking-LizardFrillsAxolotl = Lizard Frills (Axolotl)
 
 marking-LizardFrillsHood-frills_hood = Lizard Frills (Hood)
 marking-LizardFrillsHood = Lizard Frills (Hood)
+
+marking-LizardHornsArgali-horns_argali = Lizard Horns (Argali)
+marking-LizardHornsArgali = Lizard Horns (Argali)
+
+marking-LizardHornsAyrshire-horns_ayrshire = Lizard Horns (Ayrshire)
+marking-LizardHornsAyrshire = Lizard Horns (Ayrshire)
+
+marking-LizardHornsMyrsore-horns_myrsore = Lizard Horns (Myrsore)
+marking-LizardHornsMyrsore = Lizard Horns (Myrsore)
+
+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
index 9ba620b36b..60e7f34649 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -226,3 +226,39 @@
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: r_leg_tiger
+
+- type: marking
+  id: LizardHornsArgali
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_argali
+
+- type: marking
+  id: LizardHornsAyrshire
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_ayrshire
+
+- type: marking
+  id: LizardHornsMyrsore
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_myrsore
+
+- type: marking
+  id: LizardBighorn
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_bighorn
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_argali.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_argali.png
new file mode 100644
index 0000000000..f66087be66
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_argali.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_ayrshire.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_ayrshire.png
new file mode 100644
index 0000000000..0390a1fc69
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_ayrshire.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_bighorn.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_bighorn.png
new file mode 100644
index 0000000000..9ecc93c42b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_bighorn.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_myrsore.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_myrsore.png
new file mode 100644
index 0000000000..176a619bad
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_myrsore.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
index a1bc28f701..9b4e9b5db4 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",
+  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser",
   "size": {
     "x": 32,
     "y": 32
@@ -147,6 +147,22 @@
 	  "name": "r_arm_tiger",
 	  "directions": 4
 	},
+        {
+	  "name": "horns_argali",
+	  "directions": 4
+	},
+        {
+	  "name": "horns_ayrshire",
+	  "directions": 4
+	},
+        {
+	  "name": "horns_myrsore",
+	  "directions": 4
+	},
+        {
+	  "name": "horns_bighorn",
+	  "directions": 4
+	},
 	{
 	  "name": "r_leg_tiger",
 	  "directions": 4