Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Oni Speech Update #724

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Resources/Locale/en-US/chat/managers/chat-manager.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ chat-speech-verb-vox-1 = screeches
chat-speech-verb-vox-2 = shrieks
chat-speech-verb-vox-3 = croaks

chat-speech-verb-name-oni = Oni
chat-speech-verb-oni-1 = grunts
chat-speech-verb-oni-2 = bellows
chat-speech-verb-oni-3 = blares
chat-speech-verb-oni-4 = rumbles

chat-speech-verb-name-canine = Canine
chat-speech-verb-canine-1 = barks
chat-speech-verb-canine-2 = woofs
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/language/languages.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ language-RootSpeak-name = Rootspeak
language-RootSpeak-description = The strange whistling-style language spoken by the Diona.

language-Nekomimetic-name = Nekomimetic
language-Nekomimetic-description = To the casual observer, this language is an incomprehensible mess of broken Japanese. To the felinids, it's somehow comprehensible.
language-Nekomimetic-description = To the casual observer, this language is an incomprehensible mess of broken Japanese. To the Felinids and Oni, it's somehow comprehensible.

language-Draconic-name = Draconic
language-Draconic-description = The common language of lizard-people, composed of sibilant hisses and rattles.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
components:
- type: Speech
speechSounds: Baritone
speechVerb: Oni
- type: HumanoidAppearance
species: Oni
- type: Sprite
Expand Down Expand Up @@ -35,6 +36,8 @@
- MobLayer
- type: Stamina
critThreshold: 115
- type: TypingIndicator
proto: oni
- type: LanguageKnowledge
speaks:
- GalacticCommon
Expand Down
11 changes: 10 additions & 1 deletion Resources/Prototypes/Voice/speech_verbs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: speechVerb
- type: speechVerb
id: Default
name: chat-speech-verb-name-default
speechVerbStrings:
Expand Down Expand Up @@ -94,6 +94,15 @@
- chat-speech-verb-vox-2
- chat-speech-verb-vox-3

- type: speechVerb
id: Oni
name: chat-speech-verb-name-oni
speechVerbStrings:
- chat-speech-verb-oni-1
- chat-speech-verb-oni-2
- chat-speech-verb-oni-3
- chat-speech-verb-oni-4

- type: speechVerb
id: Plant
name: chat-speech-verb-name-plant
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/typing_indicator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,8 @@
id: slime
typingState: slime0
offset: 0, 0.125

- type: typingIndicator
id: oni
typingState: oni0
offset: 0, 0.0625
19 changes: 18 additions & 1 deletion Resources/Textures/Effects/speech.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"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)",
"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) | Oni sprites made by angelofallars and leonardo-dabepis (Github)",
"states": [
{
"name": "alien0",
Expand Down Expand Up @@ -422,6 +422,23 @@
0.4
]
]
},
{
"name": "oni0",
"delays": [
[
0.2,
0.3,
0.3,
0.5
]
]
},
{
"name": "oni1"
},
{
"name": "oni2"
}
]
}
Binary file added Resources/Textures/Effects/speech.rsi/oni0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Effects/speech.rsi/oni1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Effects/speech.rsi/oni2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading