New books and cockspike (#449)

* Books Add books PaperWork p. 3 4 and 5. Fix book Blood Money * Add new books * Add cockspike Add cockspike * Fix some shit * Change spawn chance and translate names * Update bookshelf.yml --------- Co-authored-by: Kirillcas <[email protected]>
Rxup · Feb 7, 2024 · 89d60fd · 89d60fd
1 parent fde1cc4
commit 89d60fd
Show file tree

Hide file tree

Showing 9 changed files with 325 additions and 38 deletions.
diff --git a/Resources/Locale/ru-RU/backmen/paper/authorbooks.ftl b/Resources/Locale/ru-RU/backmen/paper/authorbooks.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/misc/authorbooks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/misc/authorbooks.ftl
@@ -28,3 +28,7 @@ ent-BookBloodMoney = Кровавые деньги
     .desc = История самой влиятельной преступной организации
 ent-BookIanAndHamlet = Путешествие Гамлета и Иана
     .desc = Путешествие хомяка Гамлета и Иана на космической станции
+ent-BookPaperworkP6 = Бумажная работа. Ордер на любовь
+    .desc = Специальное издание очередной книги про бюрократов. (часть 1)
+ent-BookPassionsP2 = Страсти в СБ 2
+    .desc = Ещё один рассказ о страстях в СБ (строго 18+)
diff --git a/Resources/Prototypes/Backmen/Entities/Objects/Misc/authorbooks.yml b/Resources/Prototypes/Backmen/Entities/Objects/Misc/authorbooks.yml
@@ -1,8 +1,8 @@
 - type: entity
   parent: BookBase
   id: BookDetectiveP1
-  name: Детективный роман
-  description: Детективный роман о жизни и предательстве (часть 1)
+  name: Detective Novel
+  description: Detective Novel about life and betrayal (part 1)
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -14,8 +14,8 @@
 - type: entity
   parent: BookBase
   id: BookDetectiveP2
-  name: Детективный роман
-  description: Детективный роман о жизни и предательстве (часть 2)
+  name: Detective Novel
+  description: Detective Novel about life and betrayal (part 2)
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -27,8 +27,8 @@
 - type: entity
   parent: BookBase
   id: BookDetectiveP3
-  name: Детективный роман
-  description: Детективный роман о жизни и предательстве (часть 3)
+  name: Detective Novel
+  description: Detective Novel about life and betrayal (part 3)
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -40,8 +40,8 @@
 - type: entity
   parent: BookBase
   id: BookPassionsP1
-  name: Страсти в СБ
-  description: Рассказ о страстях в СБ (строго 18+)
+  name: Passions in the SS
+  description: The story of the passions in the SS (only 18+)
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -53,8 +53,8 @@
 - type: entity
   parent: BookBase
   id: BookPaperworkP1
-  name: Бумажная работа
-  description: Еще одна книга из кучи про бюрократов (часть 1)
+  name: Paperwork
+  description: Another book from the pile about bureaucrats (part 1)
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -66,8 +66,8 @@
 - type: entity
   parent: BookBase
   id: BookPaperworkP2
-  name: Бумажная работа
-  description: Еще одна книга из кучи про бюрократов (часть 2)
+  name: Paperwork
+  description: Another book from the pile about bureaucrats (part 2)
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -92,8 +92,8 @@
 - type: entity
   parent: BookBase
   id: BookSelf
-  name: Самоучебник по эсперанто
-  description: Пыльная...
+  name: Esperanto Self-study guide
+  description: Dusty...
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -105,8 +105,8 @@
 - type: entity
   parent: BookBase
   id: BookKPCS
-  name: КПКС
-  description: Опять эти коммунисты...
+  name: KPCS
+  description: Those communists again...
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -118,8 +118,8 @@
 - type: entity
   parent: BookBase
   id: BookMimBobo
-  name: Мим бобо
-  description: Немой рассказ
+  name: Mime Bobo
+  description: The Silent Story
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -131,8 +131,8 @@
 - type: entity
   parent: BookBase
   id: BookBloodMoney
-  name: Кровавые деньги
-  description: История самой влиятельной преступной организации
+  name: Blood Money
+  description: The history of the most influential criminal organization
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -144,8 +144,8 @@
 - type: entity
   parent: BookBase
   id: BookIanAndHamlet
-  name: Путешествие Гамлета и Иана
-  description: Путешествие хомяка Гамлета и Иана на космической станции
+  name: The Journey of Hamlet and Ian
+  description: Hamlet and Ian's Hamster Journey on the Space Station
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -157,8 +157,8 @@
 - type: entity
   parent: BookBase
   id: BookPaperworkP3
-  name: Бумажная работа
-  description: Еще одна книга из кучи про бюрократов (часть 3)
+  name: Paperwork
+  description: Another book from the pile about bureaucrats (part 3)
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -170,8 +170,8 @@
 - type: entity
   parent: BookBase
   id: BookPaperworkP4
-  name: Бумажная работа
-  description: Еще одна книга из кучи про бюрократов (часть 4)
+  name: Paperwork
+  description: Another book from the pile about bureaucrats (part 4)
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
@@ -183,12 +183,38 @@
 - type: entity
   parent: BookBase
   id: BookPaperworkP5
-  name: Бумажная работа
-  description: Еще одна книга из кучи про бюрократов (часть 5)
+  name: Paperwork
+  description: Another book from the pile about bureaucrats (part 5)
   components:
     - type: Sprite
       sprite: Objects/Misc/books_backmen.rsi
       layers:
         - state: paperwork_5
     - type: Paper
-      content: book-text-paperwork-p5
+      content: book-text-paperwork-p5
+
+- type: entity
+  parent: BookBase
+  id: BookPaperworkP6
+  name: Paperwork. A warrant for love
+  description: A special edition of another book about bureaucrats. (part 1)
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books_backmen.rsi
+      layers:
+        - state: paperwork_6
+    - type: Paper
+      content: book-text-paperwork-p6
+
+- type: entity
+  parent: BookBase
+  id: BookPassionsP2
+  name: Passions in the SS 2
+  description: Another one story of the passions in the SS (only 18+)
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books_backmen.rsi
+      layers:
+        - state: Passions_in_the_SB
+    - type: Paper
+      content: book-text-Passions-p2
diff --git a/Resources/Prototypes/Backmen/Entities/Structures/Furniture/cock_spike.yml b/Resources/Prototypes/Backmen/Entities/Structures/Furniture/cock_spike.yml
@@ -0,0 +1,22 @@
+- type: entity
+  name: cock spike
+  id: CockSpike
+  parent: SeatBase
+  description: For all lovers of doing >w<.
+  components:
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+  - type: Anchorable
+  - type: Sprite
+    sprite: Backmen/Structures/Furniture/cock_spike.rsi
+    state: cock_spike
+  - type: Strap
+    position: Down
+    rotation: -180
+    buckleSound:
+      collection: MaleScreams
+  - type: Construction
+    graph: Seat
+    node: chair
diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -68,7 +68,8 @@
       - id: BookJourney
         prob: 0.1
       - id: BookInspiration
-        prob: 0.1   #start-backmen-books
+        prob: 0.1   
+  #start-backmen-books
       - id: BookDetectiveP1
         prob: 0.1
         orGroup: BookPool
@@ -79,19 +80,19 @@
         prob: 0.1
         orGroup: BookPool
       - id: BookPassionsP1
-        prob: 0.1
+        prob: 0.05
         orGroup: BookPool
       - id: BookPaperworkP1
-        prob: 0.1
+        prob: 0.05
         orGroup: BookPool
       - id: BookPaperworkP2
-        prob: 0.1
+        prob: 0.05
         orGroup: BookPool
       - id: BookToolboxes
         prob: 0.1
         orGroup: BookPool
       - id: BookSelf
-        prob: 0.1
+        prob: 0.05
         orGroup: BookPool
       - id: BookKPCS
         prob: 0.1
@@ -100,20 +101,27 @@
         prob: 0.1
         orGroup: BookPool
       - id: BookBloodMoney
-        prob: 0.1
+        prob: 0.05
         orGroup: BookPool
       - id: BookIanAndHamlet
         prob: 0.1
         orGroup: BookPool
       - id: BookPaperworkP3
-        prob: 0.1
+        prob: 0.05
         orGroup: BookPool
       - id: BookPaperworkP4
-        prob: 0.1
+        prob: 0.05
         orGroup: BookPool
       - id: BookPaperworkP5
-        prob: 0.1
+        prob: 0.05
+        orGroup: BookPool
+      - id: BookPassionsP2
+        prob: 0.05
+        orGroup: BookPool
+      - id: BookPaperworkP6
+        prob: 0.05
         orGroup: BookPool
+  #end-backmen-books
       - id: BookBusido # Corvax-Books
         prob: 0.1
         orGroup: BookPool

diff --git a/Resources/Textures/Backmen/Structures/Furniture/cock_spike.rsi/cock_spike.png b/Resources/Textures/Backmen/Structures/Furniture/cock_spike.rsi/cock_spike.png
diff --git a/Resources/Textures/Backmen/Structures/Furniture/cock_spike.rsi/meta.json b/Resources/Textures/Backmen/Structures/Furniture/cock_spike.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+    "version" : 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/ed4fbf117973dafea6e654bee7efdc2316bc2d8d ,modifed by Devian505.",
+    "size": {
+        "x": 32,
+        "y": 32
+      },
+      "states" : [
+        {
+           "directions" : 1,
+           "name" : "cock_spike"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Misc/books_backmen.rsi/meta.json b/Resources/Textures/Objects/Misc/books_backmen.rsi/meta.json
@@ -51,6 +51,9 @@
       },
       {
         "name": "paperwork_5"
+      },
+      {
+        "name": "paperwork_6"
       }
   ]
 }
diff --git a/Resources/Textures/Objects/Misc/books_backmen.rsi/paperwork_6.png b/Resources/Textures/Objects/Misc/books_backmen.rsi/paperwork_6.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,9 @@ @@
           },
           {
             "name": "paperwork_5"
+          },
+          {
+            "name": "paperwork_6"
           }
       ]
     }