diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/clothing/outerclothing/coats.ftl new file mode 100644 index 00000000000..7c11590de4e --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/clothing/outerclothing/coats.ftl @@ -0,0 +1,4 @@ +ent-ClothingOuterCoatCaptainWhite = белый китель капитана + .desc = Белый китель капитана, инкрустированный золотом. +ent-ClothingOuterCoatCaptainSheriff = китель шерифа + .desc = Китель шерифа, инкрустированный золотом. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/coats.ftl index c88cb622c9d..2b028b485d8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/coats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/coats.ftl @@ -8,7 +8,7 @@ ent-ClothingOuterCoatSecurityOvercoat = шинель службы безопас .desc = Легкобронированная кожаная шинель, предназначенная для повседневной носки высокопоставленными офицерами. Имеет логотип компании Nanotrasen Security. ent-ClothingOuterCoatLabSecurityMedic = лабораторный халат бригмедика .desc = Костюм, защищающий от небольших разливов химикатов. -ent-ClothingOuterCoatCaptain = торжественная куртка капитана - .desc = Капитанская торжественная куртка, инкрустированная золотом. +ent-ClothingOuterCoatCaptain = китель капитана + .desc = Капитанский китель, инкрустированный золотом. ent-ClothingOuterCoatHOP = куртка главы персонала .desc = Деловая куртка главы персонала для создания профессионального вида. diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml index 126847d5938..9c3c5a891cf 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml @@ -97,11 +97,11 @@ sprite: Corvax/Clothing/OuterClothing/Coats/captain.rsi - type: Armor modifiers: - coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.6 - Heat: 0.5 + coefficients: # Corvax-Next-EDIT-CaptainCoats + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.7 + Heat: 0.8 - type: entity parent: ClothingOuterStorageBase diff --git a/Resources/Prototypes/_CorvaxNext/Catalog/VendingMachines/Inventories/CaptainDrobeInventory.yml b/Resources/Prototypes/_CorvaxNext/Catalog/VendingMachines/Inventories/CaptainDrobeInventory.yml index 8afc33ed84e..de1c5653884 100644 --- a/Resources/Prototypes/_CorvaxNext/Catalog/VendingMachines/Inventories/CaptainDrobeInventory.yml +++ b/Resources/Prototypes/_CorvaxNext/Catalog/VendingMachines/Inventories/CaptainDrobeInventory.yml @@ -25,6 +25,7 @@ ClothingHeadHatCapcapWhite: 1 ClothingNeckCloakRoyalCaptain: 1 ClothingNeckWhiteMantleCaptain: 1 + ClothingOuterCoatCaptainWhite: 1 ClothingUniformJumpskirtWhiteCaptain: 1 ClothingUniformJumpsuitWhiteCaptain: 1 ClothingHandsGlovesCaptainWhite: 1 @@ -32,6 +33,7 @@ # Sheriff ClothingHeadHatBeretSheriff: 1 ClothingHeadHatCapcapSheriff: 1 + ClothingOuterCoatCaptainSheriff: 1 ClothingUniformJumpsuitSheriff: 1 ClothingHandsGlovesSheriff: 1 ClothingBeltSheriffSheath: 1 diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_CorvaxNext/Entities/Clothing/OuterClothing/coats.yml new file mode 100644 index 00000000000..7d40db8bfb4 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Entities/Clothing/OuterClothing/coats.yml @@ -0,0 +1,21 @@ +- type: entity + parent: ClothingOuterCoatCaptain + id: ClothingOuterCoatCaptainWhite + name: white captain's jacket + description: White captain formal jacket, inlaid with gold. + components: + - type: Sprite + sprite: _CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi + - type: Clothing + sprite: _CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi + +- type: entity + parent: ClothingOuterCoatCaptain + id: ClothingOuterCoatCaptainSheriff + name: sheriff jacket + description: Sheriff formal jacket, inlaid with gold. + components: + - type: Sprite + sprite: _CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi + - type: Clothing + sprite: _CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi diff --git a/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/equipped-OUTERCLOTHING-digi.png b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/equipped-OUTERCLOTHING-digi.png new file mode 100644 index 00000000000..6189373c8da Binary files /dev/null and b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/equipped-OUTERCLOTHING-digi.png differ diff --git a/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..131cc6da3b7 Binary files /dev/null and b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/icon.png b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/icon.png new file mode 100644 index 00000000000..9011e551e22 Binary files /dev/null and b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/icon.png differ diff --git a/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/inhand-left.png new file mode 100644 index 00000000000..c7bbb54ec26 Binary files /dev/null and b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/inhand-right.png new file mode 100644 index 00000000000..faef08ae096 Binary files /dev/null and b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/meta.json b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/meta.json new file mode 100644 index 00000000000..bbb13c36f81 --- /dev/null +++ b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_sheriff.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TG station at: https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894#diff-ada70b2d4470118728541e389021f5b1320ace12ce32195045358bc795452819, digi made by kuro(388673708753027083)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-digi", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/equipped-OUTERCLOTHING-digi.png b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/equipped-OUTERCLOTHING-digi.png new file mode 100644 index 00000000000..7f569b3dc39 Binary files /dev/null and b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/equipped-OUTERCLOTHING-digi.png differ diff --git a/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..316f1ac4f9a Binary files /dev/null and b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/icon.png b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/icon.png new file mode 100644 index 00000000000..529282c003e Binary files /dev/null and b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/icon.png differ diff --git a/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/inhand-left.png b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/inhand-left.png new file mode 100644 index 00000000000..7bdb2603101 Binary files /dev/null and b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/inhand-right.png b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/inhand-right.png new file mode 100644 index 00000000000..8aa08acb529 Binary files /dev/null and b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/meta.json b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/meta.json new file mode 100644 index 00000000000..dd438577441 --- /dev/null +++ b/Resources/Textures/_CorvaxNext/Clothing/OuterClothing/Coats/captain_white.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "copyright": "Created by orange6775 (discord) for SS14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-digi", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +}