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 0000000000..a9bdc14b32 Binary files /dev/null and b/Resources/Textures/Clothing/Belts/suspenders.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belts/suspenders.rsi/icon.png b/Resources/Textures/Clothing/Belts/suspenders.rsi/icon.png new file mode 100644 index 0000000000..b4ff813557 Binary files /dev/null and b/Resources/Textures/Clothing/Belts/suspenders.rsi/icon.png differ 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 0000000000..776e6a1ff9 Binary files /dev/null and b/Resources/Textures/Clothing/Gloves/white.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Gloves/white.rsi/icon.png b/Resources/Textures/Clothing/Gloves/white.rsi/icon.png new file mode 100644 index 0000000000..a59b2c401d Binary files /dev/null and b/Resources/Textures/Clothing/Gloves/white.rsi/icon.png differ 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 0000000000..49e6bc6907 Binary files /dev/null and b/Resources/Textures/Clothing/Gloves/white.rsi/inhand-left.png differ 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 0000000000..19fcfc5405 Binary files /dev/null and b/Resources/Textures/Clothing/Gloves/white.rsi/inhand-right.png differ 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 0000000000..bc45873777 Binary files /dev/null and b/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/equipped-MASK.png differ 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 0000000000..065779910e Binary files /dev/null and b/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/icon.png differ 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 0000000000..4efbdfc2a3 Binary files /dev/null and b/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/inhand-left.png differ 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 0000000000..fa8af014a2 Binary files /dev/null and b/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/inhand-right.png differ 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 0000000000..0701011328 Binary files /dev/null and b/Resources/Textures/Clothing/Masks/mask_joy.rsi/equipped-MASK.png differ 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 0000000000..b81dd2fb25 Binary files /dev/null and b/Resources/Textures/Clothing/Masks/mask_joy.rsi/icon.png differ 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 0000000000..0dff034392 Binary files /dev/null and b/Resources/Textures/Clothing/Masks/mask_mime.rsi/equipped-MASK.png differ 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 0000000000..76d6e5e4bf Binary files /dev/null and b/Resources/Textures/Clothing/Masks/mask_mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Masks/mask_mime.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_mime.rsi/meta.json new file mode 100644 index 0000000000..f9b8c223d5 --- /dev/null +++ b/Resources/Textures/Clothing/Masks/mask_mime.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/OuterClothing/bio.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bio.rsi/meta.json index 117a2241ce..d69588617f 100644 --- a/Resources/Textures/Clothing/OuterClothing/bio.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/bio.rsi/meta.json @@ -1 +1,74 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[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]]}]} +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "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/Uniforms/uniform_mime.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..436ebe0bdb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/icon.png new file mode 100644 index 0000000000..3c6f4de6e5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/inhand-left.png new file mode 100644 index 0000000000..59518c35c3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/inhand-left.png differ 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 0000000000..fa96803d56 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/inhand-right.png differ 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 0000000000..b881550bda Binary files /dev/null and b/Resources/Textures/Objects/Instruments/accordion.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Instruments/accordion.rsi/inhand-right.png b/Resources/Textures/Objects/Instruments/accordion.rsi/inhand-right.png new file mode 100644 index 0000000000..b226a8d23b Binary files /dev/null and b/Resources/Textures/Objects/Instruments/accordion.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Instruments/accordion.rsi/meta.json b/Resources/Textures/Objects/Instruments/accordion.rsi/meta.json new file mode 100644 index 0000000000..b4eb2638bb --- /dev/null +++ b/Resources/Textures/Objects/Instruments/accordion.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/eguitar.png b/Resources/Textures/Objects/Instruments/eguitar.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/eguitar.png rename to Resources/Textures/Objects/Instruments/eguitar.rsi/icon.png diff --git a/Resources/Textures/Objects/Instruments/eguitar.rsi/inhand-left.png b/Resources/Textures/Objects/Instruments/eguitar.rsi/inhand-left.png new file mode 100644 index 0000000000..2334d2e7ba Binary files /dev/null and b/Resources/Textures/Objects/Instruments/eguitar.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Instruments/eguitar.rsi/inhand-right.png b/Resources/Textures/Objects/Instruments/eguitar.rsi/inhand-right.png new file mode 100644 index 0000000000..4290a49517 Binary files /dev/null and b/Resources/Textures/Objects/Instruments/eguitar.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Instruments/eguitar.rsi/meta.json b/Resources/Textures/Objects/Instruments/eguitar.rsi/meta.json new file mode 100644 index 0000000000..b4eb2638bb --- /dev/null +++ b/Resources/Textures/Objects/Instruments/eguitar.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/glockenspiel.png b/Resources/Textures/Objects/Instruments/glockenspiel.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Instruments/musician.rsi/glockenspiel.png rename to Resources/Textures/Objects/Instruments/glockenspiel.rsi/icon.png diff --git a/Resources/Textures/Objects/Instruments/glockenspiel.rsi/inhand-left.png b/Resources/Textures/Objects/Instruments/glockenspiel.rsi/inhand-left.png new file mode 100644 index 0000000000..c639ab4466 Binary files /dev/null and b/Resources/Textures/Objects/Instruments/glockenspiel.rsi/inhand-left.png differ 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 0000000000..a8af95f3ba Binary files /dev/null and b/Resources/Textures/Objects/Instruments/glockenspiel.rsi/inhand-right.png differ 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 0000000000..fa1da26b14 Binary files /dev/null and b/Resources/Textures/Objects/Instruments/guitar.rsi/inhand-left.png differ 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 0000000000..ee9726be45 Binary files /dev/null and b/Resources/Textures/Objects/Instruments/guitar.rsi/inhand-right.png differ 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 0000000000..ea8f77ae6e Binary files /dev/null and b/Resources/Textures/Objects/Instruments/h_synthesizer.rsi/inhand-left.png differ 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 0000000000..7eff932146 Binary files /dev/null and b/Resources/Textures/Objects/Instruments/h_synthesizer.rsi/inhand-right.png differ 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 0000000000..30579b39a9 Binary files /dev/null and b/Resources/Textures/Objects/Instruments/harmonica.rsi/inhand-left.png differ 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 0000000000..84fc6627df Binary files /dev/null and b/Resources/Textures/Objects/Instruments/harmonica.rsi/inhand-right.png differ 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 0000000000..0931bc795b Binary files /dev/null and b/Resources/Textures/Objects/Instruments/recorder.rsi/inhand-left.png differ 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 0000000000..d9b1a320dc Binary files /dev/null and b/Resources/Textures/Objects/Instruments/recorder.rsi/inhand-right.png differ 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 0000000000..2940a0b881 Binary files /dev/null and b/Resources/Textures/Objects/Instruments/saxophone.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Instruments/saxophone.rsi/inhand-right.png b/Resources/Textures/Objects/Instruments/saxophone.rsi/inhand-right.png new file mode 100644 index 0000000000..1337780753 Binary files /dev/null and b/Resources/Textures/Objects/Instruments/saxophone.rsi/inhand-right.png differ 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 0000000000..e517ae4541 Binary files /dev/null and b/Resources/Textures/Objects/Instruments/trombone.rsi/inhand-left.png differ 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 0000000000..b27538920b Binary files /dev/null and b/Resources/Textures/Objects/Instruments/trombone.rsi/inhand-right.png differ 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 0000000000..1edf690c49 Binary files /dev/null and b/Resources/Textures/Objects/Instruments/violin.rsi/inhand-left.png differ 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 0000000000..f193a5efbd Binary files /dev/null and b/Resources/Textures/Objects/Instruments/violin.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Instruments/violin.rsi/meta.json b/Resources/Textures/Objects/Instruments/violin.rsi/meta.json new file mode 100644 index 0000000000..b4eb2638bb --- /dev/null +++ b/Resources/Textures/Objects/Instruments/violin.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/SpaceStation14.sln b/SpaceStation14.sln index ccb629b7e1..16c8fedf49 100644 --- a/SpaceStation14.sln +++ b/SpaceStation14.sln @@ -52,22 +52,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MSBuild", "MSBuild", "{5040 EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{806ED41A-411B-4B3B-BEB6-DEC6DCA4C205}" -ProjectSection(SolutionItems) = preProject - Jenkinsfile = Jenkinsfile - Tools\generate_hashes.ps1 = Tools\generate_hashes.ps1 - Tools\package_release_build.py = Tools\package_release_build.py - Tools\run_travis.sh = Tools\run_travis.sh - .travis.yml = .travis.yml - .appveyor.yml = .appveyor.yml - Tools\gen_build_info.py = Tools\gen_build_info.py -EndProjectSection + ProjectSection(SolutionItems) = preProject + .appveyor.yml = .appveyor.yml + .travis.yml = .travis.yml + Tools\gen_build_info.py = Tools\gen_build_info.py + Tools\generate_hashes.ps1 = Tools\generate_hashes.ps1 + Jenkinsfile = Jenkinsfile + Tools\package_release_build.py = Tools\package_release_build.py + Tools\run_travis.sh = Tools\run_travis.sh + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared.Scripting", "RobustToolbox\Robust.Shared.Scripting\Robust.Shared.Scripting.csproj", "{41B450C0-A361-4CD7-8121-7072B8995CFC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.Scripting", "RobustToolbox\Robust.Shared.Scripting\Robust.Shared.Scripting.csproj", "{41B450C0-A361-4CD7-8121-7072B8995CFC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{DDD55F86-0406-42E5-8443-93EDC6BB2D75}" -ProjectSection(SolutionItems) = preProject - RobustToolbox\Tools\download_natives.py = RobustToolbox\Tools\download_natives.py -EndProjectSection + ProjectSection(SolutionItems) = preProject + RobustToolbox\Tools\download_natives.py = RobustToolbox\Tools\download_natives.py + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -135,10 +135,10 @@ Global {45C9B43F-305D-4651-9863-F6384CBC847F}.Debug|x64.Build.0 = Debug|x64 {45C9B43F-305D-4651-9863-F6384CBC847F}.Release|x64.ActiveCfg = Release|x64 {45C9B43F-305D-4651-9863-F6384CBC847F}.Release|x64.Build.0 = Release|x64 - {41B450C0-A361-4CD7-8121-7072B8995CFC}.Debug|x64.ActiveCfg = Debug|Any CPU - {41B450C0-A361-4CD7-8121-7072B8995CFC}.Debug|x64.Build.0 = Debug|Any CPU - {41B450C0-A361-4CD7-8121-7072B8995CFC}.Release|x64.ActiveCfg = Release|Any CPU - {41B450C0-A361-4CD7-8121-7072B8995CFC}.Release|x64.Build.0 = Release|Any CPU + {41B450C0-A361-4CD7-8121-7072B8995CFC}.Debug|x64.ActiveCfg = Debug|x64 + {41B450C0-A361-4CD7-8121-7072B8995CFC}.Debug|x64.Build.0 = Debug|x64 + {41B450C0-A361-4CD7-8121-7072B8995CFC}.Release|x64.ActiveCfg = Release|x64 + {41B450C0-A361-4CD7-8121-7072B8995CFC}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE