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.

Sign up for GitHub

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

Робототехник, КПК, айди #145

Closed
wants to merge 15 commits into from
Closed

Робототехник, КПК, айди #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
33dc906
Робототехник, КПК, айди
PyotrIgn Jul 29, 2024
2d12e99
Merge branch 'master' into roboticist_job
PyotrIgn Jul 29, 2024
66eca0b
Лодаут, исправление замечания
PyotrIgn Jul 31, 2024
f1c2c06
обновление?
PyotrIgn Jul 31, 2024
af35857
Merge branch 'master' into roboticist_job
PyotrIgn Aug 1, 2024
aa0053a
помогаем петру
Darkiich Aug 1, 2024
0afe104
Merge branch 'master' into roboticist_job
Darkiich Aug 1, 2024
b40acb6
немного затупил, исправляем
Darkiich Aug 1, 2024
e86deee
Merge branch 'roboticist_job' of https://github.com/PyotrIgn/space_st…
Darkiich Aug 1, 2024
8c763e5
помощь
Darkiich Aug 2, 2024
97de6e6
помогаем петру в лодаутах
Darkiich Aug 2, 2024
245cd37
Update loadout-groups.ftl
Darkiich Aug 2, 2024
8cf0dea
Merge branch 'master' into roboticist_job
PyotrIgn Aug 3, 2024
3a0e25e
Merge branch 'master' into roboticist_job
PyotrIgn Aug 3, 2024
372436e
коммит
PyotrIgn Aug 3, 2024
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
4 changes: 3 additions & 1 deletion Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-ADTPathologistIDCard = ID карта патологоанатома
.desc = { ent-IDCardStandard.desc }
.desc = { ent-IDCardStandard.desc }
ent-ADTRoboticistIDCard = ID карта робототехника
.desc = { ent-IDCardStandar.desc }
3 changes: 2 additions & 1 deletion Resources/Locale/ru-RU/ADT/Job/job-description.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы.
job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы.
job-description-roboticist = Собирайте боргов, мехов, обслуживайте синтетиков и поражайте (либо пугайте) экипаж своими новейшими разработками.
5 changes: 4 additions & 1 deletion Resources/Locale/ru-RU/ADT/Job/job-names.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
job-name-ADTPathologist = Патологоанатом
JobADTPathologist = Патологоанатом
JobADTPathologist = Патологоанатом

job-name-roboticist = робототехник
JobRoboticist = робототехник
5 changes: 5 additions & 0 deletions Resources/Locale/ru-RU/ADT/preferences/loadout-groups.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
loadout-group-patholog-head = Патологоанатом, голова
loadout-group-patholog-jumpsuit = Патологоанатом, комбинезон
loadout-group-patholog-outerclothing = Патологоанатом, верхняя одежда
loadout-group-patholog-shoes = Патологоанатом, обувь
loadout-group-patholog-backpack = Патологоанатом, рюкзак
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTSpawnPointRoboticist = робототехник
.desc = { ent-SpawnPointJobBase.desc }
7 changes: 6 additions & 1 deletion Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@

ent-ADTRoboticistPDA = КПК робототехника
.desc = Почему это всё ещё не робот?!

ent-ADTPathologistPDA = КПК патологоанатома
.desc = От него веет прохладой.
.desc = От него веет прохладой.

13 changes: 13 additions & 0 deletions Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Science

- type: entity
id: ADTSpawnPointRoboticist
parent: SpawnPointJobBase
name: roboticist
components:
- type: SpawnPoint
job_id: ADTRoboticist
- type: Sprite
layers:
- state: green
- state: scientist
0 ...cts/Device/Circuitboards/Machine/fill.txt → ...ts/Devices/Circuitboards/Machine/fill.txt
View file
Open in desktop
File renamed without changes.
14 changes: 14 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: entity
parent: BasePDA
id: ADTRoboticistPDA
name: roboticist PDA
description: It's covered with an unknown gooey substance.
components:
- type: Pda
id: ADTRoboticistIDCard
state: pda-roboticist
- type: PdaBorderColor
borderColor: "#171716"
accentVColor: "#d90000"
- type: Icon
state: pda-roboticist
0 ...T/Entities/Objects/Device/translators.yml → .../Entities/Objects/Devices/translators.yml
View file
Open in desktop
File renamed without changes.
14 changes: 13 additions & 1 deletion Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
- type: entity
parent: IDCardStandard
id: ADTRoboticistIDCard
Schrodinger71 marked this conversation as resolved.
Show resolved Hide resolved
name: roboticist ID card
components:
- type: Sprite
layers:
- state: default
- state: idroboticist
- type: PresetIdCard
job: ADTRoboticist

- type: entity
parent: IDCardStandard
id: ADTPathologistIDCard
Expand All @@ -9,4 +21,4 @@
- state: default
- state: id-pathologist
- type: PresetIdCard
job: ADTPathologist
job: ADTPathologist
104 changes: 104 additions & 0 deletions Resources/Prototypes/ADT/Loadouts/Jobs/Science/roboticist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
# Jumpsuit

- type: loadout
id: ScientistJumpsuit
equipment: ScientistJumpsuit

- type: startingGear
id: ScientistJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitScientist

- type: loadout
id: ScientistJumpskirt
equipment: ScientistJumpskirt

- type: startingGear
id: ScientistJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtScientist

- type: loadout
id: RoboticistJumpsuit
equipment: RoboticistJumpsuit

- type: startingGear
id: RoboticistJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitRoboticist

- type: loadout
id: RoboticistJumpskirt
equipment: RoboticistJumpskirt

- type: startingGear
id: RoboticistJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtRoboticist

# OuterClothing

- type: loadout
id: RegularLabCoat
equipment: RegularLabCoat

- type: startingGear
id: RegularLabCoat
equipment:
outerClothing: ClothingOuterCoatLab

- type: loadout
id: ScienceLabCoat
equipment: ScienceLabCoat

- type: startingGear
id: ScienceLabCoat
equipment:
outerClothing: ClothingOuterCoatRnd

- type: loadout
id: ScienceWintercoat
equipment: ScienceWintercoat

- type: startingGear
id: ScienceWintercoat
equipment:
outerClothing: ClothingOuterWinterSci

- type: loadout
id: RoboticistLabCoat
equipment: RoboticistLabCoat

- type: startingGear
id: RoboticistLabCoat
equipment:
outerClothing: ClothingOuterCoatRobo

- type: loadout
id: RoboticistWintercoat
equipment: RoboticistWintercoat

- type: startingGear
id: RoboticistWintercoat
equipment:
outerClothing: ClothingOuterWinterRobo

# Gloves

- type: loadout
id: LatexGloves
equipment: LatexGloves

- type: startingGear
id: LatexGloves
equipment:
gloves: ClothingHandsGlovesLatex

- type: loadout
id: RobohandsGloves
equipment: RobohandsGloves

- type: startingGear
id: RobohandsGloves
equipment:
gloves: ClothingHandsGlovesRobohands
35 changes: 34 additions & 1 deletion Resources/Prototypes/ADT/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
#Science

- type: loadoutGroup
id: RoboticistJumpsuit
name: loadout-group-roboticist-jumpsuit
minLimit: 0
loadouts:
- ScientistJumpsuit
- ScientistJumpskirt
- RoboticistJumpsuit
- RoboticistJumpskirt

- type: loadoutGroup
id: RoboticistOuterClothing
name: loadout-group-roboticist-outerclothing
minLimit: 0
loadouts:
- RegularLabCoat
- ScienceLabCoat
- ScienceWintercoat
- RoboticistWintercoat

- type: loadoutGroup
id: RobohandsGloves
name: loadout-group-roboticist-gloves
minLimit: 0
loadouts:
- LatexGloves
- PurpleGloves
- RobohandsGloves

# Medical

