Skip to content

Commit de57c21

Browse files
lexaSvarshiklexaSvarshik
authored
Merge branch 'SerbiaStrong-220:master' into master
2 parents 1022e94 + 39757e2 commit de57c21

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+221561
-199866
lines changed

‎Resources/Audio/SS220/Jukebox/Frédéric Chopin - Nocturne in E flat major, Op. 9 no. 2.ogg

1.93 MB
Binary file not shown.

‎Resources/Audio/SS220/Jukebox/Ludwig van Beethoven - Moonlight Sonata, Op. 27 No. 2.ogg

2.64 MB
Binary file not shown.

‎Resources/Audio/SS220/Jukebox/Pyotr Ilyich Tchaikovsky - Waltz of the Flowers.ogg

1.74 MB
Binary file not shown.

‎Resources/Audio/SS220/Jukebox/attributions.yml

+16
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,19 @@
3232
license: "CC-BY-3.0"
3333
copyright: "Created by Quantum_ (Feat Z.W.E.I.) for SS220"
3434
source: "https://github.com/SerbiaStrong-220"
35+
36+
- files: ["Pyotr Ilyich Tchaikovsky - Waltz of the Flowers.ogg"]
37+
license: "Custom"
38+
copyright: "PDM-1.0, European Archive"
39+
source: "https://musopen.org"
40+
41+
- files: ["Frédéric Chopin - Nocturne in E flat major, Op. 9 no. 2.ogg"]
42+
license: "Custom"
43+
copyright: "PDM-1.0, Aya Higuchi"
44+
source: "https://musopen.org"
45+
46+
- files: ["Ludwig van Beethoven - Moonlight Sonata, Op. 27 No. 2.ogg"]
47+
license: "Custom"
48+
copyright: "PDM-1.0, Paul Pitman"
49+
source: "https://musopen.org"
50+

‎Resources/Changelog/Changelog220.yml

+82-69
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,4 @@
11
Entries:
2-
- author: ReeZii
3-
changes:
4-
- message: "\u0416\u043D\u0435\u0446 \u043D\u0435 \u043B\u0435\u0447\u0438\u043B\
5-
\ \u043F\u043E\u0440\u0435\u0437\u044B \u043F\u0440\u0438 \u043F\u043E\u0435\
6-
\u0434\u0430\u043D\u0438\u0438 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0430"
7-
type: Fix
8-
id: 210
9-
time: '2024-06-30T19:45:55.0000000+00:00'
10-
url: https://github.com/SerbiaStrong-220/space-station-14/pull/1246
11-
- author: NightmareStalker
12-
changes:
13-
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0442\u0435\
14-
\u043A\u0441\u0442\u0443\u0440\u044B \u0445\u0432\u043E\u0441\u0442\u043E\u0432\
15-
\ \u0443\u043D\u0430\u0442\u0445\u043E\u0432"
16-
type: Fix
17-
id: 211
18-
time: '2024-07-03T13:49:27.0000000+00:00'
19-
url: https://github.com/SerbiaStrong-220/space-station-14/pull/1269
20-
- author: Kemran
21-
changes:
22-
- message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u044B \u0444\u043E\u0440\
23-
\u043C\u0430 \u0432 \u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u043B\u044C\
24-
\u043D\u043E\u043C \u0430\u043F\u043F\u0430\u0440\u0430\u0442\u0435 \u0426\u0435\
25-
\u043D\u0442\u041A\u043E\u043C\u0430 \u0434\u043E \u0430\u043A\u0442\u0443\u0430\
26-
\u043B\u044C\u043D\u044B\u0439 \u0432\u0435\u0440\u0441\u0438\u0439."
27-
type: Tweak
28-
id: 212
29-
time: '2024-07-03T13:42:13.0000000+00:00'
30-
url: https://github.com/SerbiaStrong-220/space-station-14/pull/1214
31-
- author: Kemran
32-
changes:
33-
- message: "\u0418\u0437\u043C\u0435\u043D\u0451\u043D \u0441\u043F\u0440\u0430\u0439\
34-
\u0442 \u0440\u0435\u0437\u0438\u043D\u043E\u0432\u043E\u0439 \u0443\u0442\u043E\
35-
\u0447\u043A\u0438."
36-
type: Tweak
37-
id: 213
38-
time: '2024-07-03T13:49:05.0000000+00:00'
39-
url: https://github.com/SerbiaStrong-220/space-station-14/pull/1268
40-
- author: ReeZii
41-
changes:
42-
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\
43-
\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0431\u043E\u0440\u0433\
44-
\u043E\u0432 \u0432 \u0437\u043E\u043D\u0434\u0435 \u043B\u043E\u0433\u043E\u0432"
45-
type: Fix
46-
id: 214
47-
time: '2024-07-03T13:48:34.0000000+00:00'
48-
url: https://github.com/SerbiaStrong-220/space-station-14/pull/1263
49-
- author: ReeZii
50-
changes:
51-
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\
52-
\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u043C\u043E\u043D\u0438\u0442\
53-
\u043E\u0440\u0430 \u043A\u0430\u043C\u0435\u0440 \u0441\u043F\u0443\u0441\u0442\
54-
\u044F \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u043E\u0435 \u0432\u0440\u0435\
55-
\u043C\u044F"
56-
type: Fix
57-
id: 215
58-
time: '2024-07-03T13:48:10.0000000+00:00'
59-
url: https://github.com/SerbiaStrong-220/space-station-14/pull/1250
60-
- author: kirus59
61-
changes:
62-
- message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u0430 \u0442\u043E\u0447\
63-
\u043D\u043E\u0441\u0442\u044C \u0410\u041A\u041C\u0421 \u0438 \u041B\u0435\u043A\
64-
\u0442\u0435\u0440\u0430 \u043F\u0440\u0438 \u043D\u0435\u043F\u0440\u0435\u0440\
65-
\u044B\u0432\u043D\u043E\u0439 \u0441\u0442\u0440\u0435\u043B\u044C\u0431\u0435\
66-
."
67-
type: Tweak
68-
id: 216
69-
time: '2024-07-03T13:44:37.0000000+00:00'
70-
url: https://github.com/SerbiaStrong-220/space-station-14/pull/1225
712
- author: Kemran
723
changes:
734
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0444\u043E\u0440\
@@ -6007,3 +5938,85 @@
60075938
id: 713
60085939
time: '2024-12-22T14:46:11.0000000+00:00'
60095940
url: https://github.com/SerbiaStrong-220/space-station-14/pull/2380
5941+
- author: stalengd, UrPrice
5942+
changes:
5943+
- message: "\u0412 \u0436\u0443\u043A\u0431\u043E\u043A\u0441 \u0434\u043E\u0431\
5944+
\u0430\u0432\u043B\u0435\u043D\u0430 \u043A\u043B\u0430\u0441\u0441\u0438\u0447\
5945+
\u0435\u0441\u043A\u0430\u044F \u043C\u0443\u0437\u044B\u043A\u0430 \u043F\u043E\
5946+
\u0434 \u043D\u043E\u0432\u043E\u0433\u043E\u0434\u043D\u044E\u044E \u0442\u0435\
5947+
\u043C\u0430\u0442\u0438\u043A\u0443."
5948+
type: Add
5949+
id: 714
5950+
time: '2024-12-23T05:29:37.0000000+00:00'
5951+
url: https://github.com/SerbiaStrong-220/space-station-14/pull/2382
5952+
- author: UrPrice
5953+
changes:
5954+
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\u0432\
5955+
\u043E\u0433\u043E\u0434\u043D\u0438\u0435 \u043F\u043E\u0434\u0430\u0440\u043A\
5956+
\u0438 \u0438 \u0433\u043E\u043B\u043E\u043F\u0430\u0434\u044B \u043D\u0430\
5957+
\ Eclipse!"
5958+
type: Add
5959+
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0433\u043E\u043B\
5960+
\u043E\u043F\u0430\u0434\u044B \u043D\u0430 Donuts!"
5961+
type: Add
5962+
id: 715
5963+
time: '2024-12-23T05:37:32.0000000+00:00'
5964+
url: https://github.com/SerbiaStrong-220/space-station-14/pull/2387
5965+
- author: VictorBoum, UrPrice
5966+
changes:
5967+
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0433\u043E\u043B\
5968+
\u043E\u043F\u0430\u0434\u044B \u0438 \u043D\u043E\u0432\u043E\u0433\u043E\u0434\
5969+
\u043D\u0438\u0435 \u0434\u0435\u043A\u043E\u0440\u0430\u0446\u0438\u0438 \u043D\
5970+
\u0430 Astro!"
5971+
type: Add
5972+
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u0437\u043E\u043D\u0430\
5973+
\ \u0421\u041C\u0430 \u043D\u0430 Astro, \u0438\u0441\u043F\u0440\u0430\u0432\
5974+
\u043B\u0435\u043D\u044B \u043D\u0435\u0434\u043E\u0447\u0451\u0442\u044B!"
5975+
type: Tweak
5976+
id: 716
5977+
time: '2024-12-23T05:38:15.0000000+00:00'
5978+
url: https://github.com/SerbiaStrong-220/space-station-14/pull/2388
5979+
- author: NightmareStalker, UrPrice
5980+
changes:
5981+
- message: "\u041D\u0430 \u043A\u0430\u0440\u0442\u0435 Axioma \u0434\u043E\u0431\
5982+
\u0430\u0432\u043B\u0435\u043D\u044B: \u0421\u041C, \u043D\u043E\u0432\u043E\
5983+
\u0433\u043E\u0434\u043D\u0438\u0435 \u0434\u0435\u043A\u043E\u0440\u0430\u0446\
5984+
\u0438\u0438 \u0438 \u0433\u043E\u043B\u043E\u043F\u0430\u0434\u044B."
5985+
type: Add
5986+
id: 717
5987+
time: '2024-12-23T05:38:00.0000000+00:00'
5988+
url: https://github.com/SerbiaStrong-220/space-station-14/pull/2368
5989+
- author: UrPrice
5990+
changes:
5991+
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0433\u043E\u043B\
5992+
\u043E\u043F\u0430\u0434\u044B \u043D\u0430: \u0448\u0430\u0442\u0442\u043B\
5993+
\ \u0421\u0411, \u0448\u0430\u0442\u0442\u043B \u041A\u0430\u0440\u0433\u043E\
5994+
, \u0448\u0430\u0442\u0442\u043B \u0423\u0442\u0438\u043B\u0438\u0437\u0430\u0442\
5995+
\u043E\u0440\u043E\u0432 \u0438 \u0442\u043E\u0440\u0433\u043E\u0432\u044B\u0439\
5996+
\ \u0430\u0432\u0430\u043D\u043F\u043E\u0441\u0442!"
5997+
type: Add
5998+
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0434\u0432\u0438\u0433\
5999+
\u0430\u0442\u0435\u043B\u0438 \u043D\u0430 \u0448\u0430\u0442\u0442\u043B\u0435\
6000+
\ \u0421\u0411!"
6001+
type: Tweak
6002+
id: 718
6003+
time: '2024-12-23T05:53:11.0000000+00:00'
6004+
url: https://github.com/SerbiaStrong-220/space-station-14/pull/2389
6005+
- author: Surani, UrPrice
6006+
changes:
6007+
- message: "\u0418\u0437\u043C\u0435\u043D\u0451\u043D \u0433\u0430\u0439\u0434\u0431\
6008+
\u0443\u043A \u041A\u0417 \u0432 \u0438\u0433\u0440\u0435."
6009+
type: Tweak
6010+
id: 719
6011+
time: '2024-12-23T06:12:46.0000000+00:00'
6012+
url: https://github.com/SerbiaStrong-220/space-station-14/pull/2090
6013+
- author: Cortez, Dinazewwr
6014+
changes:
6015+
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u044E\u0431\u043A\
6016+
\u0430 \u0432 \u043B\u043E\u0434\u0430\u0443\u0442 \u0441\u0435\u0440\u0432\u0438\
6017+
\u0441\u043D\u043E\u0433\u043E \u0440\u0430\u0431\u043E\u0442\u043D\u0438\u043A\
6018+
\u0430"
6019+
type: Add
6020+
id: 720
6021+
time: '2024-12-24T04:25:47.0000000+00:00'
6022+
url: https://github.com/SerbiaStrong-220/space-station-14/pull/2390

‎Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/holopad.ftl

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ent-HolopadMachineCircuitboard = голопад (машинная плата)
2+
.desc = Печатная плата голопада.
3+
.suffix = Машинная плата

‎Resources/Locale/ru-RU/ss220/clothing/Uniforms/jumpskirt.ftl

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
ent-ClothingUniformJumpskirtCentcomOfficerTurtleneck = водолазка с юбкой Центком
22
.desc = Версия водолазки Центком с юбкой, более редкая и востребованная, чем оригинал.
3+
ent-ClothingUniformJumpskirtWaitress = униформа официантки
4+
.desc = Униформа девочки на побегушках.

0 commit comments

Comments
 (0)