From 1b4f1ac35d8dad78661cb2511113184ced30d073 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sat, 6 Jan 2024 00:55:49 +1100 Subject: [PATCH] New moth antennae and wing pair, Underwing (#23559) * add * delete old image --- Resources/Locale/en-US/markings/moth.ftl | 7 +++++- .../Mobs/Customization/Markings/moth.yml | 22 ++++++++++++++++++ .../Moth/moth_antennas.rsi/meta.json | 10 +++++++- .../moth_antennas.rsi/underwing_primary.png | Bin 0 -> 1696 bytes .../moth_antennas.rsi/underwing_secondary.png | Bin 0 -> 1526 bytes .../Moth/moth_wings.rsi/meta.json | 10 +++++++- .../Moth/moth_wings.rsi/underwing_primary.png | Bin 0 -> 3317 bytes .../moth_wings.rsi/underwing_secondary.png | Bin 0 -> 2131 bytes 8 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/underwing_primary.png create mode 100644 Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/underwing_secondary.png create mode 100644 Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/underwing_primary.png create mode 100644 Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/underwing_secondary.png diff --git a/Resources/Locale/en-US/markings/moth.ftl b/Resources/Locale/en-US/markings/moth.ftl index 09e79475db..8e38df14e0 100644 --- a/Resources/Locale/en-US/markings/moth.ftl +++ b/Resources/Locale/en-US/markings/moth.ftl @@ -52,7 +52,9 @@ marking-MothAntennasWhitefly = Antennae (White Fly) marking-MothAntennasWitchwing-witchwing = Antennae marking-MothAntennasWitchwing = Antennae (Witch Wing) - +marking-MothAntennasUnderwing-underwing_primary = Primary +marking-MothAntennasUnderwing-underwing_secondary = Secondary +marking-MothAntennasUnderwing = Antennae (Underwing) @@ -128,6 +130,9 @@ marking-MothWingsWhitefly = Wings (White Fly) marking-MothWingsWitchwing-witchwing = Wing marking-MothWingsWitchwing = Wings (Witch Wing) +marking-MothWingsUnderwing-underwing_primary = Primary +marking-MothWingsUnderwing-underwing_secondary = Secondary +marking-MothWingsUnderwing = Wings (Underwing) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml index e7a11547c3..c1d5df2463 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml @@ -161,6 +161,17 @@ - sprite: Mobs/Customization/Moth/moth_antennas.rsi state: witchwing +- type: marking + id: MothAntennasUnderwing + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Moth] + sprites: + - sprite: Mobs/Customization/Moth/moth_antennas.rsi + state: underwing_primary + - sprite: Mobs/Customization/Moth/moth_antennas.rsi + state: underwing_secondary + # Wings - type: marking id: MothWingsDefault @@ -372,6 +383,17 @@ - sprite: Mobs/Customization/Moth/moth_wings.rsi state: witchwing +- type: marking + id: MothWingsUnderwing + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Moth] + sprites: + - sprite: Mobs/Customization/Moth/moth_wings.rsi + state: underwing_primary + - sprite: Mobs/Customization/Moth/moth_wings.rsi + state: underwing_secondary + # Body markings: # Charred - type: marking diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/meta.json b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/meta.json index 132474de96..afde361663 100644 --- a/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commits https://github.com/tgstation/tgstation/commit/b30e2934e7585bad901dd12a35d0635f1fc292c1 and https://github.com/tgstation/tgstation/commit/6b0af0febe578f47ae280781682ea7a3d77f508a, modified by https://github.com/PixelTheKermit & https://github.com/MilenVolf", + "copyright": "Taken from tgstation at commits https://github.com/tgstation/tgstation/commit/b30e2934e7585bad901dd12a35d0635f1fc292c1 and https://github.com/tgstation/tgstation/commit/6b0af0febe578f47ae280781682ea7a3d77f508a, modified by https://github.com/PixelTheKermit & https://github.com/MilenVolf, Underwing is drawn by Ubaser", "size": { "x": 32, "y": 32 @@ -78,6 +78,14 @@ { "name": "witchwing", "directions": 4 + }, + { + "name": "underwing_primary", + "directions": 4 + }, + { + "name": "underwing_secondary", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/underwing_primary.png b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/underwing_primary.png new file mode 100644 index 0000000000000000000000000000000000000000..5928de807198980fae9839c99a67ee37c333de03 GIT binary patch literal 1696 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@Xmab`HpPc6ZLt$u9~nNK8(3 z$t*6&NvsSoW?;~mSUO>^_u&AMqyDRdE?9N&$;udYI$ycORaTgxE#hhr!n!(mRvl+< zjf!Sap>Vk75BZ3Lkp&w%LJA5C1YFn!@6NH(+>udnZ+gfrrF+Mp{yffy2bbzGx zHztjj(n}Cz)4NjFZf(ACZ~oQr=|^Q=1)fP1R+H!o2yA3weOUkJa-V&lZc%tb zfL=e7&M6m9LE%kDK3`avC}dQ~;rMF8j^fvK{A+)o%*}l-IwQB>oc^s_PRtf_7f!x< z`&I>ugcL*GD<9Jk_g4$QJu5o!o6}$hQ`>uu&56$rDVA5)^Sr2j_$Qg?gDg|o)X(dc z&%Kpuo!_Yamt9;lYfmtn<7r?#@TEq0ruq6ZXaU(AKnwzxf+qt>&H|6fVqhf90%1mR zE5%I=49t0%ArU1JzCKpT`MG+DDfvmMdKI|^U|lv9RzPNMYDuC(MQ%=Bu~mhw5?F;5 zkPQ;nS5g2gDap1~itr6kaLzAERWQ>t&@)i7<5EyiuqjGOvkG!?gK7uzY?U%fN(!v> z^~=l4^~#O)@{7{-4J|D#^$m>ljf`}GDs+o0^GXscbn}XpA%?)raY-#sF3Kz@$;{7F z0GXSZlwVq6tE2?72o50bOi6~@Q&3uz1GXh4SwA%=H8(Y{q*&ij&rlzmzLLx|gbVYE zp}_$R7=4foP@4f(ZJq@s$tJ*%a;*Tm2kJkdLzBVw7MG;xBPq}~GBB{vH89dOvebwB z59oZGlw_-t%#xf`aKOR+0}esQoDx(~ka|!MAEF9XH$)WGP#b+L_S=AbZ50`mTAZI#3JP~SBQp~la9E&-B4PldBLb@q zWKnb-0U7xv`M?xal$q?ASCU#(Py|d}5F4TP;Z}ie7Q*t-yv!0iBd7sr!brN1V#ms{ zsH8l*?YcQo;E4 zmSb15gFx%UQ#qpg4>@h7uKOz1wC<{Pr}_t>rtEfgj?EKZE?GWT<;iv!@k5a3!IaM&Pc|JB!Z zCqBF?Ev;8?;1fLl@t@oA!Y#Yj`3siBes5j+Yr^YO|H>Ine2XtD_BGFGwQgGN_BGvf z-}QNS?|;8z)6T%eq0oSbSg-uxulllQY$D31H|>7LwytAMWJ~6(Z)sHF0A^>bP0l+XkKTs>rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/underwing_secondary.png b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/underwing_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..96f7e1391741b978753338b7b9caeb28c79f09d2 GIT binary patch literal 1526 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/underwing_secondary.png b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/underwing_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..9d6048827577cb8a6c620203178fbd74205970b6 GIT binary patch literal 2131 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@Xmab`HpPc6ZLt$u9~nNK8(3 z$t*6&NvsSoW?;~mSUO>^_u&AMqyDRdE?9N&$;udYI$ycORaTgxE#hhr!n!(mRvl+< zjf!Sap>Vk75BZ3Lkp&w%LJA5C1YFn!@6NH(+>udnZ+gfrrF+Mp{yffy2bbzGx zHztjj(n}Cz)4NjFZf(ACZ~oQr=|^Q=1)fP1R+H!o2yA3weOUkJa-V&lZc%tb zfL=e7&M6m9LE%kDK3`avC}dQ~;rMF8j^fvK{A+)o%*}l-IwQB>oc^s_PRtf_7f!x< z`&I>ugcL*GD<9Jk_g4$QJu5o!o6}$hQ`>uu&56$rDVA5)^Sr2j_$Qg?gDg|o)X(dc z&%Kpuo!_Yamt9;lYfmtn<7r?#@TEq0ruq6ZXaU(AKnwzxf+qt>&H|6fVqhf90%1mR zE5%I=49t0%ArU1JzCKpT`MG+DDfvmMdKI|^U|lv9RzPNMYDuC(MQ%=Bu~mhw5?F;5 zkPQ;nS5g2gDap1~itr6kaLzAERWQ>t&@)i7<5EyiuqjGOvkG!?gK7uzY?U%fN(!v> z^~=l4^~#O)@{7{-4J|D#^$m>ljf`}GDs+o0^GXscbn}XpA%?)raY-#sF3Kz@$;{7F z0GXSZlwVq6tE2?72o50bOi6~@Q&3uz1GXh4SwA%=H8(Y{q*&ij&rlzmzLLx|gbVYE zp}_$R7=4foP@4f(ZJq@s$tJ*%a;*Tm2kJkdLzBVw7MG;xBPq}~GBB{vH89dOvebwB z59oZGlw_-t%#xf`aKOR+0}esQoDx(~ka|!MAEF9XH$)WGP#b+L_S=AbZ50`mTAZI#3JP~SBQp~la9E&-B4PldBLb@q zWKnb-0U7xv`M?xal$q?ASCU#(Py|d}5F4TP;Z}ie7Q*t-yv!0iBd7sr!brN1V#ms{ zsH8l>Crjuj{XIUHu@(jCB0x3xpOdO+RYm!0)johEXKyXyk|t>9SY2Z zOx``U54dpd%hFvs<#(Q%c$8n?`S!Cysa;j^l}^D<1NL^Kso7#~YyXZf-E+IQ9u|NcdnSjlS5 zI{$qAiTXE;WhVFEma#takvVbs{r8m{FTZqo9=5u4s?_(4m|G9?SJ{bH)&5PD?RU@K ze6xb7LALJ0{-BD-y?gBxo)=mEQdqm^*bcwH`C7N;&985nH*eqNH&s8^U(cS!`J?(L z>(-mE{g(&NdYQG=E7Rcf;)@qu4R&uZ1pccKYzR?n zuQZJHjbiZWtZT91aYz??!q?;XW^Yo7Y3AC72%WO^c3VFGGxe>wdFRu$tM4wT3(P8s zYiSI3u#mAh;=aprbKf?HyA1^