From e6e35271e752b7e8dd6b787244937008062cdfd9 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 15 Dec 2024 18:03:57 -0300 Subject: [PATCH 01/10] Add cargo assistant --- .../en-US/deltav/job/job-description.ftl | 1 + .../Locale/en-US/deltav/job/job-names.ftl | 2 ++ .../DeltaV/Entities/Objects/Devices/pda.yml | 10 ++++++++++ .../Objects/Misc/identification_cards.yml | 13 +++++++++++++ .../Roles/Jobs/Cargo/cargo_assistant.yml | 17 +++++++++++++++++ .../DeltaV/Roles/play_time_trackers.yml | 3 +++ .../Misc/id_cards.rsi/idcargoassistant.png | Bin 0 -> 201 bytes .../DeltaV/Objects/Misc/id_cards.rsi/meta.json | 5 ++++- 8 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idcargoassistant.png diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl index 37d9dfd5dc8..aeabcf5e533 100644 --- a/Resources/Locale/en-US/deltav/job/job-description.ftl +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -5,3 +5,4 @@ job-description-prosecutor = Take statements from security and prepare cases aga job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs. job-description-security-borg = Purpose-built to ensure the right of every crew member to liberty, justice and freedom, ensure the peace aboard the space station by following your laws and patrolling the halls. job-description-roboticist = Fabricate borgs and other robots, repair and upgrade the station's silicon life, and scream "State Laws" when the AI takes too long to open a door. +job-description-cargo-assistant = Learn the basics of the logistics department, deliver crates and take buy orders from the rest of the station. diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index c5c4c9da684..47bb5bcb548 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -4,6 +4,7 @@ job-name-clerk = Clerk job-name-prosecutor = Prosecutor job-name-lawyer = Attorney job-name-courier = Courier +job-name-cargo-assistant = Cargo Assistant job-name-security-borg = Security Cyborg # Used by the Agent ID job-name-senior-physician = Senior Physician @@ -61,3 +62,4 @@ JobClerk = Clerk JobProsecutor = Prosecutor JobSecurityBorg = Security Cyborg JobRoboticist = Roboticist +JobCargoAssistant = Cargo Assistant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index 99b9fd5ed8c..4e90ae736b7 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -190,6 +190,16 @@ - MailMetricsCartridge - NanoChatCartridge +- type: entity + parent: CargoPDA + id: CargoAssistantPDA + name: cargo assistant PDA + description: It smells like cardboard. + components: + - type: Pda + id: CargoAssistantIDCard + state: pda-cargo-assistant + ## Alternate Job Titles # Passenger diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index 2a8b0661773..983748f73e1 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -50,6 +50,19 @@ - type: PresetIdCard job: Courier +- type: entity + parent: IDCardStandard + id: CargoAssistantIDCard + name: cargo assistant ID card + components: + - type: Sprite + layers: + - state: default + - sprite: DeltaV/Objects/Misc/id_cards.rsi + state: idcargoassistant + - type: PresetIdCard + job: CargoAssistant + ## Alternate Job Titles # Passenger diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml new file mode 100644 index 00000000000..361ee1168a0 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml @@ -0,0 +1,17 @@ +- type: job + id: CargoAssistant + name: job-name-cargo-assistant + description: job-description-cargo-assistant + startingGear: CargoAssistantGear + playTimeTracker: JobCargoAssistant + icon: "JobIconCourier" + supervisors: job-supervisors-qm + access: + - Cargo + - Maintenance + +- type: startingGear + id: CargoAssistantGear + equipment: + ears: ClothingHeadsetCargo + pocket1: BookLogistics diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml index 1ebc9024823..af329817d31 100644 --- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml @@ -21,3 +21,6 @@ - type: playTimeTracker id: JobRoboticist + +- type: playTimeTracker + id: JobCargoAssistant diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idcargoassistant.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idcargoassistant.png new file mode 100644 index 0000000000000000000000000000000000000000..73377bc36892835d8d34884cb1ba0968ef90ea49 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ37#&FArY;~2@ Date: Sun, 15 Dec 2024 18:09:29 -0300 Subject: [PATCH 02/10] Add a guidebook for the assistant --- .../DeltaV/Entities/Objects/Misc/books.yml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/books.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/books.yml index 012f46ae10e..176dfd7102c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/books.yml @@ -44,3 +44,26 @@ color: "#2c5491" - type: Paper content: book-text-vulpkanin + +- type: entity + id: BookLogistics + parent: BaseGuidebook + name: logistics 101 + description: A Nanotrasen guide book for a new cargo assistant still on training + components: + - type: Sprite + layers: + - state: paper + - state: cover_strong + color: "#785214" + - state: decor_wingette + color: "#a8741e" + - state: decor_spine + color: "#a8741e" + - state: icon_diamond + - state: icon_text3 + color: "#ffffff" + - type: GuideHelp + guides: + - Cargo + - Salvage From 615ac9d7e855dca6cdaf9ecbfff78c4d7e3f7850 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 15 Dec 2024 18:10:12 -0300 Subject: [PATCH 03/10] Add a PDA to the assistant + modified the color of the TA one due to similar colors to logistics --- .../DeltaV/Objects/Devices/pda.rsi/meta.json | 5 ++++- .../Devices/pda.rsi/pda-cargo-assistant.png | Bin 0 -> 449 bytes .../Objects/Devices/pda.rsi/pda-interntech.png | Bin 465 -> 447 bytes 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-cargo-assistant.png diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json index 78b6170b56f..10f89495235 100644 --- a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net", + "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, modified interntech and added the cargo assistant version by Radezolid", "size": { "x": 32, "y": 32 @@ -50,6 +50,9 @@ { "name": "pda-cargo" }, + { + "name": "pda-cargo-assistant" + }, { "name": "pda-ce" }, diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-cargo-assistant.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-cargo-assistant.png new file mode 100644 index 0000000000000000000000000000000000000000..35955c51d73b889d9b6e9b2592f3adb4dc9b5e9c GIT binary patch literal 449 zcmV;y0Y3hTP)YE9Ki9f;$kt<3~?&mghEyqAE2+$Cy>mY?OgB~Zqdo1o4bpPt_~6k1<}&U6k3f` zaEVhz+WVJWQV0Dlcb7}GQijpU;)^ zC_9#u3n6qy0H(KR%D&T!M=fGUH?R?wRI>65u4u{lgH9XG)!1sLs#^W)b=PBE!kOHzS%VgiYC_=Y>q<}b%l@H`am_iB& z!%(|B@*oNUY{C{%8K5kL6Tk*hIlzS22tbF}7@#PkRDcZO46uEbMG;0oo;@u?I0N$j zSXL3v0N?kW5YB+A5msxUN`w)xy06Pd7y+`MOPL6(HBcqODJLugp-sz$5F|-r93*?b zQuZAjoe)J)v9uf@2m%1^IvpCoKJW%ifaAdcfaz$;X!6csV{fh0<(FV_FzI%?CL^y8 rmrRlm8o};bd4Bx@s1GK;el+_6Yxd*42~oi_00000NkvXXu0mjfuDHUt literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-interntech.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-interntech.png index 36537f397bdc633ad3eeed552257f2dbf771ebfd..2d43b85b4e55d33fd06c5109dc43b84cfd525107 100644 GIT binary patch delta 422 zcmV;X0a^ah1HS{1BYy#gNklYE9Ki9f;#7zvXb_|naga(LKzx9{fY5?3 zkWspKsY4&ZC9_j~2*JfS2*I%wmmn<$I|*@+meSt8TkbBG+< zXMnPZN&zB-HGjbLRhC6)0Y%od2w@E<`eWHdSOYxIvqD${>P8sNfjSXdz~;KH8leS< zelArajOIX{2&+9|6$tIFI89S+BmUQeyz*>F7>3ea@qxB+-v{8e*P{s>0-wMXxE_xI z=w8OWP2r-+R(k&;-(P~k!KB~s>x|r<4|)H9(<8Rhs~@|P2a|OK)OR%d0S-RY@@AM1 QivR!s07*qoM6N<$f*5eZ1^@s6 delta 440 zcmV;p0Z0D71JMJJBYyw^b5ch_0Itp)=>Px$i%CR5R9J=W*F8(aKp4RBzaof*lV&J5 zNN@}k++E!I75WjfDc$SZ)zRU=T{`#)+#TF&Mu~ziMOqBhw;>Kvl{WX1Tv7*pmdoWy z?tUb9#~u8~UymhSvR<#J)9Y5NrF?FDeKvRRB1*sWpX?d-^dCU&?iGJyb*?-* i{X9pgzQC^^%{~Cn%i{I9Rh?A;0000 Date: Sun, 15 Dec 2024 18:26:14 -0300 Subject: [PATCH 04/10] Added icon --- .../DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml | 2 +- Resources/Prototypes/DeltaV/StatusIcon/job.yml | 8 ++++++++ .../Misc/job_icons.rsi/CargoAssistant.png | Bin 0 -> 137 bytes .../DeltaV/Interface/Misc/job_icons.rsi/meta.json | 5 ++++- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/CargoAssistant.png diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml index 361ee1168a0..857bbdb6bc2 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml @@ -4,7 +4,7 @@ description: job-description-cargo-assistant startingGear: CargoAssistantGear playTimeTracker: JobCargoAssistant - icon: "JobIconCourier" + icon: "JobIconCargoAssistant" supervisors: job-supervisors-qm access: - Cargo diff --git a/Resources/Prototypes/DeltaV/StatusIcon/job.yml b/Resources/Prototypes/DeltaV/StatusIcon/job.yml index fef4f4489a0..8c60dade5d8 100644 --- a/Resources/Prototypes/DeltaV/StatusIcon/job.yml +++ b/Resources/Prototypes/DeltaV/StatusIcon/job.yml @@ -45,3 +45,11 @@ sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: SecurityBorg jobName: job-name-security-borg + +- type: jobIcon + parent: JobIcon + id: JobIconCargoAssistant + icon: + sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi + state: CargoAssistant + jobName: job-name-cargo-assistant diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/CargoAssistant.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/CargoAssistant.png new file mode 100644 index 0000000000000000000000000000000000000000..d4c5e0d7b5661d53885225f7dcf981fdc4e84378 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxf_yc@GT>t<7UlpUjvCRd@0E*p| zD{lr;tR+Ey!3-cF!%HXc0|it(T^vI=W+o>jvM`IWxv8ZoBqXIIuuSstIg`M~v7l># cVZtp&VK0XEQ-)%vfa)1MUHx3vIVCg!0BwCKd;kCd literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json index bdbe6a6461d..d7942b8e633 100644 --- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid", "size": { "x": 8, "y": 8 @@ -42,6 +42,9 @@ }, { "name": "SecurityBorg" + }, + { + "name": "CargoAssistant" } ] } From 4417808179c28cc305a1dd4b7b56686b5807854e Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 15 Dec 2024 19:33:00 -0300 Subject: [PATCH 05/10] Add spawner+ option to the departments.yml --- .../DeltaV/Entities/Markers/Spawners/jobs.yml | 13 +++++++++++++ .../DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml | 3 +++ Resources/Prototypes/Roles/Jobs/departments.yml | 1 + .../DeltaV/Markers/jobs.rsi/cargoassistant.png | Bin 0 -> 918 bytes .../Textures/DeltaV/Markers/jobs.rsi/meta.json | 5 ++++- 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/cargoassistant.png diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index 50f08716086..130ca1897c8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -92,3 +92,16 @@ - state: green - sprite: DeltaV/Markers/jobs.rsi state: roboticist + +- type: entity + parent: SpawnPointJobBase + id: SpawnPointCargoAssistant + name: cargo assistant + components: + - type: SpawnPoint + job_id: CargoAssistant + - type: Sprite + layers: + - state: green + - sprite: DeltaV/Markers/jobs.rsi + state: cargoassistant diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml index 857bbdb6bc2..b4dc8c9aa1b 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml @@ -13,5 +13,8 @@ - type: startingGear id: CargoAssistantGear equipment: + jumpsuit: ClothingUniformJumpsuitCargo + id: CargoAssistantPDA + shoes: ClothingShoesColorBlack ears: ClothingHeadsetCargo pocket1: BookLogistics diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index c009181d6fd..446ddbb82b2 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -8,6 +8,7 @@ - Quartermaster - SalvageSpecialist - Courier # DeltaV - Courier, see Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/courier.yml + - CargoAssistant # DeltaV - Add learner role to logistics. - type: department id: Civilian diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/cargoassistant.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/cargoassistant.png new file mode 100644 index 0000000000000000000000000000000000000000..a347a8c4f9f6b7ce3c8f99002dcfa9bdc0e7b8a3 GIT binary patch literal 918 zcmV;H18Mw;P)So`VMy>$tSzXFh(q7Y(Z z0BTEX0SMBM%}a-n1dx45Atc5E%4mO34naa=vcLZ(4MGyY!6<-IPi<^$gy~FY4Ge~K zWS1(E0DgG=L3nTy#~c4RH`l=I5d}DDD!>OvCmR=Bx`WP_jbcy1d+O>U3s80K1a!6` zHh$Jov!x#&9>VmqJ;C(U9Th%Kt)jBY6PYrsuC5kxv~g_w zsKtWvTQ5W#U1$1i)X2|fvxN;2762`3G#arq`WRW631ZO7yAISoG_k;>pZK@}@{^RuUCpX?zbISHUPhST9kxdvdb6LqTS{8 zK%b)&Gtl?i4WtAh!pTC&47lBH*3&|@rS)454{7S89scA;f%&{pvMYeo>0~WfDBb*y zc?P(Cw|TMvs?ME4hUq-!r@nwTpY0Gl19`VM(NylYkzdUX3sSV{m~;&94S-AH;bh;h z76^O<8N{pMMO3w>0}Tx*Eh|HrWfe)swalNO!;z2x8_TOWkQfJ#Z@cXs&xZP|8aka0 zDwPWN8}l$QFn|ZYeaUV$O!)xx48rqyj{vm4^VHMWJiQ`5hJ}R%*zI;aX=@k#&1UnC zIeP;5(;~q&PH%cgdz*O8%T>yUN!F>Dm)OL_gs4-i)sQ2y0C;d-^I2J0a+i?~z|*`P zCO8`r1Guh9VEY1920wn0j?M#ADdE)po&X{t{|`WSSC@eJV=$h!AS%lL55!qm0n@#D zHuieGX!7ld?|gpN{QUhb!`9|z;but*=4WTo+ue;TR;viXgOgsP(I6!?mHY3{iHO8C sH%BEWUKbY^i{qlABG&iy_d|~S0ybxZRqx6uEdT%j07*qoM6N<$g4~avZ2$lO literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json index 73c7764df0a..f5ce8ad76e4 100644 --- a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by Floofers. roboticist.png created by deltanedas (github) for DeltaV.", + "copyright": "made by Floofers. roboticist.png created by deltanedas (github) for DeltaV. cargoassistant made by Radezolid", "size": { "x": 32, "y": 32 @@ -48,6 +48,9 @@ }, { "name": "roboticist" + }, + { + "name": "cargoassistant" } ] } From 6e2469f5e4db177c60d9e6590aedb3fdad0755bf Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 15 Dec 2024 20:08:39 -0300 Subject: [PATCH 06/10] Loadout --- .../deltav/preferences/loadout-groups.ftl | 6 +++ .../DeltaV/Loadouts/loadout_groups.yml | 42 ++++++++++++++++++- .../DeltaV/Loadouts/role_loadouts.yml | 15 +++++++ .../Roles/Jobs/Cargo/cargo_assistant.yml | 2 - 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index 9d0b06d8804..673c42d5b7b 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -49,6 +49,12 @@ loadout-group-mail-carrier-head = Mail Carrier head loadout-group-mail-carrier-jumpsuit = Mail Carrier jumpsuit loadout-group-mail-carrier-outerclothing = Mail Carrier outer clothing +loadout-group-cargo-assistant-head = Cargo Assistant head +loadout-group-cargo-assistant-jumpsuit = Cargo Assistant jumpsuit +loadout-group-cargo-assistant-backpack = Cargo Assistant backpack +loadout-group-cargo-assistant-outerclothing = Cargo Assistant outer clothing +loadout-group-cargo-assistant-shoes = Cargo Assistant shoes + loadout-group-salvage-specialist-neck = Salvage Specialist neck loadout-group-salvage-id-delta = Salvage Specialist PDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 8b5b827e09a..4336db20d3a 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -71,6 +71,44 @@ - CourierPDA - MailCarrierPDA +## Cargo Assistant + +- type: loadoutGroup + id: CargoAssistantHead + name: loadout-group-cargo-assistant-head + minLimit: 0 + loadouts: + - CargoTechnicianHead + +- type: loadoutGroup + id: CargoAssistantJumpsuit + name: loadout-group-cargo-assistant-jumpsuit + loadouts: + - CargoTechnicianJumpsuit + - CargoTechnicianJumpskirt + +- type: loadoutGroup + id: CargoAssistantBackpack + name: loadout-group-cargo-assistant-backpack + loadouts: + - CargoTechnicianBackpack + - CargoTechnicianSatchel + - CargoTechnicianDuffel + +- type: loadoutGroup + id: CargoAssistantOuterClothing + name: loadout-group-cargo-assistant-outerclothing + minLimit: 0 + loadouts: + - CargoTechnicianWintercoat + +- type: loadoutGroup + id: CargoAssistantShoes + name: loadout-group-cargo-assistant-shoes + loadouts: + - BlackShoes + - CargoWinterBoots + # Security ## Brig Medic - type: loadoutGroup @@ -228,7 +266,7 @@ - ChiefJusticeJumpskirt - ChiefJusticeFormalJumpsuit - ChiefJusticeWhiteJumpsuit - + - type: loadoutGroup id: ChiefJusticeNeck name: loadout-group-chiefjustice-neck @@ -257,7 +295,7 @@ loadouts: - ClerkJumpsuit - ClerkJumpskirt - + - type: loadoutGroup id: ClerkNeck name: loadout-group-clerk-neck diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index 7431e4f8a4a..a07394da56f 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -14,6 +14,21 @@ - Trinkets - GroupSpeciesBreathTool +- type: roleLoadout + id: JobCargoAssistant + groups: + - GroupTankHarness + - CargoAssistantHead + - CargoAssistantNeck + - CargoAssistantJumpsuit + - CargoAssistantBackpack + - CargoAssistantOuterClothing + - CargoAssistantShoes + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + # Security - type: roleLoadout id: JobBrigmedic diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml index b4dc8c9aa1b..84a6535d10b 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml @@ -13,8 +13,6 @@ - type: startingGear id: CargoAssistantGear equipment: - jumpsuit: ClothingUniformJumpsuitCargo id: CargoAssistantPDA - shoes: ClothingShoesColorBlack ears: ClothingHeadsetCargo pocket1: BookLogistics From ded7d2e74f8b4d4e8c24ccf4e1d9c23932a305c7 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 15 Dec 2024 20:16:58 -0300 Subject: [PATCH 07/10] Added time to cargo tech --- Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index 7ad883777ed..10fe13621f1 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -3,6 +3,12 @@ name: job-name-cargotech description: job-description-cargotech playTimeTracker: JobCargoTechnician + # Begin DeltaV modifications - Add time requirement to cargo tech + requirements: + - !type:DepartmentTimeRequirement + department: Logistics # DeltaV - Logistics Department replacing Cargo + time: 21600 # 6 hrs ~3 shifts. + # End DeltaV modifications startingGear: CargoTechGear icon: "JobIconCargoTechnician" supervisors: job-supervisors-qm From d9d53008c1347f6669dbc297c670abb646ba1646 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 15 Dec 2024 22:52:25 -0300 Subject: [PATCH 08/10] Prepare spawn for mapping --- .../Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml | 2 +- .../Prototypes/Roles/Jobs/Cargo/cargo_technician.yml | 9 +++++---- Resources/Prototypes/Roles/Jobs/departments.yml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index 130ca1897c8..e9b4deae0c1 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -99,7 +99,7 @@ name: cargo assistant components: - type: SpawnPoint - job_id: CargoAssistant + job_id: CargoTechnician # Change to CargoAssistant once it's mapped on every map - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index 10fe13621f1..48e71198911 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -4,10 +4,11 @@ description: job-description-cargotech playTimeTracker: JobCargoTechnician # Begin DeltaV modifications - Add time requirement to cargo tech - requirements: - - !type:DepartmentTimeRequirement - department: Logistics # DeltaV - Logistics Department replacing Cargo - time: 21600 # 6 hrs ~3 shifts. + # Uncomment once ready to deploy Cargo Assistant + #requirements: + #- !type:DepartmentTimeRequirement + # department: Logistics # DeltaV - Logistics Department replacing Cargo + # time: 21600 # 6 hrs ~3 shifts. # End DeltaV modifications startingGear: CargoTechGear icon: "JobIconCargoTechnician" diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 446ddbb82b2..994366a759c 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -8,7 +8,7 @@ - Quartermaster - SalvageSpecialist - Courier # DeltaV - Courier, see Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/courier.yml - - CargoAssistant # DeltaV - Add learner role to logistics. + #- CargoAssistant # DeltaV - Uncomment once ready to deploy. - type: department id: Civilian From c87fe5ed1101f6fa2604de395318ae0d2b32dd20 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 15 Dec 2024 23:21:03 -0300 Subject: [PATCH 09/10] Replace error --- Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index a07394da56f..d1f928d0a78 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -19,7 +19,6 @@ groups: - GroupTankHarness - CargoAssistantHead - - CargoAssistantNeck - CargoAssistantJumpsuit - CargoAssistantBackpack - CargoAssistantOuterClothing From 807745af6ebbf40861a8c6feb2508f3d3fc87c82 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 19 Dec 2024 18:24:50 -0300 Subject: [PATCH 10/10] Whitespace --- Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 4336db20d3a..1846e1ea662 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -72,7 +72,6 @@ - MailCarrierPDA ## Cargo Assistant - - type: loadoutGroup id: CargoAssistantHead name: loadout-group-cargo-assistant-head