From: Dinner <180707738+DinnerCalzone@users.noreply.github.com> Date: Thu, 16 Oct 2025 03:23:25 +0000 (-0400) Subject: Reorganize ID card sprites to use job icon sprites directly (#40414) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3a0095ba424813eda3002e1931b89b3fbe33d684;p=space-station-14.git Reorganize ID card sprites to use job icon sprites directly (#40414) * reorganize id card sprites * add CBURN attribution * comment offset * fix captain ID steal icon * oops * update attribution * slightly more precise language in attribution * add aliases, cleanup parents and inhands * adjust syndicate sprites * missed a spot * fix historic attribution issues, add black inhands to id cards * errant curly brace begone * control stripe color through yaml, meta fix * make deathsquad blue --- diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 0cdd785554..b4c403c213 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -36,115 +36,181 @@ - type: Sprite layers: - state: default - - state: idpassenger + - sprite: &icon-rsi Interface/Misc/job_icons.rsi + offset: &icon-offset -0.09375, 0.0625 #3 pixels left, 2 pixels up + state: Passenger - type: PresetIdCard job: Passenger +#Command + - type: entity - parent: PassengerIDCard - id: TechnicalAssistantIDCard - name: technical assistant ID card + parent: [IDCardStandard, BaseGrandTheftContraband] + id: CaptainIDCard + name: captain ID card components: - - type: PresetIdCard - job: TechnicalAssistant - type: Sprite layers: - - state: default - - state: idintern-tech + - state: gold + - state: stripe_top + color: "#1b67a5" + - state: stripe_bottom + color: "#0e4069" + - sprite: *icon-rsi + offset: *icon-offset + state: Captain + - type: Item + heldPrefix: gold + - type: PresetIdCard + job: Captain + - type: Tag + tags: + - DoorBumpOpener + - WhitelistChameleon + - WhitelistChameleonIdCard + - HighRiskItem + - type: StealTarget + stealGroup: CaptainIDCard - type: entity - parent: PassengerIDCard - id: MedicalInternIDCard - name: medical intern ID card + parent: IDCardStandard + id: HoPIDCard + name: head of personnel ID card components: - - type: PresetIdCard - job: MedicalIntern - type: Sprite layers: - - state: default - - state: idintern-med + - state: silver + - state: stripe_top + color: &color-service-top "#639137" + - state: stripe_bottom + color: &color-service-bottom "#446326" + - sprite: *icon-rsi + offset: *icon-offset + state: HeadOfPersonnel + - type: Item + heldPrefix: silver + - type: PresetIdCard + job: HeadOfPersonnel - type: entity - parent: PassengerIDCard - id: ResearchAssistantIDCard - name: research assistant ID card + parent: IDCardStandard + id: CEIDCard + name: chief engineer ID card components: - - type: PresetIdCard - job: ResearchAssistant - type: Sprite layers: - - state: default - - state: idintern-sci + - state: silver + - state: stripe_top + color: &color-engineering-top "#ffa62b" + - state: stripe_bottom + color: &color-engineering-bottom "#bc5b00" + - sprite: *icon-rsi + offset: *icon-offset + state: ChiefEngineer + - type: Item + heldPrefix: silver + - type: PresetIdCard + job: ChiefEngineer - type: entity - parent: PassengerIDCard - id: SecurityCadetIDCard - name: security cadet ID card + parent: IDCardStandard + id: CMOIDCard + name: chief medical officer ID card components: - - type: PresetIdCard - job: SecurityCadet - type: Sprite layers: - - state: default - - state: idintern-cadet + - state: silver + - state: stripe_top + color: &color-medical-top "#68aed6" + - state: stripe_bottom + color: &color-medical-bottom "#325f7a" + - sprite: *icon-rsi + offset: *icon-offset + state: ChiefMedicalOfficer + - type: Item + heldPrefix: silver + - type: PresetIdCard + job: ChiefMedicalOfficer - type: entity - parent: PassengerIDCard - id: ServiceWorkerIDCard - name: service worker ID card + parent: IDCardStandard + id: RDIDCard + name: research director ID card components: - - type: PresetIdCard - job: ServiceWorker - type: Sprite layers: - - state: default - - state: idintern-service + - state: silver + - state: stripe_top + color: &color-science-top "#a53aaa" + - state: stripe_bottom + color: &color-science-bottom "#652368" + - sprite: *icon-rsi + offset: *icon-offset + state: ResearchDirector + - type: Item + heldPrefix: silver + - type: PresetIdCard + job: ResearchDirector - type: entity - parent: [IDCardStandard, BaseGrandTheftContraband] - id: CaptainIDCard - name: captain ID card + parent: IDCardStandard + id: HoSIDCard + name: head of security ID card components: - type: Sprite layers: - - state: gold - - state: idcaptain + - state: silver + - state: stripe_top + color: &color-security-top "#cb0000" + - state: stripe_bottom + color: &color-security-bottom "#830000" + - sprite: *icon-rsi + offset: *icon-offset + state: HeadOfSecurity - type: Item - heldPrefix: gold + heldPrefix: silver - type: PresetIdCard - job: Captain - - type: Tag - tags: - - DoorBumpOpener - - WhitelistChameleon - - WhitelistChameleonIdCard - - HighRiskItem - - type: StealTarget - stealGroup: CaptainIDCard + job: HeadOfSecurity - type: entity parent: IDCardStandard - id: SecurityIDCard - name: security ID card + id: QuartermasterIDCard + name: quartermaster ID card components: - type: Sprite layers: - - state: default - - state: idsecurityofficer + - state: silver + - state: stripe_top + color: &color-supply-top "#b18644" + - state: stripe_bottom + color: &color-supply-bottom "#5b4523" + - sprite: *icon-rsi + offset: *icon-offset + state: QuarterMaster + - type: Item + heldPrefix: silver - type: PresetIdCard - job: SecurityOfficer + job: Quartermaster + +#Engineering - type: entity parent: IDCardStandard - id: WardenIDCard - name: warden ID card + id: TechnicalAssistantIDCard + name: technical assistant ID card components: - - type: Sprite - layers: - - state: default - - state: idwarden - - type: PresetIdCard - job: Warden + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-engineering-top + - state: stripe_bottom + color: *color-engineering-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: TechnicalAssistant + - type: PresetIdCard + job: TechnicalAssistant - type: entity parent: IDCardStandard @@ -154,10 +220,70 @@ - type: Sprite layers: - state: default - - state: idstationengineer + - state: stripe_top + color: *color-engineering-top + - state: stripe_bottom + color: *color-engineering-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: StationEngineer - type: PresetIdCard job: StationEngineer +- type: entity + parent: IDCardStandard + id: AtmosIDCard + name: atmospheric technician ID card + components: + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-engineering-top + - state: stripe_bottom + color: *color-engineering-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: AtmosphericTechnician + - type: PresetIdCard + job: AtmosphericTechnician + +- type: entity + parent: EngineeringIDCard + id: SeniorEngineerIDCard + name: senior engineer ID card + components: + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-engineering-top + - state: stripe_bottom + color: *color-engineering-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: SeniorEngineer + +#Medical + +- type: entity + parent: IDCardStandard + id: MedicalInternIDCard + name: medical intern ID card + components: + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-medical-top + - state: stripe_bottom + color: *color-medical-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: MedicalIntern + - type: PresetIdCard + job: MedicalIntern + - type: entity parent: IDCardStandard id: MedicalIDCard @@ -166,7 +292,13 @@ - type: Sprite layers: - state: default - - state: idmedicaldoctor + - state: stripe_top + color: *color-medical-top + - state: stripe_bottom + color: *color-medical-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: MedicalDoctor - type: PresetIdCard job: MedicalDoctor @@ -178,7 +310,13 @@ - type: Sprite layers: - state: default - - state: idparamedic + - state: stripe_top + color: *color-medical-top + - state: stripe_bottom + color: *color-medical-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Paramedic - type: PresetIdCard job: Paramedic @@ -190,47 +328,69 @@ - type: Sprite layers: - state: default - - state: idchemist + - state: stripe_top + color: *color-medical-top + - state: stripe_bottom + color: *color-medical-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Chemist - type: PresetIdCard job: Chemist - type: entity parent: IDCardStandard - id: CargoIDCard - name: cargo ID card + id: PsychologistIDCard + name: psychologist ID card components: - type: Sprite layers: - state: default - - state: idcargotechnician + - state: stripe_top + color: *color-medical-top + - state: stripe_bottom + color: *color-medical-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Psychologist - type: PresetIdCard - job: CargoTechnician + job: Psychologist - type: entity - parent: IDCardStandard - id: SalvageIDCard - name: salvage ID card + parent: MedicalIDCard + id: SeniorPhysicianIDCard + name: senior physician ID card components: - type: Sprite layers: - state: default - - state: idshaftminer - - type: PresetIdCard - job: SalvageSpecialist + - state: stripe_top + color: *color-medical-top + - state: stripe_bottom + color: *color-medical-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: SeniorPhysician + +#Science - type: entity parent: IDCardStandard - id: QuartermasterIDCard - name: quartermaster ID card + id: ResearchAssistantIDCard + name: research assistant ID card components: - - type: Sprite - layers: - - state: silver - - state: idquartermaster - - type: Item - heldPrefix: silver - - type: PresetIdCard - job: Quartermaster + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-science-top + - state: stripe_bottom + color: *color-science-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: ResearchAssistant + - type: PresetIdCard + job: ResearchAssistant - type: entity parent: IDCardStandard @@ -240,343 +400,527 @@ - type: Sprite layers: - state: default - - state: idscientist + - state: stripe_top + color: *color-science-top + - state: stripe_bottom + color: *color-science-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Scientist - type: PresetIdCard job: Scientist - type: entity - parent: IDCardStandard - id: ClownIDCard - name: clown ID card + parent: ResearchIDCard + id: SeniorResearcherIDCard + name: senior researcher ID card components: - type: Sprite layers: - state: default - - state: idclown - - type: PresetIdCard - job: Clown + - state: stripe_top + color: *color-science-top + - state: stripe_bottom + color: *color-science-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: SeniorResearcher + +#Security - type: entity parent: IDCardStandard - id: MimeIDCard - name: mime ID card + id: SecurityCadetIDCard + name: security cadet ID card components: - type: Sprite layers: - state: default - - state: idmime + - state: stripe_top + color: *color-security-top + - state: stripe_bottom + color: *color-security-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: SecurityCadet - type: PresetIdCard - job: Mime + job: SecurityCadet - type: entity parent: IDCardStandard - id: ChaplainIDCard - name: chaplain ID card + id: SecurityIDCard + name: security ID card components: - - type: Sprite - layers: - - state: default - - state: idchaplain - - type: PresetIdCard - job: Chaplain + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-security-top + - state: stripe_bottom + color: *color-security-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: SecurityOfficer + - type: PresetIdCard + job: SecurityOfficer - type: entity parent: IDCardStandard - id: JanitorIDCard - name: janitor ID card + id: WardenIDCard + name: warden ID card components: - type: Sprite layers: - state: default - - state: idjanitor + - state: stripe_top + color: *color-security-top + - state: stripe_bottom + color: *color-security-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Warden - type: PresetIdCard - job: Janitor + job: Warden - type: entity parent: IDCardStandard - id: BartenderIDCard - name: bartender ID card + id: DetectiveIDCard + name: detective ID card components: - type: Sprite layers: - state: default - - state: idbartender + - state: stripe_top + color: *color-security-top + - state: stripe_bottom + color: *color-security-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Detective - type: PresetIdCard - job: Bartender + job: Detective - type: entity parent: IDCardStandard - id: PunPunIDCard - name: pun pun ID card + id: BrigmedicIDCard + name: brigmedic ID card + components: + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-security-top + - state: stripe_bottom + color: *color-security-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Brigmedic + +- type: entity + parent: SecurityIDCard + id: SeniorOfficerIDCard + name: senior officer ID card components: - - type: Sprite - layers: - - state: default - - state: idbartender - - type: PresetIdCard - job: Bartender - name: Pun Pun - - type: Tag # Ignore Chameleon tags - tags: - - DoorBumpOpener + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-security-top + - state: stripe_bottom + color: *color-security-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: SeniorOfficer + +#Service - type: entity parent: IDCardStandard - id: ChefIDCard - name: chef ID card + id: ServiceWorkerIDCard + name: service worker ID card components: - type: Sprite layers: - state: default - - state: idcook + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: ServiceWorker - type: PresetIdCard - job: Chef + job: ServiceWorker - type: entity parent: IDCardStandard - id: BotanistIDCard - name: botanist ID card + id: ClownIDCard + name: clown ID card components: - - type: Sprite - layers: - - state: default - - state: idbotanist - - type: PresetIdCard - job: Botanist + - type: Sprite + layers: + - state: default + - state: stripe_clown + - sprite: *icon-rsi + offset: *icon-offset + state: Clown + - type: PresetIdCard + job: Clown - type: entity parent: IDCardStandard - id: LibrarianIDCard - name: librarian ID card + id: MimeIDCard + name: mime ID card components: - - type: Sprite - layers: - - state: default - - state: idcurator - - type: PresetIdCard - job: Librarian + - type: Sprite + layers: + - state: default + - state: stripe_top + color: "#2d2d2d" + - state: stripe_bottom + color: "#1d1d1d" + - sprite: *icon-rsi + offset: *icon-offset + state: Mime + - type: PresetIdCard + job: Mime - type: entity parent: IDCardStandard - id: LawyerIDCard - name: lawyer ID card + id: MusicianIDCard + name: musician ID card components: - - type: Sprite - layers: - - state: default - - state: idlawyer - - type: PresetIdCard - job: Lawyer + - type: Sprite + layers: + - state: default + - state: stripe_top + color: "#6f56b8" + - state: stripe_bottom + color: "#524089" + - sprite: *icon-rsi + offset: *icon-offset + state: Musician + - type: PresetIdCard + job: Musician - type: entity parent: IDCardStandard - id: HoPIDCard - name: head of personnel ID card + id: ChaplainIDCard + name: chaplain ID card components: - type: Sprite layers: - - state: silver - - state: idheadofpersonnel - - type: Item - heldPrefix: silver + - state: default + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Chaplain - type: PresetIdCard - job: HeadOfPersonnel + job: Chaplain - type: entity parent: IDCardStandard - id: CEIDCard - name: chief engineer ID card + id: JanitorIDCard + name: janitor ID card components: - type: Sprite layers: - - state: silver - - state: idchiefengineer - - type: Item - heldPrefix: silver + - state: default + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Janitor - type: PresetIdCard - job: ChiefEngineer + job: Janitor - type: entity parent: IDCardStandard - id: CMOIDCard - name: chief medical officer ID card + id: BartenderIDCard + name: bartender ID card components: - type: Sprite layers: - - state: silver - - state: idchiefmedicalofficer - - type: Item - heldPrefix: silver + - state: default + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Bartender - type: PresetIdCard - job: ChiefMedicalOfficer + job: Bartender - type: entity parent: IDCardStandard - id: RDIDCard - name: research director ID card + id: PunPunIDCard + name: pun pun ID card components: - type: Sprite layers: - - state: silver - - state: idresearchdirector - - type: Item - heldPrefix: silver + - state: default + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Bartender - type: PresetIdCard - job: ResearchDirector + job: Bartender + name: Pun Pun + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener - type: entity parent: IDCardStandard - id: HoSIDCard - name: head of security ID card + id: ChefIDCard + name: chef ID card components: - type: Sprite layers: - - state: silver - - state: idheadofsecurity - - type: Item - heldPrefix: silver + - state: default + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Chef - type: PresetIdCard - job: HeadOfSecurity + job: Chef - type: entity parent: IDCardStandard - id: VisitorIDCard - name: visitor ID card + id: BotanistIDCard + name: botanist ID card components: - type: Sprite layers: - state: default - - state: idvisitor - - type: IdCard - jobTitle: job-title-visitor - jobIcon: JobIconVisitor + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Botanist - type: PresetIdCard - job: Visitor + job: Botanist - type: entity parent: IDCardStandard - id: BrigmedicIDCard - name: brigmedic ID card + id: LibrarianIDCard + name: librarian ID card components: - type: Sprite layers: - state: default - - state: idbrigmedic + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Librarian + - type: PresetIdCard + job: Librarian - type: entity parent: IDCardStandard - id: CentcomIDCard - name: command officer ID card + id: LawyerIDCard + name: lawyer ID card components: - type: Sprite layers: - - state: centcom - - state: idcentcom - - type: Item - heldPrefix: blue + - state: default + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Lawyer - type: PresetIdCard - job: CentralCommandOfficial + job: Lawyer - type: entity parent: IDCardStandard - id: ERTLeaderIDCard - name: ERT leader ID card + id: ReporterIDCard + name: reporter ID card components: - type: Sprite layers: - - state: gold - - state: ert_commander + - state: default + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Reporter - type: PresetIdCard - job: ERTLeader - - type: Item - heldPrefix: gold + job: Reporter - type: entity parent: IDCardStandard - id: ERTChaplainIDCard - name: ERT chaplain ID card + id: BoxerIDCard + name: boxer ID card components: - type: Sprite layers: - - state: gold - - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now. + - state: default + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Boxer - type: PresetIdCard - job: ERTChaplain - - type: Item - heldPrefix: blue + job: Boxer - type: entity parent: IDCardStandard - id: ERTEngineerIDCard - name: ERT engineer ID card + id: ZookeeperIDCard + name: zookeeper ID card components: - type: Sprite layers: - - state: gold - - state: ert_engineer + - state: default + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: Zookeeper - type: PresetIdCard - job: ERTEngineer + job: Zookeeper + +#Supply - type: entity parent: IDCardStandard - id: ERTJanitorIDCard - name: ERT janitor ID card + id: CargoIDCard + name: cargo ID card components: - type: Sprite layers: - - state: gold - - state: ert_janitor + - state: default + - state: stripe_top + color: *color-supply-top + - state: stripe_bottom + color: *color-supply-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: CargoTechnician - type: PresetIdCard - job: ERTJanitor + job: CargoTechnician - type: entity parent: IDCardStandard - id: ERTMedicIDCard - name: ERT medic ID card + id: SalvageIDCard + name: salvage ID card components: - type: Sprite layers: - - state: gold - - state: ert_medic + - state: default + - state: stripe_top + color: *color-supply-top + - state: stripe_bottom + color: *color-supply-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: ShaftMiner - type: PresetIdCard - job: ERTMedical + job: SalvageSpecialist + +#Misc. - type: entity parent: IDCardStandard - id: ERTSecurityIDCard - name: ERT security ID card + id: PrisonerIDCard + name: prisoner ID card + description: A generically printed ID card for scummy prisoners. components: - type: Sprite layers: - - state: gold - - state: ert_security - - type: PresetIdCard - job: ERTSecurity + - state: orange + - sprite: *icon-rsi + offset: *icon-offset + state: Prisoner + - type: Item + heldPrefix: orange + - type: Access + tags: + - GenpopEnter + - type: GenpopIdCard + - type: IdCard + jobTitle: job-name-prisoner + jobIcon: JobIconPrisoner + canMicrowave: false + - type: ExpireIdCard + expireMessage: genpop-prisoner-id-expire + expiredAccess: + - GenpopLeave + - type: Speech + speechVerb: Robotic + - type: Tag + tags: + - DoorBumpOpener + - WhitelistChameleon + - WhitelistChameleonIdCard + - Recyclable + - type: StaticPrice # these are infinitely producible. + price: 0 - type: entity parent: IDCardStandard - id: MusicianIDCard - name: musician ID card + id: CluwneIDCard + name: cluwne ID card + suffix: Unremoveable components: - - type: Sprite - layers: - - state: default - - state: idmusician - - type: PresetIdCard - job: Musician + - type: Sprite + layers: + - state: default + - state: stripe_top + color: "#5dc574" + - state: stripe_bottom + color: "#3f9b53" + - sprite: *icon-rsi + offset: *icon-offset + state: Cluwne + - type: IdCard + jobTitle: job-title-cluwne + jobIcon: JobIconCluwne + - type: Unremoveable - type: entity parent: IDCardStandard - id: CentcomIDCardDeathsquad - name: death squad ID card + id: VisitorIDCard + name: visitor ID card components: - type: Sprite layers: - - state: centcom - - type: Item - heldPrefix: blue + - state: default + - sprite: *icon-rsi + offset: *icon-offset + state: Visitor + - type: IdCard + jobTitle: job-title-visitor + jobIcon: JobIconVisitor - type: PresetIdCard - job: DeathSquad + job: Visitor + +#Antags - type: entity name: passenger ID card @@ -593,7 +937,9 @@ - type: Sprite layers: - state: default - - state: idpassenger + - sprite: *icon-rsi + offset: *icon-offset + state: Passenger - type: AgentIDCard - type: UIRequiresLock - type: ActivatableUI @@ -625,18 +971,6 @@ - SyndicateAgent - NuclearOperative -- type: entity - parent: IDCardStandard - id: AtmosIDCard - name: atmospheric technician ID card - components: - - type: Sprite - layers: - - state: orange - - state: idatmospherictechnician - - type: PresetIdCard - job: AtmosphericTechnician - - type: entity parent: [ IDCardStandard, BaseSyndicateContraband ] id: SyndicateIDCard @@ -645,7 +979,15 @@ - type: Sprite layers: - state: black - - state: syndi + - state: stripe_top + color: &color-syndicate-top "#e80c0c" + - state: stripe_bottom + color: &color-syndicate-bottom "#960606" + - sprite: *icon-rsi + offset: *icon-offset + state: Syndicate + - type: Item + heldPrefix: black - type: Access tags: - NuclearOperative @@ -659,7 +1001,13 @@ - type: Sprite layers: - state: black - - state: syndi_operative + - state: stripe_top + color: *color-syndicate-top + - state: stripe_bottom + color: *color-syndicate-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: SyndicateOperative - type: AgentIDCard - type: entity @@ -670,7 +1018,13 @@ - type: Sprite layers: - state: black - - state: syndi_corpsman + - state: stripe_top + color: *color-syndicate-top + - state: stripe_bottom + color: *color-syndicate-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: SyndicateCorpsman - type: entity parent: [ SyndiOperativeIDCard, BaseSyndicateContraband ] @@ -680,7 +1034,13 @@ - type: Sprite layers: - state: black - - state: syndi_commander + - state: stripe_top + color: *color-syndicate-top + - state: stripe_bottom + color: *color-syndicate-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: SyndicateCommander - type: entity parent: [ IDCardStandard, BaseMajorContraband ] @@ -690,6 +1050,8 @@ - type: Sprite layers: - state: pirate + - type: Item + heldPrefix: orange #this is close enough to the weird puce color pirate IDs have going on - type: Access tags: - NuclearOperative @@ -697,181 +1059,203 @@ - type: entity parent: IDCardStandard - id: PsychologistIDCard - name: psychologist ID card + id: WizardIDCard + name: wizard ID card components: - type: Sprite layers: - - state: default - - state: idpsychologist - - type: PresetIdCard - job: Psychologist + - state: wizard + - sprite: *icon-rsi + offset: *icon-offset + state: Wizard + - type: Item + heldPrefix: green + - type: Access + tags: + - Wizard + - External + - Maintenance + +#ERT/Centcomm - type: entity parent: IDCardStandard - id: ReporterIDCard - name: reporter ID card + id: CentcomIDCard + name: command officer ID card components: - type: Sprite layers: - - state: default - - state: idreporter + - state: centcom + - state: stripe_top + color: &color-centcomm-top "#134975" + - state: stripe_bottom + color: &color-centcomm-bottom "#0d304d" + - sprite: *icon-rsi + offset: *icon-offset + state: Nanotrasen + - type: Item + heldPrefix: blue - type: PresetIdCard - job: Reporter + job: CentralCommandOfficial - type: entity parent: IDCardStandard - id: BoxerIDCard - name: boxer ID card + id: ERTLeaderIDCard + name: ERT leader ID card components: - type: Sprite layers: - - state: default - - state: idboxer + - state: gold + - state: stripe_top + color: *color-centcomm-top + - state: stripe_bottom + color: *color-centcomm-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: ERTLeader + - type: Item + heldPrefix: gold - type: PresetIdCard - job: Boxer + job: ERTLeader - type: entity parent: IDCardStandard - id: ZookeeperIDCard - name: zookeeper ID card + id: ERTChaplainIDCard + name: ERT chaplain ID card components: - type: Sprite layers: - - state: default - - state: idzookeeper + - state: centcom + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: ERTChaplain + - type: Item + heldPrefix: blue - type: PresetIdCard - job: Zookeeper + job: ERTChaplain - type: entity parent: IDCardStandard - id: DetectiveIDCard - name: detective ID card + id: ERTEngineerIDCard + name: ERT engineer ID card components: - type: Sprite layers: - - state: default - - state: iddetective + - state: centcom + - state: stripe_top + color: *color-engineering-top + - state: stripe_bottom + color: *color-engineering-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: ERTEngineer + - type: Item + heldPrefix: blue - type: PresetIdCard - job: Detective + job: ERTEngineer - type: entity parent: IDCardStandard - id: PrisonerIDCard - name: prisoner ID card - description: A generically printed ID card for scummy prisoners. + id: ERTJanitorIDCard + name: ERT janitor ID card components: - type: Sprite layers: - - state: orange + - state: centcom + - state: stripe_top + color: *color-service-top + - state: stripe_bottom + color: *color-service-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: ERTJanitor - type: Item - heldPrefix: orange - - type: Access - tags: - - GenpopEnter - - type: GenpopIdCard - - type: IdCard - jobTitle: job-name-prisoner - jobIcon: JobIconPrisoner - canMicrowave: false - - type: ExpireIdCard - expireMessage: genpop-prisoner-id-expire - expiredAccess: - - GenpopLeave - - type: Speech - speechVerb: Robotic - - type: Tag - tags: - - DoorBumpOpener - - WhitelistChameleon - - WhitelistChameleonIdCard - - Recyclable - - type: StaticPrice # these are infinitely producible. - price: 0 + heldPrefix: blue + - type: PresetIdCard + job: ERTJanitor - type: entity - parent: CentcomIDCard - id: CBURNIDcard - name: CBURN ID card - suffix: CBURN + parent: IDCardStandard + id: ERTMedicIDCard + name: ERT medic ID card components: - type: Sprite layers: - state: centcom + - state: stripe_top + color: *color-medical-top + - state: stripe_bottom + color: *color-medical-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: ERTMedical - type: Item heldPrefix: blue - type: PresetIdCard - job: CBURN + job: ERTMedical - type: entity parent: IDCardStandard - id: CluwneIDCard - name: cluwne ID card - suffix: Unremoveable - components: - - type: Sprite - layers: - - state: default - - state: idcluwne - - type: IdCard - jobTitle: job-title-cluwne - jobIcon: JobIconCluwne - - type: Unremoveable - -- type: entity - parent: EngineeringIDCard - id: SeniorEngineerIDCard - name: senior engineer ID card - components: - - type: Sprite - layers: - - state: default - - state: idseniorengineer - -- type: entity - parent: ResearchIDCard - id: SeniorResearcherIDCard - name: senior researcher ID card - components: - - type: Sprite - layers: - - state: default - - state: idseniorresearcher - -- type: entity - parent: MedicalIDCard - id: SeniorPhysicianIDCard - name: senior physician ID card + id: ERTSecurityIDCard + name: ERT security ID card components: - type: Sprite layers: - - state: default - - state: idseniorphysician + - state: centcom + - state: stripe_top + color: *color-security-top + - state: stripe_bottom + color: *color-security-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: ERTSecurity + - type: Item + heldPrefix: blue + - type: PresetIdCard + job: ERTSecurity - type: entity - parent: SecurityIDCard - id: SeniorOfficerIDCard - name: senior officer ID card + parent: IDCardStandard + id: CentcomIDCardDeathsquad + name: death squad ID card components: - type: Sprite layers: - - state: default - - state: idseniorofficer + - state: centcom + - state: stripe_top + color: *color-centcomm-top + - state: stripe_bottom + color: *color-centcomm-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: DeathSquad + - type: PresetIdCard + job: DeathSquad - type: entity parent: IDCardStandard - id: WizardIDCard - name: wizard ID card + id: CBURNIDcard + name: CBURN ID card + suffix: CBURN components: - type: Sprite layers: - - state: wizard - - state: idwizard - - type: Access - tags: - - Wizard - - External - - Maintenance + - state: centcom + - state: stripe_top + color: *color-centcomm-top + - state: stripe_bottom + color: *color-centcomm-bottom + - sprite: *icon-rsi + offset: *icon-offset + state: CBURN + - type: Item + heldPrefix: blue + - type: PresetIdCard + job: CBURN - type: entity parent: IDCardStandard @@ -884,7 +1268,9 @@ sprite: Objects/Misc/id_cards.rsi layers: - state: admin - - state: idadmin + - sprite: *icon-rsi + offset: *icon-offset + state: Admin - type: Clothing sprite: Objects/Misc/id_cards.rsi - type: Item diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index 0a223bd97c..4a307d9d37 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -55,13 +55,13 @@ sprite: sprite: Objects/Consumable/Food/meat.rsi state: corgi - # + - type: stealTargetGroup id: CaptainIDCard name: steal-target-groups-captain-id-card sprite: sprite: Objects/Misc/id_cards.rsi - state: ert_commander #no one will know the difference. + state: icon-captain - type: stealTargetGroup id: JetpackCaptainFilled diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/CBURN.png b/Resources/Textures/Interface/Misc/job_icons.rsi/CBURN.png new file mode 100644 index 0000000000..f4dfea6dd2 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/CBURN.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/DeathSquad.png b/Resources/Textures/Interface/Misc/job_icons.rsi/DeathSquad.png new file mode 100644 index 0000000000..0886bd17b5 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/DeathSquad.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ERTChaplain.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTChaplain.png new file mode 100644 index 0000000000..bb38728e3b Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTChaplain.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ERTEngineer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTEngineer.png new file mode 100644 index 0000000000..7d0839b3da Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTEngineer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ERTJanitor.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTJanitor.png new file mode 100644 index 0000000000..804b066080 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTJanitor.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ERTLeader.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTLeader.png new file mode 100644 index 0000000000..2921a30b35 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTLeader.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ERTMedical.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTMedical.png new file mode 100644 index 0000000000..6a54f937ba Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTMedical.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ERTSecurity.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTSecurity.png new file mode 100644 index 0000000000..ec54208081 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTSecurity.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png index a671977085..3eb3179267 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateCommander.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateCommander.png new file mode 100644 index 0000000000..0a7cc2bfe6 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateCommander.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateCorpsman.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateCorpsman.png new file mode 100644 index 0000000000..93de09c5c3 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateCorpsman.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateOperative.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateOperative.png new file mode 100644 index 0000000000..6386f9f46d Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateOperative.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Wizard.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Wizard.png new file mode 100644 index 0000000000..d2da69ae74 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Wizard.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 521ae60659..97c3546aba 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,203 +1,239 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.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) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | 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", + "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)", "size": { "x": 8, "y": 8 }, "states": [ { - "name": "Detective" + "name": "Admin" }, { - "name": "QuarterMaster" + "name": "AtmosphericTechnician" }, { - "name": "Botanist" + "name": "Bartender" }, { "name": "Borg" }, + { + "name": "Botanist" + }, { "name": "Boxer" }, { - "name": "AtmosphericTechnician" + "name": "Brigmedic" }, { - "name": "Nanotrasen" + "name": "Captain" }, { - "name": "Prisoner" + "name": "CargoTechnician" }, { - "name": "Janitor" + "name": "CBURN" }, { - "name": "Chemist" + "name": "Chaplain" }, { - "name": "StationEngineer" + "name": "Chef" }, { - "name": "SecurityOfficer" + "name": "Chemist" }, { - "name": "NoId" + "name": "ChiefEngineer" }, { "name": "ChiefMedicalOfficer" }, { - "name": "Roboticist" + "name": "Clown" }, { - "name": "Chaplain" + "name": "Cluwne" }, { - "name": "Lawyer" + "name": "Detective" }, { - "name": "Unknown" + "name": "DeathSquad" }, { - "name": "Librarian" + "name": "ERTChaplain" }, { - "name": "CargoTechnician" + "name": "ERTEngineer" }, { - "name": "Scientist" + "name": "ERTJanitor" }, { - "name": "ResearchAssistant" + "name": "ERTLeader" + }, + { + "name": "ERTMedical" + }, + { + "name": "ERTSecurity" }, { "name": "Geneticist" + }, + { + "name": "HeadOfPersonnel" }, { - "name": "Clown" + "name": "HeadOfSecurity" }, { - "name": "Cluwne" + "name": "HeadRevolutionary" }, { - "name": "Captain" + "name": "InitialInfected" }, { - "name": "HeadOfPersonnel" + "name": "Janitor" }, { - "name": "Virologist" + "name": "Lawyer" }, { - "name": "ShaftMiner" + "name": "Librarian" }, { - "name": "Passenger" + "name": "MedicalDoctor" }, { - "name": "ChiefEngineer" + "name": "MedicalIntern" }, { - "name": "Bartender" + "name": "Mime" }, { - "name": "HeadOfSecurity" + "name": "MindShield", + "delays": [ + [ + 1.0, + 1.0 + ] + ] }, { - "name": "Brigmedic" + "name": "Musician" }, { - "name": "MedicalDoctor" + "name": "Nanotrasen" }, { - "name": "Paramedic" + "name": "NoId" }, { - "name": "Chef" + "name": "ParadoxClone" }, { - "name": "Warden" + "name": "Paramedic" }, { - "name": "ResearchDirector" + "name": "Passenger" }, { - "name": "Mime" + "name": "Prisoner" }, { - "name": "Musician" + "name": "Psychologist" + }, + { + "name": "QuarterMaster" }, { "name": "Reporter" }, { - "name": "Psychologist" + "name": "ResearchAssistant" }, { - "name": "MedicalIntern" + "name": "ResearchDirector" }, { - "name": "TechnicalAssistant" + "name": "Revolutionary" }, { - "name": "ServiceWorker" + "name": "Roboticist" }, { - "name": "SecurityCadet" + "name": "Scientist" }, { - "name": "Zombie" + "name": "SecurityCadet" }, { - "name": "Zookeeper" + "name": "SecurityOfficer" }, { "name": "SeniorEngineer" }, { - "name": "SeniorResearcher" + "name": "SeniorOfficer" }, { "name": "SeniorPhysician" }, { - "name": "SeniorOfficer" + "name": "SeniorResearcher" }, { - "name": "Revolutionary" + "name": "ServiceWorker" }, { - "name": "HeadRevolutionary" + "name": "ShaftMiner" }, { - "name": "MindShield", - "delays": [ - [ - 1.0, - 1.0 - ] - ] + "name": "StationAi" }, { - "name": "StationAi" + "name": "StationEngineer" }, { "name": "Syndicate" }, + { + "name": "SyndicateCommander" + }, + { + "name": "SyndicateCorpsman" + }, + { + "name": "SyndicateOperative" + }, + { + "name": "TechnicalAssistant" + }, + { + "name": "Unknown" + }, + { + "name": "Virologist" + }, { "name": "Visitor" }, { - "name": "InitialInfected" + "name": "Warden" }, { - "name": "Admin" + "name": "Wizard" }, { - "name": "ParadoxClone" + "name": "Zombie" + }, + { + "name": "Zookeeper" } ] } diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/admin.png b/Resources/Textures/Objects/Misc/id_cards.rsi/admin.png index 99ca993b0b..9823f83fda 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/admin.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/admin.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/black-inhand-left.png b/Resources/Textures/Objects/Misc/id_cards.rsi/black-inhand-left.png new file mode 100644 index 0000000000..a69cac4c10 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/black-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/black-inhand-right.png b/Resources/Textures/Objects/Misc/id_cards.rsi/black-inhand-right.png new file mode 100644 index 0000000000..099ffe7f42 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/black-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/black.png b/Resources/Textures/Objects/Misc/id_cards.rsi/black.png index cc56db775b..044998f2c9 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/black.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/black.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png index ff1e293183..13712f48be 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/Objects/Misc/id_cards.rsi/default.png index 95b3d54c27..251e3d5eaa 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/default.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/default.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png deleted file mode 100644 index 624bb4864d..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png deleted file mode 100644 index d9c8b6e261..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png deleted file mode 100644 index a7c8b68355..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png deleted file mode 100644 index afbe56e5f0..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png deleted file mode 100644 index 6fe2ce6698..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png deleted file mode 100644 index 6bb3134b55..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png b/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png index bb20387315..31637a7a61 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/icon-captain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/icon-captain.png new file mode 100644 index 0000000000..e5ce2da32b Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/icon-captain.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idadmin.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idadmin.png deleted file mode 100644 index 3705c6bf4e..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idadmin.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png deleted file mode 100644 index 3bd5446a3b..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png deleted file mode 100644 index 04fa520302..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png deleted file mode 100644 index 87b74619eb..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png deleted file mode 100644 index 5bd85696a6..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png deleted file mode 100644 index 1f64eb4845..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png deleted file mode 100644 index e59e7c3d04..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png deleted file mode 100644 index cfa0a35dcc..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png deleted file mode 100644 index 25b7017a70..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png deleted file mode 100644 index d833be57f9..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png deleted file mode 100644 index 2dba29c206..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png deleted file mode 100644 index f105b4f88a..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png deleted file mode 100644 index 82a608a9a1..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png deleted file mode 100644 index e037202044..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png deleted file mode 100644 index d57a7e3d41..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png deleted file mode 100644 index 56dfc53b29..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png deleted file mode 100644 index 3e638f8bab..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png deleted file mode 100644 index 3b749d582a..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png deleted file mode 100644 index 1303135aa5..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png deleted file mode 100644 index 797133b885..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png deleted file mode 100644 index bb03adc665..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png deleted file mode 100644 index cebf46fade..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png deleted file mode 100644 index 15c7cde5e8..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png deleted file mode 100644 index de67694476..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png deleted file mode 100644 index 3cabb6f3f4..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png deleted file mode 100644 index f7ed302b23..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png deleted file mode 100644 index 003657a138..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png deleted file mode 100644 index 388cf5f428..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png deleted file mode 100644 index 9e390bb606..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png deleted file mode 100644 index fee6d2b010..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png deleted file mode 100644 index 9a82d447da..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png deleted file mode 100644 index 1881839e96..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png deleted file mode 100644 index 88866eb169..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png deleted file mode 100644 index f9337a37c5..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png deleted file mode 100644 index 038a5321d4..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png deleted file mode 100644 index e1fb5e5f62..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png deleted file mode 100644 index 9dbff4a6df..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png deleted file mode 100644 index fdb1fd2648..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png deleted file mode 100644 index a9d6c5facd..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png deleted file mode 100644 index 893346a9c9..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png deleted file mode 100644 index 6456d64439..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png deleted file mode 100644 index 73c8b6d00f..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png deleted file mode 100644 index f3a87d6fa4..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png deleted file mode 100644 index 2d00cf7a16..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png deleted file mode 100644 index 47a2ccb748..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png deleted file mode 100644 index c232dd439d..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png deleted file mode 100644 index 2e046fbacd..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png deleted file mode 100644 index bc792fe1a1..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png deleted file mode 100644 index 1d4b2f2d47..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idvisitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idvisitor.png deleted file mode 100644 index 93e38cc6aa..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idvisitor.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png deleted file mode 100644 index 0b4086478c..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idwizard.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idwizard.png deleted file mode 100644 index 5213047636..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idwizard.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png deleted file mode 100644 index 3dd174503b..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index a8b80d8f9a..29a2e4f741 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -1,264 +1,86 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github) | idquartermaster modified by K-Dynamic (github) | idmime and idmusician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24, syndiop/agent/commander made by Archee1 (Github)", + "copyright": "Taken and modified from /tg/station 13 at commit https://github.com/tgstation/tgstation/commit/d917f4c, edited by AJCM-git, CrudeWax, and DinnerCalzone (github) | inhands taken and modified from /vg/station13 at https://github.com/vgstation-coders/vgstation13/blob/2c2b9966ea0d03b10e6e9c59626f72bbe8475d9d/icons/mob/in-hand/left/items_lefthand.dmi | pirate made by brainfood1183 (github) | wizard by ScarkKy0 (github) | stripe_cluwne by brainfood1183 (github) | black-inhands by DinnerCalzone (github)", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "default" + "name": "admin" }, { "name": "black" }, { - "name": "centcom" + "name": "black-inhand-left", + "directions": 4 }, { - "name": "admin" + "name": "black-inhand-right", + "directions": 4 }, { - "name": "ert_chaplain" + "name": "blue-inhand-left", + "directions": 4 }, { - "name": "ert_commander" + "name": "blue-inhand-right", + "directions": 4 }, { - "name": "ert_engineer" + "name": "centcom" }, { - "name": "ert_janitor" + "name": "default" }, { - "name": "ert_medic" + "name": "default-inhand-left", + "directions": 4 }, { - "name": "ert_security" + "name": "default-inhand-right", + "directions": 4 }, { "name": "gold" }, { - "name": "idpassenger" - }, - { - "name": "idatmospherictechnician" - }, - { - "name": "idbartender" - }, - { - "name": "idbotanist" - }, - { - "name": "idboxer" - }, - { - "name": "idcaptain" - }, - { - "name": "idcargotechnician" - }, - { - "name": "idcentcom" - }, - { - "name": "idchaplain" - }, - { - "name": "idchemist" - }, - { - "name": "idchiefengineer" - }, - { - "name": "idchiefmedicalofficer" - }, - { - "name": "idclown" - }, - { - "name": "idcook" - }, - { - "name": "idcurator" - }, - { - "name": "iddetective" - }, - { - "name": "idgeneticist" - }, - { - "name": "idheadofpersonnel" - }, - { - "name": "idheadofsecurity" - }, - { - "name": "idbrigmedic" - }, - { - "name": "idjanitor" - }, - { - "name": "idlawyer" - }, - { - "name": "idmedicaldoctor" - }, - { - "name": "idmime" - }, - { - "name": "idparamedic" - }, - { - "name": "idpsychologist" - }, - { - "name": "idreporter" - }, - { - "name": "idprisoner" - }, - { - "name": "idquartermaster" - }, - { - "name": "idresearchdirector" - }, - { - "name": "idroboticist" - }, - { - "name": "idscientist" - }, - { - "name": "idsecurityofficer" - }, - { - "name": "idshaftminer" - }, - { - "name": "idstationengineer" - }, - { - "name": "idunknown" - }, - { - "name": "idvirologist" - }, - { - "name": "idvisitor" - }, - { - "name": "idwarden" - }, - { - "name": "idmusician" - }, - { - "name": "idzookeeper" - }, - { - "name": "idintern-sci" - }, - { - "name": "idintern-cadet" + "name": "gold-inhand-left", + "directions": 4 }, { - "name": "idintern-med" + "name": "gold-inhand-right", + "directions": 4 }, { - "name": "idintern-service" + "name": "green-inhand-left", + "directions": 4 }, { - "name": "idintern-tech" + "name": "green-inhand-right", + "directions": 4 }, { - "name": "idadmin" + "name": "icon-captain" }, { "name": "orange" }, { - "name": "pirate" - }, - { - "name": "prisoner_001" - }, - { - "name": "prisoner_002" - }, - { - "name": "prisoner_003" - }, - { - "name": "prisoner_004" - }, - { - "name": "prisoner_005" - }, - { - "name": "prisoner_006" - }, - { - "name": "prisoner_007" - }, - { - "name": "silver" - }, - { - "name": "syndi" - }, - { - "name": "syndi_operative" - }, - { - "name": "syndi_corpsman" - }, - { - "name": "syndi_commander" - }, - { - "name": "idcluwne" - }, - { - "name": "idseniorengineer" - }, - { - "name": "idseniorresearcher" - }, - { - "name": "idseniorphysician" - }, - { - "name": "idseniorofficer" - }, - { - "name": "wizard" - }, - { - "name": "idwizard" - }, - { - "name": "gold-inhand-left", + "name": "orange-inhand-left", "directions": 4 }, { - "name": "gold-inhand-right", + "name": "orange-inhand-right", "directions": 4 }, { - "name": "default-inhand-left", - "directions": 4 + "name": "pirate" }, { - "name": "default-inhand-right", - "directions": 4 + "name": "silver" }, { "name": "silver-inhand-left", @@ -269,28 +91,16 @@ "directions": 4 }, { - "name": "orange-inhand-left", - "directions": 4 - }, - { - "name": "orange-inhand-right", - "directions": 4 - }, - { - "name": "blue-inhand-left", - "directions": 4 + "name": "stripe_bottom" }, { - "name": "blue-inhand-right", - "directions": 4 + "name": "stripe_clown" }, { - "name": "green-inhand-left", - "directions": 4 + "name": "stripe_top" }, { - "name": "green-inhand-right", - "directions": 4 + "name": "wizard" } ] } diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png index a44da608ec..bcb2261e22 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png b/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png index d5670a71aa..b7029d819f 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png deleted file mode 100644 index 67dd3e8862..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png deleted file mode 100644 index 004677ba4a..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png deleted file mode 100644 index 23c998f150..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png deleted file mode 100644 index c6e31412cc..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png deleted file mode 100644 index d1d29bb055..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png deleted file mode 100644 index 8b2305d758..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png deleted file mode 100644 index a5041faa88..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png b/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png index b13153a246..a13eab6d8d 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_bottom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_bottom.png new file mode 100644 index 0000000000..e932dc60b0 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_bottom.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_clown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_clown.png new file mode 100644 index 0000000000..ec4149c516 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_clown.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_top.png b/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_top.png new file mode 100644 index 0000000000..138fcbf636 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_top.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi.png deleted file mode 100644 index ff49afaf60..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_commander.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_commander.png deleted file mode 100644 index da0b9f1dd8..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_commander.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_corpsman.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_corpsman.png deleted file mode 100644 index 95ec8ff75e..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_corpsman.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_operative.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_operative.png deleted file mode 100644 index b2aa56a268..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_operative.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/wizard.png b/Resources/Textures/Objects/Misc/id_cards.rsi/wizard.png index d13faa3ab1..58c4a82642 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/wizard.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/wizard.png differ diff --git a/Resources/Textures/Objects/Tools/emag.rsi/icon.png b/Resources/Textures/Objects/Tools/emag.rsi/icon.png index 61c283cfd0..d0c49d84b0 100644 Binary files a/Resources/Textures/Objects/Tools/emag.rsi/icon.png and b/Resources/Textures/Objects/Tools/emag.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/emag.rsi/meta.json b/Resources/Textures/Objects/Tools/emag.rsi/meta.json index 66fc62d663..e9e761fd86 100644 --- a/Resources/Textures/Objects/Tools/emag.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/emag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation wiki at https://tgstation13.org/wiki/File:Emag.png, inhand sprites modified from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e", + "copyright": "Taken from tgstation wiki at https://tgstation13.org/wiki/File:Emag.png, inhand sprites modified from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e , icon by CrudeWax (github), edited by DinnerCalzone (github)", "size": { "x": 32, "y": 32