-
Notifications
You must be signed in to change notification settings - Fork 50
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
Rework Офицера Синего Щита #705
Merged
Merged
Changes from 8 commits
Commits
Show all changes
46 commits
Select commit
Hold shift + click to select a range
73b82e0
Blabla
ITamiokiI 3c4fddf
Fixes
ITamiokiI 2632b86
MEOW
Ratyyy 77ace24
MEOWPS
Ratyyy 564c5bb
Meow
ITamiokiI 2a3d98a
minifix
Ratyyy 963ff7a
Merge branch 'BSH' of https://github.com/ITamiokiI/space_station into…
Ratyyy ca094c7
Merge branch 'master' into BSH
Ratyyy e3d9822
Удаление копии локали ID карт.
ITamiokiI 1181c23
Fix YAMLiner
Schrodinger71 7d7ebe3
RATATATATTATATA
ITamiokiI 6ac04c5
L
ITamiokiI 057657a
Ch
ITamiokiI 582eeb2
mewps
Ratyyy a95cfdb
mewps
Ratyyy e294563
Merge branch 'BSH' of https://github.com/ITamiokiI/space_station into…
Schrodinger71 ce13057
Носки ОСЩ
Schrodinger71 8c99479
Merge pull request #1 from Schrodinger71/blue_sheald
ITamiokiI 413d3b2
Фикс дубликата id: ADTClothingBeltAssault
Schrodinger71 9150f1c
и ещё один дубликат..
Schrodinger71 6a8fb3b
id: JobADTBlueShieldOfficer дубликат
Schrodinger71 85875f8
Update satchels.yml
Schrodinger71 dd52a35
Вернул текстуры
Schrodinger71 e9ad072
fix
Schrodinger71 81d2340
не используйте - type: BasicEntityAmmoProvider
Schrodinger71 501536c
MicroRoflFixes
ITamiokiI 3feec85
Dmgfix
ITamiokiI 3268721
Merge branch 'master' into BSH
Schrodinger71 e65162b
Merge branch 'master' into BSH
ITamiokiI 41db3c7
добавил строку - type: entity
Schrodinger71 4b5df39
Rofls
ITamiokiI a3f3acf
Merge branch 'BSH' of https://github.com/ITamiokiI/space_station into…
ITamiokiI 7b98cbc
Fix impact effect
ITamiokiI 5b77958
Fuckoff
ITamiokiI ca1a4f4
Lightfix
ITamiokiI 99c846d
Suka blyat
ITamiokiI 46d6e78
ТА ти заебав + Респрайт Чёрного берета.
ITamiokiI 4c40220
Suka
ITamiokiI c4064ef
fix
Ratyyy 314fddb
fix?
Ratyyy 00798fe
uhhh?
Ratyyy 2ce8283
uh?
Ratyyy b1c6be8
what if....
Ratyyy 89c0dd8
hmmm....
Ratyyy 4e17bee
ADD changelog
ITamiokiI c7c65a3
Merge branch 'BSH' of https://github.com/ITamiokiI/space_station into…
ITamiokiI File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,5 @@ | ||
ent-ADTClothingEyesGlassesPink = розовые очки | ||
.desc = Не замечай недостатков этого мира. | ||
.desc = Не замечай недостатков этого мира. | ||
|
||
ent-ClothingEyesGlassesBlueshield = очки офицера синего щита | ||
.desc = Продвинутые охранные очки, оснащённые не только охранным HUD, но и медицинским, давая полные показатели здоровья цели, но и защищая от вспышек. |
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
5 changes: 4 additions & 1 deletion
5
Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/Armor/blueshield_armor.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
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
127 changes: 127 additions & 0 deletions
127
Resources/Locale/ru-RU/ADT/Objects/Misc/identification_cards.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,127 @@ | ||
ent-IDCardStandard = ID карта | ||
.desc = Карта, необходимая для доступа в различные области станции. | ||
ent-PassengerIDCard = ID карта пассажира | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-TechnicalAssistantIDCard = ID карта инженера-стажера | ||
.desc = { ent-PassengerIDCard.desc } | ||
ent-MedicalInternIDCard = ID карта врача-интерна | ||
.desc = { ent-PassengerIDCard.desc } | ||
ent-ResearchAssistantIDCard = ID карта лаборанта | ||
.desc = { ent-PassengerIDCard.desc } | ||
ent-SecurityCadetIDCard = ID карта кадета СБ | ||
.desc = { ent-PassengerIDCard.desc } | ||
ent-ServiceWorkerIDCard = ID карта обслуживающего персонала | ||
.desc = { ent-PassengerIDCard.desc } | ||
ent-CaptainIDCard = ID карта капитана | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-SecurityIDCard = ID карта службы безопасности | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-WardenIDCard = ID карта смотрителя | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-EngineeringIDCard = ID карта инженера | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-MedicalIDCard = ID карта медика | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-ParamedicIDCard = ID карта парамедика | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-ChemistIDCard = ID карта химика | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-CargoIDCard = ID карта грузчика | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-SalvageIDCard = ID карта утилизатора | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-QuartermasterIDCard = ID карта квартирмейстера | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-ResearchIDCard = ID карта учёного | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-ClownIDCard = ID карта клоуна | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-MimeIDCard = ID карта мима | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-ChaplainIDCard = ID карта священика | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-JanitorIDCard = ID карта уборщика | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-BartenderIDCard = ID карта бармена | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-ChefIDCard = ID карта шеф-повара | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-BotanistIDCard = ID карта ботаника | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-LibrarianIDCard = ID карта библиотекаря | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-LawyerIDCard = ID карта адвоката | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-HoPIDCard = ID карта главы персонала | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-CEIDCard = ID карта старшего инженера | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-CMOIDCard = ID карта главного врача | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-RDIDCard = ID карта научного руководителя | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-HoSIDCard = ID карта главы службы безопасности | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-BrigmedicIDCard = ID карта бригмедика | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-CentcomIDCard = ID карта старшего офицера | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-ERTLeaderIDCard = ID карта ОБР | ||
.desc = { ent-CentcomIDCard.desc } | ||
ent-CentcomIDCardSyndie = ID карта офицера командования | ||
.desc = { ent-IDCardStandard.desc } | ||
.suffix = Фальшивый | ||
ent-MusicianIDCard = ID карта музыканта | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-CentcomIDCardDeathsquad = ID карта эскадрона смерти | ||
.desc = { ent-CentcomIDCard.desc } | ||
ent-AgentIDCard = { ent-PassengerIDCard } | ||
.suffix = Агентская | ||
.desc = { ent-PassengerIDCard.desc } | ||
ent-NukieAgentIDCard = ID карта пассажира | ||
.suffix = Оперативники | ||
.desc = { ent-AgentIDCard.desc } | ||
ent-AtmosIDCard = ID карта атмосферного техника | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-SyndicateIDCard = ID карта Синдиката | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-PsychologistIDCard = ID карта психолога | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-ReporterIDCard = ID карта репортёра | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-BoxerIDCard = ID карта боксёра | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-ZookeeperIDCard = ID карта зоотехника | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-DetectiveIDCard = ID карта детектива | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-CBURNIDcard = ID карта РХБЗЗ | ||
.desc = { ent-CentcomIDCard.desc } | ||
ent-CluwneIDCard = ID карта клувеня | ||
.suffix = Неснимаемый | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-SeniorEngineerIDCard = ID карта бригадира | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-SeniorResearcherIDCard = ID карта доцента | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-SeniorPhysicianIDCard = ID карта ведущего врача | ||
.desc = { ent-IDCardStandard.desc } | ||
ent-SeniorOfficerIDCard = ID карта офицера-инструктора | ||
.desc = { ent-IDCardStandard.desc } | ||
|
||
ent-ADTInvestigatorIDCard = ID карта следователя СБ | ||
.desc = { ent-IDCardStandard.desc } | ||
|
||
ent-ADTPathologistIDCard = ID карта патологоанатома | ||
.desc = { ent-IDCardStandard.desc } | ||
|
||
ent-ERTChaplainIDCard = ID карта священника ОБР | ||
.desc = { ent-CentcomIDCard.desc } | ||
ent-ERTEngineerIDCard = ID карта инженера ОБР | ||
.desc = { ent-CentcomIDCard.desc } | ||
ent-ERTJanitorIDCard = ID карта уборщика ОБР | ||
.desc = { ent-CentcomIDCard.desc } | ||
ent-ERTMedicIDCard = ID карта медика ОБР | ||
.desc = { ent-CentcomIDCard.desc } | ||
ent-ERTSecurityIDCard = ID карта офицера безопасности ОБР | ||
.desc = { ent-CentcomIDCard.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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
ent-BaseWeaponCaseNTBS = оружейный кейс | ||
.suffix = ОСЩ | ||
.desc = Строгий оружейный кейс, скрывающий в себе что-то смертоносное. |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Файл с такими же переводами уже существует по этому пути:
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
А вот это дап. Я скорее всего тут ошибся. Пофикшу, это всё?