diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index 4cecbc99e41..9299673b6c7 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -73,7 +73,7 @@ parent: JobIcon id: JobIconPrisoner icon: - sprite: /Textures/Interface/Misc/job_icons.rsi + sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite prisoner jobicon state: Prisoner jobName: job-name-prisoner diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Prisoner.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Prisoner.png new file mode 100644 index 00000000000..cf2b09f4530 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Prisoner.png differ diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityOfficer.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityOfficer.png index 6f8ff128c4f..4f4ec66fbe7 100644 Binary files a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityOfficer.png and b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityOfficer.png differ diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Warden.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Warden.png index 1ed853d4e0f..f497ec0de7d 100644 Binary files a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Warden.png and b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Warden.png differ diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json index 3780cba0394..ca21f0803d4 100644 --- a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill 2024. Security cards modified by TJohnson.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | SecurityOfficer, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill 2024. Security cards modified by TJohnson.", "size": { "x": 8, "y": 8 @@ -69,6 +69,9 @@ }, { "name": "SeniorOfficer" + }, + { + "name": "Prisoner" } ] } diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png index 4f4ec66fbe7..0e7c51ff1dd 100644 Binary files a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png and b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png 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 index 09a461ee267..dcf89e0ff75 100644 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsecurityofficer.png and b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsecurityofficer.png 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 index edada474506..4221aae0ddc 100644 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png and b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png 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 index bbac5740dff..97650351214 100644 --- a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid, idadminassistant by noctyrnal (github), idsurgeon by Janet Blackquill 2024. Security sprites modified by TJohnson.", + "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, idadminassistant by noctyrnal (github), idsurgeon by Janet Blackquill 2024. Security sprites modified by TJohnson.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png index 96c8f4d9825..33752f69a17 100644 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png and b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png 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 index dcf89e0ff75..edada474506 100644 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png and b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png differ