From a0e839a6ad701a96d010f4d56a41aede1f19eb43 Mon Sep 17 00:00:00 2001 From: Swept Date: Tue, 12 May 2020 02:08:39 -0700 Subject: [PATCH] Fluff --- .../Entities/Buildings/instruments.yml | 12 +- .../Entities/Items/Clothing/belts.yml | 25 ++- .../Entities/Items/Clothing/ears.yml | 6 +- .../Entities/Items/Clothing/eyes.yml | 16 +- .../Entities/Items/Clothing/gloves.yml | 13 ++ .../Entities/Items/Clothing/masks.yml | 71 ++++++-- .../Entities/Items/Clothing/uniforms.yml | 17 ++ .../Prototypes/Entities/Items/Instruments.yml | 95 ++++++++--- .../belt_utility.rsi/equipped-BELT.png | Bin .../{ => Belts}/belt_utility.rsi/meta.json | 0 .../belt_utility.rsi/utilitybelt.png | Bin .../Belts/suspenders.rsi/equipped-BELT.png | Bin 0 -> 286 bytes .../Clothing/Belts/suspenders.rsi/icon.png | Bin 0 -> 433 bytes .../Clothing/Belts/suspenders.rsi/meta.json | 38 +++++ .../headset.rsi/equipped-EARS.png | Bin .../{ => Earpieces}/headset.rsi/headset.png | Bin .../{ => Earpieces}/headset.rsi/meta.json | 0 .../meson_scanners.rsi/equipped-EYES.png | Bin .../meson_scanners.rsi/meson.png | Bin .../meson_scanners.rsi/meta.json | 0 .../sunglasses.rsi/equipped-EYES.png | Bin .../{ => Glasses}/sunglasses.rsi/meta.json | 0 .../{ => Glasses}/sunglasses.rsi/sun.png | Bin .../sunglasses.rsi/sunglasses.png | Bin .../sunglasses_sec.rsi/equipped-EYES.png | Bin .../{ => Glasses}/sunglasses_sec.rsi/icon.png | Bin .../sunglasses_sec.rsi/inhand-left.png | Bin .../sunglasses_sec.rsi/inhand-right.png | Bin .../sunglasses_sec.rsi/meta.json | 0 .../Gloves/white.rsi/equipped-HAND.png | Bin 0 -> 313 bytes .../Clothing/Gloves/white.rsi/icon.png | Bin 0 -> 220 bytes .../Clothing/Gloves/white.rsi/inhand-left.png | Bin 0 -> 404 bytes .../Gloves/white.rsi/inhand-right.png | Bin 0 -> 404 bytes .../Clothing/Gloves/white.rsi/meta.json | 60 +++++++ .../mask_breath.rsi/equipped-MASK.png | Bin .../mask_breath.rsi/icon.png} | Bin .../Clothing/Masks/mask_breath.rsi/meta.json | 38 +++++ .../mask_clown.rsi/equipped-MASK.png | Bin .../{ => Masks}/mask_clown.rsi/icon.png | Bin .../mask_clown.rsi/inhand-left.png | Bin .../mask_clown.rsi/inhand-right.png | Bin .../{ => Masks}/mask_clown.rsi/meta.json | 0 .../mask_gas.rsi}/equipped-MASK.png | Bin .../mask_gas.rsi/icon.png} | Bin .../mask_gas.rsi}/inhand-left.png | Bin .../mask_gas.rsi}/inhand-right.png | Bin .../mask_gas.rsi}/meta.json | 2 +- .../Masks/mask_gasalt.rsi/equipped-MASK.png | Bin 0 -> 871 bytes .../Clothing/Masks/mask_gasalt.rsi/icon.png | Bin 0 -> 581 bytes .../Masks/mask_gasalt.rsi/inhand-left.png | Bin 0 -> 337 bytes .../Masks/mask_gasalt.rsi/inhand-right.png | Bin 0 -> 341 bytes .../Clothing/Masks/mask_gasalt.rsi/meta.json | 46 ++++++ .../Masks/mask_joy.rsi/equipped-MASK.png | Bin 0 -> 369 bytes .../Clothing/Masks/mask_joy.rsi/icon.png | Bin 0 -> 321 bytes .../Clothing/Masks/mask_joy.rsi/meta.json | 33 ++++ .../Masks/mask_mime.rsi/equipped-MASK.png | Bin 0 -> 319 bytes .../Clothing/Masks/mask_mime.rsi/icon.png | Bin 0 -> 226 bytes .../Clothing/Masks/mask_mime.rsi/meta.json | 33 ++++ .../Clothing/OuterClothing/bio.rsi/meta.json | 75 ++++++++- .../equipped-INNERCLOTHING.png | Bin 0 -> 480 bytes .../Uniforms/uniform_mime.rsi/icon.png | Bin 0 -> 206 bytes .../Uniforms/uniform_mime.rsi/inhand-left.png | Bin 0 -> 381 bytes .../uniform_mime.rsi/inhand-right.png | Bin 0 -> 380 bytes .../Uniforms/uniform_mime.rsi/meta.json | 74 +++++++++ .../Clothing/mask_breath.rsi/meta.json | 1 - .../accordion.png => accordion.rsi/icon.png} | Bin .../Instruments/accordion.rsi/inhand-left.png | Bin 0 -> 516 bytes .../accordion.rsi/inhand-right.png | Bin 0 -> 516 bytes .../Instruments/accordion.rsi/meta.json | 56 +++++++ .../eguitar.png => eguitar.rsi/icon.png} | Bin .../Instruments/eguitar.rsi/inhand-left.png | Bin 0 -> 560 bytes .../Instruments/eguitar.rsi/inhand-right.png | Bin 0 -> 581 bytes .../Objects/Instruments/eguitar.rsi/meta.json | 56 +++++++ .../icon.png} | Bin .../glockenspiel.rsi/inhand-left.png | Bin 0 -> 509 bytes .../glockenspiel.rsi/inhand-right.png | Bin 0 -> 509 bytes .../Instruments/glockenspiel.rsi/meta.json | 56 +++++++ .../guitar.png => guitar.rsi/icon.png} | Bin .../Instruments/guitar.rsi/inhand-left.png | Bin 0 -> 631 bytes .../Instruments/guitar.rsi/inhand-right.png | Bin 0 -> 1329 bytes .../Objects/Instruments/guitar.rsi/meta.json | 56 +++++++ .../icon.png} | Bin .../h_synthesizer.rsi/inhand-left.png | Bin 0 -> 434 bytes .../h_synthesizer.rsi/inhand-right.png | Bin 0 -> 441 bytes .../Instruments/h_synthesizer.rsi/meta.json | 56 +++++++ .../harmonica.png => harmonica.rsi/icon.png} | Bin .../Instruments/harmonica.rsi/inhand-left.png | Bin 0 -> 319 bytes .../harmonica.rsi/inhand-right.png | Bin 0 -> 437 bytes .../Instruments/harmonica.rsi/meta.json | 56 +++++++ .../Instruments/musician.rsi/meta.json | 1 - .../bike_horn.png | Bin .../drum.png | Bin .../drum_bongo.png | Bin .../drum_makeshift.png | Bin .../otherinstruments.rsi/meta.json | 155 ++++++++++++++++++ .../minimoog-broken.png | Bin .../minimoog.png | Bin .../minimoogbroken.png | Bin .../piano-broken.png | Bin .../piano.png | Bin .../pianobroken.png | Bin .../synthesizer.png | Bin .../trumpet.png | Bin .../xylophone-broken.png | Bin .../xylophone.png | Bin .../recorder.png => recorder.rsi/icon.png} | Bin .../Instruments/recorder.rsi/inhand-left.png | Bin 0 -> 455 bytes .../Instruments/recorder.rsi/inhand-right.png | Bin 0 -> 459 bytes .../Instruments/recorder.rsi/meta.json | 56 +++++++ .../saxophone.png => saxophone.rsi/icon.png} | Bin .../Instruments/saxophone.rsi/inhand-left.png | Bin 0 -> 456 bytes .../saxophone.rsi/inhand-right.png | Bin 0 -> 462 bytes .../Instruments/saxophone.rsi/meta.json | 56 +++++++ .../trombone.png => trombone.rsi/icon.png} | Bin .../Instruments/trombone.rsi/inhand-left.png | Bin 0 -> 482 bytes .../Instruments/trombone.rsi/inhand-right.png | Bin 0 -> 478 bytes .../Instruments/trombone.rsi/meta.json | 56 +++++++ .../violin.png => violin.rsi/icon.png} | Bin .../Instruments/violin.rsi/inhand-left.png | Bin 0 -> 366 bytes .../Instruments/violin.rsi/inhand-right.png | Bin 0 -> 365 bytes .../Objects/Instruments/violin.rsi/meta.json | 56 +++++++ SpaceStation14.sln | 34 ++-- 122 files changed, 1326 insertions(+), 79 deletions(-) rename Resources/Textures/Clothing/{ => Belts}/belt_utility.rsi/equipped-BELT.png (100%) rename Resources/Textures/Clothing/{ => Belts}/belt_utility.rsi/meta.json (100%) rename Resources/Textures/Clothing/{ => Belts}/belt_utility.rsi/utilitybelt.png (100%) create mode 100644 Resources/Textures/Clothing/Belts/suspenders.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Clothing/Belts/suspenders.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Belts/suspenders.rsi/meta.json rename Resources/Textures/Clothing/{ => Earpieces}/headset.rsi/equipped-EARS.png (100%) rename Resources/Textures/Clothing/{ => Earpieces}/headset.rsi/headset.png (100%) rename Resources/Textures/Clothing/{ => Earpieces}/headset.rsi/meta.json (100%) rename Resources/Textures/Clothing/{ => Glasses}/meson_scanners.rsi/equipped-EYES.png (100%) rename Resources/Textures/Clothing/{ => Glasses}/meson_scanners.rsi/meson.png (100%) rename Resources/Textures/Clothing/{ => Glasses}/meson_scanners.rsi/meta.json (100%) rename Resources/Textures/Clothing/{ => Glasses}/sunglasses.rsi/equipped-EYES.png (100%) rename Resources/Textures/Clothing/{ => Glasses}/sunglasses.rsi/meta.json (100%) rename Resources/Textures/Clothing/{ => Glasses}/sunglasses.rsi/sun.png (100%) rename Resources/Textures/Clothing/{ => Glasses}/sunglasses.rsi/sunglasses.png (100%) rename Resources/Textures/Clothing/{ => Glasses}/sunglasses_sec.rsi/equipped-EYES.png (100%) rename Resources/Textures/Clothing/{ => Glasses}/sunglasses_sec.rsi/icon.png (100%) rename Resources/Textures/Clothing/{ => Glasses}/sunglasses_sec.rsi/inhand-left.png (100%) rename Resources/Textures/Clothing/{ => Glasses}/sunglasses_sec.rsi/inhand-right.png (100%) rename Resources/Textures/Clothing/{ => Glasses}/sunglasses_sec.rsi/meta.json (100%) create mode 100644 Resources/Textures/Clothing/Gloves/white.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Clothing/Gloves/white.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Gloves/white.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Gloves/white.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Gloves/white.rsi/meta.json rename Resources/Textures/Clothing/{ => Masks}/mask_breath.rsi/equipped-MASK.png (100%) rename Resources/Textures/Clothing/{mask_breath.rsi/breath.png => Masks/mask_breath.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Clothing/Masks/mask_breath.rsi/meta.json rename Resources/Textures/Clothing/{ => Masks}/mask_clown.rsi/equipped-MASK.png (100%) rename Resources/Textures/Clothing/{ => Masks}/mask_clown.rsi/icon.png (100%) rename Resources/Textures/Clothing/{ => Masks}/mask_clown.rsi/inhand-left.png (100%) rename Resources/Textures/Clothing/{ => Masks}/mask_clown.rsi/inhand-right.png (100%) rename Resources/Textures/Clothing/{ => Masks}/mask_clown.rsi/meta.json (100%) rename Resources/Textures/Clothing/{gas_mask.rsi => Masks/mask_gas.rsi}/equipped-MASK.png (100%) rename Resources/Textures/Clothing/{gas_mask.rsi/gas_mask.png => Masks/mask_gas.rsi/icon.png} (100%) rename Resources/Textures/Clothing/{gas_mask.rsi => Masks/mask_gas.rsi}/inhand-left.png (100%) rename Resources/Textures/Clothing/{gas_mask.rsi => Masks/mask_gas.rsi}/inhand-right.png (100%) rename Resources/Textures/Clothing/{gas_mask.rsi => Masks/mask_gas.rsi}/meta.json (96%) create mode 100644 Resources/Textures/Clothing/Masks/mask_gasalt.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Masks/mask_gasalt.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Masks/mask_gasalt.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Masks/mask_gasalt.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Masks/mask_gasalt.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Masks/mask_joy.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Masks/mask_joy.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Masks/mask_joy.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Masks/mask_mime.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Masks/mask_mime.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Masks/mask_mime.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/mask_breath.rsi/meta.json rename Resources/Textures/Objects/Instruments/{musician.rsi/accordion.png => accordion.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Instruments/accordion.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Instruments/accordion.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Instruments/accordion.rsi/meta.json rename Resources/Textures/Objects/Instruments/{musician.rsi/eguitar.png => eguitar.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Instruments/eguitar.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Instruments/eguitar.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Instruments/eguitar.rsi/meta.json rename Resources/Textures/Objects/Instruments/{musician.rsi/glockenspiel.png => glockenspiel.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Instruments/glockenspiel.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Instruments/glockenspiel.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Instruments/glockenspiel.rsi/meta.json rename Resources/Textures/Objects/Instruments/{musician.rsi/guitar.png => guitar.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Instruments/guitar.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Instruments/guitar.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Instruments/guitar.rsi/meta.json rename Resources/Textures/Objects/Instruments/{musician.rsi/h_synthesizer.png => h_synthesizer.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Instruments/h_synthesizer.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Instruments/h_synthesizer.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Instruments/h_synthesizer.rsi/meta.json rename Resources/Textures/Objects/Instruments/{musician.rsi/harmonica.png => harmonica.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Instruments/harmonica.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Instruments/harmonica.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Instruments/harmonica.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Instruments/musician.rsi/meta.json rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/bike_horn.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/drum.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/drum_bongo.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/drum_makeshift.png (100%) create mode 100644 Resources/Textures/Objects/Instruments/otherinstruments.rsi/meta.json rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/minimoog-broken.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/minimoog.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/minimoogbroken.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/piano-broken.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/piano.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/pianobroken.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/synthesizer.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/trumpet.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/xylophone-broken.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi => otherinstruments.rsi}/xylophone.png (100%) rename Resources/Textures/Objects/Instruments/{musician.rsi/recorder.png => recorder.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Instruments/recorder.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Instruments/recorder.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Instruments/recorder.rsi/meta.json rename Resources/Textures/Objects/Instruments/{musician.rsi/saxophone.png => saxophone.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Instruments/saxophone.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Instruments/saxophone.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Instruments/saxophone.rsi/meta.json rename Resources/Textures/Objects/Instruments/{musician.rsi/trombone.png => trombone.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Instruments/trombone.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Instruments/trombone.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Instruments/trombone.rsi/meta.json rename Resources/Textures/Objects/Instruments/{musician.rsi/violin.png => violin.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Instruments/violin.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Instruments/violin.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Instruments/violin.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Buildings/instruments.yml b/Resources/Prototypes/Entities/Buildings/instruments.yml index 2c6edf0355..22826ba0fe 100644 --- a/Resources/Prototypes/Entities/Buildings/instruments.yml +++ b/Resources/Prototypes/Entities/Buildings/instruments.yml @@ -35,10 +35,10 @@ - type: Instrument program: 1 - type: Sprite - sprite: Objects/Instruments/musician.rsi + sprite: Objects/Instruments/otherinstruments.rsi state: piano - type: Icon - sprite: Objects/Instruments/musician.rsi + sprite: Objects/Instruments/otherinstruments.rsi state: piano - type: entity @@ -49,10 +49,10 @@ - type: Instrument program: 7 - type: Sprite - sprite: Objects/Instruments/musician.rsi + sprite: Objects/Instruments/otherinstruments.rsi state: minimoog - type: Icon - sprite: Objects/Instruments/musician.rsi + sprite: Objects/Instruments/otherinstruments.rsi state: minimoog - type: entity @@ -63,8 +63,8 @@ - type: Instrument program: 13 - type: Sprite - sprite: Objects/Instruments/musician.rsi + sprite: Objects/Instruments/otherinstruments.rsi state: xylophone - type: Icon - sprite: Objects/Instruments/musician.rsi + sprite: Objects/Instruments/otherinstruments.rsi state: xylophone diff --git a/Resources/Prototypes/Entities/Items/Clothing/belts.yml b/Resources/Prototypes/Entities/Items/Clothing/belts.yml index 2994275e00..0137dc803a 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/belts.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/belts.yml @@ -6,7 +6,6 @@ - type: Clothing Slots: [belt] - - type: entity parent: BeltBase id: UtilityBeltClothing @@ -14,15 +13,15 @@ description: Belt for holding all your usual tools components: - type: Sprite - sprite: Clothing/belt_utility.rsi + sprite: Clothing/Belts/belt_utility.rsi state: utilitybelt - type: Icon - sprite: Clothing/belt_utility.rsi + sprite: Clothing/Belts/belt_utility.rsi state: utilitybelt - type: Clothing Size: 50 QuickEquip: false - sprite: Clothing/belt_utility.rsi + sprite: Clothing/Belts/belt_utility.rsi - type: Storage Capacity: 40 # Full tool loadout is 35, plus an extra @@ -31,4 +30,20 @@ parent: UtilityBeltClothing components: - type: UtilityBeltClothingFill - \ No newline at end of file + +- type: entity + parent: BeltBase + id: SuspendersClothing + name: Suspenders + description: For holding your pants up. + components: + - type: Sprite + sprite: Clothing/Belts/suspenders.rsi + state: icon + - type: Icon + sprite: Clothing/Belts/suspenders.rsi + state: icon + - type: Clothing + Size: 50 + QuickEquip: false + sprite: Clothing/Belts/suspenders.rsi diff --git a/Resources/Prototypes/Entities/Items/Clothing/ears.yml b/Resources/Prototypes/Entities/Items/Clothing/ears.yml index 18500c6fb0..79bcf9e2d1 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/ears.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/ears.yml @@ -5,12 +5,12 @@ description: The radio to keep up to date in real time with fun onboard station activities components: - type: Sprite - sprite: Clothing/headset.rsi + sprite: Clothing/Earpieces/headset.rsi state: headset - type: Icon - sprite: Clothing/headset.rsi + sprite: Clothing/Earpieces/headset.rsi state: headset - type: Clothing Slots: - ears - sprite: Clothing/headset.rsi + sprite: Clothing/Earpieces/headset.rsi diff --git a/Resources/Prototypes/Entities/Items/Clothing/eyes.yml b/Resources/Prototypes/Entities/Items/Clothing/eyes.yml index e9974afbf0..d18d06a3fa 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/eyes.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/eyes.yml @@ -17,10 +17,10 @@ sprite: Clothing/meson_scanners.rsi state: meson - type: Icon - sprite: Clothing/meson_scanners.rsi + sprite: Clothing/Glasses/meson_scanners.rsi state: meson - type: Clothing - sprite: Clothing/meson_scanners.rsi + sprite: Clothing/Glasses/meson_scanners.rsi - type: entity @@ -30,13 +30,13 @@ description: Useful both for security and cargonia components: - type: Sprite - sprite: Clothing/sunglasses.rsi + sprite: Clothing/Glasses/sunglasses.rsi state: sunglasses - type: Icon - sprite: Clothing/sunglasses.rsi + sprite: Clothing/Glasses/sunglasses.rsi state: sunglasses - type: Clothing - sprite: Clothing/sunglasses.rsi + sprite: Clothing/Glasses/sunglasses.rsi - type: entity parent: GlassesBase @@ -45,10 +45,10 @@ description: Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes. Often worn by budget security officers. components: - type: Sprite - sprite: Clothing/sunglasses_sec.rsi + sprite: Clothing/Glasses/sunglasses_sec.rsi state: icon - type: Icon - sprite: Clothing/sunglasses_sec.rsi + sprite: Clothing/Glasses/sunglasses_sec.rsi state: icon - type: Clothing - sprite: Clothing/sunglasses_sec.rsi \ No newline at end of file + sprite: Clothing/Glasses/sunglasses_sec.rsi diff --git a/Resources/Prototypes/Entities/Items/Clothing/gloves.yml b/Resources/Prototypes/Entities/Items/Clothing/gloves.yml index 2a6001bca3..d05475b187 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/gloves.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/gloves.yml @@ -766,6 +766,19 @@ - type: Clothing sprite: Clothing/Gloves/s_ninjan.rsi +- type: entity + parent: GlovesBase + id: GlovesWhite + name: White Gloves + description: + components: + - type: Sprite + sprite: Clothing/Gloves/white.rsi + - type: Icon + sprite: Clothing/Gloves/white.rsi + - type: Clothing + sprite: Clothing/Gloves/white.rsi + - type: entity parent: GlovesBase id: GlovesYellow diff --git a/Resources/Prototypes/Entities/Items/Clothing/masks.yml b/Resources/Prototypes/Entities/Items/Clothing/masks.yml index 392d4aa19f..599b6451ca 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/masks.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/masks.yml @@ -6,6 +6,20 @@ - type: Clothing Slots: [mask] +- type: entity + parent: MasksBase + id: OldGasMaskClothing + name: Old Gas Mask + description: An old, dusty mask. Yet still dutifully functional. + components: + - type: Sprite + sprite: Clothing/Masks/mask_gasalt.rsi + state: icon + - type: Icon + sprite: Clothing/Masks/mask_gasalt.rsi + state: icon + - type: Clothing + sprite: Clothing/Masks/mask_gasalt.rsi - type: entity parent: MasksBase @@ -14,14 +28,13 @@ description: Regulations require these to be stocked after the fourth coolant leak components: - type: Sprite - sprite: Clothing/gas_mask.rsi - state: gas_mask + sprite: Clothing/Masks/mask_gas.rsi + state: icon - type: Icon - sprite: Clothing/gas_mask.rsi - state: gas_mask + sprite: Clothing/Masks/mask_gas.rsi + state: icon - type: Clothing - sprite: Clothing/gas_mask.rsi - + sprite: Clothing/Masks/mask_gas.rsi - type: entity parent: MasksBase @@ -30,13 +43,13 @@ description: Might as well keep this on 24/7 components: - type: Sprite - sprite: Clothing/mask_breath.rsi - state: breath + sprite: Clothing/Masks/mask_breath.rsi + state: icon - type: Icon - sprite: Clothing/mask_breath.rsi - state: breath + sprite: Clothing/Masks/mask_breath.rsi + state: icon - type: Clothing - sprite: Clothing/mask_breath.rsi + sprite: Clothing/Masks/mask_breath.rsi - type: entity parent: MasksBase @@ -45,10 +58,40 @@ description: A true prankster's facial attire. A clown is incomplete without his wig and mask. components: - type: Sprite - sprite: Clothing/mask_clown.rsi + sprite: Clothing/Masks/mask_clown.rsi state: icon - type: Icon - sprite: Clothing/mask_clown.rsi + sprite: Clothing/Masks/mask_clown.rsi state: icon - type: Clothing - sprite: Clothing/mask_clown.rsi + sprite: Clothing/Masks/mask_clown.rsi + +- type: entity + parent: MasksBase + id: MaskJoy + name: Joy Mask + description: + components: + - type: Sprite + sprite: Clothing/Masks/mask_joy.rsi + state: icon + - type: Icon + sprite: Clothing/Masks/mask_joy.rsi + state: icon + - type: Clothing + sprite: Clothing/Masks/mask_joy.rsi + +- type: entity + parent: MasksBase + id: MaskMime + name: Mime Mask + description: + components: + - type: Sprite + sprite: Clothing/Masks/mask_mime.rsi + state: icon + - type: Icon + sprite: Clothing/Masks/mask_mime.rsi + state: icon + - type: Clothing + sprite: Clothing/Masks/mask_mime.rsi diff --git a/Resources/Prototypes/Entities/Items/Clothing/uniforms.yml b/Resources/Prototypes/Entities/Items/Clothing/uniforms.yml index 4624d07f09..612e55825c 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/uniforms.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/uniforms.yml @@ -245,6 +245,23 @@ - type: Clothing sprite: Clothing/Uniforms/uniform_rd.rsi +- type: entity + parent: UniformBase + id: UniformMime + name: Mime's Clothes + description: ... + components: + - type: Sprite + sprite: Clothing/Uniforms/uniform_mime.rsi + state: icon + + - type: Icon + sprite: Clothing/Uniforms/uniform_mime.rsi + state: icon + + - type: Clothing + sprite: Clothing/Uniforms/uniform_mime.rsi + - type: entity parent: UniformBase id: UniformHoS diff --git a/Resources/Prototypes/Entities/Items/Instruments.yml b/Resources/Prototypes/Entities/Items/Instruments.yml index 08db84188f..24b8e5565e 100644 --- a/Resources/Prototypes/Entities/Items/Instruments.yml +++ b/Resources/Prototypes/Entities/Items/Instruments.yml @@ -19,9 +19,15 @@ - type: Instrument program: 2 - type: Sprite - texture: Objects/Instruments/musician.rsi/h_synthesizer.png + sprite: Objects/Instruments/h_synthesizer.rsi + state: icon - type: Icon - texture: Objects/Instruments/musician.rsi/h_synthesizer.png + sprite: Objects/Instruments/h_synthesizer.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Instruments/h_synthesizer.rsi + - type: entity name: Acoustic Guitar @@ -31,9 +37,14 @@ - type: Instrument program: 25 - type: Sprite - texture: Objects/Instruments/musician.rsi/guitar.png + sprite: Objects/Instruments/guitar.rsi + state: icon - type: Icon - texture: Objects/Instruments/musician.rsi/guitar.png + sprite: Objects/Instruments/guitar.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Instruments/guitar.rsi - type: entity name: Violin @@ -43,9 +54,14 @@ - type: Instrument program: 40 - type: Sprite - texture: Objects/Instruments/musician.rsi/violin.png + sprite: Objects/Instruments/violin.rsi + state: icon - type: Icon - texture: Objects/Instruments/musician.rsi/violin.png + sprite: Objects/Instruments/violin.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Instruments/violin.rsi - type: entity name: Trumpet @@ -55,9 +71,9 @@ - type: Instrument program: 56 - type: Sprite - texture: Objects/Instruments/musician.rsi/trumpet.png + texture: Objects/Instruments/otherinstruments.rsi/trumpet.png - type: Icon - texture: Objects/Instruments/musician.rsi/trumpet.png + texture: Objects/Instruments/otherinstruments.rsi/trumpet.png - type: entity name: Electric Guitar @@ -67,9 +83,14 @@ - type: Instrument program: 27 - type: Sprite - texture: Objects/Instruments/musician.rsi/eguitar.png + sprite: Objects/Instruments/eguitar.rsi + state: icon - type: Icon - texture: Objects/Instruments/musician.rsi/eguitar.png + sprite: Objects/Instruments/eguitar.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Instruments/eguitar.rsi - type: entity name: Accordion @@ -79,9 +100,14 @@ - type: Instrument program: 21 - type: Sprite - texture: Objects/Instruments/musician.rsi/accordion.png + sprite: Objects/Instruments/accordion.rsi + state: icon - type: Icon - texture: Objects/Instruments/musician.rsi/accordion.png + sprite: Objects/Instruments/accordion.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Instruments/accordion.rsi - type: entity name: Harmonica @@ -91,9 +117,14 @@ - type: Instrument program: 22 - type: Sprite - texture: Objects/Instruments/musician.rsi/harmonica.png + sprite: Objects/Instruments/harmonica.rsi + state: icon - type: Icon - texture: Objects/Instruments/musician.rsi/harmonica.png + sprite: Objects/Instruments/harmonica.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Instruments/harmonica.rsi - type: entity name: Recorder @@ -103,9 +134,14 @@ - type: Instrument program: 74 - type: Sprite - texture: Objects/Instruments/musician.rsi/recorder.png + sprite: Objects/Instruments/recorder.rsi + state: icon - type: Icon - texture: Objects/Instruments/musician.rsi/recorder.png + sprite: Objects/Instruments/recorder.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Instruments/recorder.rsi - type: entity name: Trombone @@ -115,9 +151,14 @@ - type: Instrument program: 57 - type: Sprite - texture: Objects/Instruments/musician.rsi/trombone.png + sprite: Objects/Instruments/trombone.rsi + state: icon - type: Icon - texture: Objects/Instruments/musician.rsi/trombone.png + sprite: Objects/Instruments/trombone.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Instruments/trombone.rsi - type: entity name: Saxophone @@ -127,9 +168,14 @@ - type: Instrument program: 67 - type: Sprite - texture: Objects/Instruments/musician.rsi/saxophone.png + sprite: Objects/Instruments/saxophone.rsi + state: icon - type: Icon - texture: Objects/Instruments/musician.rsi/saxophone.png + sprite: Objects/Instruments/saxophone.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Instruments/saxophone.rsi - type: entity name: Glockenspiel @@ -139,6 +185,11 @@ - type: Instrument program: 9 - type: Sprite - texture: Objects/Instruments/musician.rsi/glockenspiel.png + sprite: Objects/Instruments/glockenspiel.rsi + state: icon - type: Icon - texture: Objects/Instruments/musician.rsi/glockenspiel.png + sprite: Objects/Instruments/glockenspiel.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Instruments/glockenspiel.rsi diff --git a/Resources/Textures/Clothing/belt_utility.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belts/belt_utility.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/belt_utility.rsi/equipped-BELT.png rename to Resources/Textures/Clothing/Belts/belt_utility.rsi/equipped-BELT.png diff --git a/Resources/Textures/Clothing/belt_utility.rsi/meta.json b/Resources/Textures/Clothing/Belts/belt_utility.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/belt_utility.rsi/meta.json rename to Resources/Textures/Clothing/Belts/belt_utility.rsi/meta.json diff --git a/Resources/Textures/Clothing/belt_utility.rsi/utilitybelt.png b/Resources/Textures/Clothing/Belts/belt_utility.rsi/utilitybelt.png similarity index 100% rename from Resources/Textures/Clothing/belt_utility.rsi/utilitybelt.png rename to Resources/Textures/Clothing/Belts/belt_utility.rsi/utilitybelt.png diff --git a/Resources/Textures/Clothing/Belts/suspenders.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belts/suspenders.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..a9bdc14b32363902d612a2c6346cb81c5f67117c GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-t_KbrXkcJyXlO8JVA!du zQv(!dED7=pW^j0RBMr#Os|txIaY-#sF3Kz@$;{7VV5pcA99B?N`u$6A!N;#pw7hk- z&Yd|Qydl)!qVa=AI_G^fPcjts^zN`Q4l=%M?4>a0(WE1jLKK2m?%1+J!Bn4hg?DGS zvFhd(5=$m`8?V(cG#5Q$_9Q5*;A=7CY+i<^Gi9QZS}di2HoJMcIEGmCCMQUE9cX0r z+Psi^!vanY4gsNrLI>dlx9zOXtbWdt&dz}^0u4MEbPh>GT*%nLqwI5_v5RSj0*h1U eqq0{QSQuEd*wt#egcN}$GI+ZBxvX$U4y((=)z00000NkvXXu0mjfcE`U5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belts/suspenders.rsi/meta.json b/Resources/Textures/Clothing/Belts/suspenders.rsi/meta.json new file mode 100644 index 0000000000..5618dc6a77 --- /dev/null +++ b/Resources/Textures/Clothing/Belts/suspenders.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation", + "states": [ + { + "name": "equipped-BELT", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/headset.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Earpieces/headset.rsi/equipped-EARS.png similarity index 100% rename from Resources/Textures/Clothing/headset.rsi/equipped-EARS.png rename to Resources/Textures/Clothing/Earpieces/headset.rsi/equipped-EARS.png diff --git a/Resources/Textures/Clothing/headset.rsi/headset.png b/Resources/Textures/Clothing/Earpieces/headset.rsi/headset.png similarity index 100% rename from Resources/Textures/Clothing/headset.rsi/headset.png rename to Resources/Textures/Clothing/Earpieces/headset.rsi/headset.png diff --git a/Resources/Textures/Clothing/headset.rsi/meta.json b/Resources/Textures/Clothing/Earpieces/headset.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/headset.rsi/meta.json rename to Resources/Textures/Clothing/Earpieces/headset.rsi/meta.json diff --git a/Resources/Textures/Clothing/meson_scanners.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Glasses/meson_scanners.rsi/equipped-EYES.png similarity index 100% rename from Resources/Textures/Clothing/meson_scanners.rsi/equipped-EYES.png rename to Resources/Textures/Clothing/Glasses/meson_scanners.rsi/equipped-EYES.png diff --git a/Resources/Textures/Clothing/meson_scanners.rsi/meson.png b/Resources/Textures/Clothing/Glasses/meson_scanners.rsi/meson.png similarity index 100% rename from Resources/Textures/Clothing/meson_scanners.rsi/meson.png rename to Resources/Textures/Clothing/Glasses/meson_scanners.rsi/meson.png diff --git a/Resources/Textures/Clothing/meson_scanners.rsi/meta.json b/Resources/Textures/Clothing/Glasses/meson_scanners.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/meson_scanners.rsi/meta.json rename to Resources/Textures/Clothing/Glasses/meson_scanners.rsi/meta.json diff --git a/Resources/Textures/Clothing/sunglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Glasses/sunglasses.rsi/equipped-EYES.png similarity index 100% rename from Resources/Textures/Clothing/sunglasses.rsi/equipped-EYES.png rename to Resources/Textures/Clothing/Glasses/sunglasses.rsi/equipped-EYES.png diff --git a/Resources/Textures/Clothing/sunglasses.rsi/meta.json b/Resources/Textures/Clothing/Glasses/sunglasses.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/sunglasses.rsi/meta.json rename to Resources/Textures/Clothing/Glasses/sunglasses.rsi/meta.json diff --git a/Resources/Textures/Clothing/sunglasses.rsi/sun.png b/Resources/Textures/Clothing/Glasses/sunglasses.rsi/sun.png similarity index 100% rename from Resources/Textures/Clothing/sunglasses.rsi/sun.png rename to Resources/Textures/Clothing/Glasses/sunglasses.rsi/sun.png diff --git a/Resources/Textures/Clothing/sunglasses.rsi/sunglasses.png b/Resources/Textures/Clothing/Glasses/sunglasses.rsi/sunglasses.png similarity index 100% rename from Resources/Textures/Clothing/sunglasses.rsi/sunglasses.png rename to Resources/Textures/Clothing/Glasses/sunglasses.rsi/sunglasses.png diff --git a/Resources/Textures/Clothing/sunglasses_sec.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/equipped-EYES.png similarity index 100% rename from Resources/Textures/Clothing/sunglasses_sec.rsi/equipped-EYES.png rename to Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/equipped-EYES.png diff --git a/Resources/Textures/Clothing/sunglasses_sec.rsi/icon.png b/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/sunglasses_sec.rsi/icon.png rename to Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/icon.png diff --git a/Resources/Textures/Clothing/sunglasses_sec.rsi/inhand-left.png b/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/sunglasses_sec.rsi/inhand-left.png rename to Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/sunglasses_sec.rsi/inhand-right.png b/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/sunglasses_sec.rsi/inhand-right.png rename to Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/sunglasses_sec.rsi/meta.json b/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/sunglasses_sec.rsi/meta.json rename to Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/meta.json diff --git a/Resources/Textures/Clothing/Gloves/white.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Gloves/white.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..776e6a1ff992f188d4ce14da1168652609c779ed GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(iS0KH0%a;HD|DQNkb?a6|S*#yWg0UpXFPOpM*^M+HC#xzXqQoV&IJqdZpd>RtkAb0LPH8W4$S;_|;n|HeAg9{X#W6%<;@SR2-opkQEN9so)DQS1?Bfo(S-+ei@b(H} z7RA?=w%@9Ij!*xPt01}M4O_`Zr6^WZ|P|LYp%11ul+R;8Yuz$ED^9r1If&2KKHgHz@nHotNI{JcnY`yWDK3*J86 Q0dxj~r>mdKI;Vst095%^!~g&Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Gloves/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Gloves/white.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..49e6bc6907229a5d68898eecd2a1f2d19fde485d GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV2t*3aSW-L^LCbPUW)t@F zm|qNArpUA&E)wyI;&b4Xz39A#C2-Ttt;c5;ezN0i+`xX%=6`@epMVpGVhe=$w0?)D z%I)ue4}aUWZhPjeMfXLe@0Z@~uf3P-YP%?N7Vp`|7WWEbL#KYemw$TGj&vc<-g?$R zW`iKb7H=g1{(@tIPB+>Te;9RM`5|#{iQJWKZ(aYCuX(-e`_#UE*CPxZvz}Lqm$LId>%o zAO5IZ%j7@L5-LHV5&EV)S)K; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Gloves/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Gloves/white.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..19fcfc54056e423c3651e83ce571d716d785bd84 GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV2t*3aSW-L^LCbDUW7oK#*{Qo!}#1k^|cPi()Q2q(UfrJP;3!!f)JJ3Mn2ne zZ=bfDp1PCg@PwsW&vfc9n>>4*;Sd_i-B)`*-9o?XP(=3h%vnBMO7EWB=WNh?e&?N= z1W&<{^OoC7VwVRU(*9XoA9Vd|-UrFgHtTEur+IzcGpk;-p{-EndbeVPQO1A1TM5x+ zr{Zl+&i~Dp{dSj2fv~+sP27f@g52tPA#YjzKRw^4oU@SGjBm5<)DQe;wyk_{=ljJ& zlm7&+Klq<3uK8#5IhzJ1kraVeGKjjzYP0qU-+Q{j?tyyHdU=kWstR9!H7YNXZ@luF z{alC8gsQ&>L<5mdKI;Vst0P!=R Ay8r+H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Gloves/white.rsi/meta.json b/Resources/Textures/Clothing/Gloves/white.rsi/meta.json new file mode 100644 index 0000000000..6d12c5653a --- /dev/null +++ b/Resources/Textures/Clothing/Gloves/white.rsi/meta.json @@ -0,0 +1,60 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", + "states": [ + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/mask_breath.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Masks/mask_breath.rsi/equipped-MASK.png similarity index 100% rename from Resources/Textures/Clothing/mask_breath.rsi/equipped-MASK.png rename to Resources/Textures/Clothing/Masks/mask_breath.rsi/equipped-MASK.png diff --git a/Resources/Textures/Clothing/mask_breath.rsi/breath.png b/Resources/Textures/Clothing/Masks/mask_breath.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/mask_breath.rsi/breath.png rename to Resources/Textures/Clothing/Masks/mask_breath.rsi/icon.png diff --git a/Resources/Textures/Clothing/Masks/mask_breath.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_breath.rsi/meta.json new file mode 100644 index 0000000000..06a2e40339 --- /dev/null +++ b/Resources/Textures/Clothing/Masks/mask_breath.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "equipped-MASK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/mask_clown.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Masks/mask_clown.rsi/equipped-MASK.png similarity index 100% rename from Resources/Textures/Clothing/mask_clown.rsi/equipped-MASK.png rename to Resources/Textures/Clothing/Masks/mask_clown.rsi/equipped-MASK.png diff --git a/Resources/Textures/Clothing/mask_clown.rsi/icon.png b/Resources/Textures/Clothing/Masks/mask_clown.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/mask_clown.rsi/icon.png rename to Resources/Textures/Clothing/Masks/mask_clown.rsi/icon.png diff --git a/Resources/Textures/Clothing/mask_clown.rsi/inhand-left.png b/Resources/Textures/Clothing/Masks/mask_clown.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/mask_clown.rsi/inhand-left.png rename to Resources/Textures/Clothing/Masks/mask_clown.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/mask_clown.rsi/inhand-right.png b/Resources/Textures/Clothing/Masks/mask_clown.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/mask_clown.rsi/inhand-right.png rename to Resources/Textures/Clothing/Masks/mask_clown.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/mask_clown.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_clown.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/mask_clown.rsi/meta.json rename to Resources/Textures/Clothing/Masks/mask_clown.rsi/meta.json diff --git a/Resources/Textures/Clothing/gas_mask.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Masks/mask_gas.rsi/equipped-MASK.png similarity index 100% rename from Resources/Textures/Clothing/gas_mask.rsi/equipped-MASK.png rename to Resources/Textures/Clothing/Masks/mask_gas.rsi/equipped-MASK.png diff --git a/Resources/Textures/Clothing/gas_mask.rsi/gas_mask.png b/Resources/Textures/Clothing/Masks/mask_gas.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/gas_mask.rsi/gas_mask.png rename to Resources/Textures/Clothing/Masks/mask_gas.rsi/icon.png diff --git a/Resources/Textures/Clothing/gas_mask.rsi/inhand-left.png b/Resources/Textures/Clothing/Masks/mask_gas.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/gas_mask.rsi/inhand-left.png rename to Resources/Textures/Clothing/Masks/mask_gas.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/gas_mask.rsi/inhand-right.png b/Resources/Textures/Clothing/Masks/mask_gas.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/gas_mask.rsi/inhand-right.png rename to Resources/Textures/Clothing/Masks/mask_gas.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/gas_mask.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_gas.rsi/meta.json similarity index 96% rename from Resources/Textures/Clothing/gas_mask.rsi/meta.json rename to Resources/Textures/Clothing/Masks/mask_gas.rsi/meta.json index 631338dfa8..a30198f505 100644 --- a/Resources/Textures/Clothing/gas_mask.rsi/meta.json +++ b/Resources/Textures/Clothing/Masks/mask_gas.rsi/meta.json @@ -8,7 +8,7 @@ "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9f4bd6e0d5e457b6a36f3c505a8194116a666d6f", "states": [ { - "name": "gas_mask", + "name": "icon", "directions": 1, "delays": [ [ 1.0 ] ] }, diff --git a/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..bc458737774810dd6fb688f7c1126af6973c03d9 GIT binary patch literal 871 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#Z@5@B`&GO$wiq3C7Jno3=9=> zRFB(owHOGnU9c+d;(se%df9KYi%M&pBU9Ss2Kxz;Uw%cuc^%h%-r^@~-nWwDT2HMG zZdl)UCfMw3!X9=b%V|@-%3oX{*rUc8d3YV~%(WqmhbR5KR^Y<8c)8f)M-S5c?aR+e zz0B-9!OOtFwBFOjF{EP7+gXM=w;V*;>ci*GTqIuZ_^~HNKXJikQMb)$8>Z+=2OaY; z7k%&1b5l!Sve&5OL%suN4{}#Te`$8=@Y%=LbYO*=-(Qhgj7}YAw&k8UzOAR$IkLf~^7N($ z7JNFVZ)J0OF+DkXKSs{=db~M{QiCZ z!0*fRkC&hE+}wFEVFKfU-H#vt`BAj>)ctVR$cE>Y8y4&Dwdi~J+wOzno15EsPk%O$ z>z~TJ;=|X6jPsr^yqoub+lzB)o7Z^MI)81SAfWWQR(@?5_vM!&y>8450&R)9<;;pM z-|`3qZrB=^0qL%W4M#Sc!zPvMW!9h1&dh=*dMrYKj1si zD|SG(K^mb@OE@6Ce8;J%R&x)Jlo?9BCl}2znO%8zlkCbMV~1_0J2|$Ci(ED2ZV|Zo zmetiI7?^9;&Rswj?C(gJrN*G(d-+hd&ZWA8r7^!cYuq0IDE zp}Q=1)&4#Cm+8|^EzY1X-)>CWWUBR+?{xN-GgH=7zwxT)WOGb-^XN&r<+gkBs9wh( fMzfp6Kgj+(q;#US=1?*)=P-D>`njxgN@xNATu_YR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/icon.png b/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..065779910e7dbc70a5678bbe9f0336a54558bf26 GIT binary patch literal 581 zcmV-L0=oT)P)|SN%?sq!C1;Gr&2=)${Gr_p9yI z^X=02n^-LXB63P8Tt3_^_eN(g*9VU-j$?4n5yvsE4<6m#=6aauy zd^20D+4;%S-SNINX^Ok!eaFsEo;I_^+C$WhSqq@L_nX;bz0KFpODSt-p;iX`-u{^8 z-?#bs`6g$f)^BLi6r zIT401Sq5t@L=-_yd%@s-#iW$roI^?p@%vBkCLY0B3zKCKVTfN^J0GV}28hUMt(gcz zTo5rLa`QX~=Nux6AfgD9$)xmGN|pV2o&x|bh*&k&M*trdqW24ZHoSOI6s2zv1Q-s7 zFlh>tWsM3^?Mmn&f*?Rq6!2SMtwoX~@Z(KOaidD8wPsauUyP)bt;B(rx8Xd`kt7L3 z7$S~ih%jsu20)AVfYzFsEQ6F1)wb<*+~^Ect@>-V75@~#|FWGw$vS`zVCMj@cFhNt Tf6&%B00000NkvXXu0mjf=`;zf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/inhand-left.png b/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4efbdfc2a39951cfe9a85b82e4e83dee0d536564 GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0L@_=@}UwK4sFR$cPAr zH!V3iISl8Ev$L~{i;E2n4IiZyh5{8amIV0)GdMiEkp|@CR)s{AxTF>*7iAWdWaj5F zFjUM54l5`s{r)Am;N#aPTHd-^=gyoD-VkbV(fGk5o%24LCmD)*dUseD2N_>B_EMPh zXws2MAqv5owi_+%%r{y@cXk`AZeAg=q`%vEt%jkw=n=CgL16`7iy3G0Fw9Jo4zXIx zy9Q`+s;7%%h(~8~f&}a0gbPfJ7TtjivuzeLDfejRH2F3bWEg}fFHY1jV@-N0YQXxo zFJkQmlNM<+*44`4x(yq5ge8U=aJe1SSYUe~%0+>3$t5Ohhbdwf42!lLNM!{Qi~>uK b7BDb;5$BpzsLzoPw2;Bm)z4*}Q$iB}Ce?K< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/inhand-right.png b/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fa8af014a21faa4d7c710ababb1ed07057f04f77 GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0L@_=@}Uw9vKlaWzr;u zH!a!O*$n54b8>Qui;E2n4VNEw?*l4gED7=pW^j0RBMr#OtqO@KaY-#sF3Kz@$;{7V zV5pcA99B?N`u$6A!N;#pw7hk-&Yd|Qydl)!qVa=AI_G^fPcjts^zN`Q4l=%M?4>a0 z(WE1jLKK2EZ8uujnQyd+?(8;J-Mm6#Nq@KTS`9;U(IaM0g2D>E7BkM~VVIdF9b&bX zcMZ_uOivfb5RcB}1PRu~2?k7zIZZtUfo^QBIb1$6i8>Q62;{i6bRBRxdP;kPrhr~^ zr%{zv(!}%)E*FVdQ&MBb@0B`DfdjJ3c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/meta.json new file mode 100644 index 0000000000..f8f285dfa4 --- /dev/null +++ b/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ [ 1.0 ] ] + }, + { + "name": "equipped-MASK", + "directions": 4, + "delays": [ + [ 1.0 ], + [ 1.0 ], + [ 1.0 ], + [ 1.0 ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ 1.0 ], + [ 1.0 ], + [ 1.0 ], + [ 1.0 ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ 1.0 ], + [ 1.0 ], + [ 1.0 ], + [ 1.0 ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Masks/mask_joy.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Masks/mask_joy.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..070101132813fd7576c88931b27a73c8ee918028 GIT binary patch literal 369 zcmV-%0gnEOP)YCm3IO`08DOy`UFHA)0G3Ha zK~zYI?UXSJ!!Qg*EdrVS}R>ZwaX4}19HBYzK42)_cc zt~(x81%b391B=x0a|)Drg4E|Ng$=`6i%2U_HH7rqW7U9(mEjuF{@Zb!13m6!#{?`@ zf-&@}gls#cM-dI%4%o!A$G$LzL5?roYzxfKBHG<{Af4f68{n&Ood4ntgLn#6$LgBk P00000NkvXXu0mjf$PJem literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Masks/mask_joy.rsi/icon.png b/Resources/Textures/Clothing/Masks/mask_joy.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b81dd2fb25bc623c974b92d6c9a349da4d78aeff GIT binary patch literal 321 zcmV-H0lxl;P)fu%@w?gIh4DwNtoEV zGqC)}{)GXef1?1f);UQ!BdTFn1#`))rxKv45htq-cb4t4RZoFkGL&@!a3^iiCJ!83 z0~t;M_v3~#CQuz7PrUB?1O~u&u?43sks$iDFp(!-SXu1qGT-R`VNQ|0yoJ TKMjjw00000NkvXXu0mjfRL6qc literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Masks/mask_joy.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_joy.rsi/meta.json new file mode 100644 index 0000000000..f9b8c223d5 --- /dev/null +++ b/Resources/Textures/Clothing/Masks/mask_joy.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation", + "states": [ + { + "name": "icon", + "directions": 1, + }, + { + "name": "equipped-MASK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Masks/mask_mime.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Masks/mask_mime.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..0dff03439217b1f281883de13340583a5884db6b GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(i*8>L*G&D2-$^ZZV1I3JI zGHlqe!91V!E|9}m666=m;PC858jzD&6%tY6l3JWxlvz-cnV-kNP%$Sste~j$`v8E%wal&TdIAw{c&CMUB4z76frsqCiqHyw`btxuhN3`v^+zx6;XdHOcaYoqi zKtO^FkTyLQ@}OtRe@WjB8U~KfER(eo{M??+Ox%?y($kd4%&_7Z`@BerQxQPx7(8A5 KT-G@yGywqfdV5y@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Masks/mask_mime.rsi/icon.png b/Resources/Textures/Clothing/Masks/mask_mime.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..76d6e5e4bf7d9ae2ce9cae7f29f35e18960da853 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*eE$6T-@ku%?%V;2 zrKhJKJb2K?#%B8T>D}Gk%Xj_w2^3{43GxeOaCmkj4ah0-ba4#Pn3$X(5z-JC=)vIX z;Nj^h=-MbGprD<|#Hpdcsj-`7~(A32^1j9Xb$l#euraJLGy8ECH3 z(6rQ4;#A?%(&SvF7`gb$$wvmvCj;10RYlcRQ?dw1=b7fFDZ*Bkp zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY zR3K9+H#0X?iHkEOv#1!Phl?|m200038Nkl`m(x3X)4e=hJNPF@-)n(5iX!d(B+2a4drb^8x6%9K3TtC WB{7`8uifGR00005a~ z8XmX`&EV$vw(Qfdyj`BjbNyExPn+|4CF565>2u7h56olW>fzux$$iA(m&WXS`%*L} zglrIWP~*w_6y%WmuRTagBcfqBa0(WE1jLKK2E&5g~s?l9Tx(%EgS zx_O1flKyVvwHksNTq)8;n%X;l?QHO6W0-F*UHv>JWCzgV#hxyXAs(G?r#SK*R^VY_ ze9HLX8RG+am%sn-Z}PnrBz^k08vD0NQ;lXk-N2Wa^-Afe)TNgnGT8zco*WizuwgpV zc;CU-hUp_`?j_F!hTGNVo@z*rw6tV;zU8u_+1o4HKR$P@7p_vM4)co(^tzar^~%nv zarJlmNqd>B4w&vduv#k2yozN@w~azlOT3)X>zi8>4!vTG5Pa76qG9Kzopr0OP%wl>h($ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fa96803d56c7e2b7cbf42bfdef502d2466445511 GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4S0D`pk&%)A|NpnQw~zTa z+XTpGED7=pW^j0RBMr#OtqO@KaY-#sF3Kz@$;{7VV5pcA99B?N`u$6A!N;#pw7hk- z&Yd|Qydl)!qVa=AI_G^fPcjts^zN`Q4l=%M?4>a0(WE1jLKK2E&5g~s?l9Tx(%EgS zx_O1flKyVvwHksNTq)8;n%X;l?QHO6W0-F*UHv>JWCzgVMV>B>As(G?ryS%xqQJv) zP&7e{!;jsQdHL)8E20BjbZ&k${+<|@vA5}KvS;STin)_MrCq(o&fMg9W=_J2>l1~; zvmZ>-FST#1bY8jE&^$Rn>)@M|0Ifau#J2CU7Tn@>=ABru>Ji&Djw_WO**sj`ebo9% z@U+L91Qz-)a7} X(*%9gjknzcx|YGy)z4*}Q$iB}Sqql- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/meta.json new file mode 100644 index 0000000000..43a137083a --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/meta.json @@ -0,0 +1,74 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/", + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/mask_breath.rsi/meta.json b/Resources/Textures/Clothing/mask_breath.rsi/meta.json deleted file mode 100644 index ecf72073c9..0000000000 --- a/Resources/Textures/Clothing/mask_breath.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "breath", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-MASK", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/accordion.png b/Resources/Textures/Objects/Instruments/accordion.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/accordion.png rename to Resources/Textures/Objects/Instruments/accordion.rsi/icon.png diff --git a/Resources/Textures/Objects/Instruments/accordion.rsi/inhand-left.png b/Resources/Textures/Objects/Instruments/accordion.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b881550bda99ae46a5c59023311a6be1863f99ad GIT binary patch literal 516 zcmV+f0{i`mP)fFDZ*Bkpc$`yKaB_9`^iy#0_2eo` zEh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+F*!NECkfk;426Xr zb-1hV|FSFM+$EfL@z=6&OoXKE=K&IF*EKc$nnGNL7f^0Kk9@ z=yfCr6M#_)LEpnrCpdr+hZT?*polC%9ZW0Wn5v%$v50Nbh~vXS-Q#wQY?lQKfYfVc zd>yJ5ASVT!S%RnR;9@xNq{pBTUF*4S0hQT%0zN12x>jaQO-)UIEdI;?E+>ZI613}sa-#VCB^YYY)o9V!+ zUCvibK$^G2ih}Q8p0`9IWCtuLn4Lq&1lB&3s9WFEv`csR4+URntPB_c0000fFDZ*Bkpc$`yKaB_9`^iy#0_2eo` zEh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+F*!NECkfk;426Xr zb-1hV|FSFM+$EfL@z=6&OoXKE=K&IF*EKc$nnGNL7f^0Kk9@ z=yfCr6M#_)LEpnrCpdr+hZT?*polC%9ZW0Wn5v%$v50Nbh~vXS-Q#wQY?lQKfYfVc zd>yJ5ASVT!S%RnR;9@xNq{pBTUF*4S0hQT%0zN12x>jaQO-)UIEdI;?E+>ZI613}sa-#VCB^YYY)o9V!+ zUCvibK$^G2ih}Q8p0`9IWCtuLn4Lq&1lB&3s9WFEv`csR4+URntPB_c0000fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+HN7;mB(X?|i!&v&s2HS;i!-e#F*g;& zHsn%PaP@Nm8w>z@BO3piN*?O~00BHnL_t(YiS3k4PQx$|g(t!MEUTU%Z7+b*3s_>T zt}10=i)}WIx&WyNs^kDw3AbRw6g{;A`*3)m4*G_ui#4Zw ye;t7JT2em0;x52Y@gI0HH5xg5NO+?Dzw`z93_6<`^@&jc0000fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+HN7;mB(X?|i!&v&s2HS;i!-e#F*g;& zHsn%PaP@Nm8w>z@BO3piN*?O~00B`+L_t(YiS3lnO2a@9#wX3vgQqlkffirDzxP#U z5pNZe_M+e^IY^<0)Ob{|vfu;w1|GbNc>&+cNq21~=}IoW2>l94C-a+cvVj?Zowluz z{r83rAmYG*1MvC7$N@BLqksiMZUWw@x}pix7-YKzgaIHXrc~WRjP15$G1W^0h&iMS zq+{A%#yJeM&MhsWPXywnc_1E;NN->N# zV;hSXpge5oDLS#o)Jg2fLvnR$j~SzMMsoaq(vS7N7~wxGiH>TQRLg`zf_~7e!?WtjH;!6O(Rz^7jU)rUIH|rse3Les%xGH0dGihKUa#$}lEW;^ zfA@{8nfHrv-9mh%<)_^@w&cFxlYEh8i{{Xagy+RH%Xzj^a}y}%#^Dz2`hTwP)t-s0002+ z@bmim`Db)+(9zQ8=IG(!;`jIXg>eG%=7c~z01e$@$Uct0K37zgNKHQi-1W? zOH58kV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pS zoZ^zil2jm5DLp4YIXgA4xF9n%M~RCwC9|j)q?d~`ttc@!6~s2=QdV&Fa{-$U046yd z4mYUJKL7v#<4Ht8R9J=WmeCG_APhxOL<>`NQ|JEwOIHk8j8a8dGP7`r5_{Tf-&)3! zlCGvK=lJGX9>{qi=7e&-&U1q*kWkT_FE6)1RXfx}AY%>GEw+OwgSx>E>W1mCa@}_J zgc{r*=7bwq^<5ugFnsxY9Xa6R)6vr+c*NN_xe_LCo|Kf7bV22X5auE|K0*{E$H~tH zPUn*12ylDY-4E~&plAaHVz+n}NSaAFuE!ODX3ERp*BxlHCTPceCc!4})#BMC+Hl&sn{Oax8-);m%*kv#=*YGF8N&lfYPI(Fj=PMn_00000NkvXXu0mjfXD;ou literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/glockenspiel.rsi/inhand-right.png b/Resources/Textures/Objects/Instruments/glockenspiel.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a8af95f3bae53ca6e887d97b4430d99bf6aa5ac1 GIT binary patch literal 509 zcmVP)t-s|NsB+ z@bmim`Db)+(9zQ8=IG(!;`jIXg>eG%=7c~z01e$@$Uct0K37zgNKHQi-1W? zOH58kV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pS zoZ^zil2jm5DLp4YIXgA4xF9n%M~RCwC9|j)q?d~`ttc@!6~s2=QdV&Fa{-$U046yd z4mYUJKL7v#<4Ht8R9J=WmeCG_APhxOL<>`NQ|JEwOIHk8j8a8dGP7`r5_{Tf-&)3! zlCGvK=lJGX9>{qi=7e&-&U1q*kWkT_FE6)1RXfx}AY%>GEw+OwgSx>E>W1mCa@}_J zgc{r*=7bwq^<5ugFnsxY9Xa6R)6vr+c*NN_xe_LCo|Kf7bV22X5auE|K0*{E$H~tH zPUn*12ylDY-4E~&plAaHVz+n}NSaAFuE!ODX3ERp*BxlHCTPceCc!4})#BMC+Hl&sn{Oax8-);m%*kv#=*YGF8N&lfYPI(Fj=PMn_00000NkvXXu0mjfQ@QY2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/glockenspiel.rsi/meta.json b/Resources/Textures/Objects/Instruments/glockenspiel.rsi/meta.json new file mode 100644 index 0000000000..b4eb2638bb --- /dev/null +++ b/Resources/Textures/Objects/Instruments/glockenspiel.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/guitar.png b/Resources/Textures/Objects/Instruments/guitar.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/guitar.png rename to Resources/Textures/Objects/Instruments/guitar.rsi/icon.png diff --git a/Resources/Textures/Objects/Instruments/guitar.rsi/inhand-left.png b/Resources/Textures/Objects/Instruments/guitar.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..fa1da26b1415a67226d7c282c7f1afadd1f6b40f GIT binary patch literal 631 zcmV--0*L*IP)fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;Zh zDainGjE%TBGg33tGfE(w;*!LYR3K9+y)?5Vu}F!FGbOXA7^I7fGp#5wHxYE63jkW@8k*T{(`5hv0aQsuK~z|U?Uw6q!ypWWA>oqIrG#$nSi8OdYtE)k6@tB> zbw4JJ6Df(X&xavWj1Wyte@(Kh%j+Z)=()gpqMjaCwSF#7G2kNYF@RzVr~~lxi>ggv z{aRm3FraVza^csR-wtqzC*yXzXBvU%Y<{~W06=R!B+R&XIOJA-@4>#T-{vLgbOVjk zNCFgWf3|)tN*V9m9x4E{bNNDgnBG%M%K_nV@BkTJUVX?zz4U$?00fXfp1^O4NDUzE zHDnh4D;uA0b!C)a62O5-=E|UlYXMD7O-=mC;dlJo_(uU-3HP}ADPVr#09zH_;~hi5 zVf=L)LI1y%xOD~wV9_6)F;0+#_vzN$n5EiuI5>y1qX8JdqzWWm0Gu!M@DZlK05BdV zeEVdYEFKslR1o9(Y%s^e1vkO3JO5H9Mre$1qodGt&D^Cqf?<2>X0+))>kCFw3r-^_ RcBTLT002ovPDHLkV1m7l1`7ZH literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/guitar.rsi/inhand-right.png b/Resources/Textures/Objects/Instruments/guitar.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ee9726be4524093fb033bc210b47a664b70b1e9f GIT binary patch literal 1329 zcmV-11V=-0C=1w$2$suFc1a6I(v$T_TsPIMk10z?+`GWEmTNWy}pIhO^IQg+yXm0 zdP2%_onZ7;P3DzVBN$yvCI;D~{>kb!fKlwXs80o%RZ<3{C$lAggbYSQCC0_V&W=7> z=Ng)ZSg-Q{00ezWL_t(|ob6g)Xj4}l{!WwBYDPomy)KukdDx)AN*`J_1e3lvaN@LB z3ELjZEGUG*aG)>6jh2DX5;!t$^`Fqm5h1(WJp+N<%_G`7Zg ze7HMl{^#D?b9Zcazn74cd(ZFtefK-3x99gGlv4bk(IT3FXgC6hCLkJ)0HO(qh9iJz z0;1svAew+^a1)?cBD7B-w!T*ODTMY)d}FwIP2}|e+g!Y6s|`Em=jMRvc}ms_z_Flx zF8JXtC4lY(UUPEY1MGG{X&hccZ@Nv8IZb=QM}$o$0HBKi0IM9995(^_6hhlvz+_4% zXE&G=HY$RpzXGwaTo&-!ttC>q{@+x{C*F3~rvPw$=Ba5>`a9jU*?rUVl&}r4Pa%{! z!wgIbz!HD|=o=_J&;S5yZh}}?rUwJS=+Bf4?swCZ=dVK9>B7nLSMkl|vxbr>MSrK8 zwtI|S%S2!sW5*t;?DuQ8mKw&by9B0&BUQGFMnX6odIdAd-|*FqB-F0=5TE=BZ=D{+ z?5YbB@iDrb2gWa*#d6+Q0z6Qs*cUG$g=Q#-{vdh$kEYL=zAVM*z_TM8gq4Gy&0Y1Q1O?G#mj$6A%qY0MP_Q!x2C< z0nykp0$6RH;4Xk2T^vR*Jx__(qj##9xo^ujz$#1&U}p!&Mq$MT+#O)0LMsxc1UMEX z^q-aH*Le+AcI^Ojfl+XCKztxb*_k{mO!5Xh@-985kA-DgSphZ^-;@B8srqZoACTY= zNQe&v>Gx@1@YNQsdqpfPQ+C!Ljf9GcMVGn-<{o(Ha~ z9eAA0;ncS&Vx_^M5lVX&Zm0Fi?{2RLnySGk`EYk7j}O28v#dG8NPJ68Qmph`y6z6_ z(vwdv=5Pwuxc_1aa1$`(QpJ1 nO+Yjp0YnoJ4Mzac1VrOGPiXk~5r4q<00000NkvXXu0mjfMiO5j literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/guitar.rsi/meta.json b/Resources/Textures/Objects/Instruments/guitar.rsi/meta.json new file mode 100644 index 0000000000..b4eb2638bb --- /dev/null +++ b/Resources/Textures/Objects/Instruments/guitar.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/h_synthesizer.png b/Resources/Textures/Objects/Instruments/h_synthesizer.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/h_synthesizer.png rename to Resources/Textures/Objects/Instruments/h_synthesizer.rsi/icon.png diff --git a/Resources/Textures/Objects/Instruments/h_synthesizer.rsi/inhand-left.png b/Resources/Textures/Objects/Instruments/h_synthesizer.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ea8f77ae6e9f811a6a7d8fb0ad6755be5560cf39 GIT binary patch literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0HU_YO1cT{^G@ppFe*l zCML$l#@@Jb!_Cdj(a}*~U!SkX0;q<8u_VYZn8D%MjWi%9t12X-#3i*jxhS)sBr`vc zfuUkfa9BZ6>GvSI(O!L@P<%>i^dNg>74h`Jjqbh)4RjMILP?2v6sS} zN0W|B3Q-7Nxx;9^igRbTvFhd(5=(&eS`9;U(IaM0g2D>E7Bfn7GuS#wxxABeJPEY* zq^FBxh(~8~f&}XomL4t%Cm$viO@TuuQ#>aov2wA9a0nKtELLK!V|B_r~BEunmUS0;t2XAs1LKD)`CQX_o)U`xGAjP4`$j7nOwa~k`IDk)9?-=B_Q_3miNe85CKY z7P5#KBxw~G@*Y@!V2x-bBXb**SctGhn%@JL&;wl>yayO&Tn`j2Q1W7a(~#XVosB_M W-uULDV@776fc13sb6Mw<&;$UfFOxU` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/h_synthesizer.rsi/inhand-right.png b/Resources/Textures/Objects/Instruments/h_synthesizer.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7eff93214680def41743c8701d9604272bf2e893 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iW*Z=?jtE;Pg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+ zJeqW5QiwwE${j}QRh&D!ja4_VkXQnw*J>D=iykq15)@YOwU|+wo59ve%H^G$BghFC zJY5_^JUWvTBv`MoIh~MkEfO)%Qn=yMG({^xVTD5=V=!Zv^2`{3>R za1CXV0}YHl`3z;OF$aAlW-vT%mTa08V0TzcA_B|~;x=GT7U^O7#h8=IHdWL>DCmHT z!@Y>k2~4a(A_lW}C1^Q3Gnl=6k*EKIIh~6RTsg`Z%4m?iSi@n8-VH|eJ!=jy?s$-T c)Ps@X(INeYkm&7`fPQ1}boFyt=akR{05`OtJOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/h_synthesizer.rsi/meta.json b/Resources/Textures/Objects/Instruments/h_synthesizer.rsi/meta.json new file mode 100644 index 0000000000..b4eb2638bb --- /dev/null +++ b/Resources/Textures/Objects/Instruments/h_synthesizer.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/harmonica.png b/Resources/Textures/Objects/Instruments/harmonica.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/harmonica.png rename to Resources/Textures/Objects/Instruments/harmonica.rsi/icon.png diff --git a/Resources/Textures/Objects/Instruments/harmonica.rsi/inhand-left.png b/Resources/Textures/Objects/Instruments/harmonica.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..30579b39a9bc8d525528821c891b9b56d163fd7f GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MO7gYB`&GO$wiq3C7Jno3=9=> zRF7NpH7E$M9++i&wENpJ{8$U%VhLZ|H#W5=8%>l>HFgqc=43GDXTQ}OB58>L@yjPoBF zZS3r)J;kHF^o^k5+0QatuU&Z)=XbO5`e{pRBPFG%Z1?^C;zr^e{D!v7UR+>wO^*~Uvt~=)nf*RAFBRdcJiEUjCD>R^`5SN JF6*2UngF+GeQf{$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/harmonica.rsi/inhand-right.png b/Resources/Textures/Objects/Instruments/harmonica.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..84fc6627df9901a401a80deb7ba65cb5c0c55081 GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MO7gYB`&GO$wiq3C7Jno3=9=> zRF7NpH7E$M9++i&wENpJ{$xm74Yo90@m#tD3rOOPR)8%XTB5 zs#AIEwk}gHUc{Qgu>#Nrst4KU+!n(tL-tH>Pxx$LSwQ33onulG%w7LcF zfBP<5U3~oBS{<$rmHW%=qvqWa_<6KK*;L8wwv^^l9>Iy%?}QZEV{z*&{cA^5_gNLH RXahrn!PC{xWt~$(69Dk2rN00G literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/harmonica.rsi/meta.json b/Resources/Textures/Objects/Instruments/harmonica.rsi/meta.json new file mode 100644 index 0000000000..b4eb2638bb --- /dev/null +++ b/Resources/Textures/Objects/Instruments/harmonica.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/meta.json b/Resources/Textures/Objects/Instruments/musician.rsi/meta.json deleted file mode 100644 index 966ed218b5..0000000000 --- a/Resources/Textures/Objects/Instruments/musician.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", "states": [{"name": "accordion", "directions": 1, "delays": [[1.0]]}, {"name": "bike_horn", "directions": 1, "delays": [[1.0]]}, {"name": "drum", "directions": 1, "delays": [[1.0]]}, {"name": "drum_bongo", "directions": 1, "delays": [[1.0]]}, {"name": "drum_makeshift", "directions": 1, "delays": [[1.0]]}, {"name": "glockenspiel", "directions": 1, "delays": [[1.0]]}, {"name": "guitar", "directions": 1, "delays": [[1.0]]}, {"name": "harmonica", "directions": 1, "delays": [[1.0]]}, {"name": "minimoog", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "minimoog-broken", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "piano", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "piano-broken", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "recorder", "directions": 1, "delays": [[1.0]]}, {"name": "saxophone", "directions": 1, "delays": [[1.0]]}, {"name": "trombone", "directions": 1, "delays": [[1.0]]}, {"name": "violin", "directions": 1, "delays": [[1.0]]}, {"name": "xylophone", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "xylophone-broken", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/bike_horn.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/bike_horn.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/bike_horn.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/bike_horn.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/drum.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/drum.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/drum.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/drum.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/drum_bongo.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/drum_bongo.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/drum_bongo.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/drum_bongo.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/drum_makeshift.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/drum_makeshift.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/drum_makeshift.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/drum_makeshift.png diff --git a/Resources/Textures/Objects/Instruments/otherinstruments.rsi/meta.json b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/meta.json new file mode 100644 index 0000000000..efd96412ac --- /dev/null +++ b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/meta.json @@ -0,0 +1,155 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "states": [ + { + "name": "bike_horn", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "drum", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "drum_bongo", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "drum_makeshift", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "minimoog", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "minimoog-broken", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "piano", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "piano-broken", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "xylophone", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "xylophone-broken", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/minimoog-broken.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/minimoog-broken.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/minimoog-broken.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/minimoog-broken.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/minimoog.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/minimoog.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/minimoog.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/minimoog.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/minimoogbroken.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/minimoogbroken.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/minimoogbroken.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/minimoogbroken.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/piano-broken.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/piano-broken.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/piano-broken.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/piano-broken.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/piano.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/piano.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/piano.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/piano.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/pianobroken.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/pianobroken.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/pianobroken.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/pianobroken.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/synthesizer.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/synthesizer.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/synthesizer.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/synthesizer.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/trumpet.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/trumpet.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/trumpet.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/trumpet.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/xylophone-broken.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/xylophone-broken.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/xylophone-broken.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/xylophone-broken.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/xylophone.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/xylophone.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/xylophone.png rename to Resources/Textures/Objects/Instruments/otherinstruments.rsi/xylophone.png diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/recorder.png b/Resources/Textures/Objects/Instruments/recorder.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/recorder.png rename to Resources/Textures/Objects/Instruments/recorder.rsi/icon.png diff --git a/Resources/Textures/Objects/Instruments/recorder.rsi/inhand-left.png b/Resources/Textures/Objects/Instruments/recorder.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0931bc795b6baa2437a28b49c74a1d216bddafb7 GIT binary patch literal 455 zcmV;&0XY7NP)vP(L>q*QN*n0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sVFr$zbGZONQsLxC9|j)q>qa;ttc@!6~s2=QdV&Fa{-$S0Gsj~ zWK}bS$p8QV;Ymb6R7i>C)UghNKnw=pavEGs)VM;>=z1o`72m-Jz=c`#3G~U8tv_x2 zB}NDB#9hBMcR(xhQY37%7&~B+DKNG9VJ{H2r4<|X9HIjPfWvbj#mtt-0N8sDx*)C8 zx)xkZ*tL6F)R31^#Jq_|1ro)HfQ$FJdR3r@7{zxheB~PSlnls~f&U2Tqs#%&%lnT5 zaeAGDL=Th&1Iv903^2nK8ANs4sLq2W)tbh;tsNE8ke)D5+wit002ovPDHLkV1jGuw{`#k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/recorder.rsi/inhand-right.png b/Resources/Textures/Objects/Instruments/recorder.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d9b1a320dce3565c356afded20fcd17824e24dd7 GIT binary patch literal 459 zcmV;+0W|)JP)vP(L?Vc<%530004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sVFr$zbGZONQsLxC9|j)q>qa;ttc@!6~s2=QdV&Fa{-$S0Gsj~ zWK}bS$p8QVCm9Y+jKn#X^;c~3xG~%dXa3w4{Y77sczQ9d43qFD`E|awQ zhZ>pGe`@KMUR$6?^u97^_AVgD1pQ0clwc=bCWxON&6`ae}qSlzwVmwY}qX23KtpxgpCcN5&1}v5MKS}&8XmE4( z5N?R+KuuGDBeN^8=j=rRMC%AhM}ZjRSGUdFU_rQ$iwuh}JR#0V052t&8*|VY_ Bxm^GN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/recorder.rsi/meta.json b/Resources/Textures/Objects/Instruments/recorder.rsi/meta.json new file mode 100644 index 0000000000..b4eb2638bb --- /dev/null +++ b/Resources/Textures/Objects/Instruments/recorder.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/saxophone.png b/Resources/Textures/Objects/Instruments/saxophone.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/saxophone.png rename to Resources/Textures/Objects/Instruments/saxophone.rsi/icon.png diff --git a/Resources/Textures/Objects/Instruments/saxophone.rsi/inhand-left.png b/Resources/Textures/Objects/Instruments/saxophone.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2940a0b88186d8cdc33e9c742d561f187f769c60 GIT binary patch literal 456 zcmV;(0XP1MP)R0d!JMQvg8b*k%9#0B(9z zSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1};DIwAd0002nNklb%@X`oqZTE=ugh}B5pqSk8Dweq8ppV|b#~3Z9=)J`N0000};DIwAd0002tNklky+>bliX)O1JVupG9-Zb+7B5Wj_Vw}S7&(JkiziOAyA*9?UKv|ZBBT;1B z{o#4!3AJNb0H7o0(04pI&xE81*RaDNDZ&(X0Cpn?P!aQpi2q}4%B?q40RbuhcI>Dk z;^$a5>Ua#{0?@egMZyZ9y(h3pSO>oI1e8QOnkH|NxG+0@mhh0-gb^e3`uwUMQy2!F z00$vZg7#qIjyOmYLQFoM2w^r&Es-Va8Lu@M$LokUUT6{-_JAI!DgXcg07*qoM6N<$ Ef+0k}`~Uy| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/saxophone.rsi/meta.json b/Resources/Textures/Objects/Instruments/saxophone.rsi/meta.json new file mode 100644 index 0000000000..b4eb2638bb --- /dev/null +++ b/Resources/Textures/Objects/Instruments/saxophone.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/trombone.png b/Resources/Textures/Objects/Instruments/trombone.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/trombone.png rename to Resources/Textures/Objects/Instruments/trombone.rsi/icon.png diff --git a/Resources/Textures/Objects/Instruments/trombone.rsi/inhand-left.png b/Resources/Textures/Objects/Instruments/trombone.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e517ae45414be1871068f75373b89ddff9ece2ab GIT binary patch literal 482 zcmV<80UiE{P)fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB zGg33tGfE(w;*!LYR3KBSq$oc(DL*e&iHkEOv#1!PkBc*{C^0t`#5UwoR&e!m0hO*1XHF*hzfuIIk)CcXUY%r+|VUIE7=++CKcwn}KiI(cFQ!h~Pq Y15gnm=JJ!j`Tzg`07*qoM6N<$f(+NkS^xk5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/trombone.rsi/inhand-right.png b/Resources/Textures/Objects/Instruments/trombone.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b27538920bc9033b225f7e5f817f3d5cd8e930dc GIT binary patch literal 478 zcmV<40U`d0P)|@RfGTl00DGTPE!Ct=GbNc003=zR9JLG zWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB zGg33tGfE(w;*!LYR3KBSq$oc(DL*e&iHkEOv#1!PkBc*{C^0t`#5UwoR&e!m0hNklYDn08WxZ zq;LS(C^`V&+nBIz5|08|Z7xr?h07Qa*riF6{$6STAV+U=#aj_)j^1X9KmqVEK>Q9; z`UMRL9a9Oc2R;sn1_)Or`wJC~NJ<49L=0pPqxoGF)Pzv+T1#NjyIuFUw-c7s7I#J6 z!oxfPr@})Mh!$^H#y$A*uCfERvCSc8%NA(HpDE3Hc;F;`7>}4pRfXHzq)ETj6Q;@` UP=YaJRR91007*qoM6N<$f_ak2v;Y7A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/trombone.rsi/meta.json b/Resources/Textures/Objects/Instruments/trombone.rsi/meta.json new file mode 100644 index 0000000000..b4eb2638bb --- /dev/null +++ b/Resources/Textures/Objects/Instruments/trombone.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Instruments/musician.rsi/violin.png b/Resources/Textures/Objects/Instruments/violin.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/violin.png rename to Resources/Textures/Objects/Instruments/violin.rsi/icon.png diff --git a/Resources/Textures/Objects/Instruments/violin.rsi/inhand-left.png b/Resources/Textures/Objects/Instruments/violin.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1edf690c49e05b84291e943b74971fa53688745e GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(iS0Fvp7)UUjNn`jA1V6sq z?b4GqFw6uBF_r}R1v5B2yO9RuWLJeml(?i8Cl_TFlw{`TF)&oj2@WeLD*gT?xZva0 zCtBXRTIbH358e=JaMAd|Bc1a;nkN~GdU|(Q7zY_&Huh4O^JvnMNg)csD|L+R)s6i- zyNy*huaH>M-EF*9!_Zvxh}n~%u!66}jI+5JqIXNp=XmP)7ijGSPZ!4!kIuJK_6jyA z@VGTzzITF2O6)^EllleOJN0b2485FNs*bOAs+i8t6|m}qt4V^}jN(I+1lLGkW{zUt zC(>fTP_eLm%K`-zj;3_sZ@VX4{cz|(cdUR`{FTyQ9IZ}{$DXjbP0 Hl+XkKL`aW8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Instruments/violin.rsi/inhand-right.png b/Resources/Textures/Objects/Instruments/violin.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f193a5efbdfcd98348497195509f905f2e60ad12 GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(i*Z=?j1DP|88P23J0NMY4 ze7W1D*KIP*9w^FK666=m;PC858jzD+6%tY6l3JWxlvz-cnV-kNP%$Sste~j$`JdY zH7M}7E<6@{g<0bWbAz~nVd1lX%P*eP`gb8zxjySx{ORR z;{GAgJ0%huVtR!VCazy{U*4s5niSI!Z7m+3^qme0ZkjHE7uR3qu-nHkKG9R^rNd-~ zmU(+*jEZhwzTS3y())P}OXS(w4#w{Bm7H?$;5%KHd;hnU<(}f0G{dq}8t60zPgg&e IbxsLQ0F0cI8vp