Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New books and cockspike #449

Merged
merged 23 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e80814f
Books
Devian505 Nov 12, 2023
45f9764
Merge branch 'Rxup:master' into master
Devian505 Nov 17, 2023
c3b6206
Merge branch 'Rxup:master' into master
Devian505 Nov 21, 2023
f4314ec
Merge branch 'Rxup:master' into master
Devian505 Nov 22, 2023
01f86ff
Merge branch 'Rxup:master' into master
Devian505 Nov 24, 2023
cd41629
Merge branch 'Rxup:master' into master
Devian505 Nov 27, 2023
91d6608
Merge branch 'Rxup:master' into master
Devian505 Jan 3, 2024
d88b483
Merge branch 'Rxup:master' into master
Devian505 Jan 8, 2024
7884053
Merge branch 'Rxup:master' into master
Devian505 Jan 22, 2024
a02aa1b
Merge branch 'Rxup:master' into master
Devian505 Jan 24, 2024
ade4f41
Merge branch 'Rxup:master' into master
Devian505 Feb 3, 2024
65b3ec8
Merge branch 'Rxup:master' into master
Devian505 Feb 4, 2024
43fe26e
Add new books
Devian505 Feb 4, 2024
7a14c9b
Merge branch 'Rxup:master' into feature
Devian505 Feb 5, 2024
bf7c71e
Add cockspike
Devian505 Feb 5, 2024
3f7c150
Merge branch 'Rxup:master' into master
Devian505 Feb 5, 2024
ec521c5
Fix some shit
Devian505 Feb 6, 2024
1892936
Merge branch 'Rxup:master' into master
Devian505 Feb 6, 2024
dea8d16
Merge branch 'Rxup:master' into feature
Devian505 Feb 6, 2024
8ff5682
Merge branch 'feature' of https://github.com/Devian505/space-station-14
Devian505 Feb 7, 2024
632055f
Merge branch 'master' of https://github.com/Devian505/space-station-14
Devian505 Feb 7, 2024
9f82450
Change spawn chance and translate names
Devian505 Feb 7, 2024
8079d76
Update bookshelf.yml
Kirillcas Feb 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
209 changes: 209 additions & 0 deletions Resources/Locale/ru-RU/backmen/paper/authorbooks.ftl

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ ent-BookBloodMoney = Кровавые деньги
.desc = История самой влиятельной преступной организации
ent-BookIanAndHamlet = Путешествие Гамлета и Иана
.desc = Путешествие хомяка Гамлета и Иана на космической станции
ent-BookPaperworkP6 = Бумажная работа. Ордер на любовь
.desc = Специальное издание очередной книги про бюрократов. (часть 1)
ent-BookPassionsP2 = Страсти в СБ 2
.desc = Ещё один рассказ о страстях в СБ (строго 18+)
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Original file line number Diff line number Diff line change
@@ -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
Kirillcas marked this conversation as resolved.
Show resolved Hide resolved
graph: Seat
node: chair
26 changes: 17 additions & 9 deletions Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
3 changes: 3 additions & 0 deletions Resources/Textures/Objects/Misc/books_backmen.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
},
{
"name": "paperwork_5"
},
{
"name": "paperwork_6"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading