From: YoungThug Date: Thu, 22 May 2025 05:47:04 +0000 (-0700) Subject: Rat King Chat Indicator (#37184) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=b95bcbffedca19b6afce608f9c7c98b0308bf223;p=space-station-14.git 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 --- 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 0000000000..7f877afff5 Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/regal0.png differ diff --git a/Resources/Textures/Effects/speech.rsi/regal1.png b/Resources/Textures/Effects/speech.rsi/regal1.png new file mode 100644 index 0000000000..b900e4daf5 Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/regal1.png differ diff --git a/Resources/Textures/Effects/speech.rsi/regal2.png b/Resources/Textures/Effects/speech.rsi/regal2.png new file mode 100644 index 0000000000..c87c16b6a3 Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/regal2.png differ diff --git a/Resources/Textures/Effects/speech.rsi/regal3.png b/Resources/Textures/Effects/speech.rsi/regal3.png new file mode 100644 index 0000000000..7451dfa523 Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/regal3.png differ