diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 2a15090326..5572e82057 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -5,6 +5,7 @@ startingInventory: ClothingOuterWinterClown: 1 ClothingOuterWinterMime: 1 + ClothingOuterWinterMusician: 1 ClothingMaskJoy: 2 ClothingHeadHatCardborg: 2 ClothingOuterCardborg: 2 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 6f3a11694f..d801bc815a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -284,3 +284,14 @@ Slash: 0.8 Piercing: 0.6 #slightly less bulletproof than wardens normal coat Heat: 0.75 + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterWinterMusician + name: musician's winter coat + description: An oversized, plasticine space tuxedo that'll have people asking "do you know me?" + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coatnomi.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coatnomi.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 4881e73efe..5e1d7d4384 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -822,3 +822,14 @@ sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitMusician + name: musician's tuxedo + description: A fancy tuxedo for the musically inclined. Perfect for any lounge act! + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/musician.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/musician.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 180804b7b6..74203e7fc2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -432,7 +432,7 @@ - ClothingUniformJumpskirtMedicalDoctor - ClothingUniformJumpsuitMime - ClothingUniformJumpskirtMime - - ClothingUniformJumpsuitLawyerPurple + - ClothingUniformJumpsuitMusician - ClothingUniformJumpsuitParamedic - ClothingUniformJumpskirtParamedic - ClothingUniformJumpsuitPrisoner diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index bde7f8b5d6..797a1f9df0 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -401,11 +401,11 @@ Cloth: 300 - type: latheRecipe - id: ClothingUniformJumpsuitLawyerPurple ##Musician + id: ClothingUniformJumpsuitMusician icon: - sprite: Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi + sprite: Clothing/Uniforms/Jumpsuit/musician.rsi state: icon - result: ClothingUniformJumpsuitLawyerPurple + result: ClothingUniformJumpsuitMusician completetime: 4 materials: Cloth: 300 diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index d3dc43046c..b0d1db3078 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -16,7 +16,7 @@ - type: startingGear id: MusicianGear equipment: - jumpsuit: ClothingUniformJumpsuitLawyerPurple + jumpsuit: ClothingUniformJumpsuitMusician back: ClothingBackpackMusicianFilled eyes: ClothingEyesGlassesSunglasses shoes: ClothingShoesColorBlack diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..d89406f883 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/icon.png new file mode 100644 index 0000000000..6da884441a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/inhand-left.png new file mode 100644 index 0000000000..faaf27228f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/inhand-right.png new file mode 100644 index 0000000000..e36e34c83f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json new file mode 100644 index 0000000000..af6075230c --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Ian M. Burton, based on the iconic Klaus Nomi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..23329b7245 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png new file mode 100644 index 0000000000..c69974d2e7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png new file mode 100644 index 0000000000..4896ed18ac Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png new file mode 100644 index 0000000000..60005dc4d1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/meta.json new file mode 100644 index 0000000000..96a09cefac --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/4daf5d1a1b45fc3fcc4fd9703222159e6c1f38c8, inhands and icon by peptide, edited further by Ian M. Burton", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}