diff --git a/Resources/Locale/en-US/_DV/job/job-names.ftl b/Resources/Locale/en-US/_DV/job/job-names.ftl index a1cdb112b8b..a486c14b99e 100644 --- a/Resources/Locale/en-US/_DV/job/job-names.ftl +++ b/Resources/Locale/en-US/_DV/job/job-names.ftl @@ -72,12 +72,10 @@ job-title-admeme-overwriting = Overwriting job-title-admeme-adding = Adding # Role timers -JobMedicalBorg = Medical Cyborg JobCourier = Courier JobChiefJustice = Chief Justice JobClerk = Clerk JobProsecutor = Prosecutor -JobSecurityBorg = Security Cyborg JobRoboticist = Roboticist JobCargoAssistant = Cargo Assistant JobZookeeper = Zookeeper diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index ec8bf479078..c7388bea239 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -247,3 +247,7 @@ PaperStickyNoteStackBlue : PaperStickyNoteStackFilledBlue # 2026-06-09 BoxPerformer: BoxPerformerDV + +# 2026-07-04 +SpawnPointMedicalBorg: SpawnPointBorg +SpawnPointSecurityBorg: SpawnPointBorg \ No newline at end of file diff --git a/Resources/Prototypes/Maps/byoin.yml b/Resources/Prototypes/Maps/byoin.yml index 642227725ac..85a9cb28793 100644 --- a/Resources/Prototypes/Maps/byoin.yml +++ b/Resources/Prototypes/Maps/byoin.yml @@ -57,8 +57,7 @@ ForensicMantis: [ 1, 1 ] Chaplain: [ 1, 1 ] #Silicon - MedicalBorg: [ 1, 1 ] - Borg: [ 1, 1 ] + Borg: [ 2, 2 ] #security Warden: [ 1, 1 ] Detective: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/glacier.yml b/Resources/Prototypes/Maps/glacier.yml index 1d982eac4d3..517c03751f8 100644 --- a/Resources/Prototypes/Maps/glacier.yml +++ b/Resources/Prototypes/Maps/glacier.yml @@ -54,7 +54,6 @@ Psychologist: [ 1, 1 ] MedicalDoctor: [ 2, 3 ] MedicalIntern: [ 2, 2 ] - MedicalBorg: [ 1, 1 ] Surgeon: [ 1, 2 ] #science ResearchDirector: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/submarine.yml b/Resources/Prototypes/Maps/submarine.yml index 791df224e6f..4a613ff87d8 100644 --- a/Resources/Prototypes/Maps/submarine.yml +++ b/Resources/Prototypes/Maps/submarine.yml @@ -79,5 +79,4 @@ Lawyer: [ 2, 2 ] #Synthetics StationAi: [ 1, 1] - Borg: [ 2, 4 ] - MedicalBorg: [ 2, 2 ] + Borg: [ 2, 3 ] diff --git a/Resources/Prototypes/Maps/terra.yml b/Resources/Prototypes/Maps/terra.yml index 2644cbd9995..6db8089938c 100644 --- a/Resources/Prototypes/Maps/terra.yml +++ b/Resources/Prototypes/Maps/terra.yml @@ -68,7 +68,7 @@ Zookeeper: [ 1, 1 ] #science Chaplain: [ 1, 1 ] - Borg: [ 3, 3 ] + Borg: [ 2, 3 ] ForensicMantis: [ 1, 1 ] ResearchAssistant: [ 2, 4 ] ResearchDirector: [ 1, 1 ] diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml deleted file mode 100644 index 26979b3fb37..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml +++ /dev/null @@ -1,63 +0,0 @@ -- type: entity - id: SpawnPointGladiator - parent: SpawnPointJobBase - name: gladiator - components: - - type: SpawnPoint - job_id: Gladiator - - type: Sprite - layers: - - state: green - - sprite: _DV/Markers/jobs.rsi - state: nyanogladiator - -- type: entity - id: SpawnPointPrisoner - parent: SpawnPointJobBase - name: prisoner - components: - - type: SpawnPoint - job_id: Prisoner - - type: Sprite - layers: - - state: green - - state: prisoner - -- type: entity - id: SpawnPointPrisonGuard - parent: SpawnPointJobBase - name: prison guard - components: - - type: SpawnPoint - job_id: PrisonGuard - - type: Sprite - layers: - - state: green - - sprite: _DV/Markers/jobs.rsi - state: nyanoprisonguard - -- type: entity - id: SpawnPointMartialArtist - parent: SpawnPointJobBase - name: martial artist - components: - - type: SpawnPoint - job_id: MartialArtist - - type: Sprite - layers: - - state: green - - sprite: _DV/Markers/jobs.rsi - state: nyanomartialartist - -- type: entity - id: SpawnPointForensicMantis - parent: SpawnPointJobBase - name: psionic mantis # DeltaV - Rename Forensic Mantis to Psionic Mantis - components: - - type: SpawnPoint - job_id: ForensicMantis - - type: Sprite - layers: - - state: green - - sprite: _DV/Markers/jobs.rsi - state: nyanomantis diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml index a5d7c223f44..0d61f6b0b6b 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml @@ -3,7 +3,7 @@ name: job-name-gladiator description: job-description-gladiator playTimeTracker: JobGladiator - startingGear: NyanoGladiatorGear + startingGear: gladiatorGear alwaysUseSpawner: true canBeAntag: false icon: "JobIconGladiator" @@ -16,7 +16,7 @@ time: 21600 - type: startingGear - id: NyanoGladiatorGear + id: gladiatorGear equipment: id: GladiatorPDA ears: ClothingHeadsetPrison diff --git a/Resources/Prototypes/Nyanotrasen/StatusIcon/job.yml b/Resources/Prototypes/Nyanotrasen/StatusIcon/job.yml deleted file mode 100644 index 60d22187bd8..00000000000 --- a/Resources/Prototypes/Nyanotrasen/StatusIcon/job.yml +++ /dev/null @@ -1,31 +0,0 @@ -- type: jobIcon - parent: JobIcon - id: JobIconGladiator - icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi - state: nyanoGladiator - jobName: job-name-gladiator - -- type: jobIcon - parent: JobIcon - id: JobIconPrisonGuard - icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi - state: nyanoPrisonGuard - jobName: job-name-prison-guard - -- type: jobIcon - parent: JobIcon - id: JobIconMartialArtist - icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi - state: nyanoMartialArtist - jobName: job-name-martialartist - -- type: jobIcon - parent: JobIcon - id: JobIconForensicMantis - icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi - state: nyanoMantis - jobName: job-name-mantis diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 4a7c831bb59..351ce2cc3c1 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -115,7 +115,6 @@ - Psychologist - Paramedic # BEGIN DeltaV Med Jobs - - MedicalBorg - Surgeon # END DeltaV @@ -135,7 +134,6 @@ # BEGIN DeltaV Sec Jobs - Brigmedic - PrisonGuard - - SecurityBorg - RoleLaika - RoleK9Officer # END DeltaV @@ -165,10 +163,6 @@ roles: - Borg - StationAi - # BEGIN DeltaV Silicon Jobs - - MedicalBorg - - SecurityBorg - # END DeltaV primary: false # DeltaV - removed from primary dept # DeltaV - get rid of 'station-specific' as a department. All of these diff --git a/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml index c137b476b6a..948705ed82c 100644 --- a/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml @@ -1,21 +1,71 @@ - type: entity - id: SpawnPointMedicalBorg parent: SpawnPointJobBase - name: medical cyborg + id: SpawnPointGladiator + name: gladiator components: - type: SpawnPoint - job_id: MedicalBorg + job_id: Gladiator - type: Sprite layers: - - state: green - - sprite: Mobs/Silicon/chassis.rsi - state: medical - - sprite: Mobs/Silicon/chassis.rsi - state: medical_e + - state: green + - sprite: &job-rsi-dv _DV/Markers/jobs.rsi + state: gladiator - type: entity - id: SpawnPointChiefJustice parent: SpawnPointJobBase + id: SpawnPointPrisoner + name: prisoner + components: + - type: SpawnPoint + job_id: Prisoner + - type: Sprite + layers: + - state: green + - state: prisoner + +- type: entity + parent: SpawnPointJobBase + id: SpawnPointPrisonGuard + name: prison guard + components: + - type: SpawnPoint + job_id: PrisonGuard + - type: Sprite + layers: + - state: green + - sprite: *job-rsi-dv + state: prisonguard + +- type: entity + parent: SpawnPointJobBase + id: SpawnPointMartialArtist + name: martial artist + components: + - type: SpawnPoint + job_id: MartialArtist + - type: Sprite + layers: + - state: green + - sprite: *job-rsi-dv + state: martialartist + +- type: entity + parent: SpawnPointJobBase + id: SpawnPointForensicMantis + name: psionic mantis # DeltaV - Rename Forensic Mantis to Psionic Mantis + components: + - type: SpawnPoint + job_id: ForensicMantis + - type: Sprite + layers: + - state: green + - sprite: *job-rsi-dv + state: psionicmantis + + +- type: entity + parent: SpawnPointJobBase + id: SpawnPointChiefJustice name: chiefjustice components: - type: SpawnPoint @@ -23,12 +73,12 @@ - type: Sprite layers: - state: green - - sprite: _DV/Markers/jobs.rsi + - sprite: *job-rsi-dv state: chiefjustice - type: entity - id: SpawnPointClerk parent: SpawnPointJobBase + id: SpawnPointClerk name: clerk components: - type: SpawnPoint @@ -36,12 +86,12 @@ - type: Sprite layers: - state: green - - sprite: _DV/Markers/jobs.rsi + - sprite: *job-rsi-dv state: clerk - type: entity - id: SpawnPointProsecutor parent: SpawnPointJobBase + id: SpawnPointProsecutor name: prosecutor components: - type: SpawnPoint @@ -49,12 +99,12 @@ - type: Sprite layers: - state: green - - sprite: _DV/Markers/jobs.rsi + - sprite: *job-rsi-dv state: prosecutor - type: entity - id: SpawnPointCourier parent: SpawnPointJobBase + id: SpawnPointCourier name: courier components: - type: SpawnPoint @@ -62,24 +112,9 @@ - type: Sprite layers: - state: green - - sprite: _DV/Markers/jobs.rsi + - sprite: *job-rsi-dv state: courier -- type: entity - id: SpawnPointSecurityBorg - parent: SpawnPointJobBase - name: security cyborg - components: - - type: SpawnPoint - job_id: SecurityBorg - - type: Sprite - layers: - - state: green - - sprite: _DV/Mobs/Silicon/chassis.rsi - state: security - - sprite: _DV/Mobs/Silicon/chassis.rsi - state: security_e - - type: entity parent: SpawnPointJobBase id: SpawnPointRoboticist @@ -90,7 +125,7 @@ - type: Sprite layers: - state: green - - sprite: _DV/Markers/jobs.rsi + - sprite: *job-rsi-dv state: roboticist - type: entity @@ -103,7 +138,7 @@ - type: Sprite layers: - state: green - - sprite: _DV/Markers/jobs.rsi + - sprite: *job-rsi-dv state: cargoassistant - type: entity @@ -116,12 +151,12 @@ - type: Sprite layers: - state: green - - sprite: _DV/Markers/jobs.rsi + - sprite: *job-rsi-dv state: surgeon - type: entity - id: SpawnPointBoxer parent: SpawnPointJobBase + id: SpawnPointBoxer name: boxer components: - type: SpawnPoint @@ -132,8 +167,8 @@ - state: boxer - type: entity - id: SpawnPointZookeeper parent: SpawnPointJobBase + id: SpawnPointZookeeper name: zookeeper components: - type: SpawnPoint diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml index 37e25de1956..aa5fcf8a815 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml @@ -1,6 +1,6 @@ # If an ID contains sprite component changes, put it here. Otherwise, put it in identification_cards_alt.yml -# Command +# MARK: Command - type: entity parent: IDCardStandard id: ChiefJusticeIDCard @@ -19,7 +19,7 @@ - type: PresetIdCard job: ChiefJustice -# Security and Prisoners +# MARK: Security and Prisoners - type: entity parent: IDCardStandard id: PrisonGuardIDCard @@ -33,8 +33,8 @@ - state: stripe_bottom color: &color-security-bottom "#262626" - sprite: *icon-rsi-dv - offset: - state: nyanoPrisonGuard + offset: *icon-offset + state: PrisonGuard - type: PresetIdCard job: PrisonGuard @@ -42,7 +42,7 @@ parent: IDCardStandard id: PrisonerJobIDCard # Not to be confused with genpop prisoner ids name: prisoner ID card - suffix: Job + suffix: DeltaV job components: - type: Sprite layers: @@ -63,11 +63,29 @@ - state: orange - sprite: *icon-rsi-dv offset: *icon-offset - state: nyanoGladiator + state: Gladiator - type: PresetIdCard job: Gladiator -# Cargo / Logistics +- type: entity + parent: IDCardStandard + id: K9OfficerIDCard + name: K9 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 + offset: *icon-offset + state: SecurityK9Officer + - type: PresetIdCard + job: RoleK9Officer + +# MARK: Cargo / Logistics - type: entity parent: IDCardStandard @@ -83,7 +101,7 @@ color: &color-supply-bottom "#5b4523" - sprite: *icon-rsi-dv offset: *icon-offset - state: nyanoMailCarrier + state: MailCarrier - type: PresetIdCard job: Courier @@ -105,7 +123,7 @@ - type: PresetIdCard job: CargoAssistant -# Medical +# MARK: Medical - type: entity parent: MedicalIDCard @@ -126,7 +144,7 @@ jobTitle: job-name-surgeon jobIcon: JobIconSurgeon -# Science / Epi +# MARK: Science / Epi - type: entity parent: IDCardStandard @@ -142,7 +160,7 @@ color: &color-science-bottom "#652368" - sprite: *icon-rsi-dv offset: *icon-offset - state: nyanoMantis + state: PsionicMantis - type: PresetIdCard job: ForensicMantis @@ -164,7 +182,7 @@ - type: PresetIdCard job: Roboticist -# Justice +# MARK: Justice - type: entity parent: IDCardStandard @@ -202,7 +220,7 @@ - type: PresetIdCard job: Prosecutor -# Service +# MARK: Service - type: entity parent: BartenderIDCard @@ -216,7 +234,7 @@ tags: - DoorBumpOpener -# Other +# MARK: Other - type: entity parent: IDCardStandard @@ -228,11 +246,11 @@ - state: default - sprite: *icon-rsi-dv offset: *icon-offset - state: nyanoMartialArtist + state: MartialArtist - type: PresetIdCard job: MartialArtist -# Admemes and all that +# MARK: Admemes and all that - type: entity parent: IDCardStandard @@ -302,7 +320,8 @@ categories: - Debug -# CentComm + +# MARK: CentComm / SRT - type: entity parent: IDCardStandard @@ -324,27 +343,6 @@ - type: PresetIdCard job: CentralCommandIntern -# Security K9 Officer -- type: entity - parent: IDCardStandard - id: K9OfficerIDCard - name: K9 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 - offset: *icon-offset - state: SecurityK9Officer - - type: PresetIdCard - job: RoleK9Officer - -# SRT - - type: entity parent: IDCardStandard id: CentcomIDCardSRT diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Medical/medical_borg.yml b/Resources/Prototypes/_DV/Roles/Jobs/Medical/medical_borg.yml deleted file mode 100644 index 5dc9eeb73f6..00000000000 --- a/Resources/Prototypes/_DV/Roles/Jobs/Medical/medical_borg.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: job - id: MedicalBorg - name: job-name-medical-borg - description: job-description-medical-borg - playTimeTracker: JobMedicalBorg - requirements: - - !type:OverallPlaytimeRequirement - time: 60h - - !type:DepartmentTimeRequirement - department: Medical - time: 6h - canBeAntag: false - icon: JobIconMedicalBorg - supervisors: job-supervisors-cmo - jobEntity: PlayerBorgMedical - applyTraits: false diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Security/securityborg.yml b/Resources/Prototypes/_DV/Roles/Jobs/Security/securityborg.yml deleted file mode 100644 index ee957d39854..00000000000 --- a/Resources/Prototypes/_DV/Roles/Jobs/Security/securityborg.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: job - id: SecurityBorg - name: job-name-security-borg - description: job-description-security-borg - playTimeTracker: JobSecurityBorg - requirements: - - !type:OverallPlaytimeRequirement - time: 60h - - !type:DepartmentTimeRequirement - department: Security - time: 20h - canBeAntag: false - icon: JobIconSecurityBorg - supervisors: job-supervisors-everyone - jobEntity: PlayerBorgSecurity - applyTraits: false diff --git a/Resources/Prototypes/_DV/Roles/play_time_trackers.yml b/Resources/Prototypes/_DV/Roles/play_time_trackers.yml index d93fc9e61b0..3abddbabada 100644 --- a/Resources/Prototypes/_DV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_DV/Roles/play_time_trackers.yml @@ -1,9 +1,6 @@ - type: playTimeTracker id: JobBrigmedic -- type: playTimeTracker - id: JobMedicalBorg - - type: playTimeTracker id: JobChiefJustice @@ -16,9 +13,6 @@ - type: playTimeTracker id: JobCourier -- type: playTimeTracker - id: JobSecurityBorg - - type: playTimeTracker id: JobRoboticist diff --git a/Resources/Prototypes/_DV/StatusIcon/job.yml b/Resources/Prototypes/_DV/StatusIcon/job.yml index f409903223c..b09bc4834d9 100644 --- a/Resources/Prototypes/_DV/StatusIcon/job.yml +++ b/Resources/Prototypes/_DV/StatusIcon/job.yml @@ -1,24 +1,48 @@ - type: jobIcon parent: JobIcon - id: JobIconMedicalBorg + id: JobIconGladiator icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi - state: MedicalBorg - jobName: job-name-medical-borg + sprite: &icon-rsi-dv /Textures/_DV/Interface/Misc/job_icons.rsi + state: Gladiator + jobName: job-name-gladiator + +- type: jobIcon + parent: JobIcon + id: JobIconPrisonGuard + icon: + sprite: *icon-rsi-dv + state: PrisonGuard + jobName: job-name-prison-guard + +- type: jobIcon + parent: JobIcon + id: JobIconMartialArtist + icon: + sprite: *icon-rsi-dv + state: MartialArtist + jobName: job-name-martialartist + +- type: jobIcon + parent: JobIcon + id: JobIconForensicMantis + icon: + sprite: *icon-rsi-dv + state: PsionicMantis + jobName: job-name-mantis - type: jobIcon parent: JobIcon id: JobIconCourier icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi - state: nyanoMailCarrier + sprite: *icon-rsi-dv + state: MailCarrier jobName: job-name-courier - type: jobIcon parent: JobIcon id: JobIconChiefJustice icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi + sprite: *icon-rsi-dv state: ChiefJustice jobName: job-name-chief-justice @@ -26,7 +50,7 @@ parent: JobIcon id: JobIconClerk icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi + sprite: *icon-rsi-dv state: Clerk jobName: job-name-clerk @@ -34,23 +58,15 @@ parent: JobIcon id: JobIconProsecutor icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi + sprite: *icon-rsi-dv state: Prosecutor jobName: job-name-prosecutor -- type: jobIcon - parent: JobIcon - id: JobIconSecurityBorg - icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi - state: SecurityBorg - jobName: job-name-security-borg - - type: jobIcon parent: JobIcon id: JobIconCargoAssistant icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi + sprite: *icon-rsi-dv state: CargoAssistant jobName: job-name-cargo-assistant @@ -58,23 +74,22 @@ parent: JobIcon id: JobIconSurgeon icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi + sprite: *icon-rsi-dv state: Surgeon - type: jobIcon parent: JobIcon id: JobIconSecurityK9Officer icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi + sprite: *icon-rsi-dv state: SecurityK9Officer jobName: role-name-k9-officer -# CentComm - +# MARK: CentComm - type: jobIcon parent: JobIcon id: JobIconCentCommIntern icon: - sprite: /Textures/_DV/Interface/Misc/job_icons.rsi + sprite: *icon-rsi-dv state: CentcommIntern jobName: job-name-centcomintern diff --git a/Resources/Prototypes/_DV/whitelist_tiers.yml b/Resources/Prototypes/_DV/whitelist_tiers.yml index d4ab8e747c3..1d3054645f8 100644 --- a/Resources/Prototypes/_DV/whitelist_tiers.yml +++ b/Resources/Prototypes/_DV/whitelist_tiers.yml @@ -21,7 +21,6 @@ - Detective - PrisonGuard - Prosecutor - - SecurityBorg - SecurityCadet - SecurityOfficer diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoGladiator.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Gladiator.png similarity index 100% rename from Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoGladiator.png rename to Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Gladiator.png diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/MailCarrier.png similarity index 100% rename from Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png rename to Resources/Textures/_DV/Interface/Misc/job_icons.rsi/MailCarrier.png diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/MartialArtist.png similarity index 100% rename from Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png rename to Resources/Textures/_DV/Interface/Misc/job_icons.rsi/MartialArtist.png diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/MedicalBorg.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/MedicalBorg.png deleted file mode 100644 index 95a2f0a8c3f..00000000000 Binary files a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/MedicalBorg.png and /dev/null differ diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/PrisonGuard.png similarity index 100% rename from Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png rename to Resources/Textures/_DV/Interface/Misc/job_icons.rsi/PrisonGuard.png diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoMantis.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/PsionicMantis.png similarity index 100% rename from Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoMantis.png rename to Resources/Textures/_DV/Interface/Misc/job_icons.rsi/PsionicMantis.png diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityBorg.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityBorg.png deleted file mode 100644 index 234d0eb4ebe..00000000000 Binary files a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityBorg.png and /dev/null 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 dc58fd642ce..ebaa0a79e10 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 | 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, Surgeon by Janet Blackquill 2024. Security cards modified by TJohnson. nyanoMantis Prisoner and Prosecutor made by BoxfulOfSoup (Github). CentcommIntern Modified by @Stxcking (github)| Hitman icon by stormyatt(gituhb). SecurityK9Officer by BarryNorfolk (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | SecurityOfficer, martialartist, gladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), CargoAssistant recoloured from MedicalIntern by Radezolid, Surgeon by Janet Blackquill 2024. Security cards modified by TJohnson. psionicmantis Prisoner and Prosecutor made by BoxfulOfSoup (Github). CentcommIntern Modified by @Stxcking (github)| Hitman icon by stormyatt(gituhb). SecurityK9Officer by BarryNorfolk (Github)", "size": { "x": 8, "y": 8 @@ -11,22 +11,19 @@ "name": "Chaplain" }, { - "name": "nyanoGladiator" + "name": "Gladiator" }, { - "name": "nyanoPrisonGuard" + "name": "PrisonGuard" }, { - "name": "nyanoMailCarrier" + "name": "MailCarrier" }, { - "name": "nyanoMartialArtist" + "name": "MartialArtist" }, { - "name": "nyanoMantis" - }, - { - "name": "MedicalBorg" + "name": "PsionicMantis" }, { "name": "ChiefJustice" @@ -40,9 +37,6 @@ { "name": "Lawyer" }, - { - "name": "SecurityBorg" - }, { "name": "CargoAssistant" }, diff --git a/Resources/Textures/_DV/Markers/jobs.rsi/nyanogladiator.png b/Resources/Textures/_DV/Markers/jobs.rsi/gladiator.png similarity index 100% rename from Resources/Textures/_DV/Markers/jobs.rsi/nyanogladiator.png rename to Resources/Textures/_DV/Markers/jobs.rsi/gladiator.png diff --git a/Resources/Textures/_DV/Markers/jobs.rsi/nyanomailcarrier.png b/Resources/Textures/_DV/Markers/jobs.rsi/mailcarrier.png similarity index 100% rename from Resources/Textures/_DV/Markers/jobs.rsi/nyanomailcarrier.png rename to Resources/Textures/_DV/Markers/jobs.rsi/mailcarrier.png diff --git a/Resources/Textures/_DV/Markers/jobs.rsi/nyanomartialartist.png b/Resources/Textures/_DV/Markers/jobs.rsi/martialartist.png similarity index 100% rename from Resources/Textures/_DV/Markers/jobs.rsi/nyanomartialartist.png rename to Resources/Textures/_DV/Markers/jobs.rsi/martialartist.png diff --git a/Resources/Textures/_DV/Markers/jobs.rsi/meta.json b/Resources/Textures/_DV/Markers/jobs.rsi/meta.json index 3faf7e70c95..297b70672ba 100644 --- a/Resources/Textures/_DV/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/_DV/Markers/jobs.rsi/meta.json @@ -14,22 +14,22 @@ "name": "clerk" }, { - "name": "nyanogladiator" + "name": "gladiator" }, { - "name": "nyanoprisonguard" + "name": "prisonguard" }, { "name": "prosecutor" }, { - "name": "nyanomailcarrier" + "name": "mailcarrier" }, { - "name": "nyanomartialartist" + "name": "martialartist" }, { - "name": "nyanomantis" + "name": "psionicmantis" }, { "name": "salvagespecialist" diff --git a/Resources/Textures/_DV/Markers/jobs.rsi/nyanoprisonguard.png b/Resources/Textures/_DV/Markers/jobs.rsi/prisonguard.png similarity index 100% rename from Resources/Textures/_DV/Markers/jobs.rsi/nyanoprisonguard.png rename to Resources/Textures/_DV/Markers/jobs.rsi/prisonguard.png diff --git a/Resources/Textures/_DV/Markers/jobs.rsi/nyanomantis.png b/Resources/Textures/_DV/Markers/jobs.rsi/psionicmantis.png similarity index 100% rename from Resources/Textures/_DV/Markers/jobs.rsi/nyanomantis.png rename to Resources/Textures/_DV/Markers/jobs.rsi/psionicmantis.png