forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'arumoon-server' of https://git.arumoon.ru/Workbench-Tea…
…m/space-station-14 into arumoon-server
- Loading branch information
Showing
144 changed files
with
40,997 additions
and
19,545 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
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
2 changes: 2 additions & 0 deletions
2
Resources/Locale/en-US/prototypes/catalog/cargo/cargo-cargo.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,4 @@ | ||
ent-CargoLuxuryHardsuit = { ent-CrateCargoLuxuryHardsuit } | ||
.desc = { ent-CrateCargoLuxuryHardsuit.desc } | ||
ent-CargoMinerHardsuit = { ent-CrateCargoMinerHardsuit } | ||
.desc = { ent-CrateCargoMinerHardsuit.desc } |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/en-US/prototypes/catalog/fills/crates/cargo-crates.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,4 @@ | ||
ent-CrateCargoLuxuryHardsuit = luxury mining hardsuit crate | ||
.desc = Finally, a hardsuit Quartermasters could call their own. Centcomm has heard you, now stop asking. | ||
ent-CrateCargoMinerHardsuit = miner hardsuit crate | ||
.desc = A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters. |
3 changes: 3 additions & 0 deletions
3
Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/cargo.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,3 +1,6 @@ | ||
ent-CrateCargoLuxuryHardsuit = { ent-CratePirate } | ||
.desc = { ent-CratePirate.desc } | ||
.suffix = { "" } | ||
ent-CrateCargoMinerHardsuit = { ent-CratePirate } | ||
.desc = { ent-CratePirate.desc } | ||
.suffix = { "" } |
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
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
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
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-cargo.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,4 @@ | ||
ent-CargoLuxuryHardsuit = { ent-CrateCargoLuxuryHardsuit } | ||
.desc = { ent-CrateCargoLuxuryHardsuit.desc } | ||
ent-CargoMinerHardsuit = { ent-CrateCargoMinerHardsuit } | ||
.desc = { ent-CrateCargoMinerHardsuit.desc } |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/prototypes/catalog/fills/crates/cargo-crates.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,4 @@ | ||
ent-CrateCargoLuxuryHardsuit = ящик с роскошным шахтёрским скафандром | ||
.desc = Наконец-то у Квартирмейстеров появился скафандр, который они могли бы назвать своим. Центком услышал вас, теперь перестаньте запрашивать. | ||
ent-CrateCargoMinerHardsuit = ящик с шахтерским скафандром | ||
.desc = Специальный костюм, защищающий от опасной среды с низким давлением. Создан из облегчённых материалов для столкновений с враждебной фауной обломков и экспедиций. |
3 changes: 3 additions & 0 deletions
3
Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/cargo.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,3 +1,6 @@ | ||
ent-CrateCargoLuxuryHardsuit = ящик с роскошным шахтёрским скафандром | ||
.desc = Наконец-то у Квартирмейстеров появился скафандр, который они могли бы назвать своим. Центком услышал вас, теперь перестаньте запрашивать. | ||
.suffix = { "" } | ||
ent-CrateCargoMinerHardsuit = ящик с шахтерским скафандром | ||
.desc = Специальный костюм, защищающий от опасной среды с низким давлением. Создан из облегчённых материалов для столкновений с враждебной фауной обломков и экспедиций. | ||
.suffix = { "" } |
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
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
Oops, something went wrong.