diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl index e538f112b25..c653258b2aa 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl @@ -2,6 +2,8 @@ ent-ClothingUniformJumpskirtCentcomOfficial = CentCom officer's suitskirt .desc = It's a suitskirt worn by CentCom's highest-tier Commanders. ent-ClothingUniformJumpskirtCentcomOfficer = CentCom turtleneck skirt .desc = A skirt version of the CentCom turtleneck, rarer and more sought after than the original. +ent-ClothingUniformJumpskirtElegantMaid = elegant maid uniform + .desc = Call me master and bring me some beer. ent-ClothingUniformColorJumpskirtRainbow = rainbow jumpskirt .desc = A multi-colored jumpskirt! ent-ClothingUniformJumpskirtPsychologist = psychologist suitskirt 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 ca32ef63983..397273b9d4e 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 @@ -2,6 +2,8 @@ ent-ClothingUniformJumpskirtCentcomOfficial = юбка-костюм офицер .desc = Это костюм с юбкой, который носят офицеры Центком высшего звена. ent-ClothingUniformJumpskirtCentcomOfficer = водолазка с юбкой Центком .desc = Версия водолазки Центком с юбкой, более редкая и востребованная, чем оригинал. +ent-ClothingUniformJumpskirtElegantMaid = элегантная форма горничной + .desc = Назови меня хозяином и принеси пивчански. ent-ClothingUniformColorJumpskirtRainbow = радужная юбка-комбинезон .desc = Разноцветная юбка-комбинезон! ent-ClothingUniformJumpskirtPsychologist = юбка-костюм психолога diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml index 642c1e2a390..d63f1570234 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitSuperstarCop name: superstar cop uniform @@ -41,3 +41,14 @@ sprite: Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi - type: Clothing sprite: Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtElegantMaid + name: elegant maid uniform + description: Call me master and bring me some beer. + components: + - type: Sprite + sprite: Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi + - type: Clothing + sprite: Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi diff --git a/Resources/Prototypes/Nyanotrasen/Markers/Spawners/Random/schoolgirl.yml b/Resources/Prototypes/Nyanotrasen/Markers/Spawners/Random/schoolgirl.yml index a98bfa3cc3d..4745b031daa 100644 --- a/Resources/Prototypes/Nyanotrasen/Markers/Spawners/Random/schoolgirl.yml +++ b/Resources/Prototypes/Nyanotrasen/Markers/Spawners/Random/schoolgirl.yml @@ -20,5 +20,6 @@ - UniformSchoolgirlPurple chance: 0.85 rarePrototypes: + - ClothingUniformJumpskirtElegantMaid # Corvax-Frontier - ClothingOuterSuitShrineMaiden - rareChance: 0.05 \ No newline at end of file + rareChance: 0.05 diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..b0275e3a881 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..7896eb2cae7 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/icon.png new file mode 100644 index 00000000000..c710a26a837 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/inhand-left.png new file mode 100644 index 00000000000..277145f5764 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/inhand-left.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/inhand-right.png new file mode 100644 index 00000000000..b23856b050b Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/meta.json new file mode 100644 index 00000000000..ebe4c89595b --- /dev/null +++ b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/elegantmaid.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by Ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}