diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl index a9d714680b..02f0a041d4 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/clothing.ftl @@ -13,15 +13,25 @@ ent-CP14ClothingHeadHoodieYellow = желтый капюшон # Mask ent-CP14ClothingMaskSinner = маска грешника .desc = Маска предназначенная для ношения не самыми светлыми личностями. Палачи надевают их на себя и на жертву перед казнью. +ent-CP14ClothingMaskMonocle = монокль + .desc = Аристократично, модно, да еще и с позолотой. +ent-CP14ClothingEyesGoldGlasses = золотые очки + .desc = Аристократично, модно, да еще и с позолотой. # Pants ent-CP14ClothingPantsHarlequinRed = красно-желтые штаны арлекина .desc = С одной стороны кроваво красные, с другой стороны солнечно желтые. Дуальность жизни и смерти всегда хороший повод для шуток. +ent-CP14ClothingPantsAristocratic = штаны аристократа + .desc = Они из достаточно дорогой ткани, чтобы вы не хотели в них шляться по пещерам. # Shirt ent-CP14ClothingShirtHarlequineRed = красная рубаха арлекина .desc = На ней не видно пятен крови, которые остаются после неудачных шуток. +ent-CP14ClothingShirtSteampunk = укрепленная латунью рубашка + .desc = Белая рубашка, укрепленная латунными вставками. # Shoes ent-CP14ClothingShoesBlack = простые черные ботинки - .desc = Влагу они не удержат, но это лучше чем ходить босиком. \ No newline at end of file + .desc = Влагу они не удержат, но это лучше чем ходить босиком. +ent-CP14ClothingAristocraticShoesBlack = черные туфли аристократа + .desc = Они достаточно дорогие, чтобы вы не хотели в них шляться по пещерам. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml new file mode 100644 index 0000000000..7c71096f34 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml @@ -0,0 +1,43 @@ +- type: entity + abstract: true + parent: Clothing + id: CP14ClothingEyesBase + components: + - type: Sprite + state: icon + - type: Item + size: Small + - type: Clothing + equipDelay: 0.4 + unequipDelay: 0 + slots: [eyes] + +- type: entity + parent: CP14ClothingEyesBase + id: CP14ClothingEyesMonocle + name: monocle + description: Aristocratic, fancy, gold-plated. + components: + - type: Sprite + sprite: _CP14/Clothing/Eyes/monocle.rsi + - type: Clothing + sprite: _CP14/Clothing/Eyes/monocle.rsi + +- type: entity + parent: CP14ClothingEyesBase + id: CP14ClothingEyesGoldGlasses + name: gold glasses + description: Aristocratic, fancy, gold-plated. + components: + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-flip-verb + foldVerbText: fold-flip-verb + - type: FoldableClothing + foldedEquippedPrefix: flipped + foldedHeldPrefix: flipped + - type: Sprite + sprite: _CP14/Clothing/Eyes/gold_glasses.rsi + - type: Clothing + sprite: _CP14/Clothing/Eyes/gold_glasses.rsi + diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml index f4fee04f27..daff940f49 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml @@ -19,8 +19,7 @@ description: A mask intented to be worn by not the brightest individuals. Executioners put them on themselves and the victim before execution. components: - type: Sprite - sprite: _CP14/Clothing/Masks/pluto-mask.rsi + sprite: _CP14/Clothing/Masks/sinner.rsi - type: Clothing - sprite: _CP14/Clothing/Masks/pluto-mask.rsi - - type: IdentityBlocker - \ No newline at end of file + sprite: _CP14/Clothing/Masks/sinner.rsi + - type: IdentityBlocker \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml index 5dcdab7488..0b4199fa63 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml @@ -20,4 +20,15 @@ - type: Sprite sprite: _CP14/Clothing/Pants/harlequin.rsi - type: Clothing - sprite: _CP14/Clothing/Pants/harlequin.rsi \ No newline at end of file + sprite: _CP14/Clothing/Pants/harlequin.rsi + +- type: entity + parent: CP14ClothingPantsBase + id: CP14ClothingPantsAristocratic + name: aristocrat's pants + description: Pants with enough quality fabric that you don't want to cave in them. + components: + - type: Sprite + sprite: _CP14/Clothing/Pants/aristocratic.rsi + - type: Clothing + sprite: _CP14/Clothing/Pants/aristocratic.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml index 007d0c7049..f7d2544a09 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml @@ -13,7 +13,7 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingShirtHarlequineRed + id: CP14ClothingShirtHarlequineRed name: red harlequin shirt description: It doesn't show the bloodstains that are left behind after bad jokes. components: @@ -21,4 +21,15 @@ sprite: _CP14/Clothing/Shirt/harlequine_red.rsi - type: Clothing sprite: _CP14/Clothing/Shirt/harlequine_red.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtSteampunk + name: brass reinforced shirt + description: A white shirt with brass inserts + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/steampunk.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/steampunk.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml index 8a0c85aa95..c01c12745e 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml @@ -22,4 +22,15 @@ - type: Sprite sprite: _CP14/Clothing/Shoes/black.rsi - type: Clothing - sprite: _CP14/Clothing/Shoes/black.rsi \ No newline at end of file + sprite: _CP14/Clothing/Shoes/black.rsi + +- type: entity + parent: CP14ClothingShoesBase + id: CP14ClothingAristocraticShoesBlack + name: aristocratic black boots + description: They're expensive enough that you don't want to go caving in them. + components: + - type: Sprite + sprite: _CP14/Clothing/Shoes/aristocratic_black.rsi + - type: Clothing + sprite: _CP14/Clothing/Shoes/aristocratic_black.rsi \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/equipped-EYES.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/equipped-EYES.png new file mode 100644 index 0000000000..ca06756107 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/flipped-equipped-EYES.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/flipped-equipped-EYES.png new file mode 100644 index 0000000000..1b995658a8 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/flipped-equipped-EYES.png differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/icon.png new file mode 100644 index 0000000000..ae0846993a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json new file mode 100644 index 0000000000..6f3919e0c7 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "flipped-equipped-EYES", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/equipped-EYES-flipped.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/equipped-EYES-flipped.png new file mode 100644 index 0000000000..1b995658a8 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/equipped-EYES-flipped.png differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/icon.png new file mode 100644 index 0000000000..ae0846993a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/meta.json new file mode 100644 index 0000000000..5707fda850 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses_flipped.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/equipped-EYES.png b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/equipped-EYES.png new file mode 100644 index 0000000000..8e5d962731 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/icon.png new file mode 100644 index 0000000000..887ebd97a3 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/meta.json new file mode 100644 index 0000000000..5707fda850 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Masks/pluto-mask.rsi/equipped-MASK.png b/Resources/Textures/_CP14/Clothing/Masks/sinner.rsi/equipped-MASK.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Masks/pluto-mask.rsi/equipped-MASK.png rename to Resources/Textures/_CP14/Clothing/Masks/sinner.rsi/equipped-MASK.png diff --git a/Resources/Textures/_CP14/Clothing/Masks/pluto-mask.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Masks/sinner.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Masks/pluto-mask.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Masks/sinner.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Masks/pluto-mask.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Masks/sinner.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Masks/pluto-mask.rsi/inhand-left.png rename to Resources/Textures/_CP14/Clothing/Masks/sinner.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Clothing/Masks/pluto-mask.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Masks/sinner.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Masks/pluto-mask.rsi/inhand-right.png rename to Resources/Textures/_CP14/Clothing/Masks/sinner.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Clothing/Masks/pluto-mask.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Masks/sinner.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Masks/pluto-mask.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Masks/sinner.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/equipped-PANTS.png new file mode 100644 index 0000000000..1364c5a4a6 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/equipped-PANTS.png differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/icon.png new file mode 100644 index 0000000000..bcc8f72745 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/meta.json new file mode 100644 index 0000000000..901ce57fa4 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Pants/aristocratic.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrystallPunk14, by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-PANTS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..9cbffc70c5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/icon.png new file mode 100644 index 0000000000..a98fd454b3 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/meta.json new file mode 100644 index 0000000000..fd31e639e1 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/steampunk.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrystallPunk14, by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/equipped-FEET.png b/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/equipped-FEET.png new file mode 100644 index 0000000000..fd5425f182 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/icon.png new file mode 100644 index 0000000000..226a8025c2 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/meta.json new file mode 100644 index 0000000000..b20cb0d59f --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shoes/aristocratic_black.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrystallPunk14, by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +}