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

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

Closed
wants to merge 15 commits into from
Closed
Show file tree
Hide file tree
Changes from 5 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
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/Entities/Markers/Spawners/jobs.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTSpawnPointRoboticist = робототехник
.desc = { ent-SpawnPointJobBase.desc }
Schrodinger71 marked this conversation as resolved.
Show resolved Hide resolved
20 changes: 20 additions & 0 deletions Resources/Locale/ru-RU/ADT/preferences/loadout-groups.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Errors

# Miscellaneous

# Command

# Civilian

# Cargo

# Engineering

# Science
loadout-group-roboticist-id = Робототехник, ID
loadout-group-roboticist-implanters = Робототехник, имплантер
# Security

# Medical

# Wildcards
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTRoboticistPDA = КПК робототехника
.desc = Почему это всё ещё не робот?!
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,6 @@ job-description-serviceworker = Изучите основы барменског
job-description-visitor = Наслаждайтесь своим визитом на станцию.
job-description-warden = Патрулируйте отдел безопасности, следите за тем, чтобы никто не воровал из оружейной, и чтобы все заключённые были оформлены и выпущены по окончании срока.
job-description-zookeeper = Устройте весёлое шоу с милыми животными и космическими карпами, чтобы все члены экипажа могли ими полюбоваться. Эта должность доступна на станциях Gemini и Avrite.

#ADT_Jobs
job-description-roboticist = Собирайте боргов, мехов, обслуживайте синтетиков и поражайте (либо пугайте) экипаж своими новейшими разработками.
Schrodinger71 marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 5 additions & 0 deletions Resources/Locale/ru-RU/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,8 @@ JobWarden = смотритель
JobVisitor = посетитель
JobBoxer = боксёр
JobZookeeper = зоотехник

#ADT Jobs
job-name-roboticist = робототехник
# Role timers
JobRoboticist = робототехник
Schrodinger71 marked this conversation as resolved.
Show resolved Hide resolved
13 changes: 13 additions & 0 deletions Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml
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
14 changes: 14 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml
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
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
20 changes: 20 additions & 0 deletions Resources/Prototypes/ADT/Loadouts/Jobs/Science/roboticist.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# ID
- type: loadout
id: ADTRoboticistPDA
equipment: ADTRoboticistPDA

- type: startingGear
id: ADTRoboticistPDA
equipment:
id: ADTRoboticistPDA

# Implanters
- type: loadout
id: BorgTranslatorImplanter
equipment: BorgTranslatorImplanter

- type: startingGear
id: BorgTranslatorImplanter
storage:
back:
- BorgTranslatorImplanter
20 changes: 19 additions & 1 deletion Resources/Prototypes/ADT/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
#Science

- type: loadoutGroup
id: ADTRobotocistPDA
name: loadout-group-roboticist-id
loadouts:
- ScientistPDA
- SeniorResearcherPDA
- ADTRoboticistPDA

- type: loadoutGroup
id: ADTRobotocistImplanters
name: loadout-group-roboticist-implanters
minLimit: 0
maxLimit: 1
loadouts:
- BorgTranslatorImplanter

- type: loadoutGroup
id: PathologHead
name: loadout-group-patholog-head
Expand Down Expand Up @@ -37,4 +55,4 @@
name: loadout-group-patholog-shoes
loadouts:
- BlueShoes
- MedicalWinterBoots
- MedicalWinterBoots
21 changes: 20 additions & 1 deletion Resources/Prototypes/ADT/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
- type: roleLoadout
id: JobADTRoboticist
groups:
- Inventory # Corvax-Loadouts
- GroupTankHarness
- ScientistHead
- ScientistNeck
- ScientistJumpsuit
- ScientistBackpack
- ScientistOuterClothing
- ScientistGloves
- ScientistShoes
- ADTRobotocistPDA
- ADTRobotocistImplanters
- Glasses
- Survival
- Trinkets
- GroupSpeciesBreathTool

- type: roleLoadout
id: JobADTPathologist
groups:
Expand All @@ -13,4 +32,4 @@
- Glasses
- SurvivalMedical
- Trinkets
- GroupSpeciesBreathToolMedical
- GroupSpeciesBreathToolMedical
21 changes: 21 additions & 0 deletions Resources/Prototypes/ADT/Roles/Jobs/Science/roboticist.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
- 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
5 changes: 4 additions & 1 deletion Resources/Prototypes/ADT/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
- type: playTimeTracker
id: JobADTPathologist
id: JobRoboticist

- type: playTimeTracker
id: JobADTPathologist
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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/cluster.yml
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
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprite by DreamlyJack, monkey derivative made by brainfood1183 (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprite by Prazat (discord: prazat911), monkey derivative made by brainfood1183 (github)",
Copy link
Collaborator

@1Stepka1 1Stepka1 Aug 2, 2024

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

Choose a reason for hiding this comment

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

да, если это всё таки респрайт то надо оставить авторство прошлого человека и вписать что resprite by и так далее

"size": {
"x": 32,
"y": 32
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprite by DreamlyJack, monkey derivative made by brainfood1183 (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprite by Prazat (discord: prazat911), monkey derivative made by brainfood1183 (github)",
"size": {
"x": 32,
"y": 32
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading