diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index e82c28ba6f..f37e6fc8d0 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -63,7 +63,7 @@ cp14-loadout-merchant-shirt = Merchant's shirt cp14-loadout-merchant-pants = Merchant's pants cp14-loadout-merchant-shoes = Merchant's shoes -# Guildmaster +# Guild cp14-loadout-guildmaster-outer = Guildmaster outer clothes cp14-loadout-guildmaster-head = Guildmaster hat @@ -72,3 +72,5 @@ cp14-loadout-guildmaster-shirt = Guildmaster shirt cp14-loadout-guildmaster-pants = Guildmaster pants cp14-loadout-guildmaster-shoes = Guildmaster shoes cp14-loadout-guildmaster-spells = Guildmaster spells + +cp14-loadout-guildworker-head = Guild worker's head diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index afe42c9792..405a7f6c58 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -63,7 +63,7 @@ cp14-loadout-merchant-shirt = Рубашка торговца cp14-loadout-merchant-pants = Штаны торговца cp14-loadout-merchant-shoes = Ботинки торговца -# Guildmaster +# Guild cp14-loadout-guildmaster-outer = Верхняя одежда гильдмастера cp14-loadout-guildmaster-head = Шляпа гильдмастера @@ -71,4 +71,6 @@ cp14-loadout-guildmaster-cloak = Накидка гильдмастера cp14-loadout-guildmaster-shirt = Рубашка гильдмастера cp14-loadout-guildmaster-pants = Штаны гильдмастера cp14-loadout-guildmaster-shoes = Ботинки гильдмастера -cp14-loadout-guildmaster-spells = Заклинания гильдмастера \ No newline at end of file +cp14-loadout-guildmaster-spells = Заклинания гильдмастера + +cp14-loadout-guildworker-head = Шляпа работника гильдии \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml index a4f1d87ded..68c4e06b76 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml @@ -93,6 +93,14 @@ - id: CP14StampDenied - id: CP14StampApproved - id: CP14PaperFolderBlue + - id: CP14ClothingHeadGuildBeretRed + - id: CP14ClothingHeadGuildBeretYellow + - id: CP14ClothingHeadGuildBeretBlue + - id: CP14ClothingHeadGuildBeretGreen + - id: CP14GuildSignRed + - id: CP14GuildSignYellow + - id: CP14GuildSignGreen + - id: CP14GuildSignBlue - type: entity parent: CP14WoodenCloset diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildworker.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildworker.yml new file mode 100644 index 0000000000..20c5762463 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildworker.yml @@ -0,0 +1,54 @@ +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadGuildBeret + name: guild beret + description: A welcoming sign of care and responsibility. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/GuildWorker/guild_beret.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/GuildWorker/guild_beret.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadGuildBeretRed + name: red guild beret + description: A welcoming sign of care and responsibility. This one is associated with hunting and fighting. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/GuildWorker/red_guild_beret.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/GuildWorker/red_guild_beret.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadGuildBeretYellow + name: yellow guild beret + description: A welcoming sign of care and responsibility. This one is associated with gathering and mining. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/GuildWorker/yellow_guild_beret.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/GuildWorker/yellow_guild_beret.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadGuildBeretBlue + name: blue guild beret + description: A welcoming sign of care and responsibility. This one is associated with creating and building. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/GuildWorker/blue_guild_beret.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/GuildWorker/blue_guild_beret.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadGuildBeretGreen + name: green guild beret + description: A welcoming sign of care and responsibility. This one is associated with speaking and teaching. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/GuildWorker/green_guild_beret.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/GuildWorker/green_guild_beret.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/guild_signs.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/guild_signs.yml new file mode 100644 index 0000000000..ae41e5b58e --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/guild_signs.yml @@ -0,0 +1,91 @@ +- type: entity + id: CP14GuildSignRed + name: red guild sign + description: A small sign to indicate a desk related to red quests. + parent: + - BaseItem + - CP14BaseFlammable + categories: [ ForkFiltered ] + components: + - type: Sprite + noRot: true + sprite: _CP14/Objects/Misc/guild_signs.rsi + state: red + - type: Item + size: Small + - type: Damageable + damageContainer: Inorganic + damageModifierSet: CP14Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 6 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + CP14Ash1: + min: 1 + max: 2 + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + CP14WoodenPlanks1: + min: 1 + max: 1 + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 20 + +- type: entity + id: CP14GuildSignYellow + name: yellow guild sign + description: A small sign to indicate a desk related to yellow quests. + parent: + - CP14GuildSignRed + categories: [ ForkFiltered ] + components: + - type: Sprite + noRot: true + sprite: _CP14/Objects/Misc/guild_signs.rsi + state: yellow + +- type: entity + id: CP14GuildSignBlue + name: blue guild sign + description: A small sign to indicate a desk related to blue quests. + parent: + - CP14GuildSignRed + categories: [ ForkFiltered ] + components: + - type: Sprite + noRot: true + sprite: _CP14/Objects/Misc/guild_signs.rsi + state: blue + +- type: entity + id: CP14GuildSignGreen + name: green guild sign + description: A small sign to indicate a desk related to green quests. + parent: + - CP14GuildSignRed + categories: [ ForkFiltered ] + components: + - type: Sprite + noRot: true + sprite: _CP14/Objects/Misc/guild_signs.rsi + state: green \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildworker.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildworker.yml new file mode 100644 index 0000000000..e9b85643b6 --- /dev/null +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildworker.yml @@ -0,0 +1,36 @@ +# Head + +- type: loadoutGroup + id: CP14GuildWorkerHead + name: cp14-loadout-guildworker-head + loadouts: + - CP14ClothingHeadGuildBeret + - CP14ClothingHeadGuildBeretRed + - CP14ClothingHeadGuildBeretYellow + - CP14ClothingHeadGuildBeretBlue + - CP14ClothingHeadGuildBeretGreen + +- type: loadout + id: CP14ClothingHeadGuildBeret + equipment: + head: CP14ClothingHeadGuildBeret + +- type: loadout + id: CP14ClothingHeadGuildBeretRed + equipment: + head: CP14ClothingHeadGuildBeretRed + +- type: loadout + id: CP14ClothingHeadGuildBeretYellow + equipment: + head: CP14ClothingHeadGuildBeretYellow + +- type: loadout + id: CP14ClothingHeadGuildBeretGreen + equipment: + head: CP14ClothingHeadGuildBeretGreen + +- type: loadout + id: CP14ClothingHeadGuildBeretBlue + equipment: + head: CP14ClothingHeadGuildBeretBlue \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 0f6b957660..055e21866a 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -147,7 +147,7 @@ groups: - CP14GuildmasterOuterClothing - CP14GeneralEyes - - CP14GeneralHead + - CP14GuildWorkerHead - CP14GuildmasterShirt - CP14GuildmasterPants - CP14GuildmasterShoes diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/blue_guild_beret.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/blue_guild_beret.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..dc885746b4 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/blue_guild_beret.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/blue_guild_beret.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/blue_guild_beret.rsi/icon.png new file mode 100644 index 0000000000..e8e7cac0ee Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/blue_guild_beret.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/blue_guild_beret.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/blue_guild_beret.rsi/meta.json new file mode 100644 index 0000000000..f9ee52b604 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/blue_guild_beret.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Prazat, recolored by Jaba", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/green_guild_beret.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/green_guild_beret.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..b6ef2c7025 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/green_guild_beret.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/green_guild_beret.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/green_guild_beret.rsi/icon.png new file mode 100644 index 0000000000..a144e09c50 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/green_guild_beret.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/green_guild_beret.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/green_guild_beret.rsi/meta.json new file mode 100644 index 0000000000..f9ee52b604 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/green_guild_beret.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Prazat, recolored by Jaba", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/guild_beret.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/guild_beret.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..8b1e9e6c1f Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/guild_beret.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/guild_beret.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/guild_beret.rsi/icon.png new file mode 100644 index 0000000000..fb68c7a158 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/guild_beret.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/guild_beret.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/guild_beret.rsi/meta.json new file mode 100644 index 0000000000..f9ee52b604 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/guild_beret.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Prazat, recolored by Jaba", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/red_guild_beret.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/red_guild_beret.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..3bd91e964d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/red_guild_beret.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/red_guild_beret.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/red_guild_beret.rsi/icon.png new file mode 100644 index 0000000000..a15323d650 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/red_guild_beret.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/red_guild_beret.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/red_guild_beret.rsi/meta.json new file mode 100644 index 0000000000..f9ee52b604 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/red_guild_beret.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Prazat, recolored by Jaba", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/yellow_guild_beret.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/yellow_guild_beret.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..c7e25586d0 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/yellow_guild_beret.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/yellow_guild_beret.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/yellow_guild_beret.rsi/icon.png new file mode 100644 index 0000000000..e71a34268e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/yellow_guild_beret.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/yellow_guild_beret.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/yellow_guild_beret.rsi/meta.json new file mode 100644 index 0000000000..f9ee52b604 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/GuildWorker/yellow_guild_beret.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Prazat, recolored by Jaba", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/blue.png b/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/blue.png new file mode 100644 index 0000000000..e5ef56fb79 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/blue.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/green.png b/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/green.png new file mode 100644 index 0000000000..d5106c8a61 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/green.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/meta.json b/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/meta.json new file mode 100644 index 0000000000..b92fd89ddf --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Jaba", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "red" + }, + { + "name": "green" + }, + { + "name": "yellow" + }, + { + "name": "blue" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/red.png b/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/red.png new file mode 100644 index 0000000000..42385b4180 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/red.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/yellow.png b/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/yellow.png new file mode 100644 index 0000000000..f86dcb7591 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/guild_signs.rsi/yellow.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/order_board.rsi/flag_yellow.png b/Resources/Textures/_CP14/Structures/Furniture/order_board.rsi/flag_yellow.png index fc87bc436e..824b774cc7 100644 Binary files a/Resources/Textures/_CP14/Structures/Furniture/order_board.rsi/flag_yellow.png and b/Resources/Textures/_CP14/Structures/Furniture/order_board.rsi/flag_yellow.png differ