upd

Rxup · Apr 30, 2024 · 422895a · 422895a
1 parent 55e31b4
commit 422895a
Show file tree

Hide file tree

Showing 6 changed files with 135 additions and 40 deletions.
diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
@@ -339,11 +339,11 @@ reagent-effect-guidebook-innoculate-zombie-infection =
         *[other] cure
     } an ongoing zombie infection, and provides immunity to future infections
 
-reagent-effect-guidebook-reduce-rotting = 
+reagent-effect-guidebook-reduce-rotting =
     { $chance ->
         [1] Regenerates
         *[other] regenerate
-    } {NATURALFIXED($time, 3)} {MANY("second", $time)} of rotting
+    } {$time} {MANY("second", $time)} of rotting
 
 reagent-effect-guidebook-missing =
     { $chance ->

diff --git a/Resources/Locale/ru-RU/backmen/emote.ftl b/Resources/Locale/ru-RU/backmen/emote.ftl
@@ -0,0 +1,38 @@
+
+chat-emote-name-BCatMeow = фурри вирус эмот
+chat-emote-msg-BCatMeow = рррр...
+
+chat-emote-name-ring = ring
+chat-emote-msg-ring = rings.
+
+chat-emote-name-pew = Pew
+chat-emote-msg-pew = pews.
+
+chat-emote-name-bang = Bang
+chat-emote-msg-bang = bangs.
+
+chat-emote-name-rev = Rev
+chat-emote-msg-rev = revs.
+
+chat-emote-name-caw = Caw
+chat-emote-msg-caw = caws.
+
+chat-emote-name-hiss = Hiss
+chat-emote-msg-hiss = ШШШШШШШ
+
+chat-emote-name-mews = Mews
+chat-emote-msg-meow = мя!
+
+chat-emote-name-mew = Mew
+chat-emote-msg-mew = мяв
+
+chat-emote-name-mew = Purrs
+chat-emote-msg-mew = мурчит!
+
+chat-emote-name-growls = Growls
+chat-emote-msg-growls = рычит!
+
+
+
+
+
diff --git a/Resources/Prototypes/Backmen/Adminbuse/Polymorphs/furry_virus.yml b/Resources/Prototypes/Backmen/Adminbuse/Polymorphs/furry_virus.yml
@@ -9,9 +9,9 @@
 
 - type: emote
   id: BCatMeow
+  name: chat-emote-name-BCatMeow
   category: Vocal
-  chatMessages: [рррр...]
-
+  chatMessages: ["chat-emote-msg-BCatMeow"]
 - type: disease
   id: FurryVirus
   name: disease-proto-furry-virus

diff --git a/Resources/Prototypes/Backmen/Entities/Tools/eftpos.yml b/Resources/Prototypes/Backmen/Entities/Tools/eftpos.yml
@@ -12,7 +12,7 @@
     - type: ActivatableUI
       key: enum.EftposUiKey.Key
       singleUser: true
-      closeOnHandDeselect: false
+      requireActiveHand: false
     - type: Construction
       graph: eftpos
       node: eftpos

diff --git a/Resources/Prototypes/Backmen/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Backmen/Voice/speech_emote_sounds.yml
@@ -20,8 +20,6 @@
       collection: FelinidMews
     Meows:
       collection: FelinidMeows
-    Hisses:
-      collection: FelinidHisses
     Purrs:
       collection: FelinidPurrs
     Growls:
@@ -50,8 +48,6 @@
       collection: FelinidMews
     Meows:
       collection: FelinidMeows
-    Hisses:
-      collection: FelinidHisses
     Purrs:
       collection: FelinidPurrs
     Growls:

diff --git a/Resources/Prototypes/Backmen/Voice/speech_emotes.yml b/Resources/Prototypes/Backmen/Voice/speech_emotes.yml
@@ -2,7 +2,14 @@
 - type: emote
   id: Ring
   category: Vocal
-  chatMessages: [rings.]
+  name: chat-emote-name-ring
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: ["chat-emote-msg-ring"]
   chatTriggers:
     - ring.
     - rings.
@@ -13,7 +20,14 @@
 - type: emote
   id: Pew
   category: Vocal
-  chatMessages: [pews.]
+  name: chat-emote-name-pew
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: ["chat-emote-msg-pew"]
   chatTriggers:
     - pew.
     - pews.
@@ -22,7 +36,14 @@
 - type: emote
   id: Bang
   category: Vocal
-  chatMessages: [bangs.]
+  name: chat-emote-name-bang
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: ["chat-emote-msg-bang"]
   chatTriggers:
     - bangs.
     - bang.
@@ -33,7 +54,14 @@
 - type: emote
   id: Rev
   category: Vocal
-  chatMessages: [revs.]
+  name: chat-emote-name-rev
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: ["chat-emote-msg-rev"]
   chatTriggers:
     - revs.
     - rev.
@@ -44,7 +72,14 @@
 - type: emote
   id: Caw
   category: Vocal
-  chatMessages: [caws.]
+  name: chat-emote-name-caw
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: ["chat-emote-msg-caw"]
   chatTriggers:
     - caws.
     - caw.
@@ -56,16 +91,31 @@
 - type: emote
   id: Hiss
   category: Vocal
-  chatMessages: [ШШШШШШШ]
+  name: chat-emote-name-hiss
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: ["chat-emote-msg-hiss"]
   chatTriggers:
-    - шшш
-    - ш
-    - шш
+    - хис
+    - хисс
+    - хис!
+    - хиссс!
 
 - type: emote
   id: Mews
   category: Vocal
-  chatMessages: [мя!]
+  name: chat-emote-name-mews
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: ["chat-emote-msg-meow"]
   chatTriggers:
     - mew
     - mew.
@@ -80,7 +130,14 @@
 - type: emote
   id: Mew
   category: Vocal
-  chatMessages: [мяв]
+  name: chat-emote-name-mew
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: ["chat-emote-msg-mew"]
   chatTriggers:
     - мяв
     - мяв!
@@ -90,7 +147,14 @@
 - type: emote
   id: Meows
   category: Vocal
-  chatMessages: [мяу!]
+  name: chat-emote-name-meows
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: ["chat-emote-msg-meows"]
   chatTriggers:
     - Meows
     - Meows.
@@ -105,27 +169,17 @@
     - мяукает.
     - мяукает!
 
-
-
-- type: emote
-  id: Hisses
-  category: Vocal
-  chatMessages: [шипит!]
-  chatTriggers:
-    - шипит
-    - шипит.
-    - шипит!
-    - hiss
-    - hiss.
-    - hiss!
-    - hissing
-    - hissing.
-    - hissing!
-
 - type: emote
   id: Purrs
   category: Vocal
-  chatMessages: [мурчит!]
+  name: chat-emote-name-purrs
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: ["chat-emote-msg-purrs"]
   chatTriggers:
     - мурчит
     - мурчит.
@@ -137,7 +191,14 @@
 - type: emote
   id: Growls
   category: Vocal
-  chatMessages: [рычит!]
+  name: chat-emote-name-growls
+  whitelist:
+    components:
+    - Vocal
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: ["chat-emote-msg-growls"]
   chatTriggers:
     - рычит
     - рычит.