From ddb09a2e4e174e866ae166a743e973fa5532bdcc Mon Sep 17 00:00:00 2001 From: "pocl.v" <24708225+Pinkbat5@users.noreply.github.com> Date: Sun, 15 Sep 2024 21:34:57 -0400 Subject: [PATCH 1/2] Adds nubby lizard horns Adds short, "nubby" horns to lizard markings. --- Resources/Locale/en-US/markings/reptilian.ftl | 3 +++ .../Mobs/Customization/Markings/reptilian.yml | 9 +++++++++ .../reptilian_parts.rsi/horns_nubby.png | Bin 0 -> 180 bytes .../Customization/reptilian_parts.rsi/meta.json | 6 +++++- 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_nubby.png diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl index d66d3cb9e649c9..76fac921092417 100644 --- 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 index 19768f8dc236b6..f597880e3f1c3c 100644 --- 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 new file mode 100644 index 0000000000000000000000000000000000000000..0d973badc97871218749c863de10b2c75cb2e378 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAP%zEY z#WAE}&f8lDIU5XkST8(Kc`J0cexBaKbXR^|Dc5_}Y=_h>|8pd`WarAxthcS78L74O z&7rKdn#bK;zT9hnwtcsi*=J6mK_IY4bFp$k`LPiD2WK`Ke^_!x2O|8VleaoWyi0xd Qw%H&7Pgg&ebxsLQ08Vf^rvLx| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json index bb12e3bf037897..fa3c47b800226c 100644 --- a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json @@ -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 } ] -} \ No newline at end of file +} From d28595acfd908a52449343d2793c3bca190ca522 Mon Sep 17 00:00:00 2001 From: "pocl.v" <24708225+Pinkbat5@users.noreply.github.com> Date: Wed, 18 Sep 2024 02:19:13 -0400 Subject: [PATCH 2/2] added credits --- .../Textures/Mobs/Customization/reptilian_parts.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json index fa3c47b800226c..eba85f95d5ddde 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, 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