From: Alekshhh <44923899+Alekshhh@users.noreply.github.com>
Date: Sun, 26 Mar 2023 17:50:17 +0000 (+0300)
Subject: Space Bear Round 3 (#14685)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0e5dc41fe81fc2d67cd9539068e669a6a81b90b7;p=space-station-14.git

Space Bear Round 3 (#14685)
---

diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index 27adc359e8..759717ac40 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -22,6 +22,7 @@ petting-success-tarantula = You pet {THE($target)} on {POSS-ADJ($target)} hairy
 petting-success-holo = You pet {THE($target)} on {POSS-ADJ($target)} metallic spiky head.
 petting-success-dragon = Dodging teeth, claws, and flames, you pet {THE($target)} on {POSS-ADJ($target)} massive scaled head.
 petting-success-hamster = You pet {THE($target)} on {POSS-ADJ($target)} fluffy little head.
+petting-success-bear = You reluctantly pet {THE($target)} on {POSS-ADJ($target)} mystical head.
 
 petting-failure-generic = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} aloof towards you.
 
@@ -35,6 +36,7 @@ petting-failure-sloth = You reach out to pet {THE($target)}, but {SUBJECT($targe
 petting-failure-holo = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} spikes almost impale your hand!
 petting-failure-dragon = You raise your hand, but as {THE($target)} roars, you decide you'd rather not be toasty carp food.
 petting-failure-hamster = You reach out to pet {THE($target)}, but {SUBJECT($target)} attempts to bite your finger and only your quick reflexes save you from an almost fatal injury.
+petting-failure-bear = You reach out to pet {THE($target)}, but {SUBJECT($target)} growls, making you think twice.
 
 ## Petting silicons
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
index 8b125fbd6c..25bae1d497 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
@@ -4,8 +4,6 @@
   parent: SimpleSpaceMobBase
   description: It looks friendly. Why don't you give it a hug?
   components:
-  - type: InputMover
-  - type: MobMover
   - type: HTN
     rootTask: SimpleHostileCompound
   - type: Faction
@@ -31,22 +29,13 @@
       - MobMask
       layer:
       - MobLayer
-  - type: PointLight
-    radius: 1.2
-    energy: 2
-    color: "#4faffb"
-  - type: MovementAlwaysTouching
-  - type: MobState
-    allowedStates:
-      - Alive
-      - Dead
   - type: MobThresholds
     thresholds:
       0: Alive
+      100: Critical
       150: Dead
   - type: Stamina
     excess: 150
-  - type: Appearance
   - type: DamageStateVisuals
     states:
       Alive:
@@ -64,13 +53,8 @@
       amount: 1
       prob: 0.3
   - type: Bloodstream
-    bloodMaxVolume: 500
+    bloodMaxVolume: 300
     bloodReagent: Cryoxadone
-  - type: Vocal
-    sounds:
-      Male: Bear
-      Female: Bear
-      Unsexed: Bear
   - type: CombatMode
     disarmAction:
       enabled: false
@@ -86,12 +70,32 @@
     angle: 0
     animation: WeaponArcClaw
     damage:
-      groups:
-        Brute: 15
+      types:
+        Brute: 5
+        Slash: 10
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - FootstepSound
+  - type: Puller
+    needsHands: false
   - type: ReplacementAccent
     accent: genericAggressive
+  - type: Vocal
+    sounds:
+      Unsexed: Bear
+  - type: InteractionPopup
+    successChance: 0.25
+    interactSuccessString: petting-success-bear
+    interactFailureString: petting-failure-bear
+    interactSuccessSound:
+      path: /Audio/Animals/sloth_squeak.ogg
+  - type: PointLight
+    radius: 1.2
+    energy: 2
+    color: "#4faffb"
   - type: GhostTakeoverAvailable
-    prob: 0.05
+    prob: 0.25
     name: space bear
     description: |
       You're a bear! Do bear things.
@@ -102,7 +106,7 @@
   suffix: "Salvage Ruleset"
   components:
   - type: GhostTakeoverAvailable
-    prob: 0.05
+    prob: 0.25
     name: space bear on salvage wreck
     description: |
       Defend the loot inside the salvage wreck!