Atmos crab pet: Tropico! (#22773)

* tropico mob fully functional, adjusted base crab mob

* FINALLY YES I GOT THE MAPS COMMITTED

* origin fix hopefully

* removed ghost role

* undid map changes, pulled from current master

* tropico is no longer communist

diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl
index 4a3430b0bfedd28d7d6b2edb0eefd13c9d445242..9c77ddce3ea7b9ca902e1ec00365adeb90fd0bee 100644 (file)
--- 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 a74b90d65acf12657d42a5e731efee8c635e4f55..dae14a300d2a5cc32ceebdc883987416b4d0ed18 100644 (file)
--- 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 a62d2c1b64b06d9f53da0806188d6633f50eaa60..aaff038ac525c8ce0dcbaf512476584bdd6558ba 100644 (file)
--- 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 eecf395bb195614522f9710d2df2c3956a9f1926..5e8ab3f57a76a6c17d858b765a6d7feb81da51cd 100644 (file)
--- 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 c4f3fccd51a3b257a6d0dd60764b01a40f45837b..092677d550f9d06d5806df1971876ec672a0237f 100644 (file)
--- 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 f8d37e0db0e464536142a466179044c0f3b70460..2a44bdc0334865f09fbbc4a99fee39f03c3efb6a 100644 (file)
--- 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