diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 94d0ef79fb..2e4249f316 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -102,7 +102,7 @@ - type: StorageFill contents: - id: BoxSurvival - + - type: entity abstract: true parent: ClothingBackpack @@ -112,3 +112,15 @@ contents: - id: BoxSurvival - id: Bible + +- type: entity + abstract: true + parent: ClothingBackpack + id: ClothingBackpackMusicianFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: AcousticGuitarInstrument + - id: RecorderInstrument + - id: SaxophoneInstrument diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 2a68336e24..5308bd24b7 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -91,3 +91,15 @@ contents: - id: BoxSurvival - id: Bible + +- type: entity + abstract: true + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelMusicianFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: AcousticGuitarInstrument + - id: RecorderInstrument + - id: SaxophoneInstrument diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index c99730d7af..ce9a6e69d7 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -81,7 +81,7 @@ - type: StorageFill contents: - id: BoxSurvival - + - type: entity abstract: true parent: ClothingBackpackSatchel @@ -91,3 +91,15 @@ contents: - id: BoxSurvival - id: Bible + +- type: entity + abstract: true + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelMusicianFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: AcousticGuitarInstrument + - id: RecorderInstrument + - id: SaxophoneInstrument diff --git a/Resources/Prototypes/Maps/game.yml b/Resources/Prototypes/Maps/game.yml index 63aaf6278f..62c2773816 100644 --- a/Resources/Prototypes/Maps/game.yml +++ b/Resources/Prototypes/Maps/game.yml @@ -33,6 +33,7 @@ SecurityOfficer: [ 2, 3 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] + Musician: [1, 1] - type: gameMap id: packedstation @@ -74,6 +75,7 @@ Warden: [ 1, 1 ] Librarian: [ 1, 1 ] Lawyer: [ 1, 2 ] + Musician: [1, 1] - type: gameMap id: knightship @@ -132,7 +134,8 @@ Lawyer: [ 1, 2 ] Warden: [ 1, 1 ] Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 4, 6 ] + SalvageSpecialist: [ 4, 6 ] + Musician: [1, 1] - type: gameMap id: ssreach @@ -162,6 +165,7 @@ HeadOfSecurity: [ 1, 1 ] SecurityOfficer: [ 2, 4 ] Janitor: [ 1, 1 ] + Musician: [1, 1] - type: gameMap id: dart diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml new file mode 100644 index 0000000000..2547ee6af7 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -0,0 +1,22 @@ +- type: job + id: Musician + name: "musician" + startingGear: MusicianGear + departments: + - Civilian + icon: "Musician" + supervisors: "whoever hires you" + access: + - Maintenance # TODO Remove maint access for all gimmick jobs once access work is completed + +- type: startingGear + id: MusicianGear + equipment: + jumpsuit: ClothingUniformJumpsuitLawyerPurple + back: ClothingBackpackMusicianFilled + eyes: ClothingEyesGlassesSunglasses + shoes: ClothingShoesColorBlack + id: AssistantPDA + ears: ClothingHeadsetService + satchel: ClothingBackpackSatchelMusicianFilled + duffelbag: ClothingBackpackDuffelMusicianFilled diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Musician.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Musician.png new file mode 100644 index 0000000000..072348f050 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Musician.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 0b55d8ace7..0e362aad25 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -108,6 +108,9 @@ }, { "name": "Mime" + }, + { + "name": "Musician" } ] }