diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 9cdb3a36c9cd..bf2d653d4768 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -6,6 +6,7 @@ - type: StorageFill contents: - id: ClothingHeadHatCaptain + - id: ClothingHeadBeretCap #SS220 CapBeret - id: ClothingNeckCloakCap - id: ClothingNeckCloakCapFormal - id: ClothingUniformJumpsuitCapFormal diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index d3090aada8bc..7165ec086c16 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -887,6 +887,7 @@ - ClothingUniformJumpskirtColorGrey - ClothingUniformJumpsuitBartender - ClothingUniformJumpskirtBartender + - ClothingHeadBeretCap #SS220 CapBeret - ClothingHeadCaptainCap #SS220 Captain's Cap tweak - ClothingHeadHatCaptain - ClothingUniformJumpsuitCaptain diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index ef994d407396..ac0ccce36e7b 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -988,6 +988,16 @@ Cloth: 100 Durathread: 50 +#SS220 CapBeret begin +- type: latheRecipe + id: ClothingHeadBeretCap + result: ClothingHeadBeretCap + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 +#SS220 CapBeret end + #SS220 Captain's Cap tweak begin - type: latheRecipe id: ClothingHeadCaptainCap diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/capberet.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/capberet.yml new file mode 100644 index 000000000000..be050555ff66 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/capberet.yml @@ -0,0 +1,14 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadBeretCap + name: берет капитана + description: Голубой берет миротворца. + components: + - type: Sprite + sprite: SS220/Clothing/Head/Hats/beret_cap.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hats/beret_cap.rsi + - type: Tag + tags: + - ClothMade + - WhitelistChameleon diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..cee4a66478b0 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/icon.png new file mode 100644 index 000000000000..8cb8db6f3e76 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/inhand-left.png new file mode 100644 index 000000000000..5bfca5537e47 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/inhand-right.png new file mode 100644 index 000000000000..802b6b636378 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/meta.json new file mode 100644 index 000000000000..b287cfb3731d --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Hats/beret_cap.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from tgstation at https://github.com/tgstation/tgstation/blob/df3de65e62ed01d3f9408534329c9a545fc7d1da/icons/obj/clothing/head/beret.dmi, modified by wheremytea (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}