From 80118a3e4c71ee0d2ef6b4261814700b21dd2904 Mon Sep 17 00:00:00 2001
From: mirrorcult <lunarautomaton6@gmail.com>
Date: Sat, 16 Apr 2022 16:08:52 -0700
Subject: [PATCH] Salvage mob tweaks (#7602)

---
 .../Prototypes/Entities/Mobs/NPCs/animals.yml    |  7 +++++++
 Resources/Prototypes/Entities/Mobs/NPCs/bear.yml | 11 +++++++----
 Resources/Prototypes/Entities/Mobs/NPCs/carp.yml | 16 ++++++++++++----
 .../Prototypes/Entities/Mobs/NPCs/spacetick.yml  | 13 +++++++++++--
 Resources/Prototypes/accents.yml                 |  9 ++++++++-
 5 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index ea1e43fcfc..5d84fb7aeb 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1116,6 +1116,13 @@
     spawned:
     - id: FoodMeatSpider
       amount: 2
+  - type: CombatMode
+    disarmAction:
+      enabled: false
+      autoPopulate: false
+      name: action-name-disarm
+  - type: ReplacementAccent
+    accent: xeno
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-tarantula
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
index 5dead9de1b..4ea39d4605 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
@@ -49,6 +49,11 @@
       prob: 0.3
   - type: Bloodstream
     bloodMaxVolume: 500
+  - type: CombatMode
+    disarmAction:
+      enabled: false
+      autoPopulate: false
+      name: action-name-disarm
   - type: Temperature
     heatDamageThreshold: 500
     coldDamageThreshold: 0
@@ -59,7 +64,5 @@
     damage:
       groups:
         Brute: 15
-  - type: GhostTakeoverAvailable
-    makeSentient: true
-    name: space bear
-    description: Wreak havoc on the station's inhabitants, and disrupt salvage!
+  - type: ReplacementAccent
+    accent: genericAggressive
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index a400059c82..886571f479 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -23,7 +23,7 @@
     - shape:
         !type:PhysShapeCircle
         radius: 0.40
-      mass: 50
+      mass: 20
       mask:
       - Impassable
       - MobImpassable
@@ -55,12 +55,20 @@
       path: /Audio/Effects/bite.ogg
     damage:
       groups:
-        Brute: 20
+        Brute: 16
+  - type: CombatMode
+    disarmAction:
+      enabled: false
+      autoPopulate: false
+      name: action-name-disarm
   - type: GhostTakeoverAvailable
     makeSentient: true
     name: space carp
-    description: Wreak havoc on the station's inhabitants, and disrupt salvage!
-
+    description: |
+      If you're a salvage spawn, defend the loot inside!
+      Otherwise, wreak havoc on the station!
+  - type: ReplacementAccent
+    accent: genericAggressive
 
 - type: entity
   name: magicarp
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
index 680b70e6f1..353e0c3950 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -27,7 +27,7 @@
     - shape:
         !type:PhysShapeCircle
         radius: 0.20
-      mass: 5
+      mass: 2.5
       mask:
       - Impassable
       - MobImpassable
@@ -50,6 +50,11 @@
       amount: 1
   - type: Bloodstream
     bloodMaxVolume: 50
+  - type: CombatMode
+    disarmAction:
+      enabled: false
+      autoPopulate: false
+      name: action-name-disarm
   - type: UnarmedCombat
     range: 0.5
     arcwidth: 0
@@ -73,4 +78,8 @@
   - type: GhostTakeoverAvailable
     makeSentient: true
     name: space tick
-    description: Wreak havoc on the station's inhabitants, and disrupt salvage!
+    description: |
+      If you're a salvage spawn, defend the loot inside!
+      Otherwise, wreak havoc on the station!
+  - type: ReplacementAccent
+    accent: genericAggressive
diff --git a/Resources/Prototypes/accents.yml b/Resources/Prototypes/accents.yml
index 809fdd1fdc..45fd9491f3 100644
--- a/Resources/Prototypes/accents.yml
+++ b/Resources/Prototypes/accents.yml
@@ -45,5 +45,12 @@
     - Hiss.
     - Hisssss!
     - Hisssuuu...
-    - Sssss~
     - Hiss...!
+
+- type: accent
+  id: genericAggressive
+  words:
+  - Grr!
+  - Rrrr!
+  - Grr...
+  - Grrow!!