Skip to content

Commit

Permalink
Merge branch 'arumoon-server' of https://git.arumoon.ru/Workbench-Tea…
Browse files Browse the repository at this point in the history
…m/space-station-14 into arumoon-server
  • Loading branch information
MilenVolf committed Sep 16, 2023
2 parents eeb9aef + 19e45e2 commit 8ecbe30
Show file tree
Hide file tree
Showing 144 changed files with 40,997 additions and 19,545 deletions.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ job-description-rd = Manage the science department, unlocking technologies, acqu
job-description-research-assistant = Learn the basics of how to research various artifacts and anomalies.
job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras and the radio. Currently available on Bagel Station and Core.
job-description-salvagespec = Use the salvage magnet to draw in derelicts & asteroids to loot and enrich the station, and fight off any space fauna along the way.
job-description-miner = Explore planetoids with abandoned stations thanks to your shuttle. Don't forget about mining ore! For rock and stone!
job-description-scientist = Research alien artifacts, unlock new technologies, upgrade machines around the station, and make everything run more efficiently.
job-description-security = Catch criminals and enemies of the station, enforce the law, and ensure that the station does not fall into disarray.
job-description-serviceworker = Learn the basics of bartending, cooking, and growing plants.
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ job-name-botanist = Botanist
job-name-bartender = Bartender
job-name-passenger = Assistant
job-name-salvagespec = Salvage specialist
job-name-miner = Miner
job-name-qm = Quartermaster
job-name-cargotech = Cargo Technician
job-name-chef = Chef
Expand Down
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 }
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.
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 = { "" }
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ ent-LockerSalvageSpecialistFilledHardsuit = { ent-LockerSalvageSpecialist }
ent-LockerSalvageSpecialistFilled = { ent-LockerSalvageSpecialist }
.suffix = Filled
.desc = { ent-LockerSalvageSpecialist.desc }
ent-LockerMinerFilled = { ent-LockerMiner }
.suffix = Filled
.desc = { ent-LockerMiner.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ ent-ClothingBeltMercWebbing = mercenarie webbing
ent-ClothingBeltSalvageWebbing = salvage rig
.desc = Universal unloading system for work in space.
.suffix = { "" }
ent-ClothingBeltMinerWebbing = mining rig
.desc = Universal unloading system for work in space.
.suffix = { "" }
ent-ClothingBeltMilitaryWebbing = chest rig
.desc = A set of tactical webbing worn by Syndicate boarding parties.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ ent-ClothingHeadHelmetBombSuit = bombsuit helmet
ent-ClothingHeadHelmetCult = cult helmet
.desc = A robust, evil-looking cult helmet.
.suffix = { "" }
ent-ClothingHeadHelmetMiner = miner hood
.desc = Imbued with despair and hopelessness.
.suffix = { "" }
ent-ClothingHeadHelmetMinerSyndie = syndie miner hood
.desc = Imbued with despair and hopelessness.
.suffix = { "" }
ent-ClothingHeadHelmetScaf = scaf helmet
.desc = A robust, strong helmet.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,24 @@ ent-ClothingOuterArmorRiot = riot suit
ent-ClothingOuterArmorBulletproof = bulletproof vest
.desc = A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent.
.suffix = { "" }
ent-ClothingOuterArmorMiner = miner armor
.desc = Will not protect you from pressure, but will help you well in the battle with space fauna.
.suffix = { "" }
ent-ClothingOuterArmorMinerSyndie = syndie miner armor
.desc = Blood red version of the miner's armor. We hope you bought it knowing what you were doing.
.suffix = { "" }
ent-ClothingOuterArmorMinerSyndieLight = syndie light miner armor
.desc = A lightweight version of miner's armor, made from dragon sinew. Thanks to ichor, you don't feel your weight
.suffix = { "" }
ent-ClothingOuterArmorMinerLight = light miner armor
.desc = A lightweight version of syndie miner's armor, made from dragon sinew. Thanks to ichor, you don't feel your weight
.suffix = { "" }
ent-ClothingOuterArmorMinerHeavy = heavy miner armor
.desc = Improved version of miner's armor. With this xeno scale, you sacrifice speed, but have more protection.
.suffix = { "" }
ent-ClothingOuterArmorMinerSyndieHeavy = syndie heavy miner armor
.desc = Improved version of syndie miner's armor. With this xeno scale, you sacrifice speed, but have more protection.
.suffix = { "" }
ent-ClothingOuterArmorReflective = reflective vest
.desc = An armored vest with advanced shielding to protect against energy weapons.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ ent-ClothingUniformJumpsuitEngineering = engineering jumpsuit
ent-ClothingUniformJumpsuitEngineeringHazard = hazard jumpsuit
.desc = Woven in a grungy, warm orange. Lets others around you know that you really mean business when it comes to work.
.suffix = { "" }
ent-ClothingUniformJumpsuitMiner = miner jumpsuit
.desc = A tattered suit, burnt in some places. Soaked in ash.
.suffix = { "" }
ent-ClothingUniformJumpsuitHoP = head of personnel's jumpsuit
.desc = Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,12 @@ ent-QuartermasterPDA = quartermaster PDA
ent-CargoPDA = cargo PDA
.desc = PDA for the guys that order the pizzas.
.suffix = { "" }
ent-SalvagePDA = salvage PDA
ent-MinerPDA = miner PDA
.desc = Smells like ash.
.suffix = { "" }
ent-SalvagePDA = salvage PDA
.desc = Smells like carps.
.suffix = { "" }
ent-BartenderPDA = bartender PDA
.desc = Smells like beer.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@ ent-MaterialDiamond = refined diamond
ent-MaterialDiamond1 = { ent-MaterialDiamond }
.suffix = Single
.desc = { ent-MaterialDiamond.desc }
ent-MaterialDragonSinew = dragon sinew
.suffix = Full
.desc = You feel the ichor pulsing within him.
ent-MaterialDragonSinew1 = { ent-MaterialDragonSinew }
.suffix = Single
.desc = { ent-MaterialDragonSinew.desc }
ent-MaterialXenoScale = xeno scale
.suffix = Full
.desc = You wouldn't want toxic blood on your skin.
ent-MaterialXenoScale1 = { ent-MaterialXenoScale }
.suffix = Single
.desc = { ent-MaterialXenoScale.desc }
ent-MaterialCotton = cotton
.suffix = Full
.desc = { ent-MaterialBase.desc }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ ent-CargoIDCard = cargo ID card
ent-SalvageIDCard = salvage ID card
.desc = { ent-IDCardStandard.desc }
.suffix = { "" }
ent-MinerIDCard = miner ID card
.desc = { ent-IDCardStandard.desc }
.suffix = { "" }
ent-QuartermasterIDCard = quartermaster ID card
.desc = { ent-IDCardStandard.desc }
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ ent-LockerQuarterMaster = quartermaster's locker
.desc = { ent-LockerBase.desc }
.suffix = { "" }
ent-LockerSalvageSpecialist = salvage specialist's equipment
.desc = Nevermind the pickaxe.
.desc = Nevermind the jetpack.
.suffix = { "" }
ent-LockerMiner = miner equipment
.desc = Nevermind the cutter.
.suffix = { "" }
ent-LockerCaptain = captain's locker
.desc = { ent-LockerBaseSecure.desc }
Expand Down
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,9 @@ uplink-carp-dehydrated-desc = Looks like a plush toy carp, but just add water an
uplink-gatfruit-seeds-name = Packet Of Gatfruit Seeds
uplink-gatfruit-seeds-desc = And who says guns don't grow on trees?
uplink-syndie-miner-armor-name = Syndie miner armor
uplink-syndie-miner-armor-desc = Syndie version of the miner's armor. We hope you bought it, the main thing you do.
uplink-rigged-boxing-gloves-name = Rigged Boxing Gloves
uplink-rigged-boxing-gloves-desc = Float like a butterfly, sting like a bee.
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ job-description-rd = Управляйте научным отделом, отк
job-description-research-assistant = Изучите основы того, как исследовать различные артефакты и аномалии.
job-description-reporter = Развлекайте и информируйте команду своей яркой журналистикой через беспроводные камеры и радио. Доступно на данный момент только на Bagel станции!
job-description-salvagespec = Используйте спасательный магнит, чтобы притягивать заброшенные объекты и астероиды, грабить и обогащать станцию, а также отбиваться от любой космической фауны по пути.
job-description-miner = Исследуйте планетоиды с заброшенными станциями, благодаря своему шаттлу. Не забывайте о добычи руды! For rock and stone!
job-description-scientist = Исследуйте инопланетные артефакты, открывайте новые технологии, улучшайте машины на станции и повышайте эффективность работы.
job-description-security = Ловите преступников и врагов станции, следите за соблюдением закона и следите за тем, чтобы на станции не произошел беспорядок.
job-description-serviceworker = Изучите основы барменства, кулинарии и выращивания растений.
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ job-name-botanist = Ботаник
job-name-bartender = Бармен
job-name-passenger = Ассистент
job-name-salvagespec = Утилизатор
job-name-miner = Шахтер
job-name-qm = Квартирмейстер
job-name-cargotech = Грузчик
job-name-chef = Шеф-повар
Expand Down
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 }
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-CrateCargoLuxuryHardsuit = ящик с роскошным шахтёрским скафандром
.desc = Наконец-то у Квартирмейстеров появился скафандр, который они могли бы назвать своим. Центком услышал вас, теперь перестаньте запрашивать.
ent-CrateCargoMinerHardsuit = ящик с шахтерским скафандром
.desc = Специальный костюм, защищающий от опасной среды с низким давлением. Создан из облегчённых материалов для столкновений с враждебной фауной обломков и экспедиций.
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
ent-CrateCargoLuxuryHardsuit = ящик с роскошным шахтёрским скафандром
.desc = Наконец-то у Квартирмейстеров появился скафандр, который они могли бы назвать своим. Центком услышал вас, теперь перестаньте запрашивать.
.suffix = { "" }
ent-CrateCargoMinerHardsuit = ящик с шахтерским скафандром
.desc = Специальный костюм, защищающий от опасной среды с низким давлением. Создан из облегчённых материалов для столкновений с враждебной фауной обломков и экспедиций.
.suffix = { "" }
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ ent-LockerSalvageSpecialistFilledHardsuit = { ent-LockerSalvageSpecialist }
ent-LockerSalvageSpecialistFilled = { ent-LockerSalvageSpecialist }
.suffix = Заполненный
.desc = { ent-LockerSalvageSpecialist.desc }
ent-LockerMinerFilled = { ent-LockerMiner }
.suffix = Заполненный
.desc = { ent-LockerMiner.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ ent-ClothingBeltMercWebbing = РПС наёмника
ent-ClothingBeltSalvageWebbing = РПС утилизаторов
.desc = Универсальная система разгрузки для работы в пространстве.
.suffix = { "" }
ent-ClothingBeltMinerWebbing = РПС шахтеров
.desc = Универсальная система разгрузки для работы в пространстве.
.suffix = { "" }
ent-ClothingBeltMilitaryWebbing = армейская РПС
.desc = Ременно-поясная система тактических ремней, которую носят абордажные группы Синдиката.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ ent-ClothingHeadHelmetSwatSyndicate = шлем спецназа
ent-ClothingHeadHelmetCult = шлем культа
.desc = Крепкий, злобно выглядящий шлем культа.
.suffix = { "" }
ent-ClothingHeadHelmetMiner = шахтерский капюшон
.desc = Пропитан безнадежностью и отчаянием.
.suffix = { "" }
ent-ClothingHeadHelmetMinerSyndie = кроваво-красный шахтерский капюшон
.desc = Пропитан безнадежностью и отчаянием.
.suffix = { "" }
ent-ClothingHeadHelmetRiot = легкий противоударный шлем
.desc = Это шлем был специально разработан для защиты в ближнем бою.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,24 @@ ent-ClothingOuterArmorRiot = противоударный костюм
ent-ClothingOuterArmorBulletproof = пуленепробиваемый жилет
.desc = Тяжелый бронежилет типа III, способный защитить владельца от традиционного огнестрельного оружия и, в незначительной степени, взрывов.
.suffix = { "" }
ent-ClothingOuterArmorMiner = шахтерская броня
.desc = Не защитит вас от давления, но хорошо поможет в битве с космической фауной.
.suffix = { "" }
ent-ClothingOuterArmorMinerSyndie = кроваво-красная шахтерская броня
.desc = Кроваво-красный вариант шахтерской брони. Мы надеемся, вы купили её, зная что делаете.
.suffix = { "" }
ent-ClothingOuterArmorMinerSyndieLight = легкая кроваво-красная шахтерская броня
.desc = Облегченная версия кроваво-красной шахтерской брони, сделанной из сухожилий дракона. Благодаря ихору вы не чувствуете свой вес.
.suffix = { "" }
ent-ClothingOuterArmorMinerLight = легкая шахтерская броня
.desc = Облегченная версия шахтерской брони, сделанной из сухожилий дракона. Благодаря ихору вы не чувствуете свой вес.
.suffix = { "" }
ent-ClothingOuterArmorMinerHeavy = тяжелая шахтерская броня
.desc = Утежеленная версия шахтерской брони. С этой чешуей ксено вы пожертвовали скоростью, но преобрели больше защиты.
.suffix = { "" }
ent-ClothingOuterArmorMinerSyndieHeavy = тяжелая кроваво-красная шахтерская броня
.desc = Утежеленная версия кроваво-красной шахтерской брони. С этой чешуей ксено вы пожертвовали скоростью, но преобрели больше защиты.
.suffix = { "" }
ent-ClothingOuterArmorReflective = отражающий бронежилет
.desc = Бронежилет с усовершенствованной защитой от энергетического оружия.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ent-ClothingOuterHardsuitMedical = скафандр главного врача
ent-ClothingOuterHardsuitRd = скафандр научного руководителя
.desc = Специальный костюм, защищающий от опасной среды с низким давлением. Имеет дополнительный слой брони.
.suffix = { "" }
ent-ClothingOuterHardsuitKm = скафандр квартирмейстера
ent-ClothingOuterHardsuitKm = скафандр шахтера
.desc = Специальный костюм, защищающий от опасной среды с низким давлением. Создан из облегчённых материалов для столкновений с враждебной фауной обломков и экспедиций.
.suffix = { "" }
ent-ClothingOuterHardsuitSalvage = скафандр утилизатора
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ ent-ClothingUniformJumpsuitEngineering = инженерный комбинезо
ent-ClothingUniformJumpsuitEngineeringHazard = защитный комбинезон
.desc = Соткан в тёплом оранжевом цвете. Даёт окружающим понять, что Вы действительно серьёзно относитесь к делу, когда речь идёт о работе.
.suffix = { "" }
ent-ClothingUniformJumpsuitMiner = шахтерский комбинезон
.desc = Потрепанный, прожженный в некоторых местах комбинезон. Пропитан пеплом.
.suffix = { "" }
ent-ClothingUniformJumpsuitHoP = комбинезон главы персонала
.desc = Довольно безвкусный и невзрачный. Идеально подходит для того, чтобы исчезнуть с лица Вселенной.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,12 @@ ent-QuartermasterPDA = КПК квартирмейстера
ent-CargoPDA = КПК грузчика
.desc = КПК для парней, заказывающих пиццу.
.suffix = { "" }
ent-SalvagePDA = КПК утилизатора
ent-MinerPDA = КПК шахтера
.desc = Пахнет пеплом.
.suffix = { "" }
ent-SalvagePDA = КПК утилизатора
.desc = Пахнет карпами.
.suffix = { "" }
ent-BartenderPDA = КПК бармена
.desc = Пахнет пивом.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@ ent-MaterialDiamond = очищенный бриллиант
ent-MaterialDiamond1 = { ent-MaterialDiamond }
.suffix = Один
.desc = { ent-MaterialDiamond.desc }
ent-MaterialDragonSinew = драконьи жилы
.suffix = Полный
.desc = Вы чувствуте пульсирующий внутри ихор.
ent-MaterialDragonSinew1 = { ent-MaterialDragonSinew }
.suffix = Один
.desc = { ent-MaterialDragonSinew.desc }
ent-MaterialXenoScale = чешуя пришельца
.suffix = Полный
.desc = Вы бы не хотели, чтобы токсичная кровь оказалась на вашей коже
ent-MaterialXenoScale1 = { ent-MaterialXenoScale }
.suffix = Один
.desc = { ent-MaterialXenoScale.desc }
ent-MaterialCotton = хлопок
.suffix = Полный
.desc = { ent-MaterialBase.desc }
Expand Down
Loading

0 comments on commit 8ecbe30

Please sign in to comment.