diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 2e4249f316..b78527bb84 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -122,5 +122,4 @@ 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 5308bd24b7..afa2650c72 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -101,5 +101,4 @@ 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 ce9a6e69d7..faacbd24f5 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -101,5 +101,4 @@ contents: - id: BoxSurvival - id: AcousticGuitarInstrument - - id: RecorderInstrument - id: SaxophoneInstrument diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index d6eca4ebc2..f91a110ffb 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -195,6 +195,18 @@ - state: green - state: janitor +- type: entity + id: SpawnPointMusician + parent: SpawnPointJobBase + name: musician + components: + - type: SpawnPoint + job_id: Musician + - type: Sprite + layers: + - state: green + - state: musician + # Command - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 3105e946ef..50fc424059 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -469,3 +469,31 @@ components: - type: PDA id: CentcomIDCardSyndie + +- type: entity + parent: BasePDA + id: MusicianPDA + name: musician PDA + description: It fills you with inspiration. + components: + - type: PDA + id: MusicianIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-musician + - type: Instrument + allowPercussion: false + handheld: true + bank: 1 + program: 2 + - type: ActivatableUI + inHandsOnly: true + singleUser: true + key: enum.InstrumentUiKey.Key + - type: UserInterface + interfaces: + - key: enum.InstrumentUiKey.Key + type: InstrumentBoundUserInterface + - type: Input + context: "human" diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index e3c5996ee6..e2ac85c9c6 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -365,3 +365,15 @@ - type: Access tags: - Maintenance + +- type: entity + parent: IDCardStandard + id: MusicianIDCard + name: musician ID card + components: + - type: Sprite + layers: + - state: default + - state: idmusician + - type: PresetIdCard + job: Musician diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index 2547ee6af7..ed1ef889c3 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -7,7 +7,8 @@ icon: "Musician" supervisors: "whoever hires you" access: - - Maintenance # TODO Remove maint access for all gimmick jobs once access work is completed + - Maintenance + - Theatre - type: startingGear id: MusicianGear @@ -16,7 +17,7 @@ back: ClothingBackpackMusicianFilled eyes: ClothingEyesGlassesSunglasses shoes: ClothingShoesColorBlack - id: AssistantPDA + id: MusicianPDA ears: ClothingHeadsetService satchel: ClothingBackpackSatchelMusicianFilled duffelbag: ClothingBackpackDuffelMusicianFilled diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index 0d18e81e5b..9d9b7b3c03 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -120,6 +120,9 @@ }, { "name": "warden" + }, + { + "name": "musician" } ] } diff --git a/Resources/Textures/Markers/jobs.rsi/musician.png b/Resources/Textures/Markers/jobs.rsi/musician.png new file mode 100644 index 0000000000..2ef8ec312d Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/musician.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index aeb6eaad2d..c2fa2a0936 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -141,6 +141,9 @@ }, { "name": "pda-warden" + }, + { + "name": "pda-musician" } ] } diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-musician.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-musician.png new file mode 100644 index 0000000000..cf5a5b7fca Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-musician.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png new file mode 100644 index 0000000000..b51dfaaab8 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.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 c71b490ce7..ceef1ec5f6 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -136,6 +136,9 @@ { "name": "idwarden" }, + { + "name": "idmusician" + }, { "name": "orange" },