Skip to content

Commit

Permalink
робототех, электрик бугало 2 (AdventureTimeSS14#177)
Browse files Browse the repository at this point in the history
Перезалив робототехника, ибо в первый раз из-за мерджконфликтов работать
уже было неудобно

Имплантер пока сохранил в лодауте в кармашке, потому что имплантеры
языков устроены иначе, чем майндшилд и его не прописать пока в
изначальных имплантах профессии
  • Loading branch information
PyotrIgn committed Aug 4, 2024
1 parent 7837662 commit 5845725
Show file tree
Hide file tree
Showing 26 changed files with 171 additions and 21 deletions.
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
ent-ADTPathologistIDCard = ID карта патологоанатома
.desc = { ent-IDCardStandard.desc }
.desc = { ent-IDCardStandard.desc }
ent-ADTRoboticistIDCard = ID карта робототехника
.desc = { ent-IDCardStandard.desc }
4 changes: 3 additions & 1 deletion Resources/Locale/ru-RU/ADT/Job/job-description.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы.
job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы.
job-description-roboticist = Собирайте боргов, мехов, обслуживайте синтетиков и поражайте (либо пугайте) экипаж своими новейшими разработками.
5 changes: 4 additions & 1 deletion Resources/Locale/ru-RU/ADT/Job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
job-name-ADTPathologist = Патологоанатом
JobADTPathologist = Патологоанатом
JobADTPathologist = Патологоанатом
job-name-roboticist = робототехник
JobRoboticist = робототехник
20 changes: 19 additions & 1 deletion Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl
Original file line number Diff line number Diff line change
@@ -1,8 +1,26 @@
# Errors

# Miscellaneous

# Command
ent-MagistratNeck = Галстуки
ent-MagistratJumpsuit = Костюмы
# Civilian

# Cargo

# Engineering

# Science
loadout-group-roboticist-jumpsuit = Робототехник, комбинезон
loadout-group-roboticist-outerclothing = Робототехник, верхняя одежда
loadout-group-roboticist-gloves = Робототехник, перчатки
# Security

# Medical
loadout-group-patholog-head = Патологоанатом, голова
loadout-group-patholog-jumpsuit = Патологоанатом, комбинезон
loadout-group-patholog-outerclothing = Патологоанатом, верхняя одежда
loadout-group-patholog-shoes = Патологоанатом, обувь
loadout-group-patholog-backpack = Патологоанатом, рюкзак
# Wildcards
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
ent-SpawnPointMagistrat = Точка спавна магистрата
.desc = { ent-SpawnPointJobBase.desc }
ent-ADTSpawnPointRoboticist = робототехник
.desc = { ent-SpawnPointJobBase.desc }
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
ent-MagistratPDA = КПК Магистрата
.desc = В заметках данного КПК можно найти компромат на каждого из глав.
ent-ADTPathologistPDA = КПК патологоанатома
.desc = От него веет прохладой.
ent-ADTRoboticistPDA = КПК робототехника
.desc = Почему это всё ещё не робот?!
12 changes: 12 additions & 0 deletions Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,15 @@
layers:
- state: green
- state: iaa

- type: entity
id: ADTSpawnPointRoboticist
parent: SpawnPointJobBase
name: roboticist
components:
- type: SpawnPoint
job_id: ADTRoboticist
- type: Sprite
layers:
- state: green
- state: scientist
14 changes: 0 additions & 14 deletions Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml

This file was deleted.

30 changes: 30 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,33 @@
state: pda-lawyer
- type: Icon
state: pda-lawyer

- 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

- type: entity
parent: MedicalPDA
id: ADTPathologistPDA
name: pathologist's PDA
description: It breezes chill.
components:
- type: Pda
id: ADTPathologistIDCard
state: pda-pathologist
- type: PdaBorderColor
borderColor: "#d7d7d0"
accentVColor: "#15616b"
- type: Icon
state: pda-pathologist
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,15 @@
- state: id-pathologist
- type: PresetIdCard
job: ADTPathologist

- type: entity
parent: IDCardStandard
id: ADTRoboticistIDCard
name: roboticist ID card
components:
- type: Sprite
layers:
- state: default
- state: idroboticist
- type: PresetIdCard
job: ADTRoboticist
35 changes: 34 additions & 1 deletion Resources/Prototypes/ADT/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
- type: loadoutGroup
id: MagistratJumpsuit
name: loadout-group-lawyer-jumpsuit
minLimit: 1
loadouts:
- MagistratJumpsuit
- LawyerJumpsuit
Expand Down Expand Up @@ -31,6 +32,7 @@
- type: loadoutGroup
id: PathologJumpsuit
name: loadout-group-patholog-jumpsuit
minLimit: 1
loadouts:
- PathologJumpsuit
- PathologJumpskirt
Expand All @@ -40,7 +42,7 @@
- type: loadoutGroup
id: PathologBackpack
name: loadout-group-patholog-backpack
minLimit: 0
minLimit: 1
loadouts:
- PathologBackpack
- PathologSatchel
Expand All @@ -61,3 +63,34 @@
loadouts:
- BlueShoes
- MedicalWinterBoots

#Science

- type: loadoutGroup
id: RoboticistJumpsuit
name: loadout-group-roboticist-jumpsuit
minLimit: 1
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
17 changes: 17 additions & 0 deletions Resources/Prototypes/ADT/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,20 @@
- SurvivalMedical
- Trinkets
- GroupSpeciesBreathToolMedical

- type: roleLoadout
id: JobADTRoboticist
groups:
- Inventory # Corvax-Loadouts
- GroupTankHarness
- ScientistHead
- ScientistNeck
- RoboticistJumpsuit
- ScientistBackpack
- RoboticistOuterClothing
- RobohandsGloves
- ScientistShoes
- Glasses
- Survival
- Trinkets
- GroupSpeciesBreathTool
22 changes: 22 additions & 0 deletions Resources/Prototypes/ADT/Roles/Jobs/Science/roboticist.yml
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
3 changes: 3 additions & 0 deletions Resources/Prototypes/ADT/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

- type: playTimeTracker
id: JobADTPathologist

- type: playTimeTracker
id: JobRoboticist
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
- type: EncryptionKey
channels:
- Science
- Binary # ADT Tweak Roboticist
defaultChannel: Science
- type: Sprite
layers:
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 @@ -91,6 +91,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,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprite by DreamlyJack, monkey derivative made by brainfood1183 (github)",
"copyright": "Sprite by DreamlyJack, modified by Prazat (discord: prazat911), monkey derivative made by brainfood1183 (github)",
"size": {
"x": 32,
"y": 32
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,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprite by DreamlyJack, monkey derivative made by brainfood1183 (github)",
"copyright": "Sprite by DreamlyJack, modified by Prazat (discord: prazat911), monkey derivative made by brainfood1183 (github)",
"size": {
"x": 32,
"y": 32
Expand Down

0 comments on commit 5845725

Please sign in to comment.