Skip to content
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

Новая должность "Исследователь" #2680

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ ent-CluwnePDA = КПК клувеня
.suffix = Неснимаемый
ent-BlueShieldPDA = КПК синего щита
.desc = Удивительно, но он не синий.
ent-ExplorerPDA = КПК исследователя
.desc = Прочный как камень.
ent-SeniorEngineerPDA = КПК ведущего инженера
.desc = Похоже, что его несколько раз разбирали и собирали.
ent-SeniorResearcherPDA = КПК ведущего учёного
Expand Down
5 changes: 5 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Ears/headset.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ ent-ClothingHeadsetCaptain = гарнитура капитана

ent-ClothingHeadsetBlueShield = полноразмерная гарнитура "Синий Щит"
.desc = Безупречная гарнитура для синего щита.

ent-ClothingHeadsetAltExplorer = полноразмерная гарнитура исследователя
.desc = Гарнитура исследователя. Способна услышать глубины космоса..
ent-ClothingHeadsetExplorer = гарнитура исследователя
.desc = Гарнитура исследователя. Способна услышать глубины космоса.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ ent-ClothingHeadHatInterdyneFlipped = кепка парамедика Interdyne
.desc = { ent-ClothingHeadHatInterdyneFlipped.desc }
ent-ClothingHeadHatNewYearsCap = новогодний колпак
.desc = Яркий новогодний колпак с пушистым помпоном, добавляющий волшебства и праздничного настроения!
ent-ClothingHeadHatBeretExplorer = берет исследователя
.desc = Берет специально для исследователя.
ent-ClothingHeadHatBeretIAA = берет агента внутренних дел
.desc = Берет для достойнейших... но почему он синий?
ent-ClothingHeadHatStreetJudge = шлем уличного судьи
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@ ent-ClothingUniformJumpsuitSalvageSpecialistTurtleneck = водолазка ут
.suffix = За время в игре
ent-ClothingUniformJumpsuitBrigmedicTurtleneck = водолазка бригмедика
.desc = Водолазка бригмедика.
.suffix = За время в игре
.suffix = За время в игре
ent-ClothingUniformJumpsuitExplorerTurtleneck = водолазка исследователя
.desc = Униформа, созданная для тех, кто стремится исследовать неизведанные уголки космоса.
.suffix = За время в игре
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/OuterClothing/coats.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ ent-ClothingOuterBSOCoat = пальто оперативника "Синий Щ
ent-ClothingOuterCoatHoSbomber = бомбер главы службы безопасности
.desc = Крайне теплый и не менее бронированный бомбер, для не менее важного руководителя отдела обеспечения безопасности.
ent-ClothingOuterExplorerCoat = пальто исследователя
.desc = Пальто исследователя с встроенным пластинами металла. Хорошо защищает от всяких тварих.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Хорошо защищает от всяких тварих.

5 changes: 5 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Uniforms/jumpsuit.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,8 @@ ent-ClothingUniformJumpsuitInterdyne = форма парамедика Interdyne

ent-ClothingUniformJumpsuitUssp = униформа СССП
.desc = Форма, пропитанная кровью, потом и ненавистью к капитализму.

ent-ClothingUniformJumpsuitExplorer = униформа исследователя
.desc = Практичный и функциональный комплект одежды, разработанный для работы в экстремальных условиях.
ent-ClothingUniformJumpsuitExplorerTie = униформа исследователя
.desc = Практичный и функциональный комплект одежды, разработанный для работы в экстремальных условиях.
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ss220/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ job-description-magistrate = Магистрат обязан быть гаран
job-description-prisoner = Заключённый космической станции... Что может быть лучше?
job-description-blueshield = Ваша главная цель - защитить глав станции. Помните, вы не офицер СБ.
job-description-deathsquad = Член эскадрона смерти. Уничтожьте всё живое!
job-description-explorer = Исследователь обязан изучать неизведанные территории, собирать данные и образцы, а также передавать информацию научному отделу.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/job/job-name.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ job-name-ussp = СССП
job-name-dq-operative = оперативник Эскадрона Смерти
job-name-dq-commander = командир Эскадрона Смерти
job-name-dq-specialist = специалист Эскадрона Смерти

