diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml index 6446fb08c0..4b277679de 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml @@ -259,3 +259,14 @@ sprite: _CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi - type: Clothing sprite: _CP14/Clothing/Shirt/Roles/General/Dress/light_green_dress.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingWarriorsGarbDress + name: warrior's garb + description: show your strength. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.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 ce9e6c202e..db5427e3b4 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -235,7 +235,6 @@ - CP14ClothingPantsTrouserWhite - CP14ClothingPantsTrouserDarkBlue - CP14ClothingPantsAristocratic - - CP14ClothingPantsLoincloth - CP14ClothingPantsGreen - CP14ClothingPantsBrown @@ -255,11 +254,6 @@ equipment: pants: CP14ClothingPantsAristocratic -- type: loadout - id: CP14ClothingPantsLoincloth - equipment: - pants: CP14ClothingPantsLoincloth - - type: loadout id: CP14ClothingPantsGreen equipment: @@ -300,7 +294,7 @@ - CP14ClothingShirtCottonYellow - CP14ClothingShirtCottonYellowCollar - CP14ClothingCottonYellowCollarDress - + - CP14ClothingWarriorsGarbDress - type: loadout id: CP14ClothingShirtCottonBlack @@ -422,6 +416,11 @@ equipment: shirt: CP14ClothingCottonYellowCollarDress +- type: loadout + id: CP14ClothingWarriorsGarbDress + equipment: + shirt: CP14ClothingWarriorsGarbDress + # Shoes - type: loadoutGroup diff --git a/Resources/Textures/_CP14/Clothing/Pants/Trousers/dark_blue.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Trousers/dark_blue.rsi/equipped-PANTS.png index 1f39f33089..f9d738e144 100644 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Trousers/dark_blue.rsi/equipped-PANTS.png and b/Resources/Textures/_CP14/Clothing/Pants/Trousers/dark_blue.rsi/equipped-PANTS.png differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/Trousers/white.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/Trousers/white.rsi/equipped-PANTS.png index 450e0e0b23..a3b45fe80e 100644 Binary files a/Resources/Textures/_CP14/Clothing/Pants/Trousers/white.rsi/equipped-PANTS.png and b/Resources/Textures/_CP14/Clothing/Pants/Trousers/white.rsi/equipped-PANTS.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..43f1d443aa Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi/icon.png new file mode 100644 index 0000000000..168a6b5325 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi/meta.json similarity index 70% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi/meta.json index 5d25fcf1a3..b8157363a2 100644 --- a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by Prazat", + "license": "All right reserved", + "copyright": "Created by KBAS5, interpreted by creamy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/black.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/black.rsi/equipped-SHIRT.png index fab67dfd54..c5348a89a1 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/black.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/black.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue.rsi/equipped-SHIRT.png index ebe5e90999..0720dc1a5e 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue_collar.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue_collar.rsi/equipped-SHIRT.png index c15dfb474e..d05fce49ec 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue_collar.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/blue_collar.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/equipped-SHIRT.png index 49b09d3c05..3a280864e4 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_blue.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_blue.rsi/equipped-SHIRT.png index d1e8fda160..c01137c6b7 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_blue.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_blue.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_red.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_red.rsi/equipped-SHIRT.png index 5210e6e45d..1972a98ed5 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_red.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_red.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_yellow.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_yellow.rsi/equipped-SHIRT.png index 4855775a82..ac4e3b27dd 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_yellow.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/open_yellow.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/purple.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/purple.rsi/equipped-SHIRT.png index fac9624f97..90aad98d76 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/purple.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/purple.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/red.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/red.rsi/equipped-SHIRT.png index eee17646b2..1faec26c49 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/red.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/red.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white.rsi/equipped-SHIRT.png index 04f7514f13..5f998366e4 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white_collar.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white_collar.rsi/equipped-SHIRT.png index fbbb3121e5..21746d296f 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white_collar.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/white_collar.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi/equipped-SHIRT.png index 1fad199156..8109ade73e 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_collar.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_collar.rsi/equipped-SHIRT.png index ceb5516390..6995cf8642 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_collar.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_collar.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/equipped-SHIRT.png deleted file mode 100644 index 3b1e395dfc..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/equipped-SHIRT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/icon.png deleted file mode 100644 index cb9c706dc2..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Shirts/yellow_wizard.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Guard/b_chainmail.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Guard/b_chainmail.rsi/equipped-SHIRT.png index 6fea774ee8..b65deb5495 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Guard/b_chainmail.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Guard/b_chainmail.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/equipped-SHIRT.png index 7a634526a1..0685c218c8 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/equipped-SHIRT.png differ