- type: loadoutGroup
id: PathologHead
name: loadout-group-patholog-head
Expand Down Expand Up @@ -37,4 +70,4 @@
name: loadout-group-patholog-shoes
loadouts:
- BlueShoes
- MedicalWinterBoots
- MedicalWinterBoots
19 changes: 18 additions & 1 deletion Resources/Prototypes/ADT/Loadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
- type: roleLoadout
id: JobADTRoboticist
groups:
- Inventory # Corvax-Loadouts
- GroupTankHarness
- ScientistHead
- ScientistNeck
- RoboticistJumpsuit
- ScientistBackpack
- RoboticistOuterClothing
- RobohandsGloves
- ScientistShoes
- Glasses
- Survival
- Trinkets
- GroupSpeciesBreathTool

- type: roleLoadout
id: JobADTPathologist
groups:
Expand All @@ -13,4 +30,4 @@
- Glasses
- SurvivalMedical
- Trinkets
- GroupSpeciesBreathToolMedical
- GroupSpeciesBreathToolMedical
22 changes: 22 additions & 0 deletions Resources/Prototypes/ADT/Roles/Jobs/Science/roboticist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
- type: job
id: ADTRoboticist
name: job-name-roboticist
description: job-description-roboticist
playTimeTracker: JobRoboticist
requirements:
- !type:DepartmentTimeRequirement
department: Science
time: 25200 #7 hrs
startingGear: ADTRoboticistGear
icon: "JobIconRoboticist"
supervisors: job-supervisors-rd
access:
- Research
- Maintenance

- type: startingGear
id: ADTRoboticistGear
equipment:
ears: ClothingHeadsetRobotics
id: ADTRoboticistPDA
pocket1: BorgTranslatorImplanter
Copy link
Collaborator

@1Stepka1 1Stepka1 Aug 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Может лучше всего сразу вколоть ему имплант?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

А как реализуемо?

Copy link
Collaborator

@Schrodinger71 Schrodinger71 Aug 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Вот пример прописывания

 special:
 - !type:AddImplantSpecial
   implants: [ MindShieldImplant ]

image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

тогда закрываю лодаут с имплантом и делаю таким образом

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: 4 additions & 1 deletion Resources/Prototypes/ADT/Roles/play_time_trackers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
- type: playTimeTracker
id: JobADTPathologist
id: JobRoboticist

- type: playTimeTracker
id: JobADTPathologist
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
- type: EncryptionKey
channels:
- Science
- Binary # ADT Tweak Roboticist
defaultChannel: Science
- type: Sprite
layers:
Expand Down
9 changes: 0 additions & 9 deletions Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,6 @@
equipment:
gloves: ClothingHandsGlovesLatex

- type: loadout
id: RobohandsGloves
equipment: RobohandsGloves

- type: startingGear
id: RobohandsGloves
equipment:
gloves: ClothingHandsGlovesRobohands

# Shoes
- type: loadout
id: ScienceWinterBoots
Expand Down
5 changes: 0 additions & 5 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,8 +831,6 @@
loadouts:
- ScientistJumpsuit
- ScientistJumpskirt
- RoboticistJumpsuit
- RoboticistJumpskirt
- SeniorResearcherJumpsuit
- SeniorResearcherJumpskirt

Expand All @@ -852,8 +850,6 @@
- RegularLabCoat
- ScienceLabCoat
- ScienceWintercoat
- RoboticistLabCoat
- RoboticistWintercoat
- SeniorResearcherLabCoat

- type: loadoutGroup
Expand All @@ -871,7 +867,6 @@
loadouts:
- LatexGloves
- PurpleGloves
- RobohandsGloves

- type: loadoutGroup
id: ScientistPDA
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: gameMap
- type: gameMap
id: Cluster
mapName: 'Cluster'
mapPath: /Maps/cluster.yml
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
- ResearchDirector
- Scientist
- ResearchAssistant
- ADTRoboticist # ADT-Roles

- type: department
id: Specific
Expand Down
Binary file modified .../Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/equipped-INNERCLOTHING.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Uniforms/Jumpskirt/roboticist.rsi/inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading