diff --git a/Resources/Changelog/Mira.yml b/Resources/Changelog/Mira.yml index a55d281256..d87cb41729 100644 --- a/Resources/Changelog/Mira.yml +++ b/Resources/Changelog/Mira.yml @@ -321,3 +321,9 @@ Entries: type: Add id: 50 time: '2024-08-09T18:04:00.0000000+00:00' +- author: Doctor-Cpu + changes: + - message: Added senior cargo loadouts + type: Add + id: 51 + time: '2024-08-09T18:47:00.0000000+00:00' diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 11b82d95c4..128b3016cd 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -50,6 +50,7 @@ job-name-senior-engineer = Senior Engineer job-name-senior-researcher = Senior Researcher job-name-senior-physician = Senior Physician job-name-senior-officer = Senior Officer +job-name-senior-cargo = Senior Cargo # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = Atmospheric Technician diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 07fd49c4a4..94af63533c 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -94,9 +94,11 @@ 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 +loadout-group-salvage-specialist-neck = Salvage Specialist neck loadout-group-salvage-specialist-shoes = Salvage Specialist shoes # Engineering diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index d063b8e853..720ebd2e9a 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -18,7 +18,7 @@ - state: icon_flipped map: ["foldedLayer"] visible: false - + - type: entity parent: ClothingHeadHeadHatBaseFlippable id: ClothingHeadHeadHatBaseFlipped @@ -83,6 +83,33 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadHeadHatBaseFlippable + id: ClothingHeadHatSeniorCargo + name: senior cargo cap + description: "It's a baseball hat painted in the Senior Cargo's colours." + components: + - type: Sprite + sprite: Clothing/Head/Soft/senior_cargo.rsi + - type: Clothing + sprite: Clothing/Head/Soft/senior_cargo.rsi + - type: Tag + tags: + - ClothMade + - HamsterWearable + - WhitelistChameleon + +- type: entity + parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCargosoft] + id: ClothingHeadHatSeniorCargoFlipped + name: senior cargo cap + components: + - type: Tag + tags: + - ClothMade + - HamsterWearable + - WhitelistChameleon + - type: entity parent: ClothingHeadHeadHatBaseFlippable id: ClothingHeadHatQMsoft @@ -98,7 +125,7 @@ parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatQMsoft] id: ClothingHeadHatQMsoftFlipped name: quartermaster's cap - + - type: entity parent: ClothingHeadHeadHatBaseFlippable id: ClothingHeadHatCorpsoft @@ -285,7 +312,7 @@ parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBizarreSoft] id: ClothingHeadHatBizarreSoftFlipped name: troublemaker's cap - + - type: entity parent: ClothingHeadHeadHatBaseFlippable id: ClothingHeadHatParamedicsoft diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 67d20adccc..7a3376056e 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -646,6 +646,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/senior_officer.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtSeniorCargo + name: senior cargo jumpskirt + description: A sign of skill and prestige within the cargo department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/senior_cargo.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/senior_cargo.rsi + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtSecGrey diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 9984d44c52..0db8f89ae2 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1157,6 +1157,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/senior_officer.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSeniorCargo + name: senior cargo jumpsuit + description: A sign of skill and prestige within the cargo department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/senior_cargo.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/senior_cargo.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitWeb diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 04b023248e..f139641acd 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1028,6 +1028,22 @@ - type: Icon state: pda-seniorofficer +- type: entity + parent: BasePDA + id: SeniorCargoPDA + name: senior cargo PDA + description: Covered in dirt and welding fuel. + components: + - type: Pda + id: SeniorCargoIDCard + state: pda-seniorcargo + - type: PdaBorderColor + borderColor: "#e39751" + accentHColor: "#8900c9" + accentVColor: "#a23e3e" + - type: Icon + state: pda-seniorcargo + - type: entity parent: SyndiPDA id: PiratePDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 01d4d2d324..e9bef03cff 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -617,7 +617,7 @@ - JobIconDetective - JobIconLawyer - - JobIconPassenger + - JobIconNanotrasen - JobIconCaptain - JobIconHeadOfPersonnel @@ -630,7 +630,7 @@ - JobIconParamedic - JobIconPsychologist - - JobIconClown + - JobIconPassenger - JobIconBotanist - JobIconBartender @@ -643,7 +643,7 @@ - JobIconLibrarian - JobIconChaplain - - JobIconMime + - JobIconClown - JobIconChef - JobIconZookeeper @@ -653,20 +653,20 @@ - JobIconScientist - JobIconResearchAssistant + - JobIconJanitor + - JobIconBoxer + - JobIconMusician + - JobIconMime + - JobIconReporter + - JobIconServiceWorker + # Cargo - JobIconQuarterMaster + - JobIconSeniorCargo - JobIconCargoTechnician - JobIconShaftMiner - - JobIconJanitor - - JobIconReporter - - JobIconServiceWorker - - - JobIconNanotrasen - JobIconVisitor - - JobIconBoxer - - JobIconMusician - - type: ActivatableUI key: enum.AgentIDCardUiKey.Key @@ -875,6 +875,19 @@ jobName: job-name-senior-officer jobIcon: JobIconSeniorOfficer +- type: entity + parent: CargoIDCard + id: SeniorCargoIDCard + name: senior cargo ID card + components: + - type: Sprite + layers: + - state: default + - state: idseniorcargo + - type: PresetIdCard + jobName: job-name-senior-cargo + jobIcon: JobIconSeniorCargo + - type: entity parent: IDCardStandard id: UniversalIDCard diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml index fb823fdcb9..67bfb44ba5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -1,9 +1,34 @@ +# Senior Time +- type: loadoutEffectGroup + id: SeniorCargo + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobCargoTechnician + time: 0 + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobSalvageSpecialist + time: 0 + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Cargo + time: 0 + # Head - type: loadout id: CargoTechnicianHead equipment: head: ClothingHeadHatCargosoft +- type: loadout + id: SeniorCargoHead + equipment: + head: ClothingHeadHatSeniorCargo + # Jumpsuit - type: loadout id: CargoTechnicianJumpsuit @@ -15,6 +40,22 @@ equipment: jumpsuit: ClothingUniformJumpskirtCargo +- type: loadout + id: SeniorCargoJumpsuit + effects: + - !type:GroupLoadoutEffect + proto: SeniorCargo + equipment: + jumpsuit: ClothingUniformJumpsuitSeniorCargo + +- type: loadout + id: SeniorCargoJumpskirt + effects: + - !type:GroupLoadoutEffect + proto: SeniorCargo + equipment: + jumpsuit: ClothingUniformJumpskirtSeniorCargo + # Back - type: loadout id: CargoTechnicianBackpack @@ -42,3 +83,17 @@ id: CargoWinterBoots equipment: shoes: ClothingShoesBootsWinterCargo + +# ID +- type: loadout + id: CargoTechnicianPDA + equipment: + id: CargoPDA + +- type: loadout + id: SeniorCargoPDA + effects: + - !type:GroupLoadoutEffect + proto: SeniorCargo + equipment: + id: SeniorCargoPDA diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml index 5ca110b5fc..ba2b335344 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -1,3 +1,18 @@ +# Senior times +- type: loadoutEffectGroup + id: SeniorSalvage + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobSalvageSpecialist + time: 18000 + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Cargo + time: 25200 + # Back - type: loadout id: SalvageSpecialistBackpack @@ -14,6 +29,15 @@ equipment: back: ClothingBackpackDuffelSalvage +# Neck +- type: loadout + id: SalvageSpecialistCloak + equipment: + neck: ClothingNeckCloakMiner + effects: + - !type:GroupLoadoutEffect + proto: SeniorSalvage + # OuterClothing - type: loadout id: SalvageSpecialistWintercoat diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index a43873213a..61d4f9f970 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -561,6 +561,7 @@ minLimit: 0 loadouts: - CargoTechnicianHead + - SeniorCargoHead - type: loadoutGroup id: CargoTechnicianJumpsuit @@ -568,6 +569,8 @@ loadouts: - CargoTechnicianJumpsuit - CargoTechnicianJumpskirt + - SeniorCargoJumpsuit + - SeniorCargoJumpskirt - type: loadoutGroup id: CargoTechnicianBackpack @@ -591,6 +594,13 @@ - BlackShoes - CargoWinterBoots +- type: loadoutGroup + id: CargoTechnicianPDA + name: loadout-group-cargo-technician-id + loadouts: + - CargoTechnicianPDA + - SeniorCargoPDA + - type: loadoutGroup id: SalvageSpecialistBackpack name: loadout-group-salvage-specialist-backpack @@ -599,6 +609,13 @@ - SalvageSpecialistSatchel - SalvageSpecialistDuffel +- type: loadoutGroup + id: SalvageSpecialistNeck + name: loadout-group-salvage-specialist-neck + minLimit: 0 + loadouts: + - SalvageSpecialistCloak + - type: loadoutGroup id: SalvageSpecialistOuterClothing name: loadout-group-salvage-specialist-outerclothing diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 4b79cad668..2e5820c388 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -209,6 +209,7 @@ - CargoTechnicianBackpack - CargoTechnicianOuterClothing - CargoTechnicianShoes + - CargoTechnicianPDA - Glasses - Survival - Trinkets @@ -220,6 +221,7 @@ - GroupTankHarness - SalvageSpecialistBackpack - SalvageSpecialistOuterClothing + - SalvageSpecialistNeck - SalvageSpecialistShoes - Glasses - Survival diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index 655e103bca..df7d2c88c1 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -15,7 +15,6 @@ - type: startingGear id: CargoTechGear equipment: - id: CargoPDA ears: ClothingHeadsetCargo pocket1: AppraisalTool #storage: diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index 6275f0bc07..18153cf57b 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -369,6 +369,13 @@ sprite: /Textures/Interface/Misc/job_icons.rsi state: SeniorResearcher +- type: statusIcon + parent: JobIcon + id: JobIconSeniorCargo + icon: + sprite: /Textures/Interface/Misc/job_icons.rsi + state: SeniorCargo + - type: statusIcon parent: JobIcon id: JobIconVisitor diff --git a/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..ade860a4a2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..fc4c61201f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/flipped-equipped-HELMET-hamster.png new file mode 100644 index 0000000000..d0c1a64420 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/flipped-equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/flipped-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/flipped-equipped-HELMET.png new file mode 100644 index 0000000000..e0248a15d6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/flipped-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/flipped-inhand-left.png b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/flipped-inhand-left.png new file mode 100644 index 0000000000..790e49f1a2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/flipped-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/flipped-inhand-right.png b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/flipped-inhand-right.png new file mode 100644 index 0000000000..2d7e1e13b3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/flipped-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/icon.png new file mode 100644 index 0000000000..f2a607245e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/icon_flipped.png b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/icon_flipped.png new file mode 100644 index 0000000000..a378e6bf3a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/icon_flipped.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/inhand-left.png new file mode 100644 index 0000000000..5b36e60e4a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/inhand-right.png new file mode 100644 index 0000000000..62d1f4dfca Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/meta.json new file mode 100644 index 0000000000..2b1ced7e6f --- /dev/null +++ b/Resources/Textures/Clothing/Head/Soft/senior_cargo.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, repaletted by Doctor-Cpu", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_flipped" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "flipped-equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "flipped-equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "flipped-inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "flipped-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING-monkey.png index 76d0f3793e..269dfb7306 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..269dfb7306 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..ebb57927a8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/icon.png new file mode 100644 index 0000000000..3580863d05 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/inhand-left.png new file mode 100644 index 0000000000..66127494b5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/inhand-right.png new file mode 100644 index 0000000000..0cddd1dd20 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/meta.json new file mode 100644 index 0000000000..12528a6bce --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_cargo.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Doctor-Cpu", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-long-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-long-INNERCLOTHING.png new file mode 100644 index 0000000000..f9da92530b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-long-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json index 12bdb72c4a..0727996605 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.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/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, long by Doctor-Cpu", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "equipped-long-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..143b683ac9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..defe96c869 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/icon.png new file mode 100644 index 0000000000..5c6c59c143 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/inhand-left.png new file mode 100644 index 0000000000..66127494b5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/inhand-right.png new file mode 100644 index 0000000000..0cddd1dd20 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/meta.json new file mode 100644 index 0000000000..12528a6bce --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_cargo.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Doctor-Cpu", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorCargo.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorCargo.png new file mode 100644 index 0000000000..afbe4db042 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorCargo.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index fff9f78288..3e934f3769 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -164,6 +164,9 @@ { "name": "SeniorOfficer" }, + { + "name": "SeniorCargo" + }, { "name": "Revolutionary" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index f77f8c0e71..d383392649 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14 | pda-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord), pda-pirate made by brainfood1183 (Github), pda-syndi-agent drawn by Ubaser", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14 | pda-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord), pda-pirate made by brainfood1183 (Github), pda-syndi-agent drawn by Ubaser pda-seniorcargo by Doctor-Cpu", "size": { "x": 32, "y": 32 @@ -226,6 +226,9 @@ { "name": "pda-seniorofficer" }, + { + "name": "pda-seniorcargo" + }, { "name": "equipped-IDCARD", "directions": 4 diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorcargo.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorcargo.png new file mode 100644 index 0000000000..5248e7c3e6 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorcargo.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorcargo.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorcargo.png new file mode 100644 index 0000000000..28a387c5d4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorcargo.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index bf76784bb9..2d90627f18 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -223,6 +223,9 @@ { "name": "idseniorofficer" }, + { + "name": "idseniorcargo" + }, { "name": "gold-inhand-left", "directions": 4