From c4962e534086f91af7de8432bd642ca20fdc3879 Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:25:37 +1000 Subject: [PATCH 1/7] replace mysta's ifrit with tribarine being ooh mama mia that's a spicy triangle --- .../Entities/Mobs/NPCs/familiars.yml | 21 ++-- .../Objects/Specific/Chapel/bibles.yml | 8 +- .../Markers/Spawners/ghost_roles.yml | 4 +- .../Mobs/Aliens/golems/triangle.rsi/meta.json | 61 ++++++++++ .../golems/triangle.rsi/triangle_base.png | Bin 0 -> 1452 bytes .../golems/triangle.rsi/triangle_flare.png | Bin 0 -> 4513 bytes .../Epistemics/mysta_book.rsi/icon.png | Bin 0 -> 852 bytes .../Epistemics/mysta_book.rsi/inhand-left.png | Bin 0 -> 830 bytes .../mysta_book.rsi/inhand-right.png | Bin 0 -> 829 bytes .../Epistemics/mysta_book.rsi/meta.json | 22 ++++ .../Objects/Tools/triangle_spice.rsi/icon.png | Bin 0 -> 816 bytes .../triangle_spice.rsi/inhand-left-flame.png | Bin 0 -> 2326 bytes .../Tools/triangle_spice.rsi/inhand-left.png | Bin 0 -> 99 bytes .../triangle_spice.rsi/inhand-right-flame.png | Bin 0 -> 2326 bytes .../Tools/triangle_spice.rsi/inhand-right.png | Bin 0 -> 99 bytes .../Tools/triangle_spice.rsi/meta.json | 115 ++++++++++++++++++ .../Tools/triangle_spice.rsi/welder_flame.png | Bin 0 -> 974 bytes 17 files changed, 216 insertions(+), 15 deletions(-) create mode 100644 Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_base.png create mode 100644 Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_flare.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left-flame.png create mode 100644 Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right-flame.png create mode 100644 Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/welder_flame.png diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml index 327214a102..1697299ba7 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml @@ -1,23 +1,26 @@ - type: entity parent: SimpleSpaceMobBase id: MobIfritFamiliar - name: Ifrit - description: The mystagogue's servant. + name: Tribarine Being + description: The mystagogue's servant, summoned from a different spacial dimension. It is difficult to look at and has the tendency to light things on fire. components: - type: Sprite drawdepth: Mobs - sprite: Mobs/Aliens/Guardians/guardians.rsi + sprite: DeltaV/Mobs/Aliens/Golems/triangle.rsi layers: - - state: magic_base + - state: triangle_base map: [ "enum.DamageStateVisualLayers.Base" ] - - state: magic_flare + - state: triangle_flare map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] color: "#40a7d7" shader: unshaded - type: RandomSprite available: - enum.DamageStateVisualLayers.BaseUnshaded: - magic_flare: Sixteen + triangle_flare: Emagged + - type: PointLight + radius: 2 + color: "#2F0A28" - type: Fixtures fixtures: fix1: @@ -93,13 +96,13 @@ - type: entity parent: WelderExperimental id: WelderIfrit - name: ifrit hand + name: description: The welding hand of an ifrit. components: - type: Sprite - sprite: Nyanotrasen/Objects/Tools/ifrit_hand.rsi + sprite: DeltaV/Objects/Tools/triangle_spice.rsi - type: Item - sprite: Nyanotrasen/Objects/Tools/ifrit_hand.rsi + sprite: DeltaV/Objects/Tools/triangle_spice.rsi - type: SolutionContainerManager solutions: Welder: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml index c3a1dfa436..232b1ece34 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml @@ -1,14 +1,14 @@ - type: entity parent: Bible id: BibleMystagogue - name: book of mysteries - description: The mystagogue's holy book. + name: field guide to advanced anomalous sciences + description: A book issued to all mystagogues, meant to prepare them for some of the more advanced concepts in epistemics. Now including a tutorial on summoning Tribarine Beings! components: - type: Summonable specialItem: SpawnPointGhostIfrit - type: Sprite - sprite: Nyanotrasen/Objects/Specific/Chapel/holylight.rsi + sprite: DeltaV/Objects/Specific/Epistemics/mysta_book.rsi state: icon - type: Item size: 15 - sprite: Nyanotrasen/Objects/Specific/Chapel/holylight.rsi + sprite: DeltaV/Objects/Specific/Epistemics/mysta_book.rsi diff --git a/Resources/Prototypes/Nyanotrasen/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Nyanotrasen/Markers/Spawners/ghost_roles.yml index c4520d8572..e38d2e3038 100644 --- a/Resources/Prototypes/Nyanotrasen/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Nyanotrasen/Markers/Spawners/ghost_roles.yml @@ -1,14 +1,14 @@ - type: entity id: SpawnPointGhostIfrit name: ghost role spawn point - suffix: Ifrit + suffix: Tribar parent: MarkerBase noSpawn: true components: - type: GhostRoleMobSpawner prototype: MobIfritFamiliar - type: GhostRole - name: Mystagogue's Ifrit + name: Mystagogue's Tribarine Being description: Obey the mystagogue. Defend the oracle. rules: You are a servant of the mystagogue. Obey them directly. - type: Sprite diff --git a/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json new file mode 100644 index 0000000000..9e1bd36e4d --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json @@ -0,0 +1,61 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "triangle_base", + "directions": 4 + }, + { + "name": "triangle_flare", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_base.png b/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_base.png new file mode 100644 index 0000000000000000000000000000000000000000..5441b4b524d897f4bf67c4b79f74e756d5bf7c10 GIT binary patch literal 1452 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 b(HRE?g85Ctb~29Vet?OQg<+k(OZ?vex1548 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1f3ac8e567790289714205e3d1ebe4f9ba1b72c2 GIT binary patch literal 852 zcmV-a1FQUrP)CCXZ;(%c~Je^EPtGP8P z_>Nu-Vg!IsX12AISl>N&wxjuKPIw1owej)pdVQUAJ}y1YUq^v*|BUPIKR+SDRYo7zpnGmp4sK zIRLJ9fzfA6=5k#M(DG{<@NoeQF6XAu!TIfRUI0a8%9w z|MAy5Vw7U2IrnfSUOQL_nF_P~;5J1D79Mp5c3xQ&EsTN!IE^q?=q6-513?FXe9q4% z#NZe35op*cC?;qw!@gU|gcSi*FcGB+sED13lOeNG4TVM)1F>P4STjNDh;{%-@v@#b z3>?gy417H73x%srF&0Cn*Hbb%PuM1LQh}U^X<8 z5C0EJgrN8Z1v4S=`Xb z2$DhoWa7*@E3q1!o)S)!h3JY%b^y5+;c^|x4!{-)lsJkk2T)=m#ZfS_)4(TSJ|`CZ z{QQ_Gr9`IzQ2G85SjZ3y{(QMflv08Y098b=_TbAG97GukQgrR~TZWqU*#s*)q758X eI2r=93IPC|$!j-agq}hG0000Y-ulHdG ziDUD(dHr2c7T|J3(OI-ztgFewi*`{LvT3 zlf=^CpSEr5l*luS9{;Fp@xRhOi^Q zH19`?#i^G~N47hK+tdlieE8vQaDJIM!~PeVqEQi?<(K_V_RmGX2YS-z`%q~{LyYyyt>U=`)S_mum6no%*~S3duNr`t+?}J z(P1ry?SHPlnicwOdv4;Ug!_gy=QyTnvlld;y=}gGjeYbK`L8#BUe8$(Q+}c2)3T*| z4?Eu3bo1Gz-BbHaUM?(p%HSV(HHu$<+Whm8oA17OF7LtO^z;+XA7?A^EN^X$h*etZ08%$)9Nz5E4lij>1e v=@TXmi_9lPGE^~V*2|nx1O-bC=NAUyw7l>?&(jTnk;35V>gTe~DWM4f-wJBX literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1490222c74d28f7e64cd1682865654062167ef0b GIT binary patch literal 829 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@XXVb`Ho)PG(@xm{>Y-ulHdG ziDUD(dHr2c7T|J3(OI-ztgFewi*`{LvT3 zlf=^CpSEr5l*luS9{;Fp@xRhOi^Q zH19`?#i^G~N47hK+tdlieE8vQaDJIM!~PeVqEQitk2jA+lfH$VQ*6&YU`IL9(+PKQ|Kj;0v z|9!2cc&+1|4?7R9nW9yBQssN9#Nl$YbHA_6iDNK#+51hizg)NTl6T=blQMnpb1lof zA3mxI*rr~z>9=aD^x2g^vUMy&8RP>arSfw<^OrBVx8|Gr?w)!pS9fne(F4D3o$~+v ztlC{Lxkz;y(7^9k_tzKX*A}=&&z?NHz~y=7Nl6vCg_!O|a{kluz!u-`BI>C*r24}6}yEOdsc8iRRPs<^yTqvU~2-SagW tPV3dBG2A%X{zL0z3j-5}g2BE6=F2UzIif#Y+6jyk22WQ%mvv4FO#lfIa4i4; literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/meta.json new file mode 100644 index 0000000000..7e47493c46 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6764c947185dc0b8e9c8c0ed4a242aebca9b3b59 GIT binary patch literal 816 zcmV-01JC@4P)CCXZ;(%c~Je^EPtGP8P z_>Nu-Vg!IsX12AISl>N&wxjuKPIw1owej)pdVQUAJ}y1YUq^v*|BUPIKR+SDRYo7zpnGmp4sK zIRLJ9fzfA6=5k#M(DG{<@NoeQ9hTj=-ju=5EIL z(26mBg>4$T2={z^%!Ag7iol?oCvL`!AOcd}L$%O2Yyje(?@#4YO;ceaP=F%JKHdQD zjN1PBd3*I&kSK1wK|w~%PLmYmH0Jxbgm4FAw0AM!jCvH*_Btj+s5JO9z;#l2~#9MnRCIxTYw`98i`7jPk0XxBw(6f z4xSAcrRTeOZ6sKQJd~=c0kw`IKlrQ^aA)2oLP|s+@boS1SgVfEvw%s2(mo@J%OW^w ut@1<>ILHAcaD_;-pZG6`jKSYLJ_0w?Va`#e$DViq0000HPBB4C0bMbrqHC?tmHQUb&wQUZaHWWz3V&Yltfm_Oco_k7Q}@7?#g_r7<- z+sj35i_R7R0MyR7I)5))sp~^oQ8s`7K1vAyAhDp6lQ$R^1^|ciujY5ScRB3tAvL*) zs}jAPyY-#4h`X}W5pD`?zQm?VkyU%+hd;(PAQj{Yx zW4GTei%5RXJM6&WeBvP8QQ^)$17~(~o%D2cHIIDNu=ZJ(mCgrU%vs zB&ota5df4t&NzSTn{?rK_BS!_Pira$_Y}*+sMJKe%rr|#Xu1DHYSqg<@tN=S{bmrV z<^5VvXl$W|vUd$)u8#Wr*|1;10{zO1Bq(JQD;4Ukz6y2 zuYyTAq~jI6QX0ux8!6c*F-xfoEn4H?k8SnKDfN^THds3`_Ww-?=RDmziBLguWts^6 zPNr4q;!ULw6wJLO$05eMIuR=@Xx&-p0bCJ5D<}BQH8lEiR`w}xB#tbdwXbVZW;)lk z%UNE3VeC+({0}stt!jr+5+|)Slp=79alFwOT12zTizWgP zIjHh>JqN;{jKkYq@e`grI{eAd>LRhA(N0_z`MaQ+Vn zX!YE)m=egNtY68Tu1XR9HF7O1uLs0-hBfP}Y!cR&fo>=T8mCB^!cRe_7<&Y$b8lbMY6yofpNwAd$fGc&?+dyX5hzBb327{mGBeWIRnVnP5!E;Rds|;sE>=NICxv|K`D$l>rXQ?F;m^DAP@W<)GCQI0+)N7Mb-(#}ox}~8 z&^n#ib)-Y9y@pau#^v7J=_$D?oPFvlZl%!y{}UOLMhiZj{d_8|{uk{w!a9-|R&uZa9HTv;svF%-)726wBU6S}s0z0RTlI zDW5^n)T63leit_8b_*^w?4eV zG}93Ix4n%ZEVeK-WFV=JceZqNVEuc?g1>C-6lhHb8n-xq4^3-F`X94V^@X+XyvB;M ze~N9+A-%LxxgQnrs;;YmE<>(qp#kIV$&>hN8u^2~2r*UWVtEN4^7a+`GzY&s| zfSqv!-T7#M-*T%2@C+_Y+80e8rR4h=2D+K=6`9fcf~;6 zE@dBK`p%Tc(J;_2CpJcUMzwS`@Dsx%8RG~ylrk7afdP|4Ii*be zGCb+3J4VnpMa~?J;?IuqnHJoZyD0W)vJ|(&gFR;>9X;moYCP45rpKTKC%nGI+W)me z^w-nVvkr2oOt^Cm!(dK_4ebfvp-uNUY Veo*6cf$Xyd&Ybdce&86K{vQ`53zGl< literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bb5db873e8b829e886eee99b8e77322bf3b59292 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G{hPZ!6K rh{JCWGBN^rO$z_l=Xp4QnD5yH6c`w%e-FP7HPBB4C0bMbrqHC?tmHQUb&wQUZaHWWz3V&Yltfm_Oco_k7Q}@7?#g_r7<- z+sj35i_R7R0MyR7I)5))sp~^oQ8s`7K1vAyAhDp6lQ$R^1^|ciujY5ScRB3tAvL*) zs}jAPyY-#4h`X}W5pD`?zQm?VkyU%+hd;(PAQj{Yx zW4GTei%5RXJM6&WeBvP8QQ^)$17~(~o%D2cHIIDNu=ZJ(mCgrU%vs zB&ota5df4t&NzSTn{?rK_BS!_Pira$_Y}*+sMJKe%rr|#Xu1DHYSqg<@tN=S{bmrV z<^5VvXl$W|vUd$)u8#Wr*|1;10{zO1Bq(JQD;4Ukz6y2 zuYyTAq~jI6QX0ux8!6c*F-xfoEn4H?k8SnKDfN^THds3`_Ww-?=RDmziBLguWts^6 zPNr4q;!ULw6wJLO$05eMIuR=@Xx&-p0bCJ5D<}BQH8lEiR`w}xB#tbdwXbVZW;)lk z%UNE3VeC+({0}stt!jr+5+|)Slp=79alFwOT12zTizWgP zIjHh>JqN;{jKkYq@e`grI{eAd>LRhA(N0_z`MaQ+Vn zX!YE)m=egNtY68Tu1XR9HF7O1uLs0-hBfP}Y!cR&fo>=T8mCB^!cRe_7<&Y$b8lbMY6yofpNwAd$fGc&?+dyX5hzBb327{mGBeWIRnVnP5!E;Rds|;sE>=NICxv|K`D$l>rXQ?F;m^DAP@W<)GCQI0+)N7Mb-(#}ox}~8 z&^n#ib)-Y9y@pau#^v7J=_$D?oPFvlZl%!y{}UOLMhiZj{d_8|{uk{w!a9-|R&uZa9HTv;svF%-)726wBU6S}s0z0RTlI zDW5^n)T63leit_8b_*^w?4eV zG}93Ix4n%ZEVeK-WFV=JceZqNVEuc?g1>C-6lhHb8n-xq4^3-F`X94V^@X+XyvB;M ze~N9+A-%LxxgQnrs;;YmE<>(qp#kIV$&>hN8u^2~2r*UWVtEN4^7a+`GzY&s| zfSqv!-T7#M-*T%2@C+_Y+80e8rR4h=2D+K=6`9fcf~;6 zE@dBK`p%Tc(J;_2CpJcUMzwS`@Dsx%8RG~ylrk7afdP|4Ii*be zGCb+3J4VnpMa~?J;?IuqnHJoZyD0W)vJ|(&gFR;>9X;moYCP45rpKTKC%nGI+W)me z^w-nVvkr2oOt^Cm!(dK_4ebfvp-uNUY Veo*6cf$Xyd&Ybdce&86K{vQ`53zGl< literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..bb5db873e8b829e886eee99b8e77322bf3b59292 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G{hPZ!6K rh{JCWGBN^rO$z_l=Xp4QnD5yH6c`w%e-FP7CCXZ;(%c~Je^EPtGP8P z_>Nu-Vg!IsX12AISl>N&wxjuKPIw1owej)pdVQUAJ}y1YUq^v*|BUPIKR+SDRYo7zpnGmp4sK zIRLJ9fzfA6=5k#M(DG{<@NoeQANA}B%|jGyh<%sRWCC7TF=GLoZRdp+~!&GRQj zTl>olJnR{Z)+UEeo5|~#YgToVW`6czSMt@0fnm=QS{us(_&T9V@0|UxPlN`m(?XpO z2Au`ac_IS`^TUPEir^x1W4(6giXN`n|Y~Tr+_3a=AjDdad_>8g0L{69zQ?>+Ba58gqbxwBrOs0SAeetusz7M`5 z2xtP9+aoFgNHwQ|<7~~*8`10{1nk|BeL0B1-z!1X0Vx5f3>@nl>Kv%%%n{gI1Og@k z0}Bv%MfsSG6o{&U;Bj;I>m{gU0HR^xfVyG@M0!zzqUNp-&%P{zdP%$VmvX6YL`y5d zFEv+VUV7}2`z|M?nro+|ssVOTEJGKdBs3{HjPZu#`nBL*&`spE$*ougz`?P%*BwUb z#v>0S?L1Hc;7FAR%aSINbpF0T7I%BIdP!^Dq7vteusu!=Ezn4RahMos^QA8~^|S07*qoM6N<$f-1$h3jhEB literal 0 HcmV?d00001 From aab812fe6fbcac8a57154e77193e65f921ef0c0e Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:32:15 +1000 Subject: [PATCH 2/7] Update familiars.yml forgot to rename the ifrit hand --- .../Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml index 1697299ba7..70bd112b95 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml @@ -96,8 +96,8 @@ - type: entity parent: WelderExperimental id: WelderIfrit - name: - description: The welding hand of an ifrit. + name: Tribarine Flame Array + description: Orbs of fire that the Tribar can use to weld things. components: - type: Sprite sprite: DeltaV/Objects/Tools/triangle_spice.rsi From 91acd881ae8f0ef568d63c181844bb4bb60e3a26 Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Thu, 28 Sep 2023 10:15:21 +1000 Subject: [PATCH 3/7] fixed folder capitalization issue but at what cost I couldn't figure out how to fix the folder capitalization issue without actually changing the files, so uhhhh here's glizzybeth --- .../Mobs/Aliens/Mysterious/glizzybeth.PNG | Bin 0 -> 20609 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/DeltaV/Mobs/Aliens/Mysterious/glizzybeth.PNG diff --git a/Resources/Textures/DeltaV/Mobs/Aliens/Mysterious/glizzybeth.PNG b/Resources/Textures/DeltaV/Mobs/Aliens/Mysterious/glizzybeth.PNG new file mode 100644 index 0000000000000000000000000000000000000000..7643f142540d9ebd92efc690d6b81722a663a399 GIT binary patch literal 20609 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 F`yaXz+{OR^ literal 0 HcmV?d00001 From 78089fa93f41fda76e76f2d6ef4d91a15734c406 Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Wed, 4 Oct 2023 07:54:46 +1000 Subject: [PATCH 4/7] Update Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> --- .../Mobs/Aliens/golems/triangle.rsi/meta.json | 44 ++----------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json index 9e1bd36e4d..4bc3b5fc67 100644 --- a/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json @@ -15,46 +15,10 @@ "name": "triangle_flare", "directions": 4, "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ] } ] From 13c0b809b167f91ae870608ac3d48d279ae0efa7 Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Wed, 4 Oct 2023 07:55:00 +1000 Subject: [PATCH 5/7] Update Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> --- .../Tools/triangle_spice.rsi/meta.json | 44 ++----------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json index 50ba8e4165..85eb4d4885 100644 --- a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json @@ -23,46 +23,10 @@ "name": "inhand-left-flame", "directions": 4, "delays": [ - [ - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13 - ], - [ - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13 - ], - [ - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13 - ], - [ - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13 - ] + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ], + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ], + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ], + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ] ] }, { From b05870a121cc3dffb838646450bf91ad0f0447e2 Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Wed, 4 Oct 2023 08:15:40 +1000 Subject: [PATCH 6/7] Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> --- .../Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml index 232b1ece34..3698970d13 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml @@ -1,7 +1,7 @@ - type: entity parent: Bible id: BibleMystagogue - name: field guide to advanced anomalous sciences + name: Field Guide to Advanced Anomalous Sciences description: A book issued to all mystagogues, meant to prepare them for some of the more advanced concepts in epistemics. Now including a tutorial on summoning Tribarine Beings! components: - type: Summonable From 621be5d936015aa912de25185144ad9153d3abac Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Wed, 4 Oct 2023 08:24:42 +1000 Subject: [PATCH 7/7] Update Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> --- .../Tools/triangle_spice.rsi/meta.json | 44 ++----------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json index 85eb4d4885..03875665bf 100644 --- a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json @@ -33,46 +33,10 @@ "name": "inhand-right-flame", "directions": 4, "delays": [ - [ - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13 - ], - [ - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13 - ], - [ - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13 - ], - [ - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13 - ] + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ], + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ], + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ], + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ] ] } ]