diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml index 445f37c510..c1dc81927e 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml @@ -31,3 +31,14 @@ Blunt: 0.99 Slash: 0.98 Piercing: 0.99 + +- type: entity + parent: CP14ClothingGlovesBase + id: CP14ClothingGlovesJagermeister + name: jagermeister's gloves + description: Leather gloves, a deep favourite of the local jagermeister's. + components: + - type: Sprite + sprite: _CP14/Clothing/Gloves/jagermeister_gloves.rsi + - type: Clothing + sprite: _CP14/Clothing/Gloves/jagermeister_gloves.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml index 92ea2f6dd1..c9e4726d5a 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml @@ -73,4 +73,15 @@ - type: Sprite sprite: _CP14/Clothing/Head/Roles/General/jesters_cap.rsi - type: Clothing - sprite: _CP14/Clothing/Head/Roles/General/jesters_cap.rsi \ No newline at end of file + sprite: _CP14/Clothing/Head/Roles/General/jesters_cap.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadJagermeisterHat + name: jagermeister's hat + description: The mark of a professional in his field. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml index 650f73f59d..ab71e6e7fd 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml @@ -63,3 +63,16 @@ - type: Clothing sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterClothingBase + id: CP14ClothingOuterClothingJagermeisterWaistcoat + name: jagermeister's waistcoat + description: Doesn't interfere with movement, looks restrained. Time to go hunting. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi + diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general.yml index 4d67c338c5..4e37e6136a 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general.yml @@ -67,4 +67,14 @@ - type: Sprite sprite: _CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi - type: Clothing - sprite: _CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi \ No newline at end of file + sprite: _CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi + +- type: entity + parent: CP14ClothingPantsBase + id: CP14ClothingPantsJagermeisterTrousers + name: jagermeister's trousers + components: + - type: Sprite + sprite: _CP14/Clothing/Pants/jagermeister_trousers.rsi + - type: Clothing + sprite: _CP14/Clothing/Pants/jagermeister_trousers.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index f0303fe7bf..e168123e35 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -70,6 +70,7 @@ - CP14ClothingOuterClothingBrownVest1 - CP14ClothingOuterClothingBrownVest2 - CP14ClothingOuterClothingBrownVest3 + - CP14ClothingOuterClothingJagermeisterWaistcoat - CP14ClothingOuterClothingRedVest - type: loadout @@ -92,6 +93,12 @@ equipment: outerClothing: CP14ClothingOuterClothingRedVest +- type: loadout + id: CP14ClothingOuterClothingJagermeisterWaistcoat + equipment: + outerClothing: CP14ClothingOuterClothingJagermeisterWaistcoat + + # Eyes - type: loadoutGroup @@ -120,12 +127,18 @@ minLimit: 0 loadouts: - CP14Girdles + - CP14ClothingGlovesJagermeister - type: loadout id: CP14Girdles equipment: gloves: CP14ClothingGlovesGirdles +- type: loadout + id: CP14ClothingGlovesJagermeister + equipment: + gloves: CP14ClothingGlovesJagermeister + # Mask - type: loadoutGroup @@ -164,6 +177,7 @@ - CP14ClothingHeadTriangularHatGolden - CP14ClothingHeadJestersCap - CP14ClothingHeadHuntersHat + - CP14ClothingHeadJagermeisterHat - type: loadout id: CP14ClothingHeadMetalHeadband @@ -190,6 +204,11 @@ equipment: head: CP14ClothingHeadHuntersHat +- type: loadout + id: CP14ClothingHeadJagermeisterHat + equipment: + head: CP14ClothingHeadJagermeisterHat + # Pants - type: loadoutGroup @@ -200,6 +219,7 @@ - CP14ClothingPantsTrouserDarkBlue - CP14ClothingPantsJestersPantaloons - CP14ClothingPantsAristocratic + - CP14ClothingPantsJagermeisterTrousers - CP14ClothingPantsGreen - CP14ClothingPantsBrown @@ -233,6 +253,11 @@ equipment: pants: CP14ClothingPantsBrown +- type: loadout + id: CP14ClothingPantsJagermeisterTrousers + equipment: + pants: CP14ClothingPantsJagermeisterTrousers + # Shirt - type: loadoutGroup diff --git a/Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/equipped-HAND.png b/Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/equipped-HAND.png new file mode 100644 index 0000000000..97d45664ef Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/icon.png new file mode 100644 index 0000000000..73e0148ac7 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Gloves/jagermeister_gloves.rsi/meta.json new file mode 100644 index 0000000000..efe9bf36a5 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Gloves/jagermeister_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 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..813954c229 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/icon.png new file mode 100644 index 0000000000..96d3e6bc05 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/meta.json new file mode 100644 index 0000000000..8f89a72be6 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creamy", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..689f749a51 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/icon.png new file mode 100644 index 0000000000..5dbe961f87 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.rsi/meta.json new file mode 100644 index 0000000000..52df3fe795 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/jagermeister_waistcoat.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-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/equipped-PANTS.png new file mode 100644 index 0000000000..d0826fb5fb Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/equipped-PANTS.png differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/icon.png new file mode 100644 index 0000000000..57ae0ffb53 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.rsi/meta.json new file mode 100644 index 0000000000..1eee8cb8d0 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Pants/jagermeister_trousers.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-PANTS", + "directions": 4 + } + ] +}