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

Новая роль - Пилот Сб #1978

Merged
merged 5 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
@@ -1,2 +1,4 @@
ent-IAAPDA = internal affairs agent PDA
.desc = Corporation and profit are best friends.
ent-PilotPDA = pilot PDA
.desc = Нas protection from space radiation.
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-IAAIDCard = internal affairs agent ID card
.desc = { ent-IDCardStandard.desc }
ent-PilotIDCard = pilot ID card
.desc = { ent-IDCardStandard.desc }
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/corvax/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
job-name-iaa = агент внутренних дел
JobIAA = агент внутренних дел
job-name-pilot = пилот
JobPilot = пилот
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-IAAPDA = КПК агента внутренних дел
.desc = Корпорация и прибыль - лучшие друзья.
ent-PilotPDA = КПК пилота
.desc = Имеет защиту от космической радиации.
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-IAAIDCard = ID карта агента внутренних дел
.desc = { ent-IDCardStandard.desc }
ent-PilotIDCard = ID карта пилота
.desc = { ent-IDCardStandard.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,5 @@ ent-SpawnPointPsychologist = психолог
.desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointZookeeper = зоотехник
.desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointPilot = пилот
.desc = { ent-SpawnPointJobBase.desc }
11 changes: 11 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: entity
id: SpawnPointPilot
parent: SpawnPointJobBase
name: pilot
components:
- type: SpawnPoint
job_id: Pilot
- type: Sprite
layers:
- state: green
- state: seniorofficer
15 changes: 15 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,18 @@
borderColor: "#6f6192"
- type: Icon
state: pda-lawyer

- type: entity
parent: BasePDA
id: PilotPDA
name: pilot PDA
description: Нas protection from cosmic radiation.
components:
- type: Pda
id: PilotIDCard
state: pda-seniorofficer
- type: PdaBorderColor
borderColor: "#A32D26"
accentVColor: "#DFDFDF"
- type: Icon
state: pda-seniorofficer
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,15 @@
- state: idiaa
- type: PresetIdCard
job: IAA

- type: entity
parent: IDCardStandard
id: PilotIDCard
name: pilot ID card
components:
- type: Sprite
layers:
- state: default
- state: idpilot
- type: PresetIdCard
job: Pilot
40 changes: 40 additions & 0 deletions Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
- type: job
id: Pilot
name: job-name-pilot
playTimeTracker: JobPilot
requirements:
- !type:DepartmentTimeRequirement
department: Security
time: 72000 #20 hrs
startingGear: PilotGear
icon: "JobIconPilot"
supervisors: job-supervisors-hos
canBeAntag: false
access:
- Security
- Brig
- Maintenance
- Service
- External
- Cryogenics
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant ]

- type: startingGear
id: PilotGear
equipment:
jumpsuit: ClothingUniformJumpsuitSeniorOfficer
back: ClothingBackpackSecurityFilled
shoes: ClothingShoesBootsCombatFilled
eyes: ClothingEyesGlassesSecurity
head: ClothingHeadHatBeretSecurity
outerClothing: ClothingOuterVestArmorSec
id: PilotPDA
ears: ClothingHeadsetSecurity
neck: ClothingNeckTieRed
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
innerClothingSkirt: ClothingUniformJumpskirtSeniorOfficer
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Corvax/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
- type: playTimeTracker
id: JobIAA

- type: playTimeTracker
id: JobPilot

- type: playTimeTracker
id: JobEvent1

Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Corvax/StatusEffects/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@
icon:
sprite: Interface/Misc/job_icons.rsi
state: IAA

- type: statusIcon
parent: JobIcon
id: JobIconPilot
icon:
sprite: /Textures/Interface/Misc/job_icons.rsi
state: Pilot
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
- HeadOfSecurity
- SecurityCadet
- SecurityOfficer
- Pilot # Corvax-Pilot
- Detective
- Warden

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi | Pilot icon made by poemota (Discord)",

"size": {
"x": 8,
Expand Down Expand Up @@ -107,6 +107,9 @@
{
"name": "Brigmedic"
},
{
"name": "Pilot"
},
{
"name": "MedicalDoctor"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,10 @@
"name": "idseniorphysician"
},
{
"name": "idseniorofficer"
"name": "idseniorofficer"
},
{
"name": "idpilot"
},
{
"name": "gold-inhand-left",
Expand Down
Loading