job-name-explorer = исследователь
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ss220/loadout-groups/explorer.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
loadout-group-explorer-jumpsuit = Исследователь, комбинезон
loadout-group-explorer-head = Исследователь, голова
loadout-group-explorere-outerclothing = Исследователь, верхняя одежда
loadout-group-explorer-headset = Исследователь, гарнитура
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ ent-MagistrateIDCard = ID карта магистрата
ent-PrisonerIDCard = ID карта заключённого
.desc = { ent-IDCardStandard.desc }

ent-ExplorerIDCard = ID карта исследователя
.desc = { ent-IDCardStandard.desc }

1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
roles:
- ResearchDirector
- SeniorResearcher #ss220
- Explorer #SS220 Add Explorer
- Scientist
- ResearchAssistant

Expand Down
34 changes: 34 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Ears/headset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,37 @@
sprite: SS220/Clothing/Ears/Headsets/blueshield.rsi
- type: Clothing
sprite: SS220/Clothing/Ears/Headsets/blueshield.rsi

- type: entity
parent: ClothingHeadsetAlt
id: ClothingHeadsetAltExplorer
name: full-size headset of the explorer
description: It is used by representatives of the law.
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyScience
- EncryptionKeyCargo
- EncryptionKeyCommon
- type: Sprite
sprite: SS220/Clothing/Ears/Headsets/explorer.rsi
- type: Clothing
sprite: SS220/Clothing/Ears/Headsets/explorer.rsi

- type: entity
parent: ClothingHeadset
id: ClothingHeadsetExplorer
name: headset of the explorer
description: It is used by representatives of the law.
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyScience
- EncryptionKeyCargo
- EncryptionKeyCommon
- type: Sprite
sprite: SS220/Clothing/Ears/Headsets/explorer.rsi
- type: Clothing
sprite: SS220/Clothing/Ears/Headsets/explorer.rsi
17 changes: 17 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,23 @@
Female: FemaleEngineer
Unsexed: MaleEngineer

# Научный отдел

# Исследователь
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretExplorer
name: beret explorer
description: The beret is specially for the explorer.
components:
- type: Sprite
sprite: SS220/Clothing/Head/Hats/beret_explorer.rsi
- type: Clothing
sprite: SS220/Clothing/Head/Hats/beret_explorer.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon

# OTHER

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,30 @@
Caustic: 0.75
Radiation: 0.9

- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterExplorerCoat
name: the explorer coat
description: Explorer's coat with embedded metal plates. Protects well from all kinds of critters.
components:
- type: Sprite
sprite: SS220/Clothing/OuterClothing/Coats/explorer.rsi
- type: Clothing
sprite: SS220/Clothing/OuterClothing/Coats/explorer.rsi
- type: TemperatureProtection
heatingCoefficient: 0.1
coolingCoefficient: 0.1
- type: ExplosionResistance
damageCoefficient: 0.9
- type: Armor
modifiers:
coefficients:
Heat: 0.8
Blunt: 0.7
Slash: 0.7
Piercing: 0.6
Caustic: 0.8

# Сервис
- type: entity
parent: ClothingOuterStorageBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,22 @@
- type: Clothing
sprite: SS220/Clothing/Uniforms/Jumpsuit/rd_alt.rsi

# Исследователь
- type: entity
parent: ClothingUniformBaseFoldable
id: ClothingUniformJumpsuitExplorer
name: explorer uniform
description: A practical and functional set of clothes designed to work in extreme conditions.
components:
- type: Sprite
sprite: SS220/Clothing/Uniforms/Jumpsuit/explorer.rsi
- type: Clothing
sprite: SS220/Clothing/Uniforms/Jumpsuit/explorer.rsi

- type: entity
parent: [ClothingUniformBaseFoldableTie, ClothingUniformJumpsuitExplorer]
id: ClothingUniformJumpsuitExplorerTie

# Служба Безопасности

# Офицер СБ
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,15 @@
sprite: SS220/Clothing/Uniforms/Jumpsuit/brigmedic_turtle.rsi
- type: Clothing
sprite: SS220/Clothing/Uniforms/Jumpsuit/brigmedic_turtle.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitExplorerTurtleneck
name: explorer turtleneck
description: A uniform created for those who seek to explore the unexplored corners of the cosmos.
suffix: For playtime
components:
- type: Sprite
sprite: SS220/Clothing/Uniforms/Jumpsuit/explorer_turtle.rsi
- type: Clothing
sprite: SS220/Clothing/Uniforms/Jumpsuit/explorer_turtle.rsi
14 changes: 13 additions & 1 deletion Resources/Prototypes/SS220/Entities/JobSpawners/seniorMark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,16 @@
layers:
- state: green
- state: serviceworker
#
#
- type: entity
id: SpawnPointExplorer
parent: SpawnPointJobBase
name: explorer
components:
- type: SpawnPoint
job_id: Explorer
- type: Sprite
sprite: SS220/Markers/jobs.rsi
layers:
- state: green
- state: explorer
40 changes: 40 additions & 0 deletions Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -284,3 +284,43 @@
- state: "id_overlay"
map: [ "enum.PdaVisualLayers.IdLight" ]
visible: false

- type: entity
parent: BasePDA
id: ExplorerPDA
name: explorer PDA
description: Solid as a rock
components:
- type: Pda
id: ExplorerIDCard
- type: Appearance
appearanceDataInit:
enum.PdaVisuals.PdaType:
!type:String
pda-explorer
- type: PdaBorderColor
borderColor: "#7b6c47"
accentVColor: "#8133a8"
- type: Sprite
sprite: Objects/Devices/pda.rsi
layers:
- map: [ "enum.PdaVisualLayers.Base" ]
state: "pda"
- state: "screen-pai"
shader: "unshaded"
- state: "light_overlay"
map: [ "enum.PdaVisualLayers.Flashlight" ]
shader: "unshaded"
visible: false
- state: "id_overlay"
map: [ "enum.PdaVisualLayers.IdLight" ]
visible: false
- type: Icon
state: pda-explorer
- type: Tag
tags:
- WhitelistPdaIdPainter
- DoorBumpOpener
- WhitelistChameleon
- WhitelistChameleonPDA

Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,24 @@
- type: PresetIdCard
job: Prisoner

- type: entity
parent: IDCardStandard
id: ExplorerIDCard
name: explorer ID card
components:
- type: Sprite
layers:
- state: silver
- state: idexplorer
- type: PresetIdCard
job: Explorer
- type: Tag
tags:
- WhitelistPdaIdPainter
- DoorBumpOpener
- WhitelistChameleon
- WhitelistChameleonIdCard

# Deathsquad
- type: entity
parent: IDCardStandard
Expand Down
46 changes: 46 additions & 0 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Science/explorer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Job Time
- type: loadoutEffectGroup
id: ExplorerTurtleneck
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobExplorer
time: 108000 # 30 hrs

# Head
- type: loadout
id: HatExplorer
equipment:
head: ClothingHeadHatBeretExplorer

# Headset
- type: loadout
id: ExplorerHeadset
equipment:
ears: ClothingHeadsetExplorer

- type: loadout
id: ExplorerHeadsetAlt
equipment:
ears: ClothingHeadsetAltExplorer

# Jumpsuit
- type: loadout
id: ExplorerJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitExplorer

- type: loadout
id: ExplorerTurtleneck
effects:
- !type:GroupLoadoutEffect
proto: ExplorerTurtleneck
equipment:
jumpsuit: ClothingUniformJumpsuitExplorerTurtleneck

# Outerclothing
- type: loadout
id: ExplorerCoat
equipment:
outerClothing: ClothingOuterExplorerCoat
30 changes: 30 additions & 0 deletions Resources/Prototypes/SS220/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,36 @@
- Glasses
- CyberRnDVisor
# Учёный (Конец)

# Исследователь (Начало)
- type: loadoutGroup
id: ExplorerHead
name: loadout-group-explorer-head
loadouts:
- HatExplorer

- type: loadoutGroup
id: ExplorerJumpsuit
name: loadout-group-explorer-jumpsuit
loadouts:
- ExplorerJumpsuit
- ExplorerTurtleneck

- type: loadoutGroup
id: ExplorerOuterClothing
name: loadout-group-explorere-outerclothing
loadouts:
- ExplorerCoat

- type: loadoutGroup
id: ExplorerHeadset
name: loadout-group-explorer-headset
minLimit: 1
loadouts:
- ExplorerHeadset
- ExplorerHeadsetAlt
# Исследователь (Конец)

#! Исследовательский отдел (Конец)

#! Отдел снабжения (Начало)
Expand Down
Loading
Loading