From 76dfa8ce5744ce6f73555d3f7d96904489e9b559 Mon Sep 17 00:00:00 2001 From: Chris V Date: Fri, 25 Feb 2022 21:11:04 -0800 Subject: [PATCH] Musician job completeness (#6889) --- .../Fills/Backpacks/StarterGear/backpack.yml | 1 - .../Fills/Backpacks/StarterGear/duffelbag.yml | 1 - .../Fills/Backpacks/StarterGear/satchel.yml | 1 - .../Entities/Markers/Spawners/jobs.yml | 12 ++++++++ .../Entities/Objects/Devices/pda.yml | 28 ++++++++++++++++++ .../Objects/Misc/identification_cards.yml | 12 ++++++++ .../Roles/Jobs/Civilian/musician.yml | 5 ++-- Resources/Textures/Markers/jobs.rsi/meta.json | 3 ++ .../Textures/Markers/jobs.rsi/musician.png | Bin 0 -> 707 bytes .../Objects/Devices/pda.rsi/meta.json | 3 ++ .../Objects/Devices/pda.rsi/pda-musician.png | Bin 0 -> 462 bytes .../Objects/Misc/id_cards.rsi/idmusician.png | Bin 0 -> 189 bytes .../Objects/Misc/id_cards.rsi/meta.json | 3 ++ 13 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Markers/jobs.rsi/musician.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-musician.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png 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 0000000000000000000000000000000000000000..2ef8ec312d53b1990b043e70ea58bb129dae6f78 GIT binary patch literal 707 zcmV;!0zCbRP)J&=%@YmsmK*P{fu%7OPMvw+zLpNZo2Z7soE*5GgGb zshfdP5v5m)C$y1t3DPErOaDN@Dn5tuLhf?8q-hEc`M_J=zu))1@ArG}piP?wn3_n5 z^jKV+#okK2zyPVl0P}N8{5<%J{cY`09=ZO8iZ6T{g zRU-h5CKGk{YDxfr3^tlf;5h3z&bp^xia0X?Ade!-4f6oq&^(nPMT{mBp?6240)%B* z_U1hE=I=fhLbyVVqagM0B~K`Gf#@hX0r+$mnOjKqRs7xPs^22nUuBO zlE5mc2plL(29`p03(E}ln{+1=eDqaDJ*pgt#bP3t%hep0Se7NE5I8QuPICwV-OxNP z^hR}nKo`R9fxzH?`z0gewz4pb80s2-i9b0IY44JpI2_4f{o={4uAx32Px;@N?yQoXP2o p$H|udVEU0iwGw~uHf{b3{sG)kD<+Nc&xim3002ovPDHLkV1hILNj(4n literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cf5a5b7fca4c48f0404d08a9604371b2163954e8 GIT binary patch literal 462 zcmV;<0WtoGP)Px$h)G02R9J=Wl`%`hKp2K!#RjfzY!nd^X}c9}>2gr~3;q>db?WS-tAD~j;OeA< zxVRh$L5ws9wdm0rvMA?J5^dGog{G5v;7Its+01!gpI1Ypm2*XfYV@<0Lz_#BJMe(2cX0wjT#F>c^ zLQJI13`9|kqvJ!|Ki>Vwb=qB=^iLt>2m1as&e&d>qm+VkzPJGZxVpJa-?z3m0RW@n z3r54Q_%j|%|i@bGDz`fbnlQex0OaK9+EBdy(5fp(~JVfe-=!U|Cji2CPa& z8%wspbzMj)jdXK&!s)@Aj(L(T5JIGVp)doTb{D{O*=?tuE`RtmOy?w9;JU7HA28~K zx<*v1k(vBp@CE>AG#cQXXVxgB75|2m629+iYh*$xRg5vE02Ks*g5i@fraaG6Fu2Gv z&j9BfLI~`5UM}O`E+Q?)*KrU8#s*rgRv!J5l9GSUCxK#*x%%l|0ejiD`){=G2h3ycU~P~J m`XalD-OMt5FTbGRDc