diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml index 080c12b8a2..1b3eb0cac3 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml @@ -157,4 +157,15 @@ - type: Sprite sprite: _CP14/Clothing/Head/Roles/General/hunter_hat.rsi - type: Clothing - sprite: _CP14/Clothing/Head/Roles/General/hunter_hat.rsi \ No newline at end of file + sprite: _CP14/Clothing/Head/Roles/General/hunter_hat.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadJestersCap + name: jester's cap + description: You are the fun. You are noise. You are the jester. + components: + - 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 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general.yml index 4bb47542ce..4d67c338c5 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/general.yml @@ -57,3 +57,14 @@ sprite: _CP14/Clothing/Pants/brown.rsi - type: Clothing sprite: _CP14/Clothing/Pants/brown.rsi + +- type: entity + parent: CP14ClothingPantsBase + id: CP14ClothingPantsJestersPantaloons + name: jester's pantaloons + description: It's like regular pantaloons. But you can be seen from two miles away. + components: + - 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 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml index 4b277679de..574f33145b 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml @@ -199,6 +199,17 @@ - type: Clothing sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtJestersAttire + name: jester's attire + description: It's rags, but it's colorful. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/jesters_attire.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/jesters_attire.rsi + - type: entity parent: CP14ClothingShirtBase id: CP14ClothingShirtCottonYellowCollar diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml index 54d5a8ea00..6c12cff23f 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml @@ -91,4 +91,20 @@ - type: Sprite sprite: _CP14/Clothing/Shoes/long_leather_boots.rsi - type: Clothing - sprite: _CP14/Clothing/Shoes/long_leather_boots.rsi \ No newline at end of file + sprite: _CP14/Clothing/Shoes/long_leather_boots.rsi + +- type: entity + parent: CP14ClothingShoesBase + id: CP14ClothingShoesJestersRingers + name: jester's ringers + description: Everyone around you should know that you exist, buddy. + components: + - type: Sprite + sprite: _CP14/Clothing/Shoes/jesters_ringers.rsi + - type: Clothing + sprite: _CP14/Clothing/Shoes/jesters_ringers.rsi + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepJester + params: + variation: 0.07 \ 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 db5427e3b4..d1b48c68ea 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -163,6 +163,7 @@ - CP14ClothingHeadTriangularHat - CP14ClothingHeadTriangularHatGolden - CP14ClothingHeadBeretRed + - CP14ClothingHeadJestersCap - CP14ClothingHeadBeretPurple - CP14ClothingHeadBeretYellow - CP14ClothingHeadBeretBlue @@ -191,6 +192,11 @@ equipment: head: CP14ClothingHeadBeretRed +- type: loadout + id: CP14ClothingHeadJestersCap + equipment: + head: CP14ClothingHeadJestersCap + - type: loadout id: CP14ClothingHeadBeretPurple equipment: @@ -234,10 +240,10 @@ loadouts: - CP14ClothingPantsTrouserWhite - CP14ClothingPantsTrouserDarkBlue + - CP14ClothingPantsJestersPantaloons - CP14ClothingPantsAristocratic - CP14ClothingPantsGreen - CP14ClothingPantsBrown - - type: loadout id: CP14ClothingPantsTrouserWhite @@ -249,6 +255,11 @@ equipment: pants: CP14ClothingPantsTrouserDarkBlue +- type: loadout + id: CP14ClothingPantsJestersPantaloons + equipment: + pants: CP14ClothingPantsJestersPantaloons + - type: loadout id: CP14ClothingPantsAristocratic equipment: @@ -277,6 +288,7 @@ - CP14ClothingBlueCollarDress - CP14ClothingShirtBlueOpen - CP14ClothingBlueOpenDress + - CP14ClothingShirtJestersAttire - CP14ClothingShirtRedOpen - CP14ClothingRedOpenDress - CP14ClothingShirtYellowOpen @@ -331,6 +343,11 @@ equipment: shirt: CP14ClothingBlueOpenDress +- type: loadout + id: CP14ClothingShirtJestersAttire + equipment: + shirt: CP14ClothingShirtJestersAttire + - type: loadout id: CP14ClothingShirtRedOpen equipment: @@ -431,6 +448,7 @@ - CP14ShoesAristocraticBlack - CP14ShoesSandals - CP14LongLeatherBoots + - CP14ClothingShoesJestersRingers - type: loadout id: CP14ShoesBlack @@ -452,6 +470,11 @@ equipment: shoes: CP14LongLeatherBoots +- type: loadout + id: CP14ClothingShoesJestersRingers + equipment: + shoes: CP14ClothingShoesJestersRingers + # Back - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml index bd9cc3f1a7..b4fe3a7a14 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml @@ -9,7 +9,7 @@ - type: loadout id: CP14ClothingHeadGildmaster equipment: - cloak: CP14ClothingHeadGildmaster + head: CP14ClothingHeadGildmaster # Cloak diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/jesters_cap.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jesters_cap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..e3a2d92909 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jesters_cap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/jesters_cap.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jesters_cap.rsi/icon.png new file mode 100644 index 0000000000..e098a8d116 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jesters_cap.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/General/jesters_cap.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jesters_cap.rsi/meta.json new file mode 100644 index 0000000000..c430865c36 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/General/jesters_cap.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-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi/equipped-PANTS.png new file mode 100644 index 0000000000..8a97f8833a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi/equipped-PANTS.png differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi/icon.png new file mode 100644 index 0000000000..8bb020a436 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/Trousers/jesters_pantaloons.rsi/meta.json new file mode 100644 index 0000000000..1eee8cb8d0 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Pants/Trousers/jesters_pantaloons.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 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/jesters_attire.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/jesters_attire.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..5d397aefe0 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/jesters_attire.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/jesters_attire.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/jesters_attire.rsi/icon.png new file mode 100644 index 0000000000..c16f87eafb Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/jesters_attire.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/jesters_attire.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/jesters_attire.rsi/meta.json new file mode 100644 index 0000000000..7b10adb18c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/jesters_attire.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-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shoes/jesters_ringers.rsi/equipped-FEET.png b/Resources/Textures/_CP14/Clothing/Shoes/jesters_ringers.rsi/equipped-FEET.png new file mode 100644 index 0000000000..830297c231 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shoes/jesters_ringers.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shoes/jesters_ringers.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shoes/jesters_ringers.rsi/icon.png new file mode 100644 index 0000000000..5f47abe509 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shoes/jesters_ringers.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shoes/jesters_ringers.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shoes/jesters_ringers.rsi/meta.json new file mode 100644 index 0000000000..6e672c2dad --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shoes/jesters_ringers.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-FEET", + "directions": 4 + } + ] +}