diff --git a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl index 01314fe0cbc..c0533a2bd3a 100644 --- a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl @@ -1,2 +1,3 @@ loadout-group-inventory = Мой инвентарь loadout-group-psychologist-backpack = Рюкзак психолога +loadout-group-musician-jumpsuit = Музыкант, комбинезон \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl index 397273b9d4e..ab103797063 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl @@ -10,3 +10,5 @@ ent-ClothingUniformJumpskirtPsychologist = юбка-костюм психоло .desc = Я не теряю вещи. Я кладу вещи в места, которые потом ускользают от меня. ent-ClothingUniformJumpskirtSchool = школьная юбка .desc = Стильная и удобная школьная юбка. +ent-ClothingUniformJumpskirtMusician = платье из карпокожи + .desc = Роскошное платье, сшитое только из лучших чешуек, идеально подходит для любого концерта в стиле лаунж! \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml index bda1c2735de..b768388c006 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml @@ -63,4 +63,15 @@ - type: Sprite sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi - type: Clothing - sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi \ No newline at end of file + sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtMusician + name: carpskin skirt # Corvax-Resprite + description: An luxurious skirt made with only the finest scales, perfect for any lounge act! # Corvax-Resprite + components: + - type: Sprite + sprite: Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi + - type: Clothing + sprite: Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Corvax/Loadouts/Jobs/Civilian/musician.yml new file mode 100644 index 00000000000..8cf584a7b8c --- /dev/null +++ b/Resources/Prototypes/Corvax/Loadouts/Jobs/Civilian/musician.yml @@ -0,0 +1,18 @@ +# Jumpsuit +- type: loadout + id: MusicianJumpsuit + equipment: MusicianJumpsuit + +- type: startingGear + id: MusicianJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitMusician + +- type: loadout + id: MusicianJumpskirt + equipment: MusicianJumpskirt + +- type: startingGear + id: MusicianJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtMusician \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml b/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml index 95eab89bf34..a96b999de50 100644 --- a/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml @@ -13,3 +13,9 @@ - PsychologistSatchel - PsychologistDuffel +- type: loadoutGroup + id: MusicianJumpsuit + name: loadout-group-musician-jumpsuit + loadouts: + - MusicianJumpsuit + - MusicianJumpskirt \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 941b9e4d4b1..26f735c183a 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -151,6 +151,7 @@ id: JobMusician groups: - MusicianBackpack + - MusicianJumpsuit # Corvax-MRP - MusicianOuterClothing - Glasses - Trinkets diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index 607b3226ec8..31ca9c459c6 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -17,7 +17,6 @@ - type: startingGear id: MusicianGear equipment: - jumpsuit: ClothingUniformJumpsuitMusician eyes: ClothingEyesGlassesSunglasses shoes: ClothingShoesBootsLaceup id: MusicianPDA diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..c5a2d8f2c1b Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 00000000000..3f01b9e6d7c Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..6ddb6e4d30c Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png new file mode 100644 index 00000000000..53da76c7aaa Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png new file mode 100644 index 00000000000..058c330d586 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png new file mode 100644 index 00000000000..fc8ffb36721 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json new file mode 100644 index 00000000000..d0635a91b4c --- /dev/null +++ b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by: meowstushka; Discord: meowstushka; (UwU)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}