From c7e43582c666cefc11a9d7fc8f4ae0badc1742b2 Mon Sep 17 00:00:00 2001 From: poeMota Date: Tue, 19 Mar 2024 15:11:38 +0300 Subject: [PATCH 1/5] corvax pilot --- .../corvax/entities/objects/devices/pda.ftl | 2 + .../objects/misc/identification_cards.ftl | 2 + .../Locale/ru-RU/corvax/job/job-names.ftl | 2 + .../corvax/entities/objects/devices/pda.ftl | 2 + .../objects/misc/identification_cards.ftl | 2 + .../entities/markers/spawners/jobs.ftl | 2 + .../Corvax/Entities/Markers/Spawners/jobs.yml | 11 +++++ .../Corvax/Entities/Objects/Devices/pda.yml | 15 +++++++ .../Objects/Misc/identification_cards.yml | 12 +++++ .../Corvax/Roles/Jobs/Security/pilot.yml | 41 ++++++++++++++++++ .../Corvax/Roles/play_time_trackers.yml | 3 ++ .../Prototypes/Corvax/StatusEffects/job.yml | 7 +++ .../Prototypes/Roles/Jobs/departments.yml | 1 + .../Interface/Misc/job_icons.rsi/Pilot.png | Bin 0 -> 195 bytes .../Interface/Misc/job_icons.rsi/meta.json | 10 +++-- .../Objects/Misc/id_cards.rsi/idpilot.png | Bin 0 -> 246 bytes .../Objects/Misc/id_cards.rsi/meta.json | 5 ++- 17 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml create mode 100644 Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Pilot.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idpilot.png diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl index 310d78812e0..c2a49ab3c1c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl @@ -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 cosmic radiation. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl index 51dea4d0735..ae63e9c1c6e 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl @@ -1,2 +1,4 @@ ent-IAAIDCard = internal affairs agent ID card .desc = { ent-IDCardStandard.desc } +ent-PilotIDCard = pilot ID card + .desc = { ent-IDCardStandard.desc } diff --git a/Resources/Locale/ru-RU/corvax/job/job-names.ftl b/Resources/Locale/ru-RU/corvax/job/job-names.ftl index 4521adebbf5..e0fba081bfb 100644 --- a/Resources/Locale/ru-RU/corvax/job/job-names.ftl +++ b/Resources/Locale/ru-RU/corvax/job/job-names.ftl @@ -1,2 +1,4 @@ job-name-iaa = агент внутренних дел JobIAA = агент внутренних дел +job-name-pilot = пилот +JobPilot = пилот diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl index e6a48283c39..c03990adf60 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl @@ -1,2 +1,4 @@ ent-IAAPDA = КПК агента внутренних дел .desc = Корпорация и прибыль - лучшие друзья. +ent-PilotPDA = КПК пилота + .desc = Имеет защиту от космической радиации. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl index 658ed8ff0cd..1bc170e6b76 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl @@ -1,2 +1,4 @@ ent-IAAIDCard = ID карта агента внутренних дел .desc = { ent-IDCardStandard.desc } +ent-PilotIDCard = ID карта пилота + .desc = { ent-IDCardStandard.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl index 714edf78ba9..90c277b0c9b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl @@ -95,3 +95,5 @@ ent-SpawnPointPsychologist = психолог .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointZookeeper = зоотехник .desc = { ent-SpawnPointJobBase.desc } +ent-SpawnPointPilot = пилот + .desc = { ent-SpawnPointJobBase.desc } diff --git a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml new file mode 100644 index 00000000000..0ba0637d366 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml @@ -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 diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml index f72b10c0a43..74c880d689a 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml @@ -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 diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml index cbdbc0e6227..5f95ccca973 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml @@ -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 diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml new file mode 100644 index 00000000000..c4230091eae --- /dev/null +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml @@ -0,0 +1,41 @@ +- type: job + id: Pilot + name: job-name-pilot + description: job-description-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 diff --git a/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml b/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml index ad0ed3cd69a..267322487f3 100644 --- a/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml @@ -1,6 +1,9 @@ - type: playTimeTracker id: JobIAA +- type: playTimeTracker + id: JobPilot + - type: playTimeTracker id: JobEvent1 diff --git a/Resources/Prototypes/Corvax/StatusEffects/job.yml b/Resources/Prototypes/Corvax/StatusEffects/job.yml index b230d2d66c3..1c8243b4b38 100644 --- a/Resources/Prototypes/Corvax/StatusEffects/job.yml +++ b/Resources/Prototypes/Corvax/StatusEffects/job.yml @@ -4,3 +4,10 @@ icon: sprite: Interface/Misc/job_icons.rsi state: IAA + +- type: statusIcon + parent: JobIcon + id: JobIconPilot + icon: + sprite: Interface/Misc/job_icons.rsi + state: Pilot diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index dee11089f89..1ecb17baa20 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -80,6 +80,7 @@ - HeadOfSecurity - SecurityCadet - SecurityOfficer + - Pilot # Corvax-Pilot - Detective - Warden diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Pilot.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Pilot.png new file mode 100644 index 0000000000000000000000000000000000000000..499f5450f7474168a09ec9c4247f0658fba72542 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxf7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zHZw4UGccTHVEF(4KTvFvg5?V!#aa^N7Yr2n&+vO2UocRBv%n*= zn1O-s2naJy)#j513hH>eIEF}s+jcwhF&GFiivF)JzL_hP;KESYSoZq>P#=S*tDnm{r-UW|n4~tO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index a539ec7658d..9fc2e26296d 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -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, @@ -146,6 +146,9 @@ { "name": "SecurityCadet" }, + { + "name": "Pilot" + }, { "name": "IAA" }, @@ -175,9 +178,8 @@ }, { "name": "MindShield", - "delays": - [ - [1.0,1.0] + "delays": [ + [ 1.0, 1.0 ] ] }, { diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idpilot.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idpilot.png new file mode 100644 index 0000000000000000000000000000000000000000..244a102f1b85c05913a0542bac6ffb0b9d57965b GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?ST!xB6P}uWdO*fEYD+%%o1`7WF&#-y_lKnst z&H|6fVg?4jBOuH;Rhv&5C>ZVO;uvD#|F++e>wp0V%k|Lz|DSU4nyRXpU5K`BcbJwK zT5(W+&Kr(~gfGU7p;MbDHU@Z3{kD6DY0HL;3bUrG9ih&Z&sumLlbR2ld2}{*H`~jM hzz@&(gzXe}$g2tneYIK3Ed;cN!PC{xWt~$(69BJRQj`Dy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index 01714f32af5..184f5f44865 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -218,7 +218,10 @@ "name": "idseniorphysician" }, { - "name": "idseniorofficer" + "name": "idseniorofficer" + }, + { + "name": "idpilot" }, { "name": "gold-inhand-left", From c46e46be267b5ca888f3b54eef171368931421b0 Mon Sep 17 00:00:00 2001 From: poeMota Date: Tue, 19 Mar 2024 16:02:40 +0300 Subject: [PATCH 2/5] done --- Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml | 1 - Resources/Prototypes/Corvax/StatusEffects/job.yml | 2 +- Resources/Textures/Interface/Misc/job_icons.rsi/meta.json | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml index c4230091eae..dfa3223597d 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml @@ -1,7 +1,6 @@ - type: job id: Pilot name: job-name-pilot - description: job-description-pilot playTimeTracker: JobPilot requirements: - !type:DepartmentTimeRequirement diff --git a/Resources/Prototypes/Corvax/StatusEffects/job.yml b/Resources/Prototypes/Corvax/StatusEffects/job.yml index 1c8243b4b38..98d7dfa93bd 100644 --- a/Resources/Prototypes/Corvax/StatusEffects/job.yml +++ b/Resources/Prototypes/Corvax/StatusEffects/job.yml @@ -9,5 +9,5 @@ parent: JobIcon id: JobIconPilot icon: - sprite: Interface/Misc/job_icons.rsi + sprite: /Textures/Interface/Misc/job_icons.rsi state: Pilot diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 9fc2e26296d..b380f279803 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -107,6 +107,9 @@ { "name": "Brigmedic" }, + { + "name": "Pilot" + }, { "name": "MedicalDoctor" }, @@ -146,9 +149,6 @@ { "name": "SecurityCadet" }, - { - "name": "Pilot" - }, { "name": "IAA" }, From 3a422d1615af45fcfb391ea712da6a9b38a812d8 Mon Sep 17 00:00:00 2001 From: poeMota Date: Tue, 19 Mar 2024 16:07:12 +0300 Subject: [PATCH 3/5] bruh --- Resources/Textures/Interface/Misc/job_icons.rsi/meta.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index b380f279803..4d5e9fbdf8c 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -178,8 +178,9 @@ }, { "name": "MindShield", - "delays": [ - [ 1.0, 1.0 ] + "delays": + [ + [1.0,1.0] ] }, { From 6d244acaded30dc912f980ba23960158ba288472 Mon Sep 17 00:00:00 2001 From: poeMota Date: Tue, 19 Mar 2024 16:23:00 +0300 Subject: [PATCH 4/5] huh --- .../ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl index c2a49ab3c1c..4672fe2c1cc 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl @@ -1,4 +1,4 @@ ent-IAAPDA = internal affairs agent PDA .desc = Corporation and profit are best friends. ent-PilotPDA = pilot PDA - .desc = Нas protection from cosmic radiation. + .desc = Нas protection from space radiation. From 485fea10a61c76f9d7c4588b249e1d326b68629f Mon Sep 17 00:00:00 2001 From: poeMota Date: Tue, 19 Mar 2024 16:36:39 +0300 Subject: [PATCH 5/5] resprite --- .../Interface/Misc/job_icons.rsi/Pilot.png | Bin 195 -> 195 bytes .../Objects/Misc/id_cards.rsi/idpilot.png | Bin 246 -> 247 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Pilot.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Pilot.png index 499f5450f7474168a09ec9c4247f0658fba72542..d2a91e95fb592ef8641939e6d7fa94384fd164a0 100644 GIT binary patch delta 65 zcmX@ic$jfQr&V%7Vgie!!ci7B9v&V6wtxwpoiins4)L%g2rA5%jO68xFlXjw;16NQ UT`xFy9s>|~y85}Sb4q9e09a8GdH?_b delta 65 zcmX@ic$jfQrmdKI;Vst0O&v#`Tzg` diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idpilot.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idpilot.png index 244a102f1b85c05913a0542bac6ffb0b9d57965b..9d3df6be6410e92ca4b6e412d427ae7c41809c1f 100644 GIT binary patch delta 120 zcmV-;0Ehqf0rvrrhH+d;L_t(IPwkLf3cw%?1UIkyU%9DDV-X{Qf9(iD!mx?L7W_hG zM*s+;A06<`U_^t8K&^UsB}ke87Lj~}_{m2&Ny74(6E=kU53H(w$F5xhb+ndqa)$|@ a5X>$W#S-sK%V7}!000056 z>