diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml index 48ad507f70..99b61c089a 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml @@ -62,7 +62,7 @@ parent: UniformBase id: UniformAssistant name: assistant jumpsuit - desciption: It's a generic grey jumpsuit. That's about what assistants are worth, anyway. + description: It's a generic grey jumpsuit. That's about what assistants are worth, anyway. components: - type: Sprite sprite: Clothing/Uniforms/uniform_assistant.rsi @@ -75,7 +75,7 @@ parent: UniformBase id: UniformChemistry name: chemistry jumpsuit - desciption: There's some odd stains on this jumpsuit. Hm. + description: There's some odd stains on this jumpsuit. Hm. components: - type: Sprite sprite: Clothing/Uniforms/uniform_medical.rsi @@ -89,7 +89,7 @@ parent: UniformChemistry id: UniformChemistrySkirt name: chemistry jumpskirt - desciption: A sterile jumpskirt in Chemistry colors. + description: A sterile jumpskirt in Chemistry colors. components: - type: Sprite state: chemistry_skirt @@ -102,7 +102,7 @@ parent: UniformBase id: UniformParamedic name: paramedic jumpsuit - desciption: It's got a red plus on it, that's a good thing right? + description: It's got a red plus on it, that's a good thing right? components: - type: Sprite sprite: Clothing/Uniforms/uniform_medical.rsi @@ -116,7 +116,7 @@ parent: UniformParamedic id: UniformParamedicSkirt name: paramedic jumpskirt - desciption: A sterile jumpskirt in Paramedic colors. + description: A sterile jumpskirt in Paramedic colors. components: - type: Sprite state: paramedic_skirt @@ -129,7 +129,7 @@ parent: UniformBase id: UniformScrubsPurple name: purple scrubs - desciption: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. + description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. components: - type: Sprite sprite: Clothing/Uniforms/uniform_medical.rsi @@ -143,7 +143,7 @@ parent: UniformBase id: UniformScrubsGreen name: green scrubs - desciption: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. + description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. components: - type: Sprite sprite: Clothing/Uniforms/uniform_medical.rsi @@ -157,7 +157,7 @@ parent: UniformBase id: UniformScrubsBlue name: blue scrubs - desciption: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. + description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. components: - type: Sprite sprite: Clothing/Uniforms/uniform_medical.rsi @@ -362,7 +362,7 @@ parent: UniformCargoTech id: UniformCargoTechSkirt name: cargo tech jumpskirt - desciption: A sturdy jumpskirt, issued to members of the Cargo department. + description: A sturdy jumpskirt, issued to members of the Cargo department. components: - type: Sprite state: cargo_skirt @@ -374,7 +374,7 @@ - type: entity parent: UniformBase id: UniformQM - name: qm jumpsuit + name: quartermaster's jumpsuit description: 'What can brown do for you?' components: - type: Sprite @@ -387,8 +387,8 @@ - type: entity parent: UniformQM id: UniformQMSkirt - name: qm jumpskirt - desciption: 'What can brown do for you?' + name: quartermaster's jumpskirt + description: 'What can brown do for you?' components: - type: Sprite state: qm_skirt @@ -414,7 +414,7 @@ parent: UniformChef id: UniformChefSkirt name: chef skirt - desciption: Can't cook without this. + description: Can't cook without this. components: - type: Sprite state: chef_skirt @@ -453,7 +453,7 @@ parent: UniformChiefEngineer id: UniformChiefEngineerSkirt name: ce jumpskirt - desciption: It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding. + description: It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding. components: - type: Sprite state: chief_skirt @@ -479,7 +479,7 @@ parent: UniformCMO id: UniformCMOSkirt name: cmo jumpskirt - desciption: It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. + description: It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. components: - type: Sprite state: cmo_skirt @@ -505,7 +505,7 @@ parent: UniformMedicalDoctor id: UniformMedicalDoctorSkirt name: medical doctor jumpskirt - desciption: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel. + description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel. components: - type: Sprite state: medical_skirt @@ -531,7 +531,7 @@ parent: UniformScientist id: UniformScientistSkirt name: scientist jumpskirt - desciption: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist. + description: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist. components: - type: Sprite state: sci_skirt @@ -543,7 +543,7 @@ - type: entity parent: UniformBase id: UniformResearchDirector - name: rd turtleneck + name: research director's turtleneck description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. components: - type: Sprite @@ -556,8 +556,8 @@ - type: entity parent: UniformResearchDirector id: UniformResearchDirectorSkirt - name: rd skirtleneck - desciption: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. + name: research director's skirtleneck + description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. components: - type: Sprite state: rnd_skirt @@ -583,7 +583,7 @@ parent: UniformMime id: UniformMimeSkirt name: mime skirt - desciption: ... + description: ... components: - type: Sprite state: mime_skirt @@ -592,6 +592,32 @@ ClothingPrefix: mime_skirt femaleMask: UniformTop +- type: entity + parent: UniformBase + id: UniformChaplain + name: chaplain's jumpsuit + description: It's a black jumpsuit, often worn by religious folk. + components: + - type: Sprite + sprite: Clothing/Uniforms/uniform_chaplain.rsi + state: icon + + - type: Clothing + sprite: Clothing/Uniforms/uniform_chaplain.rsi + +- type: entity + parent: UniformChaplain + id: UniformChaplainSkirt + name: chaplain's jumpskirt + description: It's a black jumpskirt. If you wear this, you probably need religious help more than you will be providing it. + components: + - type: Sprite + state: chaplain_skirt + + - type: Clothing + ClothingPrefix: chaplain_skirt + femaleMask: UniformTop + - type: entity parent: UniformBase id: UniformHoSAlt @@ -610,7 +636,7 @@ parent: UniformHoSAlt id: UniformHoSAltSkirt name: head of security skirtleneck - desciption: It's a skirtleneck worn by those who were strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from mechanical damage. + description: It's a skirtleneck worn by those who were strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from mechanical damage. components: - type: Sprite state: hosalt_skirt @@ -638,7 +664,7 @@ parent: UniformHoS id: UniformHoSSkirt name: head of security jumpskirt - desciption: It's bright red and rather crisp, much like security's victims tend to be. + description: It's bright red and rather crisp, much like security's victims tend to be. components: - type: Sprite state: hos_skirt @@ -713,7 +739,7 @@ - type: entity parent: UniformBase id: UniformWarden - name: security suit + name: warden's uniform description: A formal security suit for officers complete with Nanotrasen belt buckle. components: - type: Sprite @@ -792,7 +818,7 @@ parent: UniformPrisoner id: UniformPrisonerSkirt name: prisoner jumpskirt - desciption: Busted. + description: Busted. components: - type: Sprite state: prisoner_skirt @@ -805,7 +831,7 @@ parent: UniformBase id: UniformHoP name: hop jumpsuit - desciption: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. + description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. components: - type: Sprite sprite: Clothing/Uniforms/uniform_hop.rsi @@ -818,7 +844,7 @@ parent: UniformHoP id: UniformHoPSkirt name: hop jumpskirt - desciption: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. + description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. components: - type: Sprite state: hop_skirt @@ -831,7 +857,7 @@ parent: UniformBase id: UniformHydroponics name: hydroponics jumpsuit - desciption: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled. + description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled. components: - type: Sprite sprite: Clothing/Uniforms/uniform_hydro.rsi @@ -844,7 +870,7 @@ parent: UniformHydroponics id: UniformHydroponicsSkirt name: hydroponics jumpskirt - desciption: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled. + description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled. components: - type: Sprite state: hydro_skirt @@ -870,7 +896,7 @@ parent: UniformBartender id: UniformBartenderSkirt name: bartender's skirt - desciption: A nice and tidy skirt. Shame about the bar though. + description: A nice and tidy skirt. Shame about the bar though. components: - type: Sprite state: skirt @@ -883,7 +909,7 @@ parent: UniformBartender id: UniformBartenderPurple name: purple bartender's uniform - desciption: A special purple outfit to serve drinks. + description: A special purple outfit to serve drinks. components: - type: Sprite state: purple diff --git a/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml index aae9082344..df3a01813a 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml @@ -18,6 +18,16 @@ - type: Sprite state: Assistant +# Quartermaster +- type: entity + id: SpawnPointQuartermaster + parent: SpawnPointJobBase + name: spawn point (quartermaster) + components: + - type: SpawnPoint + job_id: Quartermaster + - type: Sprite + state: Quartermaster # Cargo tech - type: entity @@ -43,7 +53,7 @@ state: Bartender -# Bartender +# Chef - type: entity id: SpawnPointChef parent: SpawnPointJobBase @@ -54,6 +64,16 @@ - type: Sprite state: Cook +# Botanist +- type: entity + id: SpawnPointBotanist + parent: SpawnPointJobBase + name: spawn point (botanist) + components: + - type: SpawnPoint + job_id: Botanist + - type: Sprite + state: Botanist # Clown - type: entity @@ -78,6 +98,16 @@ - type: Sprite state: Mime +# Chaplain +- type: entity + id: SpawnPointChaplain + parent: SpawnPointJobBase + name: spawn point (chaplain) + components: + - type: SpawnPoint + job_id: Chaplain + - type: Sprite + state: Chaplain # Janitor - type: entity @@ -198,6 +228,16 @@ - type: Sprite state: Head of Security +# Warden +- type: entity + id: SpawnPointWarden + parent: SpawnPointJobBase + name: spawn point (warden) + components: + - type: SpawnPoint + job_id: Warden + - type: Sprite + state: Warden # SecurityOfficer - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index b92b232906..5f94b67611 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -52,6 +52,21 @@ - type: Icon state: pda-cook +- type: entity + name: Botanist PDA + parent: BasePDA + id: BotanistPDA + description: Has an earthy scent. + components: + - type: PDA + idCard: BotanistIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-hydro + - type: Icon + state: pda-hydro + - type: entity name: Clown PDA parent: BasePDA @@ -90,21 +105,35 @@ - type: Icon state: pda-mime -# TODO: uncomment this when the QM job gets added -#- type: entity -# name: Quartermaster PDA -# parent: BasePDA -# id: QuartermasterPDA -# description: PDA for the guy that orders the guns. -# components: -# - type: PDA -# idCard: QuartermasterIDCard -# - type: Appearance -# visuals: -# - type: PDAVisualizer -# state: pda-qm -# - type: Icon -# state: pda-qm +- type: entity + name: Chaplain PDA + parent: BasePDA + id: ChaplainPDA + description: God's chosen PDA. + components: + - type: PDA + idCard: ChaplainIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-chaplain + - type: Icon + state: pda-chaplain + +- type: entity + name: Quartermaster PDA + parent: BasePDA + id: QuartermasterPDA + description: PDA for the guy that orders the guns. + components: + - type: PDA + idCard: QuartermasterIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-qm + - type: Icon + state: pda-qm - type: entity name: Cargo PDA @@ -292,21 +321,20 @@ - type: Icon state: pda-hos -# TODO: Uncomment this when the Warden job gets added -#- type: entity -# name: Warden PDA -# parent: BasePDA -# id: WardenPDA -# description: The OS appears to have been jailbroken. -# components: -# - type: PDA -# idCard: WardenIDCard -# - type: Appearance -# visuals: -# - type: PDAVisualizer -# state: pda-warden -# - type: Icon -# state: pda-warden +- type: entity + name: Warden PDA + parent: BasePDA + id: WardenPDA + description: The OS appears to have been jailbroken. + components: + - type: PDA + idCard: WardenIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-warden + - type: Icon + state: pda-warden - type: entity name: Security PDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 30f70e2dd7..4302feeeac 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -62,6 +62,20 @@ - type: PresetIdCard job: SecurityOfficer +- type: entity + parent: IDCardStandard + id: WardenIDCard + name: warden ID card + components: + - type: Sprite + layers: + - state: default + - state: assigned + - state: idwarden + + - type: PresetIdCard + job: Warden + - type: entity parent: IDCardStandard id: EngineeringIDCard @@ -104,6 +118,20 @@ - type: PresetIdCard job: CargoTechnician +- type: entity + parent: IDCardStandard + id: QuartermasterIDCard + name: quartermaster ID card + components: + - type: Sprite + layers: + - state: default + - state: assigned + - state: idquartermaster + + - type: PresetIdCard + job: Quartermaster + - type: entity parent: IDCardStandard id: ResearchIDCard @@ -146,6 +174,20 @@ - type: PresetIdCard job: Mime +- type: entity + parent: IDCardStandard + id: ChaplainIDCard + name: chaplain ID card + components: + - type: Sprite + layers: + - state: default + - state: assigned + - state: idchaplain + + - type: PresetIdCard + job: Chaplain + - type: entity parent: IDCardStandard id: JanitorIDCard @@ -188,6 +230,21 @@ - type: PresetIdCard job: Chef +- type: entity + parent: IDCardStandard + id: BotanistIDCard + name: botanist ID card + components: + - type: Sprite + layers: + - state: default + - state: assigned + - state: idbotanist + + - type: PresetIdCard + job: Botanist + + - type: entity parent: IDCardStandard id: HoPIDCard diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml new file mode 100644 index 0000000000..3125f420a0 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -0,0 +1,22 @@ +- type: job + id: Quartermaster + name: "quartermaster" + positions: 1 + spawnPositions: 1 + startingGear: QuartermasterGear + department: + - Cargo + icon: "QuarterMaster" + access: + - Cargo + - Quartermaster + - Maintenance + +- type: startingGear + id: QuartermasterGear + equipment: + innerclothing: UniformQM + backpack: BackpackClothingFilled + shoes: ShoesBrown + idcard: QuartermasterPDA + ears: HeadsetCargo diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml new file mode 100644 index 0000000000..53fdd5d039 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -0,0 +1,22 @@ +- type: job + id: Botanist + name: "botanist" + positions: 2 + spawnPositions: 2 + startingGear: BotanistGear + department: + - Civilian + icon: "Botanist" + access: + - Service + - Hydroponics + - Maintenance + +- type: startingGear + id: BotanistGear + equipment: + innerclothing: UniformHydroponics + backpack: BackpackClothingFilled + shoes: ShoesBrown + idcard: BotanistPDA + ears: HeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml new file mode 100644 index 0000000000..34b9d5faef --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -0,0 +1,20 @@ +- type: job + id: Chaplain + name: "chaplain" + positions: 1 + startingGear: ChaplainGear + department: + - Civilian + icon: "Chaplain" + access: + - Chapel + - Maintenance + +- type: startingGear + id: ChaplainGear + equipment: + innerclothing: UniformChaplain + backpack: BackpackClothing + shoes: ShoesBlack + idcard: ChaplainPDA + ears: HeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml new file mode 100644 index 0000000000..9e223a4a9a --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -0,0 +1,25 @@ +- type: job + id: Warden + name: "warden" + positions: 1 + spawnPositions: 1 + startingGear: WardenGear + department: + - Security + icon: "Warden" + access: + - Security + - Brig + - Maintenance + - Service + +- type: startingGear + id: WardenGear + equipment: + innerclothing: UniformWarden + backpack: SecPackFilled + shoes: ShoesJackboots + eyes: SecGlasses + outerclothing: OuterclothingArmorVest + idcard: WardenPDA + ears: HeadsetSecurity diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/chaplain_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/chaplain_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..600f014582 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/chaplain_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/chaplain_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/chaplain_skirt.png new file mode 100644 index 0000000000..a72665e993 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/chaplain_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..7423a21e65 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/icon.png new file mode 100644 index 0000000000..01d31abcc8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/inhand-left.png new file mode 100644 index 0000000000..3520c2732a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/inhand-right.png new file mode 100644 index 0000000000..2c8df85d4d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/meta.json new file mode 100644 index 0000000000..b303e0d2b2 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/meta.json @@ -0,0 +1,101 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/commit/f2a314f575fd3ed9c6abf3b2cada6ebf5a8c1a4b", + "states": [ + { + "name": "chaplain_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "chaplain_skirt", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/assigned.png b/Resources/Textures/Objects/Misc/id_cards.rsi/assigned.png index 07cfb13662..ffaf2654cc 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/assigned.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/assigned.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png new file mode 100644 index 0000000000..d6ee9844f0 Binary files /dev/null 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 deb2d35c6b..1252002516 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 new file mode 100644 index 0000000000..7dc38a4c60 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png 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 new file mode 100644 index 0000000000..b1ae7ea755 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png 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 new file mode 100644 index 0000000000..16218ebd3a Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png 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 new file mode 100644 index 0000000000..da667d4ac5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png 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 new file mode 100644 index 0000000000..05710e9e87 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png 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 new file mode 100644 index 0000000000..830ea41793 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png b/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png index fa8d36dfaa..06dd13ac40 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/idassistant.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idassistant.png index 397b416a59..0f92b2edf1 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idassistant.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idassistant.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idassistant_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idassistant_icon.png deleted file mode 100644 index 128ce26f12..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idassistant_icon.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 new file mode 100644 index 0000000000..3bd5446a3b Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png index 372e732578..435ea39ad6 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender_icon.png deleted file mode 100644 index 92b2be60b2..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender_icon.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 new file mode 100644 index 0000000000..effef4daf3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png index 73f0d871bc..e59e7c3d04 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain_icon.png deleted file mode 100644 index 9410b08ecb..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain_icon.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 index f97f5d7e9d..cfa0a35dcc 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician_icon.png deleted file mode 100644 index cf786cae71..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician_icon.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 index 25b7017a70..c0ee96e365 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom_icon.png deleted file mode 100644 index b0d93bb128..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom_icon.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 new file mode 100644 index 0000000000..e10e3c82a6 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png new file mode 100644 index 0000000000..2dba29c206 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png index 3595cbf4aa..259d125daf 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer_icon.png deleted file mode 100644 index 6187d0af61..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer_icon.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 index 82a608a9a1..70cc3c0abb 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer_icon.png deleted file mode 100644 index 53bc0bbdef..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer_icon.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 index 33a9f40eb4..e037202044 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idclown_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idclown_icon.png deleted file mode 100644 index 9578881011..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idclown_icon.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 index 4dbab6d125..4a98a9b57a 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcook_icon.png deleted file mode 100644 index d42abaab81..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook_icon.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 new file mode 100644 index 0000000000..cd01dc7770 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png new file mode 100644 index 0000000000..4707ff4826 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png new file mode 100644 index 0000000000..56d8e50c90 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png index 929fc47494..be72e37e57 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel_icon.png deleted file mode 100644 index 50910a8422..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel_icon.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 index 2a15b2baa9..bb03adc665 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity_icon.png deleted file mode 100644 index b6abed66a3..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity_icon.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 index 72b63d920e..320c3885e7 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor_icon.png deleted file mode 100644 index 11a6cb8179..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor_icon.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 new file mode 100644 index 0000000000..b86f437aee Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png index 72a1d36b66..3e716b0195 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor_icon.png deleted file mode 100644 index 58774fec33..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor_icon.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 index 5f2c9cec76..b917612dae 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmime_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmime_icon.png deleted file mode 100644 index 3eb8ce03d4..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmime_icon.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 new file mode 100644 index 0000000000..2a1fe45f39 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png new file mode 100644 index 0000000000..f9337a37c5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png new file mode 100644 index 0000000000..d65c0cbda7 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png index 46abf0dc6f..13f4957204 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector_icon.png deleted file mode 100644 index 083e7b7762..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector_icon.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 new file mode 100644 index 0000000000..4571a5e345 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png index b99f716ef1..7322d0b8bc 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist_icon.png deleted file mode 100644 index c6e8c39113..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist_icon.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 index 72e192ff42..f0e1562168 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer_icon.png deleted file mode 100644 index a9d669f53a..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer_icon.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 new file mode 100644 index 0000000000..c232dd439d Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png index a729081ca2..2e046fbacd 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer_icon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer_icon.png deleted file mode 100644 index bb9177eba8..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer_icon.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 new file mode 100644 index 0000000000..bc792fe1a1 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png new file mode 100644 index 0000000000..bbcf4456f0 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png new file mode 100644 index 0000000000..f2c207fa17 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index 860f04eb6e..d0f801dde0 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -1,495 +1,603 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "assigned", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "gold", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "default", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idassistant", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idcaptain", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idcargotechnician", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idcentcom", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idchiefengineer", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idchiefmedicalofficer", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idclown", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idheadofpersonnel", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idheadofsecurity", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idjanitor", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idmedicaldoctor", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idresearchdirector", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idscientist", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idsecurityofficer", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idcargotechnician", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idstationengineer", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idmime", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idassistant_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idcaptain_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idcargotechnician_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idcentcom_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idchiefengineer_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idchiefmedicalofficer_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idclown_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idheadofpersonnel_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idheadofsecurity_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idjanitor_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idmedicaldoctor_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idresearchdirector_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idscientist_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idsecurityofficer_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idcargotechnician_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idstationengineer_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idmime_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "silver", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "default-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "gold-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "silver-inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "default-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "gold-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "silver-inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "idbartender", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idcook", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idbartender_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "idcook_icon", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - } - ] -} + "states": [ + { + "name": "assigned", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "centcom", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "default", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "default-inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "default-inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "ert_chaplain", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "ert_commander", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "ert_engineer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "ert_janitor", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "ert_medic", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "ert_security", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "gold", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "gold-inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "gold-inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "idassistant", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idatmospherictechnician", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idbartender", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idbotanist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idcaptain", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idcargotechnician", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idcentcom", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idchaplain", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idchemist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idchiefengineer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idchiefmedicalofficer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idclown", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idcook", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idcurator", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "iddetective", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idgeneticist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idheadofpersonnel", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idheadofsecurity", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idjanitor", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idlawyer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idmedicaldoctor", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idmime", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idparamedic", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idprisoner", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idquartermaster", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idresearchdirector", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idroboticist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idscientist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idsecurityofficer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idshaftminer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idstationengineer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idunknown", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idvirologist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "idwarden", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "orange", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "prisoner_001", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "prisoner_002", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "prisoner_003", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "prisoner_004", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "prisoner_005", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "prisoner_006", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "prisoner_007", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "silver", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "silver-inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "silver-inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "syndie", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png new file mode 100644 index 0000000000..432f16af2c Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.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 new file mode 100644 index 0000000000..3cfc5596d5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png 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 new file mode 100644 index 0000000000..95e07a47d7 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png 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 new file mode 100644 index 0000000000..590a7fb487 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png 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 new file mode 100644 index 0000000000..7f2d2f4173 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png 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 new file mode 100644 index 0000000000..afede7b7b0 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png 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 new file mode 100644 index 0000000000..1791dff0b4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png 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 new file mode 100644 index 0000000000..877f17d40c Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png b/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png index bebf6a9296..90e6343b8e 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/syndie.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png new file mode 100644 index 0000000000..96e9f1cae2 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png differ