diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index 335bc384cb..8e8f00ad25 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -28,6 +28,7 @@ cp14-loadout-alchemist-belt = Alchemist's belt # Blacksmith cp14-loadout-blacksmith-cloak = Blacksmith's cloak +cp14-loadout-blacksmith-gloves = Blacksmith's gloves # Guard commander diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index 45c464b0cc..286a9c827f 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -28,6 +28,7 @@ cp14-loadout-alchemist-belt = Пояс алхимика # Blacksmith cp14-loadout-blacksmith-cloak = Накидка кузнеца +cp14-loadout-blacksmith-gloves = Перчатки кузнеца # Guard commander diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml index 1cd0e00ed3..9784a8a61f 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml @@ -64,6 +64,8 @@ contents: - id: CP14ClothingCloakBlacksmithArpon prob: 1 + - id: CP14ClothingGlovesBlacksmith + prob: 0.8 - type: entity parent: CP14WoodenCabinet diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml index c1dc81927e..219bee4524 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml @@ -41,4 +41,15 @@ - type: Sprite sprite: _CP14/Clothing/Gloves/jagermeister_gloves.rsi - type: Clothing - sprite: _CP14/Clothing/Gloves/jagermeister_gloves.rsi \ No newline at end of file + sprite: _CP14/Clothing/Gloves/jagermeister_gloves.rsi + +- type: entity + parent: CP14ClothingGlovesBase + id: CP14ClothingGlovesBlacksmith + name: blacksmith's gloves + description: They say you can get your hands on a newly poured ingot in them. But it's still not worth checking. + components: + - type: Sprite + sprite: _CP14/Clothing/Gloves/blacksmith_gloves.rsi + - type: Clothing + sprite: _CP14/Clothing/Gloves/blacksmith_gloves.rsi diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/blacksmith.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/blacksmith.yml index 4b93f2e9fc..aaf495f264 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/blacksmith.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/blacksmith.yml @@ -9,4 +9,23 @@ - type: loadout id: CP14ClothingCloakBlacksmithArpon equipment: - cloak: CP14ClothingCloakBlacksmithArpon \ No newline at end of file + cloak: CP14ClothingCloakBlacksmithArpon + +# Gloves + +- type: loadoutGroup + id: CP14BlacksmithGloves + name: cp14-loadout-blacksmith-gloves + loadouts: + - CP14ClothingGlovesBlacksmith + - CP14ClothingGlovesGirdles + +- type: loadout + id: CP14ClothingGlovesBlacksmith + equipment: + gloves: CP14ClothingGlovesBlacksmith + +- type: loadout + id: CP14ClothingGlovesGirdles + equipment: + gloves: CP14ClothingGlovesGirdles \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index e5331881db..ac1b7ea9d7 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -69,7 +69,7 @@ - CP14GeneralOuterClothing - CP14GeneralEyes - CP14BlacksmithCloak - - CP14GeneralGloves + - CP14BlacksmithGloves - CP14GeneralShirt - CP14GeneralPants - CP14GeneralShoes diff --git a/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/equipped-HAND.png b/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/equipped-HAND.png new file mode 100644 index 0000000000..c8122e3e2c Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/icon.png new file mode 100644 index 0000000000..fde660398d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/meta.json new file mode 100644 index 0000000000..efe9bf36a5 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +}