From adce717e252b4dfe36086156baa54415bca46b64 Mon Sep 17 00:00:00 2001 From: meowstushka Date: Sat, 22 Jun 2024 00:35:25 +0300 Subject: [PATCH] Jumpskirt --- .../corvax/preferences/loadout-groups.ftl | 1 + .../entities/clothing/uniforms/jumpskirts.ftl | 2 ++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 ++++++ .../Loadouts/Jobs/Civilian/musician.yml | 18 ++++++++++ .../Corvax/Loadouts/loadout_groups.yml | 7 ++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 943 bytes .../equipped-INNERCLOTHING-reptilian.png | Bin 0 -> 1169 bytes .../musician.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1073 bytes .../Uniforms/Jumpskirt/musician.rsi/icon.png | Bin 0 -> 591 bytes .../Jumpskirt/musician.rsi/inhand-left.png | Bin 0 -> 358 bytes .../Jumpskirt/musician.rsi/inhand-right.png | Bin 0 -> 363 bytes .../Uniforms/Jumpskirt/musician.rsi/meta.json | 34 ++++++++++++++++++ 12 files changed, 73 insertions(+) create mode 100644 Resources/Prototypes/Corvax/Loadouts/Jobs/Civilian/musician.yml create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-reptilian.png create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json diff --git a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl index a7177ec5c79..81709bdf01d 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-chief-engineer-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 608666acd0e..fb9ed1b76d3 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 @@ -18,3 +18,5 @@ ent-ClothingUniformJumpskirtHoSBlack = чёрная юбка-комбинезо .desc = Это чёрный костюм с юбкой главы службы безопасности. ent-ClothingUniformJumpskirtRDClassical = классическая юбка-костюм научного руководителя .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 bd15a6385a9..ff349150134 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml @@ -108,3 +108,14 @@ sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_classical.rsi - type: Clothing sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_classical.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 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 a99c45f054c..8793822a3c2 100644 --- a/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml @@ -12,3 +12,10 @@ - ChiefEngineerBackpack - ChiefEngineerSatchel - ChiefEngineerDuffel + +- type: loadoutGroup + id: MusicianJumpsuit + name: loadout-group-musician-jumpsuit + loadouts: + - MusicianJumpsuit + - MusicianJumpskirt \ No newline at end of file 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 0000000000000000000000000000000000000000..c5a2d8f2c1b22cf7d4f0994afa52626be76d96d9 GIT binary patch literal 943 zcmV;g15o^lP)Px&X-PyuRCt{2noUb%R~UewJ2aGO$Te_?gh4}k<9T*oe=xg3#jUIPz~V-@)QPwd(h`z>Sg0r&(vb+x(3~#D6LbcLdu|ei&iiZ*$xY64 z^5&fP!hK&51VIo4K@i?g9Gef9g1QE19&En#y?0$37p0)C&t9AY@K@)jp=ZWh(f}DZ zXYK#MM*i)>7eu`-=~PBP+j}?^%`dF!py=yrR2Qn z{oj1~6+bk8VYxIn9KV0^V9F3nvV-|)vKR+LIXU8hqSj=LQIomU<~(dSX)F{|NmU5G@vtXZtUAWrvKXewpazA6x0XlRK^L4J_Y3x6n&?l zTqh{{PCAuw-n=!98*>z|_=jUUm3iyd7>C#aF!EX$YG9an%vcM<#EY=>U-ORYj~#&K z!KTxHb>?hDI~0_w`{z9h%EgQu(GHi%Zz6f%($A%z+x82BAP9mW2!bF8f*=TjAp9># z^aS*V;DdqC*9EGbt-k;75YlBHi zbOZp>sSNF-ecDH_U-!?wVFSY?IeT%+Z@<27$T04_@)FONXa~$MtZ5iujoyZv`UA|G zY_Sf2+2-S{(c8Fh>JPZOHXCdkBqma$ze~4O0PeCzFZ}_6AP9mW2!b$H{sVK)*Qpv8 RBPRd=002ovPDHLkV1l1W&jtVh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3f01b9e6d7c60f49c1f6d6809747e727d4710adc GIT binary patch literal 1169 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..53da76c7aaae4a211a192f3a8c11095dabced651 GIT binary patch literal 591 zcmV-V0Px%2}wjjR9J=Wlrd`>VHn4MwzY%Dod<_bRZPSd!Qt>?5V{pYI!QObK!)sDI;J0> zdpkL%5j7FYKvA#z2bCR?_pq;5*{bXVJ?}j!>M(Kt!+{>3{2<2#1SmS zvzo$t^An>VU%=Q6Qx<^7LCK5%bs$esI>?feEeLzg$X=L_+MW%13u z17Q5iXFFeF`cymoI=Fckq_Or3s;b7o>2lk>hyh3mm4;=J)f5iTKP<$hgbKiI_aZiM zx>QvyR0q}?II_*9vo~?ka|Iff#r4OxG%Sma7X`eD8~E;D#6sQr!?Vp-em+xPm^ii0 zcx~)r_u5Dal}^98=u}uj?}0g;eiJ=c;Huq3R#IHGAI_bAQ?wKiath|iN{VzcgWYSB zPG;~XE>c3p?zPEh%6$Ib7d9ZY2>}Y}6hTpR6AE=eipyj*1t_eHc2CBejYLX@U&T^f zre+wNw>khTW6dy-;`0Ap#Q-h)B<9UV9GjPT6PK)}tc=IzCEjdA%RUJ`2|^k44ofy`glX(f`s0a9jxM~`N z%P2WrdULNSW4eiH%EG<7U;clU659DGDBa$^b9+-&k44ofy`glX(f`s0a9jxM~`N z%P2WrdULNSW4eiH%EG<7U;clU659DGDBa$^Zv>9z+z-={ zI5#(AQ~A#sLLNZ7>bM1V{u9<`_*U{9MwE^1=EPy{6Y=vHyL wM1A4u*z!VBAoHSnxj@Fn;0K!@^Eas9oU*O(hJeH}peGqTUHx3vIVCg!0O^OBX8-^I literal 0 HcmV?d00001 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 + } + ] +}