diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 53955ed1f6..077462e73b 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -100,6 +100,7 @@ loadout-group-cargo-technician-jumpsuit = Cargo Technician jumpsuit loadout-group-cargo-technician-backpack = Cargo Technician backpack loadout-group-cargo-technician-outerclothing = Cargo Technician outer clothing loadout-group-cargo-technician-shoes = Cargo Technician shoes +loadout-group-cargo-technician-id = Cargo Technician ID loadout-group-salvage-specialist-backpack = Salvage Specialist backpack loadout-group-salvage-specialist-outerclothing = Salvage Specialist outer clothing diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 1153047e7d..6a024d29fa 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1426,6 +1426,25 @@ - type: Icon state: pda-seniorofficer +- type: entity + parent: BasePDA + id: SeniorCourierPDA + name: senior courier PDA + description: Smells like postage stamps and shuttle fuel. + components: + - type: Pda + id: CargoIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-seniorcourier + - type: PdaBorderColor + borderColor: "#e39751" + accentVColor: "#DFDFDF" + - type: Icon + state: pda-seniorcourier + - type: entity parent: [ BaseMajorContraband, SyndiPDA ] id: PiratePDA diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml index fb823fdcb9..d23027130f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -1,3 +1,23 @@ +# Senior times +- type: loadoutEffectGroup + id: SeniorCargo + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobCargoTechnician + time: 21600 #6 hrs + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobSalvageSpecialist + time: 21600 #6 hrs + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Cargo + time: 216000 # 60 hrs + # Head - type: loadout id: CargoTechnicianHead @@ -42,3 +62,17 @@ id: CargoWinterBoots equipment: shoes: ClothingShoesBootsWinterCargo + +# ID +- type: loadout + id: CargoTechnicianPDA + equipment: + id: CargoPDA + +- type: loadout + id: SeniorCourierPDA + effects: + - !type:GroupLoadoutEffect + proto: SeniorCargo + equipment: + id: SeniorCourierPDA diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 333d914225..7930b3ff1b 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -688,6 +688,13 @@ - BlackShoes - CargoWinterBoots +- type: loadoutGroup + id: CargoTechnicianID + name: loadout-group-cargo-technician-id + loadouts: + - CargoTechnicianPDA + - SeniorCourierPDA + - type: loadoutGroup id: SalvageSpecialistBackpack name: loadout-group-salvage-specialist-backpack diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 43ede4a05f..e08e6aa0fc 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -225,6 +225,7 @@ - CargoTechnicianBackpack - CargoTechnicianOuterClothing - CargoTechnicianShoes + - CargoTechnicianID - Glasses - Survival - Trinkets diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index ae64cb438a..dcf7add35e 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -19,7 +19,6 @@ - type: startingGear id: CargoTechGear equipment: - id: CargoPDA ears: ClothingHeadsetCargo pocket1: AppraisalTool #storage: diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 8f987ac66e..9606232b68 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -231,6 +231,9 @@ }, { "name": "pda-seniorofficer" + }, + { + "name": "pda-seniorcourier" }, { "name": "pda-wizard", diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorcourier.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorcourier.png new file mode 100644 index 0000000000..b1224dae9c Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorcourier.png differ