diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index a91bd27996..5fb56fe888 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -54,6 +54,7 @@ cp14-loadout-merchant-shoes = Merchant's shoes # Guildmaster cp14-loadout-guildmaster-outer = Guildmaster outer clothes +cp14-loadout-guildmaster-head = Guildmaster hat cp14-loadout-guildmaster-cloak = Guildmaster cloak cp14-loadout-guildmaster-shirt = Guildmaster shirt cp14-loadout-guildmaster-pants = Guildmaster pants diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 95bc03f9db..cdb9f40b46 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -601,6 +601,9 @@ ent-CP14ClothingHeadAlchemistBeret = берет алхимика ent-CP14ClothingHeadCaptainCap = капитанская кепка .desc = Нет, ну вы посмотрите какой красавчик! +ent-CP14ClothingHeadGildmaster = шляпа гильдмастера + .desc = Знак безграничного опыта и чести. + ent-CP14ClothingHeadBeretBase = { ent-CP14ClothingHeadBase } .desc = Это берет. diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index 7d32157e9c..54f5041b1a 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -54,6 +54,7 @@ cp14-loadout-merchant-shoes = Ботинки торговца # Guildmaster cp14-loadout-guildmaster-outer = Верхняя одежда гильдмастера +cp14-loadout-guildmaster-head = Шляпа гильдмастера cp14-loadout-guildmaster-cloak = Накидка гильдмастера cp14-loadout-guildmaster-shirt = Рубашка гильдмастера cp14-loadout-guildmaster-pants = Штаны гильдмастера diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildmaster.yml new file mode 100644 index 0000000000..03d52e0e88 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildmaster.yml @@ -0,0 +1,10 @@ +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadGildmaster + name: guildmaster hat + description: A sign of unlimited experience and honor. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml index a31095c1e9..bd9cc3f1a7 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml @@ -1,6 +1,16 @@ # Head +- type: loadoutGroup + id: CP14GuildmasterHead + name: cp14-loadout-guildmaster-head + loadouts: + - CP14ClothingHeadGildmaster +- type: loadout + id: CP14ClothingHeadGildmaster + equipment: + cloak: CP14ClothingHeadGildmaster + # Cloak - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 002e9cd80d..fa5076515f 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -127,6 +127,7 @@ - CP14GeneralSpells - CP14GuildmasterOuterClothing - CP14GeneralEyes + - CP14GuildmasterHead - CP14GuildmasterCloak - CP14GuildmasterShirt - CP14GuildmasterPants diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..8a5dabfd80 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/icon.png new file mode 100644 index 0000000000..6076521759 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/meta.json new file mode 100644 index 0000000000..8f89a72be6 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_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 + } + ] +}