diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index c893429f1c..52311c5c7d 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -43,3 +43,7 @@ job-description-security = Catch criminals and enemies of the station, enforce t job-description-serviceworker = Learn the basics of bartending, cooking, and growing plants. job-description-warden = Patrol the security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up. job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Kettle Station. +job-description-senior-engineer = Teach new engineers the basics of the station's engine, repairing, atmospherics and power. +job-description-senior-researcher = Teach new scientists the basics of item printing, artifact research and anomalous objects. +job-description-senior-physician = Teach new medics the basics of tending to the wounded, chemistry, diagnosing the diseased and disposing of the dead. +job-description-senior-officer = Teach new officers the basics of searches, preforming arrests, prison times and how to properly shoot a firearm. diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 104c0c5448..3d58092e1c 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -43,6 +43,10 @@ job-name-ertmedic = ERT Medic job-name-ertjanitor = ERT Janitor job-name-boxer = Boxer job-name-zookeeper = Zookeeper +job-name-senior-engineer = Senior Engineer +job-name-senior-researcher = Senior Researcher +job-name-senior-physician = Senior Physician +job-name-senior-officer = Senior Officer # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = Atmospheric Technician @@ -85,6 +89,10 @@ JobSalvageSpecialist = Salvage Specialist JobScientist = Scientist JobSecurityCadet = Security Cadet JobSecurityOfficer = Security Officer +JobSeniorEngineer = Senior Engineer +JobSeniorOfficer = Senior Officer +JobSeniorPhysician = Senior Physician +JobSeniorResearcher = Senior Researcher JobServiceWorker = Service Worker JobStationEngineer = Station Engineer JobTechnicalAssistant = Technical Assistant diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl index 6c92db181d..c8df164576 100644 --- a/Resources/Locale/en-US/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/job/job-supervisors.ftl @@ -7,8 +7,9 @@ job-supervisors-cmo = the chief medical officer job-supervisors-rd = the research director job-supervisors-qm = the quartermaster job-supervisors-service = chefs, botanists, the bartender, and the head of personnel -job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer -job-supervisors-medicine = medical doctors, chemists, and the chief medical officer -job-supervisors-security = security officers, the warden, and the head of security +job-supervisors-engineering = station engineers, atmospheric technicians, the senior engineer, and the chief engineer +job-supervisors-medicine = medical doctors, chemists, the senior physician, and the chief medical officer +job-supervisors-security = security officers, the senior officer, the warden, and the head of security +job-supervisors-science = scientists, the senior researcher, and the research director job-supervisors-hire = whoever hires you job-supervisors-everyone = absolutely everyone diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 06d334d3fe..6b3a54c886 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -312,3 +312,33 @@ Piercing: 0.65 Heat: 0.85 Caustic: 0.75 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatLabSeniorResearcher + name: senior researcher lab coat + description: A suit that protects against minor chemical spills. Has a purple collar and wrist trims. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.75 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatLabSeniorPhysician + name: senior physician lab coat + description: A suit that protects against minor chemical spills. Has light blue sleeves and an orange waist trim. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.75 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 76232d7142..00ed76351b 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -718,3 +718,47 @@ sprite: Clothing/Uniforms/Jumpskirt/skirtoflife.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/skirtoflife.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtSeniorEngineer + name: senior engineer jumpskirt + description: A sign of skill and prestige within the engineering department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/senior_engineer.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/senior_engineer.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtSeniorResearcher + name: senior researcher jumpskirt + description: A sign of skill and prestige within the science department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/senior_researcher.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/senior_researcher.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtSeniorPhysician + name: senior physician jumpskirt + description: A sign of skill and prestige within the medical department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/senior_physician.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/senior_physician.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtSeniorOfficer + name: senior officer jumpskirt + description: A sign of skill and prestige within the security department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/senior_officer.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/senior_officer.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index fc9981466f..7ce0bafe9e 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1192,3 +1192,47 @@ sprite: Clothing/Uniforms/Jumpsuit/flannel.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/flannel.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSeniorEngineer + name: senior engineer jumpsuit + description: A sign of skill and prestige within the engineering department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/senior_engineer.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/senior_engineer.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSeniorResearcher + name: senior researcher jumpsuit + description: A sign of skill and prestige within the science department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/senior_researcher.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/senior_researcher.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSeniorPhysician + name: senior physician jumpsuit + description: A sign of skill and prestige within the medical department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/senior_physician.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/senior_physician.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSeniorOfficer + name: senior officer jumpsuit + description: A sign of skill and prestige within the security department. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/senior_officer.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/senior_officer.rsi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 7fd3eab110..6c94f74e3e 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -305,6 +305,18 @@ - state: green - state: ce +- type: entity + id: SpawnPointSeniorEngineer + parent: SpawnPointJobBase + name: seniorengineer + components: + - type: SpawnPoint + job_id: SeniorEngineer + - type: Sprite + layers: + - state: green + - state: seniorengineer + - type: entity id: SpawnPointStationEngineer parent: SpawnPointJobBase @@ -343,6 +355,18 @@ - state: green - state: cmo +- type: entity + id: SpawnPointSeniorPhysician + parent: SpawnPointJobBase + name: seniorphysician + components: + - type: SpawnPoint + job_id: SeniorPhysician + - type: Sprite + layers: + - state: green + - state: seniorphysician + - type: entity id: SpawnPointMedicalDoctor parent: SpawnPointJobBase @@ -393,6 +417,18 @@ - state: green - state: rd +- type: entity + id: SpawnPointSeniorResearcher + parent: SpawnPointJobBase + name: seniorresearcher + components: + - type: SpawnPoint + job_id: SeniorResearcher + - type: Sprite + layers: + - state: green + - state: seniorresearcher + - type: entity id: SpawnPointScientist parent: SpawnPointJobBase @@ -431,6 +467,18 @@ - state: green - state: warden +- type: entity + id: SpawnPointSeniorOfficer + parent: SpawnPointJobBase + name: seniorofficer + components: + - type: SpawnPoint + job_id: SeniorOfficer + - type: Sprite + layers: + - state: green + - state: seniorofficer + - type: entity id: SpawnPointSecurityOfficer parent: SpawnPointJobBase diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 85d0fa1661..b6a396755c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -874,3 +874,68 @@ - Write - type: Unremoveable +- type: entity + parent: BasePDA + id: SeniorEngineerPDA + name: senior engineer PDA + description: Seems to have been taken apart and put back together several times. + components: + - type: Pda + id: SeniorEngineerIDCard + state: pda-seniorengineer + - type: PdaBorderColor + borderColor: "#949137" + accentVColor: "#CD6900" + - type: Icon + state: pda-seniorengineer + +- type: entity + parent: BasePDA + id: SeniorResearcherPDA + name: senior researcher PDA + description: Looks like it's been through years of chemical burns and explosions. + components: + - type: Pda + id: SeniorResearcherIDCard + state: pda-seniorresearcher + - type: PdaBorderColor + borderColor: "#d7d7d0" + accentHColor: "#8900c9" + accentVColor: "#8900c9" + - type: Icon + state: pda-seniorresearcher + +- type: entity + parent: BasePDA + id: SeniorPhysicianPDA + name: senior physician PDA + description: Smells faintly like iron and chemicals. Has a built-in health analyzer. + components: + - type: Pda + id: SeniorPhysicianIDCard + state: pda-seniorphysician + - type: PdaBorderColor + borderColor: "#d7d7d0" + accentHColor: "#447987" + accentVColor: "#B34200" + - type: Icon + state: pda-seniorphysician + - type: HealthAnalyzer + scanDelay: 1 + scanningEndSound: + path: "/Audio/Items/Medical/healthscanner.ogg" + +- type: entity + parent: BasePDA + id: SeniorOfficerPDA + name: senior officer PDA + description: Beaten, battered and broken, but just barely useable. + components: + - type: Pda + id: SeniorOfficerIDCard + state: pda-seniorofficer + - type: PdaBorderColor + borderColor: "#A32D26" + accentVColor: "#DFDFDF" + - type: Icon + state: pda-seniorofficer diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index fb9c71a73d..a4be8db5ad 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -617,3 +617,51 @@ - type: IdCard jobTitle: Cluwne - type: Unremoveable + +- type: entity + parent: IDCardStandard + id: SeniorEngineerIDCard + name: senior engineer ID card + components: + - type: Sprite + layers: + - state: default + - state: idseniorengineer + - type: PresetIdCard + job: SeniorEngineer + +- type: entity + parent: IDCardStandard + id: SeniorResearcherIDCard + name: senior researcher ID card + components: + - type: Sprite + layers: + - state: default + - state: idseniorresearcher + - type: PresetIdCard + job: SeniorResearcher + +- type: entity + parent: IDCardStandard + id: SeniorPhysicianIDCard + name: senior physician ID card + components: + - type: Sprite + layers: + - state: default + - state: idseniorphysician + - type: PresetIdCard + job: SeniorPhysician + +- type: entity + parent: IDCardStandard + id: SeniorOfficerIDCard + name: senior officer ID card + components: + - type: Sprite + layers: + - state: default + - state: idseniorofficer + - type: PresetIdCard + job: SeniorOfficer diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml new file mode 100644 index 0000000000..304b9324b9 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -0,0 +1,38 @@ +- type: job + id: SeniorEngineer + name: job-name-senior-engineer + description: job-description-senior-engineer + playTimeTracker: JobSeniorEngineer + requirements: + - !type:RoleTimeRequirement + role: JobAtmosphericTechnician + time: 43200 #12 hrs + - !type:RoleTimeRequirement + role: JobStationEngineer + time: 43200 #12 hrs + - !type:DepartmentTimeRequirement + department: Engineering + time: 216000 # 60 hrs + startingGear: SeniorEngineerGear + icon: "SeniorEngineer" + supervisors: job-supervisors-ce + access: + - Maintenance + - Engineering + - External + - Atmospherics + +- type: startingGear + id: SeniorEngineerGear + equipment: + head: ClothingHeadHatBeretEngineering + jumpsuit: ClothingUniformJumpsuitSeniorEngineer + back: ClothingBackpackEngineeringFilled + shoes: ClothingShoesBootsWork + id: SeniorEngineerPDA + eyes: ClothingEyesGlassesMeson + belt: ClothingBeltUtilityEngineering + ears: ClothingHeadsetEngineering + innerclothingskirt: ClothingUniformJumpskirtSeniorEngineer + satchel: ClothingBackpackSatchelEngineeringFilled + duffelbag: ClothingBackpackDuffelEngineeringFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml new file mode 100644 index 0000000000..0712b6d332 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -0,0 +1,36 @@ +- type: job + id: SeniorPhysician + name: job-name-senior-physician + description: job-description-senior-physician + playTimeTracker: JobSeniorPhysician + requirements: + - !type:RoleTimeRequirement + role: JobChemist + time: 43200 #12 hrs + - !type:RoleTimeRequirement + role: JobMedicalDoctor + time: 43200 #12 hrs + - !type:DepartmentTimeRequirement + department: Medical + time: 216000 # 60 hrs + startingGear: SeniorPhysicianGear + icon: "SeniorPhysician" + supervisors: job-supervisors-cmo + access: + - Medical + - Maintenance + - Chemistry + +- type: startingGear + id: SeniorPhysicianGear + equipment: + jumpsuit: ClothingUniformJumpsuitSeniorPhysician + back: ClothingBackpackMedicalFilled + shoes: ClothingShoesColorBlack + outerClothing: ClothingOuterCoatLabSeniorPhysician + id: SeniorPhysicianPDA + ears: ClothingHeadsetMedical + belt: ClothingBeltMedicalFilled + innerclothingskirt: ClothingUniformJumpskirtSeniorPhysician + satchel: ClothingBackpackSatchelMedicalFilled + duffelbag: ClothingBackpackDuffelMedicalFilled diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index 51d5ea3d3e..c66ce497eb 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -10,7 +10,7 @@ inverted: true # stop playing intern if you're good at science! startingGear: ResearchAssistantGear icon: "ResearchAssistant" - supervisors: job-supervisors-rd + supervisors: job-supervisors-science canBeAntag: false access: - Research diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml new file mode 100644 index 0000000000..62f867b825 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -0,0 +1,29 @@ +- type: job + id: SeniorResearcher + name: job-name-senior-researcher + description: job-description-senior-researcher + playTimeTracker: JobSeniorResearcher + requirements: + - !type:DepartmentTimeRequirement + department: Science + time: 216000 #60 hrs + startingGear: SeniorResearcherGear + icon: "SeniorResearcher" + supervisors: job-supervisors-rd + access: + - Research + - Maintenance + +- type: startingGear + id: SeniorResearcherGear + equipment: + head: ClothingHeadHatBeretRND + jumpsuit: ClothingUniformJumpsuitSeniorResearcher + back: ClothingBackpackScienceFilled + shoes: ClothingShoesColorBlack + outerClothing: ClothingOuterCoatLabSeniorResearcher + id: SeniorResearcherPDA + ears: ClothingHeadsetScience + innerclothingskirt: ClothingUniformJumpskirtSeniorResearcher + satchel: ClothingBackpackSatchelScienceFilled + duffelbag: ClothingBackpackDuffelScienceFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml new file mode 100644 index 0000000000..27c50a9ef0 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -0,0 +1,45 @@ +- type: job + id: SeniorOfficer + name: job-name-senior-officer + description: job-description-senior-officer + playTimeTracker: JobSeniorOfficer + requirements: + - !type:RoleTimeRequirement + role: JobWarden + time: 43200 #12 hrs + - !type:RoleTimeRequirement + role: JobDetective + time: 14400 #4 hrs + - !type:RoleTimeRequirement + role: JobSecurityOfficer + time: 72000 #20 hrs + - !type:DepartmentTimeRequirement + department: Security + time: 216000 # 60 hrs + startingGear: SeniorOfficerGear + icon: "SeniorOfficer" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - External + +- type: startingGear + id: SeniorOfficerGear + equipment: + jumpsuit: ClothingUniformJumpsuitSeniorOfficer + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsCombatFilled + eyes: ClothingEyesGlassesSecurity + head: ClothingHeadHatBeret + outerClothing: ClothingOuterArmorBasic + id: SeniorOfficerPDA + ears: ClothingHeadsetSecurity + belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58Nonlethal + innerclothingskirt: ClothingUniformJumpskirtSeniorOfficer + satchel: ClothingBackpackSatchelSecurityFilled + duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 522da2f467..5a6c39edbe 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -54,6 +54,7 @@ roles: - AtmosphericTechnician - ChiefEngineer + - SeniorEngineer - StationEngineer - TechnicalAssistant @@ -68,6 +69,7 @@ - MedicalIntern - Psychologist - Paramedic + - SeniorPhysician - type: department id: Security @@ -77,6 +79,7 @@ - HeadOfSecurity - SecurityCadet - SecurityOfficer + - SeniorOfficer - Detective - Warden @@ -86,6 +89,7 @@ color: "#D381C9" roles: - ResearchDirector + - SeniorResearcher - Scientist - ResearchAssistant diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 6f076c9746..996eec692f 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -118,6 +118,18 @@ - type: playTimeTracker id: JobSecurityOfficer +- type: playTimeTracker + id: JobSeniorEngineer + +- type: playTimeTracker + id: JobSeniorOfficer + +- type: playTimeTracker + id: JobSeniorPhysician + +- type: playTimeTracker + id: JobSeniorResearcher + - type: playTimeTracker id: JobServiceWorker diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..134e2856bd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon-open.png new file mode 100644 index 0000000000..6b5a60bbe1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon.png new file mode 100644 index 0000000000..9830020e33 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-left.png new file mode 100644 index 0000000000..0a5ccbabcd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-right.png new file mode 100644 index 0000000000..ea28f8cf3e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json new file mode 100644 index 0000000000..46a5d33e01 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at pull request https://github.com/space-wizards/space-station-14/pull/10758,", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..6b66914222 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-left.png new file mode 100644 index 0000000000..f71113eb24 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-right.png new file mode 100644 index 0000000000..cbd68e913b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..ed02ccf802 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon-open.png new file mode 100644 index 0000000000..38dff18251 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon.png new file mode 100644 index 0000000000..c4cc759c34 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-left.png new file mode 100644 index 0000000000..59b2c93e60 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-right.png new file mode 100644 index 0000000000..b3b9ada646 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json new file mode 100644 index 0000000000..dd16b8c78e --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at commit https://github.com/space-wizards/space-station-14/pull/10758", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..bd35aecb08 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-left.png new file mode 100644 index 0000000000..4683ab9d08 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-right.png new file mode 100644 index 0000000000..389d929422 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..c37ef04570 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..2536ec824c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/icon.png new file mode 100644 index 0000000000..07d0b38025 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-left.png new file mode 100644 index 0000000000..2541991f9a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-right.png new file mode 100644 index 0000000000..a238a7d7be Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/meta.json new file mode 100644 index 0000000000..9b15553cde --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit of hazard from tgstation at commit https://github.com/tgstation/tgstation/pull/67000, by Nairod (github) for ss14", + "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/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..2f8c480cb5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..b3ecbd9712 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png new file mode 100644 index 0000000000..18ab875179 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png new file mode 100644 index 0000000000..d90b6f3c45 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png new file mode 100644 index 0000000000..356e2a5ec2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json new file mode 100644 index 0000000000..7f498ead9b --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit by Nairodian (github) of secskirt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7779930358ba4776575975690d2c952f0d05c6cc", + "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/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..4e98c89cc9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..311e0aecb9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png new file mode 100644 index 0000000000..aaee2537da Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png new file mode 100644 index 0000000000..e0b2d4759b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png new file mode 100644 index 0000000000..a2ecc2b551 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/meta.json new file mode 100644 index 0000000000..5b8e413038 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit by Nairodian (github) of paramedic_skirt from tgstation at pull request https://github.com/tgstation/tgstation/pull/48236.", + "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/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..b317451d8f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..0d1e3b13bf Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/icon.png new file mode 100644 index 0000000000..8bbaf401e9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-left.png new file mode 100644 index 0000000000..197f1a6af5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-right.png new file mode 100644 index 0000000000..edd1c6fdbb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/meta.json new file mode 100644 index 0000000000..c2d804360b --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by Nairodian (github) from the formal scientist jumpsuit by Flareguy for Space Station 14.", + "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/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..7113bbf3ec Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..5b19cb2dc7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/icon.png new file mode 100644 index 0000000000..fba921db3a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-left.png new file mode 100644 index 0000000000..2541991f9a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-right.png new file mode 100644 index 0000000000..a238a7d7be Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/meta.json new file mode 100644 index 0000000000..9b15553cde --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit of hazard from tgstation at commit https://github.com/tgstation/tgstation/pull/67000, by Nairod (github) for ss14", + "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/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..37bfef9fbd Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..463828936c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png new file mode 100644 index 0000000000..5f1d7e7506 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png new file mode 100644 index 0000000000..d90b6f3c45 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png new file mode 100644 index 0000000000..356e2a5ec2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json new file mode 100644 index 0000000000..913d940881 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit by Nairodian (github) of secred_s taken from tgstation at pull request https://github.com/tgstation/tgstation/pull/2984", + "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/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..5248c1b09f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..f67f3c67bf Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png new file mode 100644 index 0000000000..d5d956c4e5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png new file mode 100644 index 0000000000..e0b2d4759b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png new file mode 100644 index 0000000000..a2ecc2b551 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/meta.json new file mode 100644 index 0000000000..1e67f97187 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit by Nairodian (github) of paramedic from tgstation at pull request https://github.com/tgstation/tgstation/pull/48236.", + "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/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..9a1392a5b5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..a70cd6f5bc Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/icon.png new file mode 100644 index 0000000000..b8425e6ff6 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-left.png new file mode 100644 index 0000000000..197f1a6af5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-right.png new file mode 100644 index 0000000000..edd1c6fdbb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/meta.json new file mode 100644 index 0000000000..c2d804360b --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by Nairodian (github) from the formal scientist jumpsuit by Flareguy for Space Station 14.", + "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/SeniorEngineer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorEngineer.png new file mode 100644 index 0000000000..7bf4c5b193 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorEngineer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorOfficer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorOfficer.png new file mode 100644 index 0000000000..bc4d4c2a26 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorOfficer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorPhysician.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorPhysician.png new file mode 100644 index 0000000000..04af86dbe3 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorPhysician.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorResearcher.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorResearcher.png new file mode 100644 index 0000000000..a9a0de4d7f Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/SeniorResearcher.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 95c1c7f32a..61c0838277 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -147,6 +147,18 @@ }, { "name": "Zookeeper" + }, + { + "name": "SeniorEngineer" + }, + { + "name": "SeniorResearcher" + }, + { + "name": "SeniorPhysician" + }, + { + "name": "SeniorOfficer" } ] } diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index 25e636d401..2401b27be7 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -174,6 +174,18 @@ }, { "name": "musician" + }, + { + "name": "seniorengineer" + }, + { + "name": "seniorresearcher" + }, + { + "name": "seniorphysician" + }, + { + "name": "seniorofficer" } ] } diff --git a/Resources/Textures/Markers/jobs.rsi/seniorengineer.png b/Resources/Textures/Markers/jobs.rsi/seniorengineer.png new file mode 100644 index 0000000000..738ff1f4e6 Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/seniorengineer.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/seniorofficer.png b/Resources/Textures/Markers/jobs.rsi/seniorofficer.png new file mode 100644 index 0000000000..51d0ef9270 Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/seniorofficer.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/seniorphysician.png b/Resources/Textures/Markers/jobs.rsi/seniorphysician.png new file mode 100644 index 0000000000..84bdf623dd Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/seniorphysician.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/seniorresearcher.png b/Resources/Textures/Markers/jobs.rsi/seniorresearcher.png new file mode 100644 index 0000000000..a3fe76d0d7 Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/seniorresearcher.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 6147108744..7ec6b3b175 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -207,6 +207,18 @@ }, { "name": "pda-cluwne" + }, + { + "name": "pda-seniorengineer" + }, + { + "name": "pda-seniorresearcher" + }, + { + "name": "pda-seniorphysician" + }, + { + "name": "pda-seniorofficer" } ] } diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorengineer.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorengineer.png new file mode 100644 index 0000000000..0635de35e3 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorengineer.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorofficer.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorofficer.png new file mode 100644 index 0000000000..a6e7e6915e Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorofficer.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorphysician.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorphysician.png new file mode 100644 index 0000000000..b3e5debb3f Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorphysician.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorresearcher.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorresearcher.png new file mode 100644 index 0000000000..aa6901f0da Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorresearcher.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png new file mode 100644 index 0000000000..73c8b6d00f Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png new file mode 100644 index 0000000000..f3a87d6fa4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png new file mode 100644 index 0000000000..2d00cf7a16 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png new file mode 100644 index 0000000000..47a2ccb748 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.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 9ed87c6d4c..f169027a0d 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -202,6 +202,18 @@ { "name": "idcluwne" }, + { + "name": "idseniorengineer" + }, + { + "name": "idseniorresearcher" + }, + { + "name": "idseniorphysician" + }, + { + "name": "idseniorofficer" + }, { "name": "gold-inhand-left", "directions": 4