diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml index 596143eeb9..a66c6ce598 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml @@ -45,4 +45,37 @@ - type: Sprite sprite: _CP14/Clothing/Head/triangularhat_golden.rsi - type: Clothing - sprite: _CP14/Clothing/Head/triangularhat_golden.rsi \ No newline at end of file + sprite: _CP14/Clothing/Head/triangularhat_golden.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadRedBeret + name: red beret + description: this is beret. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Beret/red.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Beret/red.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadPurpleBeret + name: purple beret + description: this is beret. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Beret/purple.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Beret/purple.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadWhiteBeret + name: white beret + description: this is beret. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Beret/white.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Beret/white.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml index d72a54739f..9b50e50e8f 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml @@ -108,6 +108,33 @@ equipment: head: CP14ClothingHeadTriangularHatGolden +- type: loadout + id: CP14ClothingHeadRedBeret + equipment: CP14ClothingHeadRedBeret + +- type: startingGear + id: CP14ClothingHeadRedBeret + equipment: + head: CP14ClothingHeadRedBeret + +- type: loadout + id: CP14ClothingHeadPurpleBeret + equipment: CP14ClothingHeadPurpleBeret + +- type: startingGear + id: CP14ClothingHeadPurpleBeret + equipment: + head: CP14ClothingHeadPurpleBeret + +- type: loadout + id: CP14ClothingHeadWhiteBeret + equipment: CP14ClothingHeadWhiteBeret + +- type: startingGear + id: CP14ClothingHeadWhiteBeret + equipment: + head: CP14ClothingHeadWhiteBeret + # Mask - type: loadout diff --git a/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml b/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml index 8e13f2c5e5..1806304c3f 100644 --- a/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml @@ -32,6 +32,9 @@ - CP14ClothingHeadMetalHeadband - CP14ClothingHeadTriangularHat - CP14ClothingHeadTriangularHatGolden + - CP14ClothingHeadRedBeret + - CP14ClothingHeadPurpleBeret + - CP14ClothingHeadWhiteBeret - type: loadoutGroup id: CP14TestMask diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..586fdea522 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/icon.png new file mode 100644 index 0000000000..0903354f40 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/meta.json new file mode 100644 index 0000000000..e6f822d30d --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Beret/purple.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "CrystallPunk14, by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..28c6d969bf Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/icon.png new file mode 100644 index 0000000000..225225545d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/meta.json new file mode 100644 index 0000000000..e6f822d30d --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Beret/red.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "CrystallPunk14, by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..2d84c241fa Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/icon.png new file mode 100644 index 0000000000..1fafb5dd48 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/meta.json new file mode 100644 index 0000000000..e6f822d30d --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "CrystallPunk14, by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/equipped-SHIRT.png index 5a057d26b0..1db6ec9a7b 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/icon.png index 23d48eaf88..93e667f610 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/icon.png and b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/red.rsi/icon.png differ