Merge branch 'add-boo-cat-figurine' into add-boo-cat-figurine-ms

MetalSage · Dec 10, 2024 · b7aa333 · b7aa333
2 parents c0badb0 + d6bd41c
commit b7aa333
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 1 deletion.
diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl
@@ -1,6 +1,11 @@
 figurines-hop-1 = Papers, please.
 figurines-hop-2 = You are fired.
 
+figurines-boo-cat-1 = Boo! Are you scared? Don't be afraid, I'm a friend, I won't hurt you.
+figurines-boo-cat-2 = Come here, come to me, sit next to me, look into my eyes.
+figurines-boo-cat-3 = Do you see me? I can see you too.
+figurines-boo-cat-4 = Don't you want to? Why? Is something wrong?
+
 figurines-passenger-1 = Insuls please.
 figurines-passenger-2 = Call evac.
 

diff --git a/Resources/Locale/ru-RU/datasets/figurines.ftl b/Resources/Locale/ru-RU/datasets/figurines.ftl
@@ -1,5 +1,9 @@
 figurines-hop-1 = Бумаги, пожалуйста.
 figurines-hop-2 = Вы уволены.
+figurines-boo-cat-1 = Бу! Испугался? Не бойся, я друг, я тебя не обижу.
+figurines-boo-cat-2 = Иди сюда, иди ко мне, посмотри мне в глаза.
+figurines-boo-cat-3 = Ты видишь меня? Я тоже тебя вижу.
+figurines-boo-cat-4 = Ты не хочешь? Почему? Что-то не так?
 figurines-passenger-1 = Изоли пожалуйста.
 figurines-passenger-2 = Вызывайте эвак.
 figurines-greytider-1 = Чувак, эта вечеринка отстой. Я, бля, ненавижу этих людей.

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/figurines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/figurines.ftl
@@ -2,6 +2,8 @@ ent-BaseFigurine = фигурка
     .desc = Небольшая миниатюра.
 ent-ToyFigurineHeadOfPersonnel = фигурка главы персонала
     .desc = Фигурка, изображающая прославленного главу всея персонала, как обычно, отсутствующего в своём кабинете.
+ent-ToyFigurineBooCat = фигурка зловещего кота
+    .desc = Фигурка, изображающая зловещего кота, который обычно обитает в темноте технических туннелей.
 ent-ToyFigurinePassenger = фигурка ассистента
     .desc = Фигурка, изображающая обычного заурядного ассистента. Никаких приколов.
 ent-ToyFigurineGreytider = фигурка грейтайдера

diff --git a/Resources/Prototypes/Datasets/figurines.yml b/Resources/Prototypes/Datasets/figurines.yml
@@ -4,6 +4,12 @@
     prefix: figurines-hop-
     count: 2
 
+- type: localizedDataset
+  id: FigurinesBooCat
+  values:
+    prefix: figurines-boo-cat-
+    count: 4
+
 - type: localizedDataset
   id: FigurinesPassenger
   values:

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -101,7 +101,7 @@
       - ToyFigurineLawyer
       - ToyFigurineCargoTech
       - ToyFigurineSalvage
-      - ToyFigurineQuartermaster   
+      - ToyFigurineQuartermaster
       - ToyFigurineChiefEngineer
       - ToyFigurineAtmosTech
       - ToyFigurineEngineer
@@ -112,6 +112,7 @@
       - ToyFigurineParamedic
       - ToyFigurineMedicalDoctor
       - ToyFigurineHeadOfPersonnel
+      - ToyFigurineBooCat
       - ToyFigurineLibrarian
       - ToyFigurineChaplain
       - ToyFigurineChef

diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
@@ -118,6 +118,9 @@
       - id: ToyFigurineRatKing
         prob: 0.30
         orGroup: SpacemenFig
+      - id: ToyFigurineBooCat
+        prob: 0.50
+        orGroup: SpacemenFig
       - id: ToyFigurineRatServant
         prob: 0.40
         orGroup: SpacemenFig

diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -33,6 +33,17 @@
   - type: SpeakOnUse
     pack: FigurinesHoP
 
+- type: entity
+  parent: BaseFigurine
+  id: ToyFigurineBooCat
+  name: sinister cat figure
+  description: A figurine depicting a sinister cat that usually lives in the darkness of technical tunnels.
+  components:
+  - type: Sprite
+    state: boo_cat
+  - type: SpeakOnUse
+    pack: FigurinesBooCat
+
 - type: entity
   parent: BaseFigurine
   id: ToyFigurinePassenger

diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/boo_cat.png b/Resources/Textures/Objects/Fun/figurines.rsi/boo_cat.png
diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/meta.json b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json
@@ -162,6 +162,9 @@
         },
         {
             "name": "figurine_spawner"
+        },
+        {
+            "name": "boo_cat"
         }
     ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -162,6 +162,9 @@ @@
             },
             {
                 "name": "figurine_spawner"
+            },
+            {
+                "name": "boo_cat"
             }
         ]
     }