diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index f995aa88f0..098085cf3e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -39,70 +39,13 @@ - 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 -- type: entity - parent: PassengerIDCard - id: TechnicalAssistantIDCard - name: technical assistant ID card - components: - - type: PresetIdCard - job: TechnicalAssistant - - type: Sprite - layers: - - state: default - - state: idintern-tech - -- type: entity - parent: PassengerIDCard - id: MedicalInternIDCard - name: medical intern ID card - components: - - type: PresetIdCard - job: MedicalIntern - - type: Sprite - layers: - - state: default - - state: idintern-med - -- type: entity - parent: PassengerIDCard - id: ResearchAssistantIDCard - name: research assistant ID card - components: - - type: PresetIdCard - job: ResearchAssistant - - type: Sprite - layers: - - state: default - - state: idintern-sci - -- type: entity - parent: PassengerIDCard - id: SecurityCadetIDCard - name: security cadet ID card - components: - - type: PresetIdCard - job: SecurityCadet - - type: Sprite - sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs - layers: - - state: default - - state: idintern-cadet - -- type: entity - parent: PassengerIDCard - id: ServiceWorkerIDCard - name: service worker ID card - components: - - type: PresetIdCard - job: ServiceWorker - - type: Sprite - layers: - - state: default - - state: idintern-service +#Command - type: entity parent: [IDCardStandard, BaseGrandTheftContraband] @@ -112,7 +55,13 @@ - type: Sprite layers: - state: gold - - state: idcaptain + - state: stripe_top + color: "#1b67a5" + - state: stripe_bottom + color: "#0e4069" + - sprite: *icon-rsi + offset: *icon-offset + state: Captain - type: Item heldPrefix: gold - type: PresetIdCard @@ -126,256 +75,6 @@ - type: StealTarget stealGroup: CaptainIDCard -- type: entity - parent: IDCardStandard - id: SecurityIDCard - name: security ID card - components: - - type: Sprite - sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs - layers: - - state: default - - state: idsecurityofficer - - type: PresetIdCard - job: SecurityOfficer - -- type: entity - parent: IDCardStandard - id: WardenIDCard - name: warden ID card - components: - - type: Sprite - sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs - layers: - - state: default - - state: idwarden - - type: PresetIdCard - job: Warden - -- type: entity - parent: IDCardStandard - id: EngineeringIDCard - name: engineer ID card - components: - - type: Sprite - layers: - - state: default - - state: idstationengineer - - type: PresetIdCard - job: StationEngineer - -- type: entity - parent: IDCardStandard - id: MedicalIDCard - name: medical ID card - components: - - type: Sprite - layers: - - state: default - - state: idmedicaldoctor - - type: PresetIdCard - job: MedicalDoctor - -- type: entity - parent: IDCardStandard - id: ParamedicIDCard - name: paramedic ID card - components: - - type: Sprite - layers: - - state: default - - state: idparamedic - - type: PresetIdCard - job: Paramedic - -- type: entity - parent: IDCardStandard - id: ChemistIDCard - name: chemist ID card - components: - - type: Sprite - layers: - - state: default - - state: idchemist - - type: PresetIdCard - job: Chemist - -- type: entity - parent: IDCardStandard - id: CargoIDCard - name: logistics ID card # DeltaV - Logistics Department replacing Cargo - components: - - type: Sprite - layers: - - state: default - - state: idcargotechnician - - type: PresetIdCard - job: CargoTechnician - -- type: entity - parent: IDCardStandard - id: SalvageIDCard - name: salvage ID card - components: - - type: Sprite - layers: - - state: default - - state: idshaftminer - - type: PresetIdCard - job: SalvageSpecialist - -- type: entity - parent: IDCardStandard - id: QuartermasterIDCard - name: logistics officer ID card # DeltaV - Logistics Department replacing Cargo - components: - - type: Sprite - layers: - - state: silver - - state: idquartermaster - - type: Item - heldPrefix: silver - - type: PresetIdCard - job: Quartermaster - -- type: entity - parent: IDCardStandard - id: ResearchIDCard - name: research ID card - components: - - type: Sprite - layers: - - state: default - - state: idscientist - - type: PresetIdCard - job: Scientist - -- type: entity - parent: IDCardStandard - id: ClownIDCard - name: clown ID card - components: - - type: Sprite - layers: - - state: default - - state: idclown - - type: PresetIdCard - job: Clown - -- type: entity - parent: IDCardStandard - id: MimeIDCard - name: mime ID card - components: - - type: Sprite - layers: - - state: default - - state: idmime - - type: PresetIdCard - job: Mime - -- type: entity - parent: IDCardStandard - id: ChaplainIDCard - name: chaplain ID card - components: - - type: Sprite - layers: - - state: default - - sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - Give Chaplain ID Epistemics colors - state: idchaplain - - type: PresetIdCard - job: Chaplain - -- type: entity - parent: IDCardStandard - id: JanitorIDCard - name: janitor ID card - components: - - type: Sprite - layers: - - state: default - - state: idjanitor - - type: PresetIdCard - job: Janitor - -- type: entity - parent: IDCardStandard - id: BartenderIDCard - name: bartender ID card - components: - - type: Sprite - layers: - - state: default - - state: idbartender - - type: PresetIdCard - job: Bartender - -- type: entity - parent: IDCardStandard - id: PunPunIDCard - name: pun pun 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: entity - parent: IDCardStandard - id: ChefIDCard - name: chef ID card - components: - - type: Sprite - layers: - - state: default - - state: idcook - - type: PresetIdCard - job: Chef - -- type: entity - parent: IDCardStandard - id: BotanistIDCard - name: botanist ID card - components: - - type: Sprite - layers: - - state: default - - state: idbotanist - - type: PresetIdCard - job: Botanist - -- type: entity - parent: IDCardStandard - id: LibrarianIDCard - name: librarian ID card - components: - - type: Sprite - layers: - - state: default - - state: idcurator - - type: PresetIdCard - job: Librarian - -- type: entity - parent: IDCardStandard - id: LawyerIDCard - name: attorney ID card # DeltaV - Changed Lawyer to Attorney - components: - - type: Sprite - layers: - - state: default - - sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - Give Lawyer ID Justice colors - state: idlawyer - - type: PresetIdCard - job: Lawyer - - type: entity parent: IDCardStandard id: HoPIDCard @@ -384,7 +83,13 @@ - type: Sprite layers: - state: silver - - state: idheadofpersonnel + - 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 @@ -398,7 +103,13 @@ - type: Sprite layers: - state: silver - - state: idchiefengineer + - 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 @@ -412,7 +123,13 @@ - type: Sprite layers: - state: silver - - state: idchiefmedicalofficer + - 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 @@ -426,7 +143,13 @@ - type: Sprite layers: - state: silver - - state: idresearchdirector + - 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 @@ -438,15 +161,751 @@ name: head of security ID card components: - type: Sprite - sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs layers: - state: silver - - state: idheadofsecurity + - state: stripe_top + color: &color-security-top "#39393c" + - state: stripe_bottom + color: &color-security-bottom "#262626" + - sprite: *icon-rsi + offset: *icon-offset + state: HeadOfSecurity - type: Item heldPrefix: silver - type: PresetIdCard job: HeadOfSecurity +- type: entity + parent: IDCardStandard + id: QuartermasterIDCard + name: quartermaster ID card + components: + - type: Sprite + layers: + - 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: Quartermaster + +#Engineering + +- type: entity + parent: IDCardStandard + id: TechnicalAssistantIDCard + name: technical assistant 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: TechnicalAssistant + - type: PresetIdCard + job: TechnicalAssistant + +- type: entity + parent: IDCardStandard + id: EngineeringIDCard + name: 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: 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 + name: medical 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: MedicalDoctor + - type: PresetIdCard + job: MedicalDoctor + +- type: entity + parent: IDCardStandard + id: ParamedicIDCard + name: paramedic 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: Paramedic + - type: PresetIdCard + job: Paramedic + +- type: entity + parent: IDCardStandard + id: ChemistIDCard + name: chemist 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: Chemist + - type: PresetIdCard + job: Chemist + +- type: entity + parent: IDCardStandard + id: PsychologistIDCard + name: psychologist 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: Psychologist + - type: PresetIdCard + job: Psychologist + +- type: entity + parent: MedicalIDCard + id: SeniorPhysicianIDCard + name: senior physician 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: SeniorPhysician + +#Science + +- type: entity + parent: IDCardStandard + id: ResearchAssistantIDCard + name: research assistant ID card + components: + - 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 + id: ResearchIDCard + name: research ID card + components: + - 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: Scientist + - type: PresetIdCard + job: Scientist + +- type: entity + parent: ResearchIDCard + id: SeniorResearcherIDCard + name: senior researcher ID card + components: + - 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: SeniorResearcher + +#Security + +- type: entity + parent: IDCardStandard + id: SecurityCadetIDCard + name: security cadet 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-dv /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - Sec Icon Resprite + offset: *icon-offset + state: SecurityCadet + - type: PresetIdCard + job: SecurityCadet + +- type: entity + parent: IDCardStandard + id: SecurityIDCard + name: security 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: SecurityOfficer + - type: PresetIdCard + job: SecurityOfficer + +- type: entity + parent: IDCardStandard + id: WardenIDCard + name: warden 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-dv # DeltaV - Sec Icon Resprite + offset: *icon-offset + state: Warden + - type: PresetIdCard + job: Warden + +- type: entity + parent: IDCardStandard + id: DetectiveIDCard + name: detective 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-dv # DeltaV - Sec Icon Resprite + offset: *icon-offset + state: Detective + - type: PresetIdCard + job: Detective + +- type: entity + parent: IDCardStandard + id: BrigmedicIDCard + name: corpsman ID card # DeltaV - rename brigmedic to corpsman + components: + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-security-top + - state: stripe_bottom + color: *color-security-bottom + - sprite: *icon-rsi-dv # DeltaV - Sec Icon Resprite + offset: *icon-offset + state: Brigmedic + +- type: entity + parent: SecurityIDCard + id: SeniorOfficerIDCard + name: senior officer 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-dv # DeltaV - Sec Icon Resprite + offset: *icon-offset + state: SeniorOfficer + +#Service + +- type: entity + parent: IDCardStandard + id: ServiceWorkerIDCard + name: service worker ID card + components: + - type: Sprite + layers: + - state: default + - 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: ServiceWorker + +- type: entity + parent: IDCardStandard + id: ClownIDCard + name: clown ID card + components: + - 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: MimeIDCard + name: mime ID card + components: + - 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: MusicianIDCard + name: musician ID card + components: + - 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: ChaplainIDCard + name: chaplain ID card + components: + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-science-top # DeltaV - Chap is Epi + - state: stripe_bottom + color: *color-science-bottom # DeltaV - Chap is Epi + - sprite: *icon-rsi-dv # DeltaV - Chaplain Icon Resprite + offset: *icon-offset + state: Chaplain + - type: PresetIdCard + job: Chaplain + +- type: entity + parent: IDCardStandard + id: JanitorIDCard + name: janitor ID card + components: + - type: Sprite + layers: + - 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: Janitor + +- type: entity + parent: IDCardStandard + id: BartenderIDCard + name: bartender ID card + components: + - type: Sprite + layers: + - 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: Bartender + +- type: entity + parent: IDCardStandard + id: PunPunIDCard + name: pun pun ID card + components: + - type: Sprite + layers: + - 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: Bartender + name: Pun Pun + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener + +- type: entity + parent: IDCardStandard + id: ChefIDCard + name: chef ID card + components: + - type: Sprite + layers: + - 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: Chef + +- type: entity + parent: IDCardStandard + id: BotanistIDCard + name: botanist ID card + components: + - type: Sprite + layers: + - state: default + - 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: Botanist + +- type: entity + parent: IDCardStandard + id: LibrarianIDCard + name: librarian ID card + components: + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-science-top # DeltaV - Librarian is Epi + - state: stripe_bottom + color: *color-science-bottom # DeltaV - Librarian is Epi + - sprite: *icon-rsi + offset: *icon-offset + state: Librarian + - type: PresetIdCard + job: Librarian + +- type: entity + parent: IDCardStandard + id: LawyerIDCard + name: lawyer ID card + components: + - type: Sprite + layers: + - state: default + - state: stripe_top + color: &color-justice-top "#641327" # DeltaV - Lawyer is Justice + - state: stripe_bottom + color: &color-justice-bottom "#4c0e1d" # DeltaV - Lawyer is Justice + - sprite: *icon-rsi-dv # DeltaV - Lawyer Icon Resprite + offset: *icon-offset + state: Lawyer + - type: PresetIdCard + job: Lawyer + +- type: entity + parent: IDCardStandard + id: ReporterIDCard + name: reporter ID card + components: + - type: Sprite + layers: + - 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: Reporter + +- type: entity + parent: IDCardStandard + id: BoxerIDCard + name: boxer ID card + components: + - type: Sprite + layers: + - 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: Boxer + +- type: entity + parent: IDCardStandard + id: ZookeeperIDCard + name: zookeeper ID card + components: + - type: Sprite + layers: + - 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: Zookeeper + +#Supply + +- type: entity + parent: IDCardStandard + id: CargoIDCard + name: cargo ID card + components: + - type: Sprite + layers: + - 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: CargoTechnician + +- type: entity + parent: IDCardStandard + id: SalvageIDCard + name: salvage ID card + components: + - type: Sprite + layers: + - 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: SalvageSpecialist + +#Misc. + +- type: entity + parent: IDCardStandard + id: PrisonerIDCard + name: prisoner ID card + description: A generically printed ID card for scummy prisoners. + components: + - type: Sprite + layers: + - state: orange + - sprite: *icon-rsi-dv # DeltaV - Prisoner Icon Resprite + 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: CluwneIDCard + name: cluwne ID card + suffix: Unremoveable + components: + - 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: VisitorIDCard @@ -455,156 +914,16 @@ - type: Sprite layers: - state: default - - state: idvisitor + - sprite: *icon-rsi + offset: *icon-offset + state: Visitor - type: IdCard jobTitle: job-title-visitor jobIcon: JobIconVisitor - type: PresetIdCard job: Visitor -- type: entity - parent: IDCardStandard - id: BrigmedicIDCard - name: corpsman ID card # DeltaV - rename brigmedic to corpsman - components: - - type: Sprite - sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs - layers: - - state: default - - state: idbrigmedic - - type: PresetIdCard # DeltaV - Brigmedic, see Prototypes/_DV/Roles/Jobs/Security/brigmedic.yml - job: Brigmedic - -- type: entity - parent: IDCardStandard - id: CentcomIDCard - name: command officer ID card - components: - - type: Sprite - layers: - - state: centcom - - state: idcentcom - - type: Item - heldPrefix: blue - - type: PresetIdCard - job: CentralCommandOfficial - - type: NanoChatCard # DeltaV - listNumber: false - -- type: entity - parent: IDCardStandard - id: ERTLeaderIDCard - name: ERT leader ID card - components: - - type: Sprite - layers: - - state: gold - - state: ert_commander - - type: PresetIdCard - job: ERTLeader - - type: Item - heldPrefix: gold - - type: NanoChatCard # DeltaV - listNumber: false - -- type: entity - parent: IDCardStandard - id: ERTChaplainIDCard - name: ERT chaplain 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. - - type: PresetIdCard - job: ERTChaplain - - type: Item - heldPrefix: blue - - type: NanoChatCard # DeltaV - listNumber: false - -- type: entity - parent: IDCardStandard - id: ERTEngineerIDCard - name: ERT engineer ID card - components: - - type: Sprite - layers: - - state: gold - - state: ert_engineer - - type: PresetIdCard - job: ERTEngineer - - type: NanoChatCard # DeltaV - listNumber: false - -- type: entity - parent: IDCardStandard - id: ERTJanitorIDCard - name: ERT janitor ID card - components: - - type: Sprite - layers: - - state: gold - - state: ert_janitor - - type: PresetIdCard - job: ERTJanitor - - type: NanoChatCard # DeltaV - listNumber: false - -- type: entity - parent: IDCardStandard - id: ERTMedicIDCard - name: ERT medic ID card - components: - - type: Sprite - layers: - - state: gold - - state: ert_medic - - type: PresetIdCard - job: ERTMedical - - type: NanoChatCard # DeltaV - listNumber: false - -- type: entity - parent: IDCardStandard - id: ERTSecurityIDCard - name: ERT security ID card - components: - - type: Sprite - layers: - - state: gold - - state: ert_security - - type: PresetIdCard - job: ERTSecurity - - type: NanoChatCard # DeltaV - listNumber: false - -- type: entity - parent: IDCardStandard - id: MusicianIDCard - name: musician ID card - components: - - type: Sprite - layers: - - state: default - - state: idmusician - - type: PresetIdCard - job: Musician - -- type: entity - parent: IDCardStandard - id: CentcomIDCardDeathsquad - name: death squad ID card - components: - - type: Sprite - layers: - - state: centcom - - type: Item - heldPrefix: blue - - type: PresetIdCard - job: DeathSquad - - type: NanoChatCard # DeltaV - listNumber: false +#Antags - type: entity name: passenger ID card @@ -621,7 +940,9 @@ - type: Sprite layers: - state: default - - state: idpassenger + - sprite: *icon-rsi + offset: *icon-offset + state: Passenger - type: AgentIDCard - type: UIRequiresLock - type: ActivatableUI @@ -655,18 +976,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 @@ -675,7 +984,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 @@ -691,7 +1008,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 @@ -702,7 +1025,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 ] @@ -712,7 +1041,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 ] @@ -722,6 +1057,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 @@ -731,101 +1068,185 @@ - 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 - -- type: entity - parent: IDCardStandard - id: ReporterIDCard - name: reporter ID card - components: - - type: Sprite - layers: - - state: default - - state: idreporter - - type: PresetIdCard - job: Reporter - -- type: entity - parent: IDCardStandard - id: BoxerIDCard - name: boxer ID card - components: - - type: Sprite - layers: - - state: default - - state: idboxer - - type: PresetIdCard - job: Boxer - -- type: entity - parent: IDCardStandard - id: ZookeeperIDCard - name: zookeeper ID card - components: - - type: Sprite - layers: - - state: default - - state: idzookeeper - - type: PresetIdCard - job: Zookeeper - -- type: entity - parent: IDCardStandard - id: DetectiveIDCard - name: detective ID card - components: - - type: Sprite - sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs - layers: - - state: default - - state: iddetective - - type: PresetIdCard - job: Detective - -- type: entity - parent: IDCardStandard - id: PrisonerIDCard - name: prisoner ID card - description: A generically printed ID card for scummy prisoners. - components: - - type: Sprite - layers: - - state: orange + - state: wizard + - sprite: *icon-rsi + offset: *icon-offset + state: Wizard - type: Item - heldPrefix: orange + heldPrefix: green - 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 + - Wizard + - External + - Maintenance + +#ERT/Centcomm - type: entity - parent: CentcomIDCard + parent: IDCardStandard + id: CentcomIDCard + name: command officer ID card + components: + - type: Sprite + layers: + - 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: CentralCommandOfficial + +- type: entity + parent: IDCardStandard + id: ERTLeaderIDCard + name: ERT leader ID card + components: + - type: Sprite + layers: + - 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: ERTLeader + +- type: entity + parent: IDCardStandard + id: ERTChaplainIDCard + name: ERT chaplain ID card + components: + - type: Sprite + layers: + - state: centcom + - state: stripe_top + color: *color-science-top # DeltaV - Chap is Epi + - state: stripe_bottom + color: *color-science-bottom # DeltaV - Chap is Epi + - sprite: *icon-rsi + offset: *icon-offset + state: ERTChaplain + - type: Item + heldPrefix: blue + - type: PresetIdCard + job: ERTChaplain + +- type: entity + parent: IDCardStandard + id: ERTEngineerIDCard + name: ERT engineer ID card + components: + - type: Sprite + layers: + - 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: ERTEngineer + +- type: entity + parent: IDCardStandard + id: ERTJanitorIDCard + name: ERT janitor ID card + components: + - type: Sprite + layers: + - 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: blue + - type: PresetIdCard + job: ERTJanitor + +- type: entity + 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: ERTMedical + +- type: entity + parent: IDCardStandard + id: ERTSecurityIDCard + name: ERT security ID card + components: + - type: Sprite + layers: + - 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: IDCardStandard + id: CentcomIDCardDeathsquad + name: death squad ID card + components: + - type: Sprite + layers: + - 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: CBURNIDcard name: CBURN ID card suffix: CBURN @@ -833,97 +1254,17 @@ - type: Sprite layers: - 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: NanoChatCard # DeltaV - listNumber: false - -- 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: NanoChatCard # DeltaV - listNumber: false - -- type: entity - parent: EngineeringIDCard - id: SeniorEngineerIDCard - name: senior engineer ID card - components: - - type: Sprite - layers: - - state: default - - state: idseniorengineer - - type: IdCard # DeltaV - Change senior job titles - jobTitle: job-alt-title-senior-engineer - jobIcon: JobIconSeniorEngineer - -- type: entity - parent: ResearchIDCard - id: SeniorResearcherIDCard - name: senior researcher ID card - components: - - type: Sprite - layers: - - state: default - - state: idseniorresearcher - - type: IdCard # DeltaV - Change senior job titles - jobTitle: job-alt-title-senior-researcher - jobIcon: JobIconSeniorResearcher - -- type: entity - parent: MedicalIDCard - id: SeniorPhysicianIDCard - name: senior physician ID card - components: - - type: Sprite - layers: - - state: default - - state: idseniorphysician - - type: IdCard # DeltaV - Change senior job titles - jobTitle: job-alt-title-senior-physician - jobIcon: JobIconSeniorPhysician - -- type: entity - parent: SecurityIDCard - id: SeniorOfficerIDCard - name: senior officer ID card - components: - - type: Sprite - sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs - layers: - - state: default - - state: idseniorofficer - - type: IdCard # DeltaV - Change senior job titles - jobTitle: job-alt-title-senior-officer - jobIcon: JobIconSeniorOfficer - -- type: entity - parent: IDCardStandard - id: WizardIDCard - name: wizard ID card - components: - - type: Sprite - layers: - - state: wizard - - state: idwizard - - type: Access - tags: - - Wizard - - External - - Maintenance - type: entity parent: IDCardStandard @@ -936,7 +1277,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 df19ae0336..8badf55f02 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/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index 6d832785c2..8879e99d6a 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -197,7 +197,7 @@ parent: JobIcon id: JobIconBrigmedic icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons + sprite: &icon-rsi-dv /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons state: Brigmedic jobName: job-name-brigmedic @@ -205,7 +205,7 @@ parent: JobIcon id: JobIconDetective icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons + sprite: *icon-rsi-dv # DeltaV - resprite sec icons state: Detective jobName: job-name-detective @@ -213,7 +213,7 @@ parent: JobIcon id: JobIconSecurityCadet icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons + sprite: *icon-rsi-dv # DeltaV - resprite sec icons state: SecurityCadet jobName: job-name-cadet @@ -221,7 +221,7 @@ parent: JobIcon id: JobIconSecurityOfficer icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons + sprite: *icon-rsi-dv # DeltaV - resprite sec icons state: SecurityOfficer jobName: job-name-security @@ -229,7 +229,7 @@ parent: JobIcon id: JobIconWarden icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons + sprite: *icon-rsi-dv # DeltaV - resprite sec icons state: Warden jobName: job-name-warden @@ -263,7 +263,7 @@ parent: JobIcon id: JobIconChaplain icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - Move Chaplain into Epistemics + sprite: *icon-rsi-dv # DeltaV - Move Chaplain into Epistemics state: Chaplain # DeltaV - Move Chaplain into Epistemics jobName: job-name-chaplain @@ -287,7 +287,7 @@ parent: JobIcon id: JobIconLawyer icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - Move Lawyer into Justice + sprite: *icon-rsi-dv # DeltaV - Move Lawyer into Justice state: Lawyer jobName: job-name-lawyer @@ -399,7 +399,7 @@ parent: JobIcon id: JobIconPrisoner icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite prisoner jobicon + sprite: *icon-rsi-dv # DeltaV - resprite prisoner jobicon state: Prisoner jobName: job-name-prisoner @@ -450,7 +450,7 @@ parent: JobIcon id: JobIconSeniorOfficer icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons + sprite: *icon-rsi-dv # DeltaV - resprite sec icons state: SeniorOfficer allowSelection: true # DeltaV - Selectable, was false jobName: job-name-senior-officer # DeltaV - Agent ID localization diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml index 4c2270b047..4799eea13b 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml @@ -1,15 +1,55 @@ -# For prisoner job, not to be confused with genpop prisoner ids +# If an ID contains sprite component changes, put it here. Otherwise, put it in identification_cards_alt.yml + +# Command - type: entity parent: IDCardStandard - id: PrisonerJobIDCard + id: ChiefJusticeIDCard + name: chief justice ID card + components: + - type: Sprite + layers: + - state: silver + - state: stripe_top + color: &color-justice-top "#641327" + - state: stripe_bottom + color: &color-justice-bottom "#4C0E1D" + - sprite: &icon-rsi-dv /Textures/_DV/Interface/Misc/job_icons.rsi + offset: &icon-offset -0.09375, 0.0625 #3 pixels left, 2 pixels up + state: ChiefJustice + - type: PresetIdCard + job: ChiefJustice + +# Security and Prisoners +- type: entity + parent: IDCardStandard + id: PrisonGuardIDCard + name: prison guard ID card + components: + - type: Sprite + layers: + - state: default + - state: stripe_top + color: &color-security-top "#39393c" + - state: stripe_bottom + color: &color-security-bottom "#262626" + - sprite: *icon-rsi-dv + offset: + state: nyanoPrisonGuard + - type: PresetIdCard + job: PrisonGuard + +- type: entity + parent: IDCardStandard + id: PrisonerJobIDCard # Not to be confused with genpop prisoner ids name: prisoner ID card suffix: Job components: - type: Sprite layers: - state: orange - - sprite: _DV/Objects/Misc/id_cards.rsi - state: nyanoprisoner + - sprite: *icon-rsi-dv + offset: *icon-offset + state: Prisoner - type: PresetIdCard job: Prisoner @@ -21,101 +61,13 @@ - type: Sprite layers: - state: orange - - sprite: _DV/Objects/Misc/id_cards.rsi - state: nyanogladiator + - sprite: *icon-rsi-dv + offset: *icon-offset + state: nyanoGladiator - type: PresetIdCard job: Gladiator -- type: entity - parent: IDCardStandard - id: PrisonGuardIDCard - name: prison guard ID card - components: - - type: Sprite - layers: - - state: default - - sprite: _DV/Objects/Misc/id_cards.rsi - state: nyanoprisonguard - - type: PresetIdCard - job: PrisonGuard - -- type: entity - parent: CourierIDCard - id: MailCarrierIDCard - name: mail carrier ID card - components: - - type: Sprite - layers: - - state: default - - sprite: _DV/Objects/Misc/id_cards.rsi - state: nyanomailcarrier - - type: IdCard - jobTitle: job-alt-title-mail-carrier - -- type: entity - parent: IDCardStandard - id: MartialArtistIDCard - name: martial artist ID card - components: - - type: Sprite - layers: - - state: default - - sprite: _DV/Objects/Misc/id_cards.rsi - state: nyanomartialartist - - type: PresetIdCard - job: MartialArtist - -- type: entity - parent: IDCardStandard - id: ForensicMantisIDCard - name: psionic mantis ID card - components: - - type: Sprite - layers: - - state: default - - sprite: _DV/Objects/Misc/id_cards.rsi - state: nyanomantis - - type: PresetIdCard - job: ForensicMantis - -- type: entity - parent: IDCardStandard - id: ChiefJusticeIDCard - name: chief justice ID card - components: - - type: PresetIdCard - job: ChiefJustice - - type: Sprite - layers: - - state: default - - sprite: _DV/Objects/Misc/id_cards.rsi - state: idchiefjustice - -- type: entity - parent: IDCardStandard - id: ClerkIDCard - name: clerk ID card - components: - - type: PresetIdCard - job: Clerk - - type: Sprite - layers: - - state: default - - sprite: _DV/Objects/Misc/id_cards.rsi - state: idclerk - -- type: entity - parent: IDCardStandard - id: ProsecutorIDCard - name: presecutor ID card - components: - - type: PresetIdCard - job: Prosecutor - - type: Sprite - layers: - - state: default - - sprite: _DV/Objects/Misc/id_cards.rsi - state: idprosecutor +# Cargo / Logistics - type: entity parent: IDCardStandard @@ -125,8 +77,13 @@ - type: Sprite layers: - state: default - - sprite: _DV/Objects/Misc/id_cards.rsi - state: nyanomailcarrier + - state: stripe_top + color: &color-supply-top "#b18644" + - state: stripe_bottom + color: &color-supply-bottom "#5b4523" + - sprite: *icon-rsi-dv + offset: *icon-offset + state: nyanoMailCarrier - type: PresetIdCard job: Courier @@ -138,158 +95,17 @@ - type: Sprite layers: - state: default - - sprite: _DV/Objects/Misc/id_cards.rsi - state: idcargoassistant + - state: stripe_top + color: *color-supply-top + - state: stripe_bottom + color: *color-supply-bottom + - sprite: *icon-rsi-dv + offset: *icon-offset + state: CargoAssistant - type: PresetIdCard job: CargoAssistant - -## Alternate Job Titles - -# Passenger - -- type: entity - parent: PassengerIDCard - id: VisitorIDCardLoadout - name: visitor ID card - components: - - type: IdCard - jobTitle: job-title-visitor - -- type: entity - parent: PassengerIDCard - id: TouristIDCard - name: tourist ID card - components: - - type: IdCard - jobTitle: job-alt-title-tourist - -- type: entity - parent: PassengerIDCard - id: OffDutyCrewIDCard - name: off-duty crew ID card - components: - - type: IdCard - jobTitle: job-alt-title-off-duty-crew - -- type: entity - parent: PassengerIDCard - id: StudentIDCard - name: student ID card - components: - - type: IdCard - jobTitle: job-alt-title-student - -# Bartender - -- type: entity - parent: BartenderIDCard - id: MixologistIDCard - name: mixologist ID card - components: - - type: IdCard - jobTitle: job-alt-title-mixologist - -# Chef - -- type: entity - parent: ChefIDCard - id: BakerIDCard - name: baker ID card - components: - - type: IdCard - jobTitle: job-alt-title-baker - -- type: entity - parent: ChefIDCard - id: ButcherIDCard - name: butcher ID card - components: - - type: IdCard - jobTitle: job-alt-title-butcher - -- type: entity - parent: ChefIDCard - id: PizzaioloIDCard - name: pizzaiolo ID card - components: - - type: IdCard - jobTitle: job-alt-title-pizzaiolo - -# Medical Intern - -- type: entity - parent: MedicalInternIDCard - id: PracticalNurseIDCard - name: practical nurse ID card - components: - - type: IdCard - jobTitle: job-alt-title-practical-nurse - -- type: entity - parent: MedicalInternIDCard - id: ResidentIDCard - name: resident ID card - components: - - type: IdCard - jobTitle: job-alt-title-resident - -# Medical Doctor - -- type: entity - parent: MedicalIDCard - id: ClinicianIDCard - name: clinician ID card - components: - - type: IdCard - jobTitle: job-alt-title-clinician - -# Senior Physician - -- type: entity - parent: SeniorPhysicianIDCard - id: CryogenicsSpecialistIDCard - name: cryogenics specialist ID card - components: - - type: IdCard - jobTitle: job-alt-title-cryogenics-specialist - -# Chemist - -- type: entity - parent: ChemistIDCard - id: PharmacistIDCard - name: pharmacist ID card - components: - - type: IdCard - jobTitle: job-alt-title-pharmacist - -# Psychologist - -- type: entity - parent: PsychologistIDCard - id: PsychiatristIDCard - name: psychiatrist ID card - components: - - type: IdCard - jobTitle: job-alt-title-psychiatrist - -- type: entity - parent: PsychologistIDCard - id: TherapistIDCard - name: therapist ID card - components: - - type: IdCard - jobTitle: job-alt-title-therapist - -- type: entity - parent: PsychologistIDCard - id: SocialWorkerIDCard - name: social worker ID card - components: - - type: IdCard - jobTitle: job-alt-title-social-worker - -# Surgeon + +# Medical - type: entity parent: MedicalIDCard @@ -299,101 +115,36 @@ - type: Sprite layers: - state: default - - sprite: _DV/Objects/Misc/id_cards.rsi - state: idsurgeon + - state: stripe_top + color: &color-medical-top "#68aed6" + - state: stripe_bottom + color: &color-medical-bottom "#325f7a" + - sprite: *icon-rsi-dv + offset: *icon-offset + state: Surgeon - type: IdCard jobTitle: job-name-surgeon jobIcon: JobIconSurgeon -# Atmospheric Technician +# Science / Epi - type: entity - parent: AtmosIDCard - id: LifeSupportTechIDCard - name: life support technician ID card + parent: IDCardStandard + id: ForensicMantisIDCard + name: psionic mantis ID card components: - - type: IdCard - jobTitle: job-alt-title-life-support - -- type: entity - parent: AtmosIDCard - id: PlasmaScientistIDCard - name: plasma scientist ID card - components: - - type: IdCard - jobTitle: job-alt-title-plasma-scientist - -# Station Engineer - -- type: entity - parent: EngineeringIDCard - id: ElectricianIDCard - name: electrician ID card - components: - - type: IdCard - jobTitle: job-alt-title-electrician - -- type: entity - parent: EngineeringIDCard - id: MechanicIDCard - name: mechanic ID card - components: - - type: IdCard - jobTitle: job-alt-title-mechanic - -# Cargo Technician - -- type: entity - parent: CargoIDCard - id: DeckWorkerIDCard - name: deck worker ID card - components: - - type: IdCard - jobTitle: job-alt-title-deck-worker - -- type: entity - parent: CargoIDCard - id: InventoryAssociateIDCard - name: inventory associate ID card - components: - - type: IdCard - jobTitle: job-alt-title-inventory-associate - -# Salvage Specialist - -- type: entity - parent: SalvageIDCard - id: ProspectorIDCard - name: prospector ID card - components: - - type: IdCard - jobTitle: job-alt-title-prospector - -- type: entity - parent: SalvageIDCard - id: ExcavatorIDCard - name: excavator ID card - components: - - type: IdCard - jobTitle: job-alt-title-excavator - -# Scientist - -- type: entity - parent: ResearchIDCard - id: LabTechIDCard - name: lab technician ID card - components: - - type: IdCard - jobTitle: job-alt-title-lab-technician - -- type: entity - parent: ResearchIDCard - id: XenoarchIDCard - name: xenoarchaeologist ID card - components: - - type: IdCard - jobTitle: job-alt-title-xenoarch + - type: Sprite + layers: + - state: default + - state: stripe_top + color: &color-science-top "#a53aaa" + - state: stripe_bottom + color: &color-science-bottom "#652368" + - sprite: *icon-rsi-dv + offset: *icon-offset + state: nyanoMantis + - type: PresetIdCard + job: ForensicMantis - type: entity parent: ResearchIDCard @@ -403,52 +154,71 @@ - type: Sprite layers: - state: default - - state: idroboticist + - state: stripe_top + color: *color-science-top + - state: stripe_bottom + color: *color-science-bottom + - sprite: &icon-rsi /Textures/Interface/Misc/job_icons.rsi + offset: *icon-offset + state: Roboticist - type: PresetIdCard job: Roboticist -# Clown +# Justice - type: entity - parent: ClownIDCard - id: JesterIDCard - name: jester ID card + parent: IDCardStandard + id: ClerkIDCard + name: clerk ID card components: - - type: IdCard - jobTitle: job-alt-title-jester + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-justice-top + - state: stripe_bottom + color: *color-justice-bottom + - sprite: *icon-rsi-dv + offset: *icon-offset + state: Clerk + - type: PresetIdCard + job: Clerk - type: entity - parent: ClownIDCard - id: FoolIDCard - name: fool ID card + parent: IDCardStandard + id: ProsecutorIDCard + name: presecutor ID card components: - - type: IdCard - jobTitle: job-alt-title-fool + - type: Sprite + layers: + - state: default + - state: stripe_top + color: *color-justice-top + - state: stripe_bottom + color: *color-justice-bottom + - sprite: *icon-rsi-dv + offset: *icon-offset + state: Prosecutor + - type: PresetIdCard + job: Prosecutor -# Janitor +# Other - type: entity - parent: JanitorIDCard - id: HygieneTechnicianIDCard - name: hygiene technician ID card + parent: IDCardStandard + id: MartialArtistIDCard + name: martial artist ID card components: - - type: IdCard - jobTitle: job-alt-title-hygiene-technician + - type: Sprite + layers: + - state: default + - sprite: *icon-rsi-dv + offset: *icon-offset + state: nyanoMartialArtist + - type: PresetIdCard + job: MartialArtist -# Robo-Neuroticisit - -- type: entity - parent: SyndicateIDCard - id: RoboNeuroticistIDCard - name: robo-neuroticist ID card - components: - - type: Access - tags: - - NuclearOperative - - SyndicateAgent - - External - - Robotics - - Maintenance +# Admemes and all that - type: entity parent: IDCardStandard @@ -458,10 +228,11 @@ description: An ID card that can replace the accesses of what it touches with the ones on the card components: - type: Sprite - sprite: Objects/Misc/id_cards.rsi layers: - - state: admin - - state: idwizard + - state: wizard + - sprite: *icon-rsi + offset: *icon-offset + state: Wizard - type: Clothing sprite: Objects/Misc/id_cards.rsi - type: Item @@ -469,7 +240,7 @@ - type: IdCard jobTitle: job-title-admeme-overwriting jobIcon: JobIconAdmin - - type: Tag # Ignore Chameleon tags + - type: Tag # Ignore Chameleon tags tags: - DoorBumpOpener - type: ReverseAgentIDCard @@ -501,7 +272,9 @@ sprite: Objects/Misc/id_cards.rsi layers: - state: admin - - state: idpassenger + - sprite: *icon-rsi + offset: *icon-offset + state: Admin - type: Clothing sprite: Objects/Misc/id_cards.rsi - type: Item @@ -515,22 +288,3 @@ categories: - Debug -#Recruiter -- type: entity - parent: SyndicateIDCard - id: RecruiterIDCard - suffix: Recruiter - components: - - type: Sprite - layers: - - state: default - - state: idpassenger - - type: Access - tags: - - NuclearOperative - - SyndicateAgent - - External - - Maintenance - - type: IdCard - jobTitle: job-name-passenger - jobIcon: JobIconPassenger diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards_alternate.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards_alternate.yml new file mode 100644 index 0000000000..680350823d --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards_alternate.yml @@ -0,0 +1,307 @@ + +## Alternate Job Titles + +## Only put in here if it inherits an existing job's ID *AND* there are no sprite component changes to the card + +# Passenger +- type: entity + parent: PassengerIDCard + id: VisitorIDCardLoadout + name: visitor ID card + components: + - type: IdCard + jobTitle: job-title-visitor + +- type: entity + parent: PassengerIDCard + id: TouristIDCard + name: tourist ID card + components: + - type: IdCard + jobTitle: job-alt-title-tourist + +- type: entity + parent: PassengerIDCard + id: OffDutyCrewIDCard + name: off-duty crew ID card + components: + - type: IdCard + jobTitle: job-alt-title-off-duty-crew + +- type: entity + parent: PassengerIDCard + id: StudentIDCard + name: student ID card + components: + - type: IdCard + jobTitle: job-alt-title-student + +# Bartender + +- type: entity + parent: BartenderIDCard + id: MixologistIDCard + name: mixologist ID card + components: + - type: IdCard + jobTitle: job-alt-title-mixologist + +# Chef + +- type: entity + parent: ChefIDCard + id: BakerIDCard + name: baker ID card + components: + - type: IdCard + jobTitle: job-alt-title-baker + +- type: entity + parent: ChefIDCard + id: ButcherIDCard + name: butcher ID card + components: + - type: IdCard + jobTitle: job-alt-title-butcher + +- type: entity + parent: ChefIDCard + id: PizzaioloIDCard + name: pizzaiolo ID card + components: + - type: IdCard + jobTitle: job-alt-title-pizzaiolo + +# Medical Intern + +- type: entity + parent: MedicalInternIDCard + id: PracticalNurseIDCard + name: practical nurse ID card + components: + - type: IdCard + jobTitle: job-alt-title-practical-nurse + +- type: entity + parent: MedicalInternIDCard + id: ResidentIDCard + name: resident ID card + components: + - type: IdCard + jobTitle: job-alt-title-resident + +# Medical Doctor + +- type: entity + parent: MedicalIDCard + id: ClinicianIDCard + name: clinician ID card + components: + - type: IdCard + jobTitle: job-alt-title-clinician + +# Senior Physician + +- type: entity + parent: SeniorPhysicianIDCard + id: CryogenicsSpecialistIDCard + name: cryogenics specialist ID card + components: + - type: IdCard + jobTitle: job-alt-title-cryogenics-specialist + +# Chemist + +- type: entity + parent: ChemistIDCard + id: PharmacistIDCard + name: pharmacist ID card + components: + - type: IdCard + jobTitle: job-alt-title-pharmacist + +# Psychologist + +- type: entity + parent: PsychologistIDCard + id: PsychiatristIDCard + name: psychiatrist ID card + components: + - type: IdCard + jobTitle: job-alt-title-psychiatrist + +- type: entity + parent: PsychologistIDCard + id: TherapistIDCard + name: therapist ID card + components: + - type: IdCard + jobTitle: job-alt-title-therapist + +- type: entity + parent: PsychologistIDCard + id: SocialWorkerIDCard + name: social worker ID card + components: + - type: IdCard + jobTitle: job-alt-title-social-worker + +# Atmospheric Technician + +- type: entity + parent: AtmosIDCard + id: LifeSupportTechIDCard + name: life support technician ID card + components: + - type: IdCard + jobTitle: job-alt-title-life-support + +- type: entity + parent: AtmosIDCard + id: PlasmaScientistIDCard + name: plasma scientist ID card + components: + - type: IdCard + jobTitle: job-alt-title-plasma-scientist + +# Station Engineer + +- type: entity + parent: EngineeringIDCard + id: ElectricianIDCard + name: electrician ID card + components: + - type: IdCard + jobTitle: job-alt-title-electrician + +- type: entity + parent: EngineeringIDCard + id: MechanicIDCard + name: mechanic ID card + components: + - type: IdCard + jobTitle: job-alt-title-mechanic + +# Cargo Technician + +- type: entity + parent: CargoIDCard + id: DeckWorkerIDCard + name: deck worker ID card + components: + - type: IdCard + jobTitle: job-alt-title-deck-worker + +- type: entity + parent: CargoIDCard + id: InventoryAssociateIDCard + name: inventory associate ID card + components: + - type: IdCard + jobTitle: job-alt-title-inventory-associate + +# Courier + +- type: entity + parent: CourierIDCard + id: MailCarrierIDCard + name: mail carrier ID card + components: + - type: IdCard + jobTitle: job-alt-title-mail-carrier + +# Salvage Specialist + +- type: entity + parent: SalvageIDCard + id: ProspectorIDCard + name: prospector ID card + components: + - type: IdCard + jobTitle: job-alt-title-prospector + +- type: entity + parent: SalvageIDCard + id: ExcavatorIDCard + name: excavator ID card + components: + - type: IdCard + jobTitle: job-alt-title-excavator + +# Scientist + +- type: entity + parent: ResearchIDCard + id: LabTechIDCard + name: lab technician ID card + components: + - type: IdCard + jobTitle: job-alt-title-lab-technician + +- type: entity + parent: ResearchIDCard + id: XenoarchIDCard + name: xenoarchaeologist ID card + components: + - type: IdCard + jobTitle: job-alt-title-xenoarch + +# Clown + +- type: entity + parent: ClownIDCard + id: JesterIDCard + name: jester ID card + components: + - type: IdCard + jobTitle: job-alt-title-jester + +- type: entity + parent: ClownIDCard + id: FoolIDCard + name: fool ID card + components: + - type: IdCard + jobTitle: job-alt-title-fool + +# Janitor + +- type: entity + parent: JanitorIDCard + id: HygieneTechnicianIDCard + name: hygiene technician ID card + components: + - type: IdCard + jobTitle: job-alt-title-hygiene-technician + +# Syndicate Recruiter + +- type: entity + parent: SyndicateIDCard + id: RecruiterIDCard + suffix: Recruiter + components: + - type: Access + tags: + - NuclearOperative + - SyndicateAgent + - External + - Maintenance + - type: IdCard + jobTitle: job-name-passenger + jobIcon: JobIconPassenger + +# Robo-Neuroticisit + +- type: entity + parent: SyndicateIDCard + id: RoboNeuroticistIDCard + name: robo-neuroticist ID card + components: + - type: Access + tags: + - NuclearOperative + - SyndicateAgent + - External + - Robotics + - Maintenance 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 4880954a9a..97c3546aba 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,80 +1,56 @@ { "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)| Librarian re-recoloured by AeraAulin (github) | 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": "QuarterMaster" - }, - { - "name": "Botanist" - }, - { - "name": "Borg" - }, - { - "name": "Boxer" + "name": "Admin" }, { "name": "AtmosphericTechnician" }, { - "name": "Nanotrasen" + "name": "Bartender" }, { - "name": "Prisoner" + "name": "Borg" }, { - "name": "Janitor" + "name": "Botanist" }, { - "name": "Chemist" + "name": "Boxer" }, { - "name": "StationEngineer" + "name": "Brigmedic" }, { - "name": "SecurityOfficer" - }, - { - "name": "NoId" - }, - { - "name": "ChiefMedicalOfficer" - }, - { - "name": "Roboticist" - }, - { - "name": "Chaplain" - }, - { - "name": "Lawyer" - }, - { - "name": "Unknown" - }, - { - "name": "Librarian" + "name": "Captain" }, { "name": "CargoTechnician" }, { - "name": "Scientist" + "name": "CBURN" }, { - "name": "ResearchAssistant" + "name": "Chaplain" }, { - "name": "Geneticist" + "name": "Chef" + }, + { + "name": "Chemist" + }, + { + "name": "ChiefEngineer" + }, + { + "name": "ChiefMedicalOfficer" }, { "name": "Clown" @@ -83,94 +59,61 @@ "name": "Cluwne" }, { - "name": "Captain" + "name": "Detective" }, { + "name": "DeathSquad" + }, + { + "name": "ERTChaplain" + }, + { + "name": "ERTEngineer" + }, + { + "name": "ERTJanitor" + }, + { + "name": "ERTLeader" + }, + { + "name": "ERTMedical" + }, + { + "name": "ERTSecurity" + }, + { + "name": "Geneticist" + }, + { "name": "HeadOfPersonnel" }, - { - "name": "Virologist" - }, - { - "name": "ShaftMiner" - }, - { - "name": "Passenger" - }, - { - "name": "ChiefEngineer" - }, - { - "name": "Bartender" - }, { "name": "HeadOfSecurity" }, { - "name": "Brigmedic" + "name": "HeadRevolutionary" + }, + { + "name": "InitialInfected" + }, + { + "name": "Janitor" + }, + { + "name": "Lawyer" + }, + { + "name": "Librarian" }, { "name": "MedicalDoctor" }, - { - "name": "Paramedic" - }, - { - "name": "Chef" - }, - { - "name": "Warden" - }, - { - "name": "ResearchDirector" - }, - { - "name": "Mime" - }, - { - "name": "Musician" - }, - { - "name": "Reporter" - }, - { - "name": "Psychologist" - }, { "name": "MedicalIntern" }, { - "name": "TechnicalAssistant" - }, - { - "name": "ServiceWorker" - }, - { - "name": "SecurityCadet" - }, - { - "name": "Zombie" - }, - { - "name": "Zookeeper" - }, - { - "name": "SeniorEngineer" - }, - { - "name": "SeniorResearcher" - }, - { - "name": "SeniorPhysician" - }, - { - "name": "SeniorOfficer" - }, - { - "name": "Revolutionary" - }, - { - "name": "HeadRevolutionary" + "name": "Mime" }, { "name": "MindShield", @@ -181,23 +124,116 @@ ] ] }, + { + "name": "Musician" + }, + { + "name": "Nanotrasen" + }, + { + "name": "NoId" + }, + { + "name": "ParadoxClone" + }, + { + "name": "Paramedic" + }, + { + "name": "Passenger" + }, + { + "name": "Prisoner" + }, + { + "name": "Psychologist" + }, + { + "name": "QuarterMaster" + }, + { + "name": "Reporter" + }, + { + "name": "ResearchAssistant" + }, + { + "name": "ResearchDirector" + }, + { + "name": "Revolutionary" + }, + { + "name": "Roboticist" + }, + { + "name": "Scientist" + }, + { + "name": "SecurityCadet" + }, + { + "name": "SecurityOfficer" + }, + { + "name": "SeniorEngineer" + }, + { + "name": "SeniorOfficer" + }, + { + "name": "SeniorPhysician" + }, + { + "name": "SeniorResearcher" + }, + { + "name": "ServiceWorker" + }, + { + "name": "ShaftMiner" + }, { "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/Consumable/Food/candy.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json index a93e0a71ed..c50a8f0ece 100644 --- a/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json @@ -42,6 +42,9 @@ { "name": "orange" }, + { + "name": "swirl_lollipop" + }, { "name": "swirl_lollipop-inhand-right", "directions": 4 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 d73dfea460..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 dd0e1de10d..29a2e4f741 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -1,279 +1,24 @@ { "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). | idcurator recoloured by AeraAulin (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": "admin" - }, - { - "name": "ert_chaplain" - }, - { - "name": "ert_commander" - }, - { - "name": "ert_engineer" - }, - { - "name": "ert_janitor" - }, - { - "name": "ert_medic" - }, - { - "name": "ert_security" - }, - { - "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": "idintern-med" - }, - { - "name": "idintern-service" - }, - { - "name": "idintern-tech" - }, - { - "name": "idadmin" - }, - { - "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": "black-inhand-left", "directions": 4 }, { - "name": "gold-inhand-right", - "directions": 4 - }, - { - "name": "default-inhand-left", - "directions": 4 - }, - { - "name": "default-inhand-right", - "directions": 4 - }, - { - "name": "silver-inhand-left", - "directions": 4 - }, - { - "name": "silver-inhand-right", - "directions": 4 - }, - { - "name": "orange-inhand-left", - "directions": 4 - }, - { - "name": "orange-inhand-right", + "name": "black-inhand-right", "directions": 4 }, { @@ -284,6 +29,31 @@ "name": "blue-inhand-right", "directions": 4 }, + { + "name": "centcom" + }, + { + "name": "default" + }, + { + "name": "default-inhand-left", + "directions": 4 + }, + { + "name": "default-inhand-right", + "directions": 4 + }, + { + "name": "gold" + }, + { + "name": "gold-inhand-left", + "directions": 4 + }, + { + "name": "gold-inhand-right", + "directions": 4 + }, { "name": "green-inhand-left", "directions": 4 @@ -291,6 +61,46 @@ { "name": "green-inhand-right", "directions": 4 + }, + { + "name": "icon-captain" + }, + { + "name": "orange" + }, + { + "name": "orange-inhand-left", + "directions": 4 + }, + { + "name": "orange-inhand-right", + "directions": 4 + }, + { + "name": "pirate" + }, + { + "name": "silver" + }, + { + "name": "silver-inhand-left", + "directions": 4 + }, + { + "name": "silver-inhand-right", + "directions": 4 + }, + { + "name": "stripe_bottom" + }, + { + "name": "stripe_clown" + }, + { + "name": "stripe_top" + }, + { + "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 diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/default.png deleted file mode 100644 index 95b3d54c27..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/default.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idbrigmedic.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idbrigmedic.png deleted file mode 100644 index 58d2d9b37a..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idbrigmedic.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idcargoassistant.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idcargoassistant.png deleted file mode 100644 index 73377bc368..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idcargoassistant.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idchaplain.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idchaplain.png deleted file mode 100644 index d27ec5bbfd..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idchaplain.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idchiefjustice.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idchiefjustice.png deleted file mode 100644 index 54b75e16dc..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idchiefjustice.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idclerk.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idclerk.png deleted file mode 100644 index 25848b5a1d..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idclerk.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/iddetective.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/iddetective.png deleted file mode 100644 index 185cab8790..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/iddetective.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idheadofsecurity.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idheadofsecurity.png deleted file mode 100644 index 152f70fa3f..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idheadofsecurity.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idintern-cadet.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idintern-cadet.png deleted file mode 100644 index ec95c9a37e..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idintern-cadet.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idlawyer.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idlawyer.png deleted file mode 100644 index 044079dd7e..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idlawyer.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idprosecutor.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idprosecutor.png deleted file mode 100644 index 7078d06992..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idprosecutor.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsecurityofficer.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsecurityofficer.png deleted file mode 100644 index dcf89e0ff7..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsecurityofficer.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idseniorofficer.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idseniorofficer.png deleted file mode 100644 index fbea205b70..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idseniorofficer.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsurgeon.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsurgeon.png deleted file mode 100644 index 4f53469e54..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsurgeon.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png deleted file mode 100644 index 4221aae0dd..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json deleted file mode 100644 index f588c1ad19..0000000000 --- a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | idsecurityofficer, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid, idsurgeon by Janet Blackquill 2024. Security sprites modified by TJohnson. idprosecutor nyanomantis and nyanoprisoner icons made by BoxfulOfSoup (Github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "idchaplain" - }, - { - "name": "nyanogladiator" - }, - { - "name": "nyanoprisonguard" - }, - { - "name": "nyanoprisoner" - }, - { - "name": "nyanomailcarrier" - }, - { - "name": "nyanomartialartist" - }, - { - "name": "nyanomantis" - }, - { - "name": "idchiefjustice" - }, - { - "name": "idclerk" - }, - { - "name": "idprosecutor" - }, - { - "name": "idlawyer" - }, - { - "name": "idcargoassistant" - }, - { - "name": "idsurgeon" - }, - { - "name": "idbrigmedic" - }, - { - "name": "iddetective" - }, - { - "name": "idheadofsecurity" - }, - { - "name": "idintern-cadet" - }, - { - "name": "idsecurityofficer" - }, - { - "name": "idseniorofficer" - }, - { - "name": "idwarden" - }, - { - "name": "default" - }, - { - "name": "silver" - } - ] -} diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanogladiator.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanogladiator.png deleted file mode 100644 index 17f3ea2aae..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanogladiator.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanomailcarrier.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanomailcarrier.png deleted file mode 100644 index ba7a3d4dcd..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanomailcarrier.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanomantis.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanomantis.png deleted file mode 100644 index ee3917457e..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanomantis.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanomartialartist.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanomartialartist.png deleted file mode 100644 index 1f7862d092..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanomartialartist.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png deleted file mode 100644 index a42cf933bc..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png deleted file mode 100644 index edada47450..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/silver.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/silver.png deleted file mode 100644 index b13153a246..0000000000 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/silver.png and /dev/null differ