diff --git a/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml index 055a5e6f1d0..6745e1e03d5 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml @@ -31,6 +31,7 @@ damage: types: Slash: 3 +# Poison: 1 # Too Stinky - type: Speech speechSounds: Alto - type: DamageOnHighSpeedImpact @@ -60,6 +61,27 @@ # tallDensity: 185 - type: ReplacementAccent accent: goblin_accent + - type: TypingIndicator + proto: goblin + - type: SlowOnDamage + speedModifierThresholds: + 60: 0.85 # 0.7 is base speed. + 80: 0.75 # 0.5 is base speed. + - type: Reactive + groups: + Flammable: [ Touch ] + Extinguish: [ Touch ] + reactions: + - reagents: [ Water, SpaceCleaner, SoapReagent ] + methods: [ Touch ] + effects: + - !type:WashCreamPieReaction + - reagents: [ Water, SpaceCleaner, SoapReagent ] + methods: [ Touch ] + effects: + - !type:Emote + emote: Scream + probability: 0.2 - type: entity save: false diff --git a/Resources/Prototypes/_NF/typing_indicator.yml b/Resources/Prototypes/_NF/typing_indicator.yml new file mode 100644 index 00000000000..1faa4df1f4d --- /dev/null +++ b/Resources/Prototypes/_NF/typing_indicator.yml @@ -0,0 +1,5 @@ +- type: typingIndicator + id: goblin + spritePath: /Textures/_NF/Effects/speech.rsi + typingState: goblin0 + offset: 0, 0.2 diff --git a/Resources/ServerInfo/Guidebook/Mobs/Goblin.xml b/Resources/ServerInfo/Guidebook/Mobs/Goblin.xml index 7ab352a80e2..3221645512f 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Goblin.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Goblin.xml @@ -7,10 +7,10 @@ They can [color=#ffa500]only[/color] eat meat and fruits, but can eat raw meat and drink blood without any ill effects. - Their small stature allows goblins to dive into toilets and mailing units. + Their small stature allows goblins to dive into toilets and mailing units. They don't like to be sprayed with water or space cleaner. - Their unarmed attacks deal Slash damage instead of Blunt. + Their unarmed attacks deal [color=red]Slash[/color] damage instead of Blunt. - Due to their unusual dietary choices goblins take [color=green]20% less Toxin damage[/color], but because of their small size they take [color=#ffa500]10% more Brute (Blunt/Slash/Piercing) damage[/color]. + Due to their unusual dietary choices goblins take [color=lime]20% less Toxin damage[/color], but because of their small size they take [color=#ffa500]10% more Brute (Blunt/Slash/Piercing) damage[/color]. diff --git a/Resources/Textures/_NF/Effects/speech.rsi/goblin0.png b/Resources/Textures/_NF/Effects/speech.rsi/goblin0.png new file mode 100644 index 00000000000..59399c7d7ca Binary files /dev/null and b/Resources/Textures/_NF/Effects/speech.rsi/goblin0.png differ diff --git a/Resources/Textures/_NF/Effects/speech.rsi/goblin1.png b/Resources/Textures/_NF/Effects/speech.rsi/goblin1.png new file mode 100644 index 00000000000..a55b767808d Binary files /dev/null and b/Resources/Textures/_NF/Effects/speech.rsi/goblin1.png differ diff --git a/Resources/Textures/_NF/Effects/speech.rsi/goblin2.png b/Resources/Textures/_NF/Effects/speech.rsi/goblin2.png new file mode 100644 index 00000000000..5320d891dbc Binary files /dev/null and b/Resources/Textures/_NF/Effects/speech.rsi/goblin2.png differ diff --git a/Resources/Textures/_NF/Effects/speech.rsi/meta.json b/Resources/Textures/_NF/Effects/speech.rsi/meta.json new file mode 100644 index 00000000000..bfff36ab804 --- /dev/null +++ b/Resources/Textures/_NF/Effects/speech.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Goblin speech bubble by ErhardSteinhauer", + "states": [ + { + "name": "goblin0", + "delays": [ + [ + 0.2, + 0.3, + 0.3, + 0.5 + ] + ] + }, + { + "name": "goblin1" + }, + { + "name": "goblin2" + } + ] +}