From b95bcbffedca19b6afce608f9c7c98b0308bf223 Mon Sep 17 00:00:00 2001 From: YoungThug Date: Wed, 21 May 2025 22:47:04 -0700 Subject: [PATCH] Rat King Chat Indicator (#37184) * Rat King Chat Indicator * BUFFRATWHEN * Added it to the crown wawa * Ignore this * Whats the limit for stuff I can put here? * Fix da merge conflicts for real this time * WE DID ITgit add -A * Errant Requested Changes --- .../Entities/Clothing/Head/misc.yml | 4 +- .../Entities/Mobs/NPCs/regalrat.yml | 2 + Resources/Prototypes/typing_indicator.yml | 6 ++ .../Textures/Effects/speech.rsi/meta.json | 61 +++++++++++++----- .../Textures/Effects/speech.rsi/regal0.png | Bin 0 -> 474 bytes .../Textures/Effects/speech.rsi/regal1.png | Bin 0 -> 387 bytes .../Textures/Effects/speech.rsi/regal2.png | Bin 0 -> 234 bytes .../Textures/Effects/speech.rsi/regal3.png | Bin 0 -> 594 bytes 8 files changed, 56 insertions(+), 17 deletions(-) create mode 100644 Resources/Textures/Effects/speech.rsi/regal0.png create mode 100644 Resources/Textures/Effects/speech.rsi/regal1.png create mode 100644 Resources/Textures/Effects/speech.rsi/regal2.png create mode 100644 Resources/Textures/Effects/speech.rsi/regal3.png diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 22dbb17cac..a7c9e701ba 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -196,6 +196,8 @@ sprite: Clothing/Head/Misc/fancycrown.rsi - type: Clothing sprite: Clothing/Head/Misc/fancycrown.rsi + - type: TypingIndicatorClothing + proto: regal - type: MobPrice price: 3000 - type: AddAccentClothing @@ -279,7 +281,7 @@ - Hair - HeadTop - HeadSide - - FacialHair + - FacialHair - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 7b9817665c..4ba7ac7c55 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -29,6 +29,8 @@ - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] state: eyes shader: unshaded + - type: TypingIndicator + proto: regal - type: Physics bodyType: KinematicController - type: Fixtures diff --git a/Resources/Prototypes/typing_indicator.yml b/Resources/Prototypes/typing_indicator.yml index 0c8cee3c4b..2b11123f3c 100644 --- a/Resources/Prototypes/typing_indicator.yml +++ b/Resources/Prototypes/typing_indicator.yml @@ -76,3 +76,9 @@ typingState: diona0 idleState: diona0 offset: 0, 0.125 + +- type: typingIndicator + id: regal + typingState: regal0 + idleState: regal3 + offset: 0, 0.125 diff --git a/Resources/Textures/Effects/speech.rsi/meta.json b/Resources/Textures/Effects/speech.rsi/meta.json index 11e5820687..0da8a9bcb1 100644 --- a/Resources/Textures/Effects/speech.rsi/meta.json +++ b/Resources/Textures/Effects/speech.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github) | Spider sprites made by PixelTheKermit (Github) | Lizard sprites made by AmalgoMyte (Github) | Diona and Gingerbread sprites made by YoungThugSS14 (Github) | Xenoborg sprites by Samuka-c (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github) | Spider sprites made by PixelTheKermit (Github) | Lizard sprites made by AmalgoMyte (Github) | Diona, Gingerbread, and Regalsprites made by YoungThugSS14 (Github) | Xenoborg sprites by Samuka-c (Github)", "size": { "x": 32, "y": 32 @@ -29,27 +29,27 @@ { "name": "alien3", "delays": [ - [ - 0.2, - 0.3, - 0.3, - 0.5, - 0.5 - ] + [ + 0.2, + 0.3, + 0.3, + 0.5, + 0.5 ] + ] }, { "name": "alienroyal0", "delays": [ - [ - 0.2, - 0.3, - 0.3, - 0.3, - 0.3, - 0.5 - ] + [ + 0.2, + 0.3, + 0.3, + 0.3, + 0.3, + 0.5 ] + ] }, { "name": "alienroyal1" @@ -411,6 +411,35 @@ { "name": "machine2" }, + { + "name": "regal0", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.4 + ] + ] + }, + { + "name": "regal1" + }, + { + "name": "regal2" + }, + { + "name": "regal3", + "delays": [ + [ + 0.2, + 0.3, + 0.3, + 0.5, + 0.5 + ] + ] + }, { "name": "robot0", "delays": [ diff --git a/Resources/Textures/Effects/speech.rsi/regal0.png b/Resources/Textures/Effects/speech.rsi/regal0.png new file mode 100644 index 0000000000000000000000000000000000000000..7f877afff572de72e52382413a4dd25b298c1559 GIT binary patch literal 474 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zCwaO!hE&A8 zowYIdumg|lQdXwz@3uN_9Rlmr8_x`HjJcg(~hga|A3b3BbS2IJ~*D`0--n;g4uS~+% z*QQ?ad>Nt1Z><^@-M_`SXZDsW@*7Ik!s`#b|F+~`gU0&228%Cd91XLwJS-JLcQG71 w#mKN?W!n_yprzabYh)PkNt|deKfu2`Bq^Z1#5EfjRScf4elF{r5}Fto0E8{mZ~y=R literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/speech.rsi/regal1.png b/Resources/Textures/Effects/speech.rsi/regal1.png new file mode 100644 index 0000000000000000000000000000000000000000..b900e4daf5b9fef6639c95d55ac5cead70853ccd GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zZ9QEaLn`9l zPTR|S$UwqnGHXE8FCB-Yd?HtPoKG5D5qaZql<8%rvKT|HN1xA`^Hb=42B+7ms(8K#PurZcZNy=rd`iN@|!{~w;kokfe99yZLfE`RZuVZu{E zCMJn_u^%5YGq06l{4Tlc>7?6shBn_HHCwlZ^-1jEbLek>D9@xI&!3^x!fIJ$*7B4i ziq-yv-=3e+VoJ=<7$UY@SjD3t!L&uIZsOUck%Hc99=ppLNHHx|L?aj&wm*+m{C!gP S6wtK{p00i_>zopr7#IMp22x4@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/speech.rsi/regal3.png b/Resources/Textures/Effects/speech.rsi/regal3.png new file mode 100644 index 0000000000000000000000000000000000000000..7451dfa523f8ab30dc08fec98dcdf648fb5fcfff GIT binary patch literal 594 zcmV-Y0Px%3Q0skRCr$PoWV^4F%(3z9i)gfz=h@TnyOTUp)ME|=2C1S(3)f3fdJGQ%h;(2COr-u0fRQ4zUSj}Rotss+6EKTp)^(hK ztj^7<+XX+*xI>bZs0cCP5syn;&80@FjqV(^+ z3$zm>Q3c#O()N=ok=hSmhU&p6B7XPI^X-8wQu`r*SuY)`>llElGpM?p02FCe9VbB5 z8B|?P0E)D#juW8j45}_C07Y6=#|cn%23406fFiA`;{>QWgR093Xh}2r^C+jcbmZm( z&_IS7Bat6Vqc_~^NzDf^V8}E_8JjPf22jbf|9^lJKqBCqU=N->CWj7!kHTo;YI;t9 znj`3XoB%X&H9aRl%@K4xP5_#?nw}G&<_NkTCjd=cP0tBXa|B(F6M!bJrso8xIfAao g2|yE9)4Kqr$&GNfr)P2i0000 literal 0 HcmV?d00001 -- 2.51.2