forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fixes * fix fix * no CE * issue * emergency toolbox * health scan * uplink loc * mark * mark 2 * fix mark * fix mark 2 * linter * settings
- Loading branch information
Showing
15 changed files
with
61 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/dispensers/soda.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
ent-soda_dispenser = soda dispenser | ||
# 220 Loc Fix | ||
ent-SodaDispenser = soda dispenser | ||
.desc = A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers. |
3 changes: 2 additions & 1 deletion
3
Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
ent-chem_master = ChemMaster 4000 | ||
# 220 Loc Fix | ||
ent-ChemMaster = ChemMaster 4000 | ||
.desc = An industrial grade chemical manipulator with pill and bottle production included. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,8 @@ | ||
ent-ClothingEyesEyepatch = глазная повязка | ||
.desc = Яррр. | ||
# start 220 Loc Fix | ||
ent-ClothingEyesEyepatchFlipped = { ent-ClothingEyesEyepatch } | ||
.desc = { ent-ClothingEyesEyepatch.desc } | ||
# end 220 Loc Fix | ||
ent-ClothingEyesBlindfold = повязка на глаза | ||
.desc = Полоса непроницаемого материала. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 5 additions & 3 deletions
8
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/dispensers/soda.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,8 @@ | ||
ent-soda_dispenser = раздатчик безалкоголя | ||
# start 220 Loc Fix | ||
ent-SodaDispenser = раздатчик безалкоголя | ||
.desc = Разливочный автомат с ассортиментом из газировки и ряда других популярных напитков. Имеет один слот для ёмкостей. | ||
.suffix = Заполненный | ||
ent-SodaDispenserEmpty = { ent-soda_dispenser } | ||
ent-SodaDispenserEmpty = { ent-SodaDispenser } | ||
.suffix = Пустой | ||
.desc = { ent-soda_dispenser.desc } | ||
.desc = { ent-SodaDispenser.desc } | ||
# end 220 Loc Fix |
3 changes: 2 additions & 1 deletion
3
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
ent-chem_master = ХимМастер 4000 | ||
# 220 Loc Fix | ||
ent-ChemMaster = ХимМастер 4000 | ||
.desc = Химический манипулятор промышленного класса с возможностью производства таблеток и бутылочек. |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ss220/station-events/events/meteor-swarm.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
station-event-space-dust-start-announcement = Станция проходит через облако обломков, ожидается незначительный ущерб внешнему оборудованию и обшивке. | ||
station-event-meteor-urist-start-announcement = Станция столкнулась с неопознанным роем обломков. Пожалуйста, сохраняйте спокойствие и не слушайте их. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters