-
Notifications
You must be signed in to change notification settings - Fork 47
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
майор РХБЗЗ #213
Merged
Merged
майор РХБЗЗ #213
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
44356e7
майор РХБЗЗ
Darkiich 54fe65b
Rename human.ftl to humanoid.ftl
Darkiich f053392
Merge branch 'master' into maior
Darkiich 71fc8a1
ревью
Darkiich 5b84e2a
ревью
Darkiich a3c7e27
закинул перевод в humanoid, а не в ipc
Darkiich caa7939
Revert "ревью"
Darkiich 3911880
фиксим ямл
Darkiich deb4bf2
Update humanoid.yml
Darkiich 5d32d9d
перенес датасет в ADT
Darkiich 5964e4b
Merge branch 'maior' of https://github.com/Darki255/space_station_ADT…
Darkiich 2b23151
поменял звания
Darkiich 3b1e1f4
Update humanoid.ftl
Darkiich 32bf485
Update humanoid.yml
Darkiich 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
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/Ghost/Roles/ghost-role-component.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 @@ | ||
ghost-role-information-cmnd-cburn-agent-name = Майор РХБЗЗ | ||
ghost-role-information-cmnd-cburn-agent-description = Высококвалифицированный командир РХБЗЗ, способный справиться с любыми угрозами. |
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,13 @@ | ||
- type: dataset | ||
id: ADTCmndNamesFirstMilitary | ||
values: | ||
- Капитан | ||
|
||
- type: dataset | ||
id: ADTNamesFirstMilitaryRXBZZ | ||
values: | ||
- Прапорщик | ||
- Старший Прапорщик | ||
- Младший лейтенант | ||
- Лейтенант | ||
- Старший лейтенант |
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,86 @@ | ||
- type: dataset | ||
id: NamesLastERTCallsign | ||
values: | ||
#- Антарес | ||
#- Андромеда | ||
- Бейд | ||
#- Бетельгейзе | ||
- Вега | ||
#- Водолей | ||
- Гинан | ||
#- Геркулес | ||
#- Денеб | ||
#- Дракон | ||
#- Зосма | ||
#- Змееносец | ||
- Иклил | ||
- Йильдун | ||
- Канопус | ||
#- Козерог | ||
- Лабр | ||
#- Лебедь | ||
- Матар | ||
#- Микроскоп | ||
#- Нави | ||
- Нихал | ||
- Окул | ||
#- Орион | ||
#- Процион | ||
#- Персей | ||
- Ригель | ||
#- Регул | ||
#- Сириус | ||
- Саргас | ||
- Табит | ||
#- Телец | ||
- Укдах | ||
#- Фомальгаут | ||
#- Феникс | ||
- Хадар | ||
#- Хамелеон | ||
- Целена | ||
#- Центавр | ||
#- Чау | ||
- Шедар | ||
- Шаула | ||
#- Электра | ||
- Антаро | ||
- Тигурий | ||
- Сикарий | ||
- Пелеос | ||
- Кассиан | ||
- Калгар | ||
- Фабиан | ||
- Сарерван | ||
- Сардаукар | ||
- Атрейдес | ||
- Коррино | ||
- Харконен | ||
- Раббан | ||
- Абефор | ||
- Амминадаб | ||
- Багратиони | ||
- Баланеску | ||
- Бескид | ||
- Вико | ||
- Вайку | ||
- Виххейсет | ||
- Гинац | ||
- Делабре | ||
- Джуналем | ||
- Ичихара | ||
- Исфахан | ||
- Исонцо | ||
- Иставиан | ||
- Нгара | ||
- Ноабар | ||
- Оссиан | ||
- Регинауд | ||
- Сиккунри | ||
- Таглиари | ||
- Хэллек | ||
- Ши-Ланг | ||
- Эстилон | ||
- Экзекарий | ||
- Язов | ||
- Ямиаций |
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 |
---|---|---|
|
@@ -419,3 +419,39 @@ | |
settings: short | ||
- type: Loadout | ||
prototypes: [ ADTERTMedicalGearEVARiot ] | ||
|
||
# start Майор РХБЗЗ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Поменяй коммент, это Капитан РХБЗЗ |
||
- type: entity | ||
id: ADTRandomHumanoidSpawnerCBURNUnit | ||
name: Cmnd CBURN Agent | ||
suffix: AdtERTRole | ||
components: | ||
- type: Sprite | ||
sprite: Markers/jobs.rsi | ||
state: cburn | ||
- type: RandomHumanoidSpawner | ||
settings: ADTCmndCBURNAgent | ||
- type: AutoImplant | ||
implants: | ||
- MindShieldImplant | ||
|
||
- type: randomHumanoidSettings | ||
speciesBlacklist: | ||
- Diona | ||
id: ADTCmndCBURNAgent | ||
components: | ||
- type: MindShield | ||
- type: Loadout | ||
prototypes: [ADTCmndCBURNGear] | ||
- type: GhostRole | ||
name: ghost-role-information-cmnd-cburn-agent-name | ||
description: ghost-role-information-cmnd-cburn-agent-description | ||
requirements: | ||
- !type:OverallPlaytimeRequirement | ||
time: 36000 # 10h overall | ||
- type: GhostTakeoverAvailable | ||
- type: RandomMetadata | ||
nameSegments: | ||
- ADTCmndNamesFirstMilitary | ||
- NamesLastERTCallsign # Corvax Localization | ||
# end Майор РХБЗЗ |
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,31 @@ | ||
- type: startingGear | ||
id: ADTCmndCBURNGear | ||
equipment: | ||
jumpsuit: ClothingUniformJumpsuitColorBrown | ||
back: ClothingBackpackDuffelCBURN | ||
mask: ClothingMaskGasExplorer | ||
eyes: ClothingEyesHudSecurity | ||
ears: ClothingHeadsetAltCentCom | ||
gloves: ClothingHandsGlovesCombat | ||
outerClothing: ClothingOuterHardsuitCBURNLeader | ||
shoes: ADTClothingShoesBootsMagERT | ||
id: CBURNPDA | ||
pocket1: RubberStampCentcom | ||
pocket2: WeaponPulsePistol | ||
suitstorage: OxygenTankFilled | ||
belt: ClothingBeltBandolier | ||
storage: | ||
back: | ||
- BoxSurvivalEngineering | ||
- WeaponShotgunDoubleBarreled | ||
- BoxShotgunIncendiary | ||
- GrenadeFlashBang | ||
- PillAmbuzolPlus | ||
- PillAmbuzol | ||
- RadioHandheld | ||
# underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear | ||
# underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear | ||
# underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear | ||
# innerClothingSkirt: ClothingUniformJumpsuitColorBrown | ||
# satchel: ClothingBackpackDuffelCBURN | ||
# duffelbag: ClothingBackpackDuffelCBURN |
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.
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.
Подпиши суffикс
РХБЗЗ
^-^, с тебя горячий арт