From f92ed8418b2f8841aedb6f2a77687c3afb3c0d06 Mon Sep 17 00:00:00 2001 From: ThatGuyUSA Date: Tue, 6 Jan 2026 02:28:04 -0800 Subject: [PATCH] [FEATURE] More icons (#42200) * innit bruv, but also done! * added comment to signify why it's like that * init, but done * init commit * you think you got everythin, until you didn't * credits and one last touch up * i fucking hate git * KILL OLD COMMITS This reverts commit 6f834a51de611f215ede02f291a9d834777884a5. * KILLING OLD COMMITS This reverts commit 36e1f4a476b873f2326723740eccf455060520d8. * I am going to become the joker * one day i'll learn how to delete old commits properly * god fucking damn it * capitalization! --- .../Locale/en-US/job/job-description.ftl | 2 +- Resources/Locale/en-US/job/job-names.ftl | 92 +++++++------- .../Locale/en-US/prototypes/roles/antags.ftl | 2 + .../Entities/Mobs/Corpses/corpses.yml | 2 +- .../Entities/Mobs/Player/humanoid.yml | 2 +- .../Entities/Objects/Devices/pda.yml | 16 +++ .../Objects/Misc/identification_cards.yml | 44 ++++++- Resources/Prototypes/Roles/Antags/ninja.yml | 4 +- Resources/Prototypes/Roles/Antags/nukeops.yml | 6 +- Resources/Prototypes/Roles/Antags/pirate.yml | 14 +++ .../Prototypes/Roles/Jobs/CentComm/cburn.yml | 2 +- .../Roles/Jobs/CentComm/deathsquad.yml | 2 +- .../Jobs/CentComm/emergencyresponseteam.yml | 12 +- .../Roles/Jobs/CentComm/official.yml | 8 +- .../Roles/Jobs/Fun/wizard_startinggear.yml | 1 + Resources/Prototypes/StatusIcon/job.yml | 114 +++++++++++++++++- .../Interface/Misc/job_icons.rsi/Ninja.png | Bin 0 -> 645 bytes .../Interface/Misc/job_icons.rsi/Pirate.png | Bin 0 -> 599 bytes .../Interface/Misc/job_icons.rsi/meta.json | 12 +- .../Objects/Devices/pda.rsi/meta.json | 5 +- .../Objects/Devices/pda.rsi/pda-ninja.png | Bin 0 -> 904 bytes .../Objects/Misc/id_cards.rsi/meta.json | 5 +- .../Objects/Misc/id_cards.rsi/ninja.png | Bin 0 -> 1195 bytes .../Objects/Misc/id_cards.rsi/orange.png | Bin 398 -> 846 bytes .../Objects/Misc/id_cards.rsi/pirate.png | Bin 444 -> 850 bytes 25 files changed, 273 insertions(+), 72 deletions(-) create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Ninja.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Pirate.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-ninja.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/ninja.png diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 35ada63d8c..15a9c9a173 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -8,7 +8,7 @@ job-description-cadet = Learn the basics of arresting criminals and managing the job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will. job-description-cargotech = Deal with requisitions and deliveries, pilot the cargo shuttle to the trade station and back, and work with others to make ludicrous amounts of cash and then waste it all gambling. job-description-ce = Manage the Engineering department to ensure power, atmospherics, and the hull are in perfect shape. -job-description-centcomoff = Act as an ambassador to the newest state-of-the-art space station in Nanotrasen's fleet. +job-description-centcommoff = Act as an ambassador to the newest state-of-the-art space station in Nanotrasen's fleet. job-description-chaplain = Preach the good word of your deity and religion, and conduct spiritual healing and miracles with your bible. job-description-chef = Keep the station fed with a variety of food items, butcher dead animals to ensure ammonia doesn't leak, and help keep the bar lively. job-description-chemist = Produce medicinal drugs for the doctors to use, research ethically dubious rare chemicals, and produce weapons of war when enemies of the station arrive. diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index f7d3167dca..76f9e78ee6 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -1,70 +1,80 @@ -job-name-warden = Warden -job-name-security = Security Officer +job-name-atmostech = Atmospheric Technician +job-name-bartender = Bartender +job-name-borg = Cyborg +job-name-botanist = Botanist +job-name-brigmedic = Brigmedic job-name-cadet = Security Cadet -job-name-hos = Head of Security +job-name-captain = Captain +job-name-cargotech = Cargo Technician +job-name-cburn = CentComm Quarantine Officer +job-name-ce = Chief Engineer +job-name-centcommoff = CentComm Official +job-name-chef = Chef +job-name-chaplain = Chaplain +job-name-chemist = Chemist +job-name-clown = Clown +job-name-cluwne = Cluwne +job-name-cmo = Chief Medical Officer +job-name-deathsquad = Death Squad job-name-detective = Detective -job-name-brigmedic = Brigmedic -job-name-borg = Cyborg -job-name-scientist = Scientist -job-name-research-assistant = Research Assistant -job-name-rd = Research Director -job-name-psychologist = Psychologist -job-name-intern = Medical Intern job-name-doctor = Medical Doctor -job-name-paramedic = Paramedic -job-name-cmo = Chief Medical Officer -job-name-chemist = Chemist -job-name-technical-assistant = Technical Assistant job-name-engineer = Station Engineer -job-name-atmostech = Atmospheric Technician +job-name-ertchaplain = ERT Chaplain +job-name-ertengineer = ERT Engineer +job-name-ertjanitor = ERT Janitor +job-name-ertleader = ERT Leader +job-name-ertmedic = ERT Medic +job-name-ertsecurity = ERT Security job-name-hop = Head of Personnel -job-name-captain = Captain -job-name-serviceworker = Service Worker -job-name-centcomoff = CentComm Official -job-name-cburn = Centcomm Quarantine Officer -job-name-deathsquad = Centcomm Agent -job-name-reporter = Reporter -job-name-musician = Musician -job-name-librarian = Librarian +job-name-hos = Head of Security +job-name-intern = Medical Intern +job-name-janitor = Janitor job-name-lawyer = Lawyer +job-name-librarian = Librarian job-name-mime = Mime -job-name-ce = Chief Engineer -job-name-janitor = Janitor -job-name-chaplain = Chaplain -job-name-botanist = Botanist -job-name-bartender = Bartender +job-name-musician = Musician +job-name-paramedic = Paramedic job-name-passenger = Passenger +job-name-psychologist = Psychologist +job-name-qm = Quartermaster +job-name-rd = Research Director +job-name-reporter = Reporter +job-name-research-assistant = Research Assistant job-name-salvagespec = Salvage Specialist +job-name-scientist = Scientist +job-name-security = Security Officer +job-name-serviceworker = Service Worker job-name-station-ai = Station AI -job-name-qm = Quartermaster -job-name-cargotech = Cargo Technician -job-name-chef = Chef -job-name-clown = Clown -job-name-ertleader = ERT Leader -job-name-ertchaplain = ERT Chaplain -job-name-ertengineer = ERT Engineer -job-name-ertsecurity = ERT Security -job-name-ertmedic = ERT Medic -job-name-ertjanitor = ERT Janitor +job-name-technical-assistant = Technical Assistant job-name-visitor = Visitor -job-name-cluwne = Cluwne +job-name-warden = Warden # unused jobs # these are required for the agent ID job icon tooltips # I am keeping them for roleplaying opportunities job-name-geneticist = Geneticist +job-name-boxer = Boxer job-name-no-id = No ID job-name-prisoner = Prisoner job-name-roboticist = Roboticist -job-name-syndicate = Syndicate job-name-unknown = Unknown job-name-virologist = Virologist +job-name-zookeeper = Zookeeper + +# antagonist jobs +job-name-ninja = Ninja +job-name-syndicate = Syndicate +job-name-syndicate-commander = Syndicate Commander +job-name-syndicate-corpsman = Syndicate Corpsman +job-name-syndicate-operative = Syndicate Operative +job-name-pirate = Pirate +job-name-wizard = Wizard job-name-zombie = Zombie # Job titles -job-title-visitor = Visitor job-title-cluwne = Cluwne job-title-universal = Universal +job-title-visitor = Visitor # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = Atmospheric Technician diff --git a/Resources/Locale/en-US/prototypes/roles/antags.ftl b/Resources/Locale/en-US/prototypes/roles/antags.ftl index 3fa969d170..f0c80f9dfc 100644 --- a/Resources/Locale/en-US/prototypes/roles/antags.ftl +++ b/Resources/Locale/en-US/prototypes/roles/antags.ftl @@ -36,6 +36,8 @@ roles-antag-space-ninja-objective = Use your stealth to sabotage the station, no roles-antag-paradox-clone-name = Paradox Clone roles-antag-paradox-clone-objective = A freak space-time anomaly has teleported you into another reality! Now you have to find your counterpart and kill and replace them. +roles-antag-pirate-name = Pirate + roles-antag-thief-name = Thief roles-antag-thief-objective = Add some NT property to your personal collection without using violence. diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml index c8d2f236fa..f4b632df4f 100644 --- a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml +++ b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml @@ -79,7 +79,7 @@ - type: Loadout prototypes: - HoPGear - - CentcomGear + - CentcommGear - CaptainGear - HoSGear - ResearchDirectorGear diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 51a9b7a02c..75e4cbd60e 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -587,7 +587,7 @@ settings: default job: CentralCommandOfficial - type: Loadout - prototypes: [ CentcomGear ] + prototypes: [ CentcommGear ] roleLoadout: [ RoleSurvivalStandard ] ## Syndicate diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 877a64b20e..b1bbe6bb2d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1500,6 +1500,22 @@ - type: Icon state: pda-seniorcourier +- type: entity + parent: [ BaseHighlyIllegalContraband, BasePDA ] + id: NinjaPDA + name: ninja PDA + description: You stealthy bastard, you! + components: + - type: Pda + id: NinjaIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-ninja + - type: Icon + state: pda-ninja + - type: entity parent: [ BaseMajorContraband, SyndiPDA ] id: PiratePDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index e175b6a77f..9a5a649015 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -995,6 +995,8 @@ offset: *icon-offset state: SyndicateOperative - type: AgentIDCard + - type: IdCard + jobIcon: JobIconSyndicateOperative - type: entity parent: [ SyndiOperativeIDCard, BaseSyndicateContraband ] @@ -1011,6 +1013,8 @@ - sprite: *icon-rsi offset: *icon-offset state: SyndicateCorpsman + - type: IdCard + jobIcon: JobIconSyndicateCorpsman - type: entity parent: [ SyndiOperativeIDCard, BaseSyndicateContraband ] @@ -1027,6 +1031,33 @@ - sprite: *icon-rsi offset: *icon-offset state: SyndicateCommander + - type: IdCard + jobIcon: JobIconSyndicateCommander + +- type: entity + parent: [ IDCardStandard, BaseHighlyIllegalContraband ] + id: NinjaIDCard + name: ninja ID card + suffix: Ninja + components: + - type: Sprite + layers: + - state: ninja + - state: stripe_top + color: "#38D848" + - state: stripe_bottom + color: "#309000" + - sprite: *icon-rsi + offset: *icon-offset + state: Ninja + - type: Item + heldPrefix: green + - type: AgentIDCard + - type: IdCard + jobIcon: JobIconNinja + - type: Access + tags: + - Maintenance - type: entity parent: [ IDCardStandard, BaseMajorContraband ] @@ -1036,12 +1067,13 @@ - type: Sprite layers: - state: pirate + - sprite: *icon-rsi + offset: *icon-offset + state: Pirate - type: Item heldPrefix: orange #this is close enough to the weird puce color pirate IDs have going on - - type: Access - tags: - - NuclearOperative - - SyndicateAgent + - type: IdCard + jobIcon: JobIconPirate - type: entity parent: IDCardStandard @@ -1056,7 +1088,7 @@ - Xenoborg - type: entity - parent: IDCardStandard + parent: [ IDCardStandard, BaseMagicalContraband ] id: WizardIDCard name: wizard ID card components: @@ -1073,6 +1105,8 @@ - Wizard - External - Maintenance + - type: IdCard + jobIcon: JobIconWizard #ERT/Centcomm diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml index b43dbf72c1..919471a61c 100644 --- a/Resources/Prototypes/Roles/Antags/ninja.yml +++ b/Resources/Prototypes/Roles/Antags/ninja.yml @@ -18,7 +18,7 @@ gloves: ClothingHandsGlovesSpaceNinja outerClothing: ClothingOuterSuitSpaceNinja shoes: ClothingShoesSpaceNinja - id: AgentIDCard + id: NinjaPDA ears: ClothingHeadsetNinja pocket1: SpiderCharge pocket2: PinpointerStation @@ -41,7 +41,7 @@ - type: chameleonOutfit id: NinjaChameleonOutfit name: roles-antag-space-ninja-name + icon: "JobIconNinja" startingGear: SpaceNinjaGear equipment: - id: PassengerPDA neck: ClothingNeckGoldmedal diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index e2018b91a6..de86b70560 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -69,7 +69,7 @@ id: NukeopsOutfit name: roles-antag-nuclear-operative-name startingGear: SyndicateOperativeGearFullNoUplink - icon: "JobIconSyndicate" + icon: "JobIconSyndicateOperative" equipment: head: ClothingHeadHelmetHardsuitSyndie neck: ClothingNeckScarfStripedSyndieRed @@ -89,7 +89,7 @@ id: NukeopsCommanderOutfit name: roles-antag-nuclear-operative-commander-name startingGear: SyndicateCommanderGearFull - icon: "JobIconSyndicate" + icon: "JobIconSyndicateCommander" equipment: head: ClothingHeadHelmetHardsuitSyndieCommander neck: ClothingNeckScarfStripedSyndieGreen @@ -120,7 +120,7 @@ id: NukeopsMedicOutfit name: roles-antag-nuclear-operative-agent-name startingGear: SyndicateOperativeMedicFull - icon: "JobIconSyndicate" + icon: "JobIconSyndicateCorpsman" equipment: head: ClothingHeadHelmetHardsuitSyndieMedic neck: ClothingNeckScarfStripedLightBlue diff --git a/Resources/Prototypes/Roles/Antags/pirate.yml b/Resources/Prototypes/Roles/Antags/pirate.yml index 849e9dc1f2..0585ec075a 100644 --- a/Resources/Prototypes/Roles/Antags/pirate.yml +++ b/Resources/Prototypes/Roles/Antags/pirate.yml @@ -23,3 +23,17 @@ equipment: head: ClothingHeadHatPirateTricord outerClothing: ClothingOuterCoatGentle + +- type: chameleonOutfit + id: PirateChameleonOutfit + name: roles-antag-pirate-name + icon: "JobIconPirate" + startingGear: PirateFirstmateGear + equipment: + eyes: ClothingEyesEyepatch + ears: ClothingHeadsetFreelance + mask: ClothingMaskNeckGaiter + neck: ClothingNeckBling + gloves: ClothingHandsGlovesColorLightBrown + outerClothing: ClothingOuterCoatPirate + diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml index 2ba54d48b1..a17acc9898 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml @@ -5,7 +5,7 @@ playTimeTracker: JobCBURN setPreference: false startingGear: CBURNGear - icon: "JobIconNanotrasen" + icon: "JobIconCBURN" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml index 3231783fd3..0b197af4d8 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml @@ -5,7 +5,7 @@ playTimeTracker: JobDeathSquad setPreference: false startingGear: DeathSquadGear - icon: "JobIconNanotrasen" + icon: "JobIconDeathSquad" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml index e0aa56d79e..27c61ac337 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml @@ -6,7 +6,7 @@ playTimeTracker: JobERTLeader setPreference: false startingGear: ERTLeaderGearEVA - icon: "JobIconNanotrasen" + icon: "JobIconERTLeader" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: @@ -105,7 +105,7 @@ playTimeTracker: JobERTChaplain setPreference: false startingGear: ERTChaplainGear - icon: "JobIconNanotrasen" + icon: "JobIconERTChaplain" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: @@ -182,7 +182,7 @@ playTimeTracker: JobERTEngineer setPreference: false startingGear: ERTEngineerGearEVA - icon: "JobIconNanotrasen" + icon: "JobIconERTEngineer" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: @@ -276,7 +276,7 @@ playTimeTracker: JobERTSecurity setPreference: false startingGear: ERTSecurityGearEVA - icon: "JobIconNanotrasen" + icon: "JobIconERTSecurity" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: @@ -463,7 +463,7 @@ playTimeTracker: JobERTMedical setPreference: false startingGear: ERTMedicalGearEVA - icon: "JobIconNanotrasen" + icon: "JobIconERTMedic" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: @@ -563,7 +563,7 @@ playTimeTracker: JobERTJanitor setPreference: false startingGear: ERTJanitorGearEVA - icon: "JobIconNanotrasen" + icon: "JobIconERTJanitor" supervisors: job-supervisors-centcom canBeAntag: false accessGroups: diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml index 86cf79d207..0ec4910b7c 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml @@ -1,10 +1,10 @@ - type: job id: CentralCommandOfficial - name: job-name-centcomoff - description: job-description-centcomoff + name: job-name-centcommoff + description: job-description-centcommoff playTimeTracker: JobCentralCommandOfficial setPreference: false - startingGear: CentcomGear + startingGear: CentcommGear icon: "JobIconNanotrasen" supervisors: job-supervisors-hos canBeAntag: false @@ -17,7 +17,7 @@ implants: [ MindShieldImplant, DeathRattleImplantCentcomm ] - type: startingGear - id: CentcomGear + id: CentcommGear equipment: jumpsuit: ClothingUniformJumpsuitCentcomOfficial shoes: ClothingShoesBootsCombatFilled diff --git a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml index e59e08bf79..a02fdfadf1 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml @@ -33,6 +33,7 @@ id: WizardChameleonOutfit name: roles-antag-wizard-name startingGear: WizardBlueGear + icon: "JobIconWizard" equipment: eyes: ClothingEyesGlassesCheapSunglasses mask: ClothingMaskBreath diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index 3ac1ab07be..cdcabfd649 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -395,6 +395,22 @@ state: Cluwne jobName: job-name-cluwne +- type: jobIcon + parent: JobIcon + id: JobIconNinja + icon: + sprite: *icon-rsi + state: Ninja + jobName: job-name-ninja + +- type: jobIcon + parent: JobIcon + id: JobIconPirate + icon: + sprite: *icon-rsi + state: Pirate + jobName: job-name-pirate + - type: jobIcon parent: JobIcon id: JobIconPrisoner @@ -411,6 +427,38 @@ state: Syndicate jobName: job-name-syndicate +- type: jobIcon + parent: JobIcon + id: JobIconSyndicateCommander + icon: + sprite: *icon-rsi + state: SyndicateCommander + jobName: job-name-syndicate-commander + +- type: jobIcon + parent: JobIcon + id: JobIconSyndicateCorpsman + icon: + sprite: *icon-rsi + state: SyndicateCorpsman + jobName: job-name-syndicate-corpsman + +- type: jobIcon + parent: JobIcon + id: JobIconSyndicateOperative + icon: + sprite: *icon-rsi + state: SyndicateOperative + jobName: job-name-syndicate-operative + +- type: jobIcon + parent: JobIcon + id: JobIconWizard + icon: + sprite: *icon-rsi + state: Wizard + jobName: job-name-wizard + - type: jobIcon parent: JobIcon id: JobIconZombie # This is a perfectly legitimate profession to pursue @@ -421,13 +469,77 @@ # Admin +- type: jobIcon + parent: JobIcon + id: JobIconCBURN + icon: + sprite: *icon-rsi + state: CBURN + jobName: job-name-cburn + +- type: jobIcon + parent: JobIcon + id: JobIconDeathSquad + icon: + sprite: *icon-rsi + state: DeathSquad + jobName: job-name-deathsquad + +- type: jobIcon + parent: JobIcon + id: JobIconERTLeader + icon: + sprite: *icon-rsi + state: ERTLeader + jobName: job-name-ertleader + +- type: jobIcon + parent: JobIcon + id: JobIconERTChaplain + icon: + sprite: *icon-rsi + state: ERTChaplain + jobName: job-name-ertchaplain + +- type: jobIcon + parent: JobIcon + id: JobIconERTEngineer + icon: + sprite: *icon-rsi + state: ERTEngineer + jobName: job-name-ertengineer + +- type: jobIcon + parent: JobIcon + id: JobIconERTSecurity + icon: + sprite: *icon-rsi + state: ERTSecurity + jobName: job-name-ertsecurity + +- type: jobIcon + parent: JobIcon + id: JobIconERTMedic + icon: + sprite: *icon-rsi + state: ERTMedical + jobName: job-name-ertmedic + +- type: jobIcon + parent: JobIcon + id: JobIconERTJanitor + icon: + sprite: *icon-rsi + state: ERTJanitor + jobName: job-name-ertjanitor + - type: jobIcon parent: JobIcon id: JobIconNanotrasen icon: sprite: *icon-rsi state: Nanotrasen - jobName: job-name-centcomoff + jobName: job-name-centcommoff - type: jobIcon parent: JobIcon diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Ninja.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Ninja.png new file mode 100644 index 0000000000000000000000000000000000000000..0345d9de1cfc6962c361cf4b6c4a3d9ed7acb853 GIT binary patch literal 645 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enLwjaOL`j6Nk5zJhu3lnFep0GlMQ#C5H3Nf< zeMLcHa&~HoLQ-maW}dD3``!E16*5z7)x%AF4SWlnQ!_F>s)|yBtNcQetFn_VQ`GJ4 zc)4sUtbiuurj{fsROII56ON0GHI_ zN%^HEwo0X?nJHFjiD{-uDJiD9Nr}cOx`u`+iMoj?#)i5n#>Oe;riK zGN53Bhi+;fFi6XRVW%@?1~)L=+dW+zLo|YuQxXyq9z1;d?|cJm&CfqmC(dl2{(JxY zaE<2UH}CU25}zx1C3NemCH@i68zy z#h>SYu$^Jdsi%iR8n_RLzVQ8b?0`jke`6t^eDl30`7^jw&ej{P&^&1j!XC5!w`eD% cC_M0GXx*-(`MO>5D<~~^y85}Sb4q9e0B)ns)|yBtNcQetFn_VQ`GJ4 zc)4sUtbiuurj{fsROII56ON0GHI_ zN%^HEwo0X?nJHFjiD{-uDJiD9Nr}cOx`u`+iMoj?#)i5n#>Oe;riK zGN53Bhi+;fFi6XRVW%@?1~)L=BRyRlLo|Y0`!8}HP~dTik5Nv(t8ng-T%pc$kNT{@ z%$JTFG4JG#FsP{NzuFr;af)E$?tEcE53k8n-uY$cW?zqzOb!T3z8mbHAmn#R_(5~f hj_BuwlX~Wx>rY};zq3|c8I)icJYD@<);T3K0RVaQ!Xy9y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 97c3546aba..4b137a937a 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken and modified from /tg/station113 from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github) | Mime and Musician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24 | Wizard originally by ScarKy0 (github) at https://github.com/space-wizards/space-station-14/commit/7c6028bc8037306536dca68f3c2cdd5edec56d14, edited by DinnerCalzone (github) | SyndicateCommander/Corpsman/Operative originally by Archeel1 (github) at https://github.com/space-wizards/space-station-14/commit/1a92ada, edited by DinnerCalzone (github)", + "copyright": "Taken and modified from /tg/station113 from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github) | Mime and Musician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24 | Wizard originally by ScarKy0 (github) at https://github.com/space-wizards/space-station-14/commit/7c6028bc8037306536dca68f3c2cdd5edec56d14, edited by DinnerCalzone (github) | SyndicateCommander/Corpsman/Operative originally by Archeel1 (github) at https://github.com/space-wizards/space-station-14/commit/1a92ada, edited by DinnerCalzone (github), ninja icon by ThatGuyUSA (github)", "size": { "x": 8, "y": 8 @@ -130,6 +130,9 @@ { "name": "Nanotrasen" }, + { + "name": "Ninja" + }, { "name": "NoId" }, @@ -142,6 +145,9 @@ { "name": "Passenger" }, + { + "name": "Pirate" + }, { "name": "Prisoner" }, @@ -230,10 +236,10 @@ "name": "Wizard" }, { - "name": "Zombie" + "name": "Zookeeper" }, { - "name": "Zookeeper" + "name": "Zombie" } ] } diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 977d7d17b2..e5833360bd 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, pda-wizard recolour by Velken, pda-syndi-commander/operative by Archee1 (Github)", + "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-wizard recolour by Velken, pda-syndi-commander/operative by Archee1 (Github), pda-ninja by ThatGuyUSA (github)", "size": { "x": 32, "y": 32 @@ -120,6 +120,9 @@ { "name": "pda-miner" }, + { + "name": "pda-ninja" + }, { "name": "pda-pirate" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-ninja.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-ninja.png new file mode 100644 index 0000000000000000000000000000000000000000..8d980a3d4f9aa3cd0be4190a189bfca75bc46dc5 GIT binary patch literal 904 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a+Pp*=Gsq9nrC$0|8LS1&OoKPgqOBDVmjnt{Q_ zzM>#8IXksPAt^OIGtXB2{qFth3YjUk>fxro2EGN(sTr9bRYj@6RemAKRoTgwDeCri zyj(UFRzMSSQ%e#RDspr3imfVamB0pD0ofp7eI+}aqLehNAQv~N3Lwu`DWjyMz)D}g zyu4hm+*mKaC|%#s($Z4jz)0W7NEfI=x41H|B(Xv_uUHvsfJi^MBT&`V?*5(W8)NaQ$q`*G{Yn%sP!e8 zX$brCilM;(3=n;gjJ~0s0m#W9wv~TTW-8DXAS>+*ZNTyr;b6;e7m147hjU52fJ%ml;EX+o{vk9ExaTp{{GgyqMzYO%YPp{ z`1EJ{laqh-&ogqhHhJhx{^+91q2`i!r^UrlMXLMH&(n9em*0QxogWeDS9!U!GEnWI zg<8(-Po|2xM$G-MQ@7|J&6@v1%Ak0o>5`rAjD0>^Nig>YNFJYRJ0(CUzmZS&_Dv=s zKQ8yZs&CGfHRdzl?dQwOTfgMJLjIvWfesf}EX=sFBg`c0gfwei?X6wUi?vdiXYbUJ zUv$jkhQ}vM(M^q?H**1bH?|+H@oUX#*u=DkHEeU=x7Wsvq;=>%;`Tkt$Iy`ru;I*c}Fo$3LeL^k|CyPX6MV+-`NXQEM ze3mh@(4Z@RUR2Ug_U4UmcbWNo)|;WSChWAw^7h5o`W+ToNOf0yoWaKMWL{mBEkncA n9EKL*z^Eexlq%tsQ zoS!<;(u3JiqSbz}qu|j)3QA(pF50Ytg5I5rIM`I&K4{%J?4r24?JkS7_d&CShZieE z&92>wy1~`-fH6rwLi3hK#D7mFPA3-jwx1Qo?+rh*F}Z7A{`TtEfik1K9Hm8P&+2D< zUC)xapjYhBu9r&}8$T{w)wjMn>q^!2)ti3Y&)61bBb;UOP|)~oTFdm-b~B^Qqt%BL zi$k}!oNuj;*}34u;!C|s`!)TKP$p~GWB$^YlVdtw`hnf#1o-R|dHwaJh z{Yps&Dm7{m!r+z z_59SW9~8Ib96VYYX4nJ@ErnSMo|r~24D=e zXNE+SMELqxCFkerC8p#jrRr7W764T1^l#~=$>Fbx5m+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1 zSLT%@R_NvxD?<%%Ni9w;$}A|!%+FH*8JL)qUs__TR9c#uVwIMdW}1|eVyc^zXq=*J zXqb|yo0wv3sGDMJoMLWjXknCQn4|=?z9cgZVSipRG#G#Zq7RbMH`Fr#IT^&Z@-NCv z1-b%crJbP-SRO^pMjzx5B!}5SM1Xz;vfv>D3MP2yrse^Iv>X_AI#XtF1Ea*&)5S3) z!u{=3N3X*UB5nV7c`AAaduv999t@Hyc$<2s^zotY3P$m~qK3Ew);q+4nw&~Qy-b%y zozPKPx6J3>nI*naE(LZRD)(8Qou9o&@<4*YpK_^?0-5XQR<1sM{dtsif6;-$w>2ia z7VI*+{Ic1sCCF;s+~0fa4lZ4t`f%pst-C@zw^;8pYf)LiF=5>_3rk!5J%=l2+P)J> z+E)?EX0gcW$=h1L(9}f+ZX(Ba?2fyvm=N8d;<@CAmBi^O-w#%FB-k9ex^{1&(o#mg zgK?rOno>;eTFuF2K`NM2=!lvI6;>1s;*b3=DjSK$uZf!>a+Pp*=Gsq9nrC$0|8LS1&OoKPgqOBDVmjnt{Q_ zzM>#8IXksPAt^OIGtXB2{qFth3YjUk>fxro2EGN(sTr9bRYj@6RemAKRoTgwDeCri zyj(UFRzMSSQ%e#RDspr3imfVamB0pD0ofp7eI+}aqLehNAQv~N3Lwu`DWjyMz)D}g zyu4hm+*mKaC|%#s($Z4jz)0W7NEfI=x41H|B(Xv_uUHvsfJi^MBT&`V?*5(W8)NaQ$q`*G{Yn%sP!e8 zX$brCilM;(3=n;gjJ~0s0m#W9wv~TTW-8DXAS>+*ZNTy1^AlpQ-DU-*hl{^tZ2+;(zwz(NV2Lp2rN2OrQ4ZoLuoyC-A=U zL8rW_7nmeiCiN85X6coD^_i7#7sv0BaN z$x}WX%FVwruPdxE_QP_)7hK$y5j$epzkb`_;}98Qy(BK;krd-&nbWZaC7z3)@`}IM zz#DlYP;AS@2|+@)^)4_)u*7&U-aHo7=gn;18-4c_Z*(12YmkjU hUJ!Fqu0MVMPgdg>J#R(R&aDF_YEM@`mvv4FO#t9SKHUHS delta 359 zcmV-t0hs>I295)eFn<9^Nklm1S@(5W1et-i{8N9Zk3iJuwAx&@`$-2ab4%IhVoR9z4=}rP14#$6| zWeT)!kvA!{+UT{eP2$T@zcKO7aAu5Y4FG`3=xE)GNc-PBlz&zO%TXVl;Vjox!Dyf? z{`{a9>P2KVQQl0EtE$BHmSe9P5u^}7ioxRr2HLM=Y*H>N@u3nQ@mL>c9YGyLkOBY( z-@xkSG+tQ&wumPoJbAR6h4@-^Z@G!=AmSbp~~pQgi3q>Ks?sxvwMIu z??n^Ble_OaJz$W3ys@w2;;gHT4(nP|@Hu%007MIdyy05eL0>@FmDUQdjv(wxL<{q6 zX3D{D1=d?2o}SqQdjbFe002ovPDHLk FV1nuVq`UwC diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png b/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png index b7029d819fe44470f18ac2eff3b50841d1179e7a..2ea87c6abeb1d664133c712fc04c7ca066da2121 100644 GIT binary patch literal 850 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a+Pp*=Gsq9nrC$0|8LS1&OoKPgqOBDVmjnt{Q_ zzM>#8IXksPAt^OIGtXB2{qFth3YjUk>fxro2EGN(sTr9bRYj@6RemAKRoTgwDeCri zyj(UFRzMSSQ%e#RDspr3imfVamB0pD0ofp7eI+}aqLehNAQv~N3Lwu`DWjyMz)D}g zyu4hm+*mKaC|%#s($Z4jz)0W7NEfI=x41H|B(Xv_uUHvsfJi^MBT&`V?*5(W8)NaQ$q`*G{Yn%sP!e8 zX$brCilM;(3=n;gjJ~0s0m#W9wv~TTW-8DXAS>+*ZNTy{lcF*6J03zR0mKhQ8m^fGJbQ6=ZJZL5Nhx?Nq`s;b{`s7d>Ij=8T=>B0F=6!+)e zegF9Yskc@78jejk1P6?bO+$V@U#6ghlA-~F(otG7$o z&uJG*)ohNfQ8Qs=W9~d5Fn4a)HIE-9+a`Cqq_{D&hXl-Ae=X!z*YO)^9=`&+>ZUw0 ziwe2swM}YAb>&r=+aDwjZ_+Sxo^_(KXU=hn;`w=uuXsulBSjpp^O!i!n-zC3&NyLL z(=HyFpo2#;ELPOEZDP}~>}O<1p2&E?SEAd;?(paKkd>kF(>9gc=En_c<)`KnZnRra(-HT89e l#bnHwZ#;f~<6(hC9pn9|d5dLVMT7DRgQu&X%Q~loCIG0BJhlJ; delta 406 zcmV;H0crly2D}51Fnx4Bz*a!IGqJCW*2E09dReTwk060362wV@z0g97mX6HX0e}?SlsZ z_&WW@^d;-aZQ$|sO{k27X)(!HaeNpQCg3&#Zeze(Qb%qBX{dp86EbRPK!&OXx@#Il zZ4EHSGIGWkEPu-qLJ;&wiW(>tpl>t<5n)-@;WZ>-ntpJg-V@-&`EzlOODklfvDVVY(oVHk$!8_oL8fE$LD0?;E1xQ)d+ z0-w#Roq@$V66QCR^x}R#n=5}tfBrkxXf&EVe+ja3J`Z`fJ^%m!07*qoM6N<$f=V2| AkpKVy -- 2.52.0