diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl index 4a3430b0bf..9c77ddce3e 100644 --- a/Resources/Locale/en-US/accent/accents.ftl +++ b/Resources/Locale/en-US/accent/accents.ftl @@ -99,3 +99,11 @@ accent-words-slimes-5 = Blabl blump! # Mothroach accent-words-mothroach-1 = Chirp! + +# Crab +accent-words-crab-1 = Click. +accent-words-crab-2 = Click-clack! +accent-words-crab-3 = Clack? +accent-words-crab-4 = Tipi-tap! +accent-words-crab-5 = Clik-tap. +accent-words-crab-6 = Cliliick. diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index a74b90d65a..dae14a300d 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -109,6 +109,9 @@ ghost-role-information-space-cobra-description = Space cobras really don't like ghost-role-information-salvage-cobra-name = Space cobra on salvage wreck ghost-role-information-salvage-cobra-description = Space cobras really don't like guests, and will always snack on a visitor. +ghost-role-information-tropico-name = Tropico +ghost-role-information-tropico-description = The noble companion of Atmosia, and its most stalwart defender. Viva! + ghost-role-information-guardian-name = Guardian ghost-role-information-guardian-description = Listen to your owner. Don't tank damage. Punch people hard. @@ -183,7 +186,7 @@ ghost-role-information-Death-Squad-name = Death Squad Operative ghost-role-information-Death-Squad-description = One of Nanotrasen's top internal affairs agents. Await orders from CentComm or an official. ghost-role-information-Cak-name = Cak -ghost-role-information-Cak-description = You are the chef's favorite child. You're a living cake cat. +ghost-role-information-Cak-description = You are the chef's favorite child. You're a living cake cat. ghost-role-information-Cak-rules = You are a living edible sweet cat. Your task is to find your place in this world where everything wants to eat you. ghost-role-information-BreadDog-name = BreadDog @@ -192,4 +195,4 @@ ghost-role-information-BreadDog-rules = You're an edible dog made of bread. Your ghost-role-information-exterminator-name = Exterminator ghost-role-information-exterminator-description = You been been sent back in time to terminate a target with high importance to the future. -ghost-role-information-exterminator-rules = You are an antagonist and may kill anyone that tries to stop you, but killing the target is always your top priority. +ghost-role-information-exterminator-rules = You are an antagonist and may kill anyone that tries to stop you, but killing the target is always your top priority. \ No newline at end of file diff --git a/Resources/Prototypes/Accents/full_replacements.yml b/Resources/Prototypes/Accents/full_replacements.yml index a62d2c1b64..aaff038ac5 100644 --- a/Resources/Prototypes/Accents/full_replacements.yml +++ b/Resources/Prototypes/Accents/full_replacements.yml @@ -143,3 +143,13 @@ - accent-words-slimes-3 - accent-words-slimes-4 - accent-words-slimes-5 + +- type: accent + id: crab + fullReplacements: + - accent-words-crab-1 + - accent-words-crab-2 + - accent-words-crab-3 + - accent-words-crab-4 + - accent-words-crab-5 + - accent-words-crab-6 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index eecf395bb1..5e8ab3f57a 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -127,6 +127,19 @@ prototypes: - MobCatException +- type: entity + name: Tropico Spawner + id: SpawnMobCrabAtmos + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: ai + - type: ConditionalSpawner + prototypes: + - MobCrabAtmos + - type: entity name: Floppa Spawner id: SpawnMobCatFloppa @@ -165,7 +178,7 @@ - type: ConditionalSpawner prototypes: - MobCatSpace - + - type: entity name: Kitten Spawner id: SpawnMobCatKitten diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index c4f3fccd51..092677d550 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -719,6 +719,9 @@ - MobMask layer: - MobLayer + - type: Speech + speechVerb: Arachnid + speechSounds: Arachnid - type: DamageStateVisuals states: Alive: @@ -734,6 +737,10 @@ interactSuccessString: petting-success-crab interactFailureString: petting-failure-crab interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Voice/Arachnid/arachnid_laugh.ogg + - type: ReplacementAccent + accent: crab - type: Bloodstream bloodMaxVolume: 50 bloodReagent: CopperBlood diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index f8d37e0db0..2a44bdc033 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -801,3 +801,28 @@ gender: male - type: StealTarget stealGroup: AnimalPunPun + +- type: entity + name: Tropico + parent: MobCrab + id: MobCrabAtmos + description: The noble and stalwart defender of Atmosia. Viva! + components: +# - type: GhostRole +# prob: 1 +# makeSentient: true +# allowSpeech: true +# allowMovement: true +# name: ghost-role-information-tropico-name +# description: ghost-role-information-tropico-description +# - type: GhostTakeoverAvailable +# - type: Flashable + - type: Tag + tags: + - VimPilot + - CannotSuicide + - type: Grammar + attributes: + proper: true + gender: male +# - type: AlwaysRevolutionaryConvertible