From c31f1ad130d8c8be5cc25a87b363b653f4d4b70d Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Fri, 25 Oct 2024 00:23:35 +0300 Subject: [PATCH] Banker and commandant outfit + fix purchase bugs (#509) * reaname QM to commandant, and merchant to banker * Update game_presets.yml * add bureaucracy crate * fix buying * bowler hats * reorganize shirt folders * cloak refactor, add commandant cloak * Update battle_royale_temp.yml * Update migration.yml --- .../TravelingStoreShip/CP14CargoSystem.UI.cs | 2 +- .../TravelingStoreShip/CP14CargoSystem.cs | 11 +- ...tationTravelingStoreShipTargetComponent.cs | 2 +- .../BuyServices/CP14BuyItemsService.cs | 15 ++- .../CP14StoreBuyPositionPrototype.cs | 2 +- Resources/Locale/en-US/_CP14/job/job.ftl | 8 +- .../Locale/en-US/_CP14/job/supervisors.ftl | 2 +- .../Locale/en-US/_CP14/loadouts/loadout.ftl | 11 +- .../travelingStoreship/positions_buy.ftl | 5 +- Resources/Locale/ru-RU/_CP14/job/job.ftl | 8 +- .../Locale/ru-RU/_CP14/job/supervisors.ftl | 2 +- .../Locale/ru-RU/_CP14/loadouts/loadout.ftl | 11 +- .../travelingStoreship/positions_buy.ftl | 5 +- .../Prototypes/_CP14/Catalog/Cargo/crates.yml | 20 ++++ .../alchemist.yml} | 20 ++-- .../Entities/Clothing/Cloak/Roles/bank.yml | 12 ++ .../Entities/Clothing/Cloak/Roles/captain.yml | 12 ++ .../Entities/Clothing/Cloak/Roles/general.yml | 54 +++++++++ .../_CP14/Entities/Clothing/Cloak/base.yml | 13 +++ .../Cloak/{basic_cloak.yml => sort_later.yml} | 94 +-------------- .../Entities/Clothing/Head/Roles/bank.yml | 21 ++++ .../Entities/Clothing/Shirt/Roles/bank.yml | 10 ++ .../Entities/Clothing/Shirt/Roles/general.yml | 81 +++++++++++++ .../_CP14/Entities/Clothing/Shirt/base.yml | 14 +++ .../_CP14/Entities/Clothing/Shirt/shirt.yml | 107 ------------------ .../Spawners/Random/battle_royale_temp.yml | 2 +- .../_CP14/Entities/Markers/Spawners/jobs.yml | 14 +-- .../Prototypes/_CP14/Loadouts/Jobs/bank.yml | 67 +++++++++++ .../_CP14/Loadouts/Jobs/general.yml | 6 + .../_CP14/Loadouts/role_loadouts.yml | 27 ++--- Resources/Prototypes/_CP14/Maps/arenas.yml | 4 +- .../_CP14/Roles/Jobs/Bank/banker.yml | 13 +++ .../_CP14/Roles/Jobs/Bank/commandant.yml | 17 +++ .../_CP14/Roles/Jobs/Bank/merchant.yml | 16 --- .../_CP14/Roles/Jobs/Bank/quartermaster.yml | 17 --- .../_CP14/Roles/Jobs/departments.yml | 6 +- .../_CP14/Roles/play_time_tracker.yml | 4 +- Resources/Prototypes/_CP14/StatusIcon/job.yml | 12 +- Resources/Prototypes/_CP14/Store/buy.yml | 24 +++- Resources/Prototypes/_CP14/game_presets.yml | 1 - Resources/Prototypes/_CP14/secret_weights.yml | 4 +- .../redguardarmor.rsi/equipped-CLOAK.png | Bin .../{ => Armor}/redguardarmor.rsi/icon.png | Bin .../{ => Armor}/redguardarmor.rsi/meta.json | 0 .../alchemist_cloak.rsi/equipped-CLOAK.png | Bin .../Alchemist}/alchemist_cloak.rsi/icon.png | Bin .../Alchemist/alchemist_cloak.rsi}/meta.json | 0 .../commandant_jacket.rsi/equipped-CLOAK.png | Bin 0 -> 916 bytes .../Roles/Bank/commandant_jacket.rsi/icon.png | Bin 0 -> 453 bytes .../Bank/commandant_jacket.rsi}/meta.json | 0 .../captain_jacket.rsi/equipped-CLOAK.png | Bin .../Captain}/captain_jacket.rsi/icon.png | Bin .../Captain/captain_jacket.rsi}/meta.json | 0 .../blacksmith_apron.rsi/equipped-CLOAK.png | Bin .../General}/blacksmith_apron.rsi/icon.png | Bin .../General}/blacksmith_apron.rsi/meta.json | 0 .../cheetah_skin.rsi/equipped-CLOAK.png | Bin .../General}/cheetah_skin.rsi/icon.png | Bin .../General}/cheetah_skin.rsi/meta.json | 0 .../General}/dark_blue.rsi/equipped-CLOAK.png | Bin .../General}/dark_blue.rsi/icon.png | Bin .../General/dark_blue.rsi}/meta.json | 0 .../General}/furcape.rsi/equipped-CLOAK.png | Bin .../{ => Roles/General}/furcape.rsi/icon.png | Bin .../{ => Roles/General}/furcape.rsi/meta.json | 0 .../General}/furcape2.rsi/equipped-CLOAK.png | Bin .../{ => Roles/General}/furcape2.rsi/icon.png | Bin .../General}/furcape2.rsi/meta.json | 0 .../maid_apron.rsi/equipped-CLOAK.png | Bin .../General}/maid_apron.rsi/icon.png | Bin .../General}/maid_apron.rsi/meta.json | 0 .../General}/white.rsi/equipped-CLOAK.png | Bin .../General}/white.rsi/icon.png | Bin .../Cloak/Roles/General/white.rsi/meta.json | 18 +++ .../bowler_golden_hat.rsi/equipped-HELMET.png | Bin 0 -> 414 bytes .../Roles/Bank/bowler_golden_hat.rsi/icon.png | Bin 0 -> 295 bytes .../Bank/bowler_golden_hat.rsi/meta.json | 18 +++ .../Bank/bowler_hat.rsi/equipped-HELMET.png | Bin 0 -> 356 bytes .../Head/Roles/Bank/bowler_hat.rsi/icon.png | Bin 0 -> 248 bytes .../Head/Roles/Bank/bowler_hat.rsi/meta.json | 18 +++ .../Bank/banker.rsi}/equipped-SHIRT.png | Bin .../Bank/banker.rsi}/icon.png | Bin .../Bank/banker.rsi}/meta.json | 0 .../General}/black.rsi/equipped-SHIRT.png | Bin .../General}/black.rsi/icon.png | Bin .../General}/black.rsi/meta.json | 0 .../General}/blue.rsi/equipped-SHIRT.png | Bin .../General}/blue.rsi/icon.png | Bin .../General}/blue.rsi/meta.json | 0 .../General}/mercenary.rsi/equipped-SHIRT.png | Bin .../General}/mercenary.rsi/icon.png | Bin .../General}/mercenary.rsi/inhand-left.png | Bin .../General}/mercenary.rsi/inhand-right.png | Bin .../General}/mercenary.rsi/meta.json | 0 .../General}/purple.rsi/equipped-SHIRT.png | Bin .../General}/purple.rsi/icon.png | Bin .../General}/purple.rsi/meta.json | 0 .../General}/red.rsi/equipped-SHIRT.png | Bin .../General}/red.rsi/icon.png | Bin .../General}/red.rsi/meta.json | 0 .../General}/white.rsi/equipped-SHIRT.png | Bin .../General}/white.rsi/icon.png | Bin .../General}/white.rsi/meta.json | 0 .../General}/yellow.rsi/equipped-SHIRT.png | Bin .../General}/yellow.rsi/icon.png | Bin .../General}/yellow.rsi/meta.json | 0 .../yellow_wizard.rsi/equipped-SHIRT.png | Bin .../General}/yellow_wizard.rsi/icon.png | Bin .../General}/yellow_wizard.rsi/meta.json | 0 .../{Merchant.png => Banker.png} | Bin .../{Quartermaster.png => Commandant.png} | Bin .../Interface/Misc/job_icons.rsi/meta.json | 4 +- .../_CP14/Markers/jobs.rsi/banker.png | Bin 0 -> 1219 bytes .../_CP14/Markers/jobs.rsi/commandant.png | Bin 0 -> 1327 bytes .../Textures/_CP14/Markers/jobs.rsi/meta.json | 10 +- Resources/migration.yml | 5 +- 116 files changed, 534 insertions(+), 315 deletions(-) rename Resources/Prototypes/_CP14/Entities/Clothing/Cloak/{alchemist_cloak.yml => Roles/alchemist.yml} (56%) create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/bank.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/captain.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Cloak/base.yml rename Resources/Prototypes/_CP14/Entities/Clothing/Cloak/{basic_cloak.yml => sort_later.yml} (60%) create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/bank.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/bank.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Shirt/base.yml delete mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml create mode 100644 Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml create mode 100644 Resources/Prototypes/_CP14/Roles/Jobs/Bank/banker.yml create mode 100644 Resources/Prototypes/_CP14/Roles/Jobs/Bank/commandant.yml delete mode 100644 Resources/Prototypes/_CP14/Roles/Jobs/Bank/merchant.yml delete mode 100644 Resources/Prototypes/_CP14/Roles/Jobs/Bank/quartermaster.yml rename Resources/Textures/_CP14/Clothing/Cloak/{ => Armor}/redguardarmor.rsi/equipped-CLOAK.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Armor}/redguardarmor.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Armor}/redguardarmor.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/Alchemist}/alchemist_cloak.rsi/equipped-CLOAK.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/Alchemist}/alchemist_cloak.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{Simple/dark_blue.rsi => Roles/Alchemist/alchemist_cloak.rsi}/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi/equipped-CLOAK.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi/icon.png rename Resources/Textures/_CP14/Clothing/Cloak/{Simple/white.rsi => Roles/Bank/commandant_jacket.rsi}/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/Captain}/captain_jacket.rsi/equipped-CLOAK.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/Captain}/captain_jacket.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{alchemist_cloak.rsi => Roles/Captain/captain_jacket.rsi}/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/blacksmith_apron.rsi/equipped-CLOAK.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/blacksmith_apron.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/blacksmith_apron.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/cheetah_skin.rsi/equipped-CLOAK.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/cheetah_skin.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/cheetah_skin.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{Simple => Roles/General}/dark_blue.rsi/equipped-CLOAK.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{Simple => Roles/General}/dark_blue.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{captain_jacket.rsi => Roles/General/dark_blue.rsi}/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/furcape.rsi/equipped-CLOAK.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/furcape.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/furcape.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/furcape2.rsi/equipped-CLOAK.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/furcape2.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/furcape2.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/maid_apron.rsi/equipped-CLOAK.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/maid_apron.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{ => Roles/General}/maid_apron.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{Simple => Roles/General}/white.rsi/equipped-CLOAK.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/{Simple => Roles/General}/white.rsi/icon.png (100%) create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/General/white.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi/meta.json rename Resources/Textures/_CP14/Clothing/Shirt/{steampunk.rsi => Roles/Bank/banker.rsi}/equipped-SHIRT.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{steampunk.rsi => Roles/Bank/banker.rsi}/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{steampunk.rsi => Roles/Bank/banker.rsi}/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/black.rsi/equipped-SHIRT.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/black.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/black.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/blue.rsi/equipped-SHIRT.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/blue.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/blue.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{ => Roles/General}/mercenary.rsi/equipped-SHIRT.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{ => Roles/General}/mercenary.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{ => Roles/General}/mercenary.rsi/inhand-left.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{ => Roles/General}/mercenary.rsi/inhand-right.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{ => Roles/General}/mercenary.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/purple.rsi/equipped-SHIRT.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/purple.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/purple.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/red.rsi/equipped-SHIRT.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/red.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/red.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/white.rsi/equipped-SHIRT.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/white.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/white.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/yellow.rsi/equipped-SHIRT.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/yellow.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{Cotton => Roles/General}/yellow.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{ => Roles/General}/yellow_wizard.rsi/equipped-SHIRT.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{ => Roles/General}/yellow_wizard.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/{ => Roles/General}/yellow_wizard.rsi/meta.json (100%) rename Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/{Merchant.png => Banker.png} (100%) rename Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/{Quartermaster.png => Commandant.png} (100%) create mode 100644 Resources/Textures/_CP14/Markers/jobs.rsi/banker.png create mode 100644 Resources/Textures/_CP14/Markers/jobs.rsi/commandant.png diff --git a/Content.Server/_CP14/TravelingStoreShip/CP14CargoSystem.UI.cs b/Content.Server/_CP14/TravelingStoreShip/CP14CargoSystem.UI.cs index dc33270c33..dca7931b29 100644 --- a/Content.Server/_CP14/TravelingStoreShip/CP14CargoSystem.UI.cs +++ b/Content.Server/_CP14/TravelingStoreShip/CP14CargoSystem.UI.cs @@ -64,7 +64,7 @@ public sealed partial class CP14CargoSystem desc.Append(service.GetDescription(_proto, EntityManager)); } - desc.Append("\n" + Loc.GetString("cp14-store-buy-hint", ("name", Loc.GetString(proto.Key.Name)), ("code", "#" + proto.Key.Code))); + desc.Append("\n" + Loc.GetString("cp14-store-buy-hint", ("name", Loc.GetString(proto.Key.Name)), ("code", "[color=yellow][bold]#" + proto.Key.Code + "[/bold][/color]"))); prodBuy.Add(new CP14StoreUiProductEntry(proto.Key.ID, proto.Key.Icon, name, desc.ToString(), proto.Value)); } diff --git a/Content.Server/_CP14/TravelingStoreShip/CP14CargoSystem.cs b/Content.Server/_CP14/TravelingStoreShip/CP14CargoSystem.cs index e5ddcfc0d6..9e98a8b157 100644 --- a/Content.Server/_CP14/TravelingStoreShip/CP14CargoSystem.cs +++ b/Content.Server/_CP14/TravelingStoreShip/CP14CargoSystem.cs @@ -216,7 +216,14 @@ public sealed partial class CP14CargoSystem : CP14SharedCargoSystem continue; station.Comp.Balance -= request.Value; - station.Comp.BuyedQueue.Enqueue(request); + + if (!_proto.TryIndex(request.Key, out var indexedBuyed)) + continue; + + foreach (var service in indexedBuyed.Services) + { + service.Buy(EntityManager, station); + } } } @@ -242,7 +249,7 @@ public sealed partial class CP14CargoSystem : CP14SharedCargoSystem continue; var buyedThing = station.Comp.BuyedQueue.Dequeue(); - Spawn(buyedThing.Key.ID, palletXform.Coordinates); + Spawn(buyedThing, palletXform.Coordinates); } } diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14StationTravelingStoreShipTargetComponent.cs b/Content.Shared/_CP14/TravelingStoreShip/CP14StationTravelingStoreShipTargetComponent.cs index 393f8a2aaa..4e54f9191c 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14StationTravelingStoreShipTargetComponent.cs +++ b/Content.Shared/_CP14/TravelingStoreShip/CP14StationTravelingStoreShipTargetComponent.cs @@ -51,5 +51,5 @@ public sealed partial class CP14StationTravelingStoreShipTargetComponent : Compo /// a queue of purchased items. The oldest purchases are taken out one by one to be unloaded onto the ship /// [DataField] - public Queue> BuyedQueue = new(); + public Queue BuyedQueue = new(); } diff --git a/Content.Shared/_CP14/TravelingStoreShip/Prototype/BuyServices/CP14BuyItemsService.cs b/Content.Shared/_CP14/TravelingStoreShip/Prototype/BuyServices/CP14BuyItemsService.cs index 60737691da..ea3b12eded 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/Prototype/BuyServices/CP14BuyItemsService.cs +++ b/Content.Shared/_CP14/TravelingStoreShip/Prototype/BuyServices/CP14BuyItemsService.cs @@ -8,11 +8,14 @@ public sealed partial class CP14BuyItemsService : CP14StoreBuyService [DataField(required: true)] public Dictionary Product = new(); - public override void Buy(EntityManager entManager, EntityUid station) + public override void Buy(EntityManager entManager, Entity station) { - foreach (var pai in Product) + foreach (var (protoId, count) in Product) { - Logger.Debug($"куплено: {pai.Key} x{pai.Value}"); + for (var i = 0; i < count; i++) + { + station.Comp.BuyedQueue.Enqueue(protoId); + } } } @@ -20,12 +23,12 @@ public sealed partial class CP14BuyItemsService : CP14StoreBuyService { var sb = new StringBuilder(); sb.Append(Loc.GetString("cp14-store-service-buy-items") + " \n"); - foreach (var pai in Product) + foreach (var (protoId, count) in Product) { - if (!prototype.TryIndex(pai.Key, out var indexedProto)) + if (!prototype.TryIndex(protoId, out var indexedProto)) continue; - sb.Append($"{indexedProto.Name} x{pai.Value} \n"); + sb.Append($"{indexedProto.Name} x{count} \n"); } return sb.ToString(); } diff --git a/Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreBuyPositionPrototype.cs b/Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreBuyPositionPrototype.cs index a335941181..f34a006d5e 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreBuyPositionPrototype.cs +++ b/Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreBuyPositionPrototype.cs @@ -46,7 +46,7 @@ public sealed partial class CP14StoreBuyPositionPrototype : IPrototype [MeansImplicitUse] public abstract partial class CP14StoreBuyService { - public abstract void Buy(EntityManager entManager, EntityUid station); + public abstract void Buy(EntityManager entManager, Entity station); public abstract string? GetDescription(IPrototypeManager prototype, IEntityManager entSys); } diff --git a/Resources/Locale/en-US/_CP14/job/job.ftl b/Resources/Locale/en-US/_CP14/job/job.ftl index ef14940f55..d89f0c64d4 100644 --- a/Resources/Locale/en-US/_CP14/job/job.ftl +++ b/Resources/Locale/en-US/_CP14/job/job.ftl @@ -10,11 +10,11 @@ cp14-job-desc-guard-commander = The most dangerous person in the neighborhood. M # Bank -cp14-job-name-quartermaster = Commandant -cp14-job-desc-quartermaster = Control the economy of the settlement by trading with the Empire. Manage stocks and finances by directing resources to the laboring hands. +cp14-job-name-commandant = Commandant +cp14-job-desc-commandant = Control the economy of the settlement by trading with the Empire. Manage stocks and finances by directing resources to the laboring hands. -cp14-job-name-merchant = Banker -cp14-job-desc-merchant = Make deals, store entrusted valuables, issue interest-bearing deposits, and do any other economic work that will enrich your bank. +cp14-job-name-banker = Banker +cp14-job-desc-banker = Make deals, store entrusted valuables, issue interest-bearing deposits, and do any other economic work that will enrich your bank. # Mercenary diff --git a/Resources/Locale/en-US/_CP14/job/supervisors.ftl b/Resources/Locale/en-US/_CP14/job/supervisors.ftl index 1e31088764..5f5caad646 100644 --- a/Resources/Locale/en-US/_CP14/job/supervisors.ftl +++ b/Resources/Locale/en-US/_CP14/job/supervisors.ftl @@ -1,4 +1,4 @@ cp14-job-supervisors-empire = Empire and its authority cp14-job-supervisors-command = all authority figures -cp14-job-supervisors-quartermaster = quartermaster \ No newline at end of file +cp14-job-supervisors-commandant = commandant \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index 923842ba0a..09ef632184 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -24,4 +24,13 @@ cp14-loadout-captain-head = Captain's head # Guard commander -cp14-loadout-guard-commander-cloak = Guard commander's cloak \ No newline at end of file +cp14-loadout-guard-commander-cloak = Guard commander's cloak + +# Bank + +cp14-loadout-bank-head = Bank employee hat +cp14-loadout-commandant-head = Commandant's hat +cp14-loadout-commandant-cloak = Commandant's cloak +cp14-loadout-bank-shirt = Bank Employee shirt +cp14-loadout-bank-pants = Bank Employee pants +cp14-loadout-bank-shoes = Bank Employee shoes \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl b/Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl index 1e462c6ea3..b0f9cf55d0 100644 --- a/Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl +++ b/Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl @@ -4,4 +4,7 @@ cp14-store-buy-alchemy-normalizer-name = Solution normalizer cp14-store-buy-alchemy-normalizer-desc = Are your alchemists making poor quality potions? Fix it with a modern technological device made by Dwarf! “Alchemical Normalizer” - will remove any residue from your potions! cp14-store-buy-alchemy-vials-name = Alchemical vials -cp14-store-buy-alchemy-vials-desc = Now the problem of shortage of potion vessels is no longer a problem! After all, for a rather modest price you can order batches of shiny vials directly from the glassblowing factory! Random alchemical devices as a gift. \ No newline at end of file +cp14-store-buy-alchemy-vials-desc = Now the problem of shortage of potion vessels is no longer a problem! After all, for a rather modest price you can order batches of shiny vials directly from the glassblowing factory! Random alchemical devices as a gift. + +cp14-store-buy-alchemy-bureaucracy-name = Bureaucratic reserve +cp14-store-buy-alchemy-bureaucracy-desc = Feather pens, inkwells and a big stack of paper. In folders of different colors, or without folders at all: because we make sure that you can choose the option that is most comfortable for you. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/job/job.ftl b/Resources/Locale/ru-RU/_CP14/job/job.ftl index 14e5898759..85c5c4f26c 100644 --- a/Resources/Locale/ru-RU/_CP14/job/job.ftl +++ b/Resources/Locale/ru-RU/_CP14/job/job.ftl @@ -10,11 +10,11 @@ cp14-job-desc-guard-commander = Самая опасная личность в о # Bank -cp14-job-name-quartermaster = Комендант -cp14-job-desc-quartermaster = Контролируйте экономику поселения, торгуя с Империей. Заведуйте запасами и финансами, направляя ресурсы рабочим рукам. +cp14-job-name-commandant = Комендант +cp14-job-desc-commandant = Контролируйте экономику поселения, торгуя с Империей. Заведуйте запасами и финансами, направляя ресурсы рабочим рукам. -cp14-job-name-merchant = Банкир -cp14-job-desc-merchant = Заключайте сделки, храните доверенные ценности, выдавайте вклады под проценты и занимайтесь любой другой экономической работой, которая обогатит ваш банк. +cp14-job-name-banker = Банкир +cp14-job-desc-banker = Заключайте сделки, храните доверенные ценности, выдавайте вклады под проценты и занимайтесь любой другой экономической работой, которая обогатит ваш банк. # Mercenary diff --git a/Resources/Locale/ru-RU/_CP14/job/supervisors.ftl b/Resources/Locale/ru-RU/_CP14/job/supervisors.ftl index 5de1f1d211..9403ca4957 100644 --- a/Resources/Locale/ru-RU/_CP14/job/supervisors.ftl +++ b/Resources/Locale/ru-RU/_CP14/job/supervisors.ftl @@ -1,4 +1,4 @@ cp14-job-supervisors-empire = Империи и ее представителям власти cp14-job-supervisors-command = всем представителям власти -cp14-job-supervisors-quartermaster = квартирмейстеру \ No newline at end of file +cp14-job-supervisors-commandant = коменданту \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index 4991a1be9e..06140b845f 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -24,4 +24,13 @@ cp14-loadout-captain-head = Капитанская шляпа # Guard commander -cp14-loadout-guard-commander-cloak = Накидка командира стражи \ No newline at end of file +cp14-loadout-guard-commander-cloak = Накидка командира стражи + +# Bank + +cp14-loadout-bank-head = Шляпа работника банка +cp14-loadout-commandant-head = Шляпа коменданта +cp14-loadout-commandant-cloak = Накидка коменданта +cp14-loadout-bank-shirt = Рубашка работника банка +cp14-loadout-bank-pants = Штаны работника банка +cp14-loadout-bank-shoes = Ботинки работника банка \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl b/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl index d9f9f25921..d34544d059 100644 --- a/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl +++ b/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl @@ -4,4 +4,7 @@ cp14-store-buy-alchemy-normalizer-name = Нормализатор раствор cp14-store-buy-alchemy-normalizer-desc = Ваши алхимики делают некачественные зелья? Исправьте это при помощи современного технологического устройства дворфского производства! "Алхимический нормализатор" - удалит из ваших зелий любой осадок! cp14-store-buy-alchemy-vials-name = Алхимические пузырьки -cp14-store-buy-alchemy-vials-desc = Теперь проблема дефицита емкостей для зелий больше не проблема! Ведь по довольно скромной цене вы можете заказывать партии блестящих склянок прямо с стеклодульного завода! Случайные алхимические приборы в подарок. \ No newline at end of file +cp14-store-buy-alchemy-vials-desc = Теперь проблема дефицита емкостей для зелий больше не проблема! Ведь по довольно скромной цене вы можете заказывать партии блестящих склянок прямо с стеклодульного завода! Случайные алхимические приборы в подарок. + +cp14-store-buy-alchemy-bureaucracy-name = Бюрократический запас +cp14-store-buy-alchemy-bureaucracy-desc = Ручки, чернильницы и большая пачка бумаги. В папках разных цветов, и вовсе без папок: ведь мы заботимся о том, чтобы вы могли выбирать тот вариант, который вам комфортнее. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml index 6f69f3721f..55f860a93c 100644 --- a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml @@ -21,4 +21,24 @@ - id: CP14VialTiny prob: 0.2 - id: ShardGlass #Lol. Something broken + prob: 0.2 + +- type: entity + parent: CP14BrassChest + id: CP14BrassChestFilledBureaucracy + suffix: Bureaucracy + components: + - type: StorageFill + contents: + - id: CP14PaperFolderBlue + amount: 5 + - id: CP14PaperFolderRed + amount: 5 + - id: CP14Paper + amount: 5 + - id: CP14PenFeather + amount: 3 + #Gift + - id: CP14Inkwell + amount: 1 prob: 0.2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/alchemist_cloak.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/alchemist.yml similarity index 56% rename from Resources/Prototypes/_CP14/Entities/Clothing/Cloak/alchemist_cloak.yml rename to Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/alchemist.yml index e1575bc933..db8639d6c2 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/alchemist_cloak.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/alchemist.yml @@ -1,21 +1,15 @@ - type: entity parent: CP14ClothingCloakBase - id: CP14ClothingCloakAlchemistBase - abstract: true - components: - - type: Armor - modifiers: - coefficients: - Heat: 0.9 - Caustic: 0.75 - -- type: entity - parent: CP14ClothingCloakAlchemistBase id: CP14ClothingCloakAlchemist name: alchemist's cloak description: An expensive fabric that can withstand acid splashes - the standard for alchemist experts. components: - type: Sprite - sprite: _CP14/Clothing/Cloak/alchemist_cloak.rsi + sprite: _CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi - type: Clothing - sprite: _CP14/Clothing/Cloak/alchemist_cloak.rsi \ No newline at end of file + sprite: _CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi + - type: Armor + modifiers: + coefficients: + Heat: 0.9 + Caustic: 0.75 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/bank.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/bank.yml new file mode 100644 index 0000000000..3f65902585 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/bank.yml @@ -0,0 +1,12 @@ +- type: entity + parent: + - CP14ClothingCloakBase + - ClothingSlotBase + id: CP14ClothingCloakCommandantJacket + name: commandant's jacket + description: the colors white and gold tell you that you're looking at a higher power. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/captain.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/captain.yml new file mode 100644 index 0000000000..1a9771957e --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/captain.yml @@ -0,0 +1,12 @@ +- type: entity + parent: + - CP14ClothingCloakBase + - ClothingSlotBase + id: CP14ClothingCloakCaptainJacket + name: captain's jacket + description: the colors white and gold tell you that you're looking at a higher power. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml new file mode 100644 index 0000000000..f990947998 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml @@ -0,0 +1,54 @@ +- type: entity + parent: CP14ClothingCloakBase + id: CP14ClothingCloakFurcapeBlack + name: furcape + description: Brutal woolen wool cape. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/Roles/General/furcape2.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/Roles/General/furcape2.rsi + +- type: entity + parent: CP14ClothingCloakBase + id: CP14ClothingCloakFurcapeBlue + name: furcape + description: Brutal woolen wool cape. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/Roles/General/furcape.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/Roles/General/furcape.rsi + +- type: entity + parent: CP14ClothingCloakBase + id: CP14ClothingCloakSimpleWhite + name: white cloak + description: Long coat with a high collar. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/Roles/General/white.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/Roles/General/white.rsi + +- type: entity + parent: CP14ClothingCloakBase + id: CP14ClothingCloakSimpleDarkBlue + name: dark cloak + description: Long coat with a high collar. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/Roles/General/dark_blue.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/Roles/General/dark_blue.rsi + +- type: entity + parent: CP14ClothingCloakBase + id: CP14ClothingCloakRitualAttireLeather + name: ritual attire with leather + description: The traditional attire of Southern mages who have undergone the ritual. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/base.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/base.yml new file mode 100644 index 0000000000..1d63034c30 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/base.yml @@ -0,0 +1,13 @@ +- type: entity + abstract: true + parent: Clothing + id: CP14ClothingCloakBase + categories: [ ForkFiltered ] + components: + - type: Clothing + equipDelay: 1 + unequipDelay: 1 + slots: + - cloak + - type: Sprite + state: icon \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/basic_cloak.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml similarity index 60% rename from Resources/Prototypes/_CP14/Entities/Clothing/Cloak/basic_cloak.yml rename to Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml index acdc3bf016..870b34ad9b 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/basic_cloak.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml @@ -1,17 +1,3 @@ -- type: entity - abstract: true - parent: Clothing - id: CP14ClothingCloakBase - categories: [ ForkFiltered ] - components: - - type: Clothing - equipDelay: 1 - unequipDelay: 1 - slots: - - cloak - - type: Sprite - state: icon - - type: entity parent: CP14ClothingCloakBase id: CP14ClothingCloakArmoredRed @@ -19,9 +5,9 @@ description: Huge metal shoulder pads give extra protection from getting your head chopped off. components: - type: Sprite - sprite: _CP14/Clothing/Cloak/redguardarmor.rsi + sprite: _CP14/Clothing/Cloak/Armor/redguardarmor.rsi - type: Clothing - sprite: _CP14/Clothing/Cloak/redguardarmor.rsi + sprite: _CP14/Clothing/Cloak/Armor/redguardarmor.rsi - type: Armor #same as regular sec armor modifiers: coefficients: @@ -39,9 +25,9 @@ description: Loose leather strips, still actually being clothing. components: - type: Sprite - sprite: _CP14/Clothing/Cloak/blacksmith_apron.rsi + sprite: _CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi - type: Clothing - sprite: _CP14/Clothing/Cloak/blacksmith_apron.rsi + sprite: _CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi - type: entity parent: @@ -52,77 +38,9 @@ description: Cleanliness, orderliness and obedience are the main traits of a good maid. components: - type: Sprite - sprite: _CP14/Clothing/Cloak/maid_apron.rsi + sprite: _CP14/Clothing/Cloak/Roles/General/maid_apron.rsi - type: Clothing - sprite: _CP14/Clothing/Cloak/maid_apron.rsi - -- type: entity - parent: CP14ClothingCloakBase - id: CP14ClothingCloakFurcapeBlack - name: furcape - description: Brutal woolen wool cape. - components: - - type: Sprite - sprite: _CP14/Clothing/Cloak/furcape2.rsi - - type: Clothing - sprite: _CP14/Clothing/Cloak/furcape2.rsi - -- type: entity - parent: CP14ClothingCloakBase - id: CP14ClothingCloakFurcapeBlue - name: furcape - description: Brutal woolen wool cape. - components: - - type: Sprite - sprite: _CP14/Clothing/Cloak/furcape.rsi - - type: Clothing - sprite: _CP14/Clothing/Cloak/furcape.rsi - -- type: entity - parent: CP14ClothingCloakBase - id: CP14ClothingCloakSimpleWhite - name: white cloak - description: Long coat with a high collar. - components: - - type: Sprite - sprite: _CP14/Clothing/Cloak/Simple/white.rsi - - type: Clothing - sprite: _CP14/Clothing/Cloak/Simple/white.rsi - -- type: entity - parent: CP14ClothingCloakBase - id: CP14ClothingCloakSimpleDarkBlue - name: dark cloak - description: Long coat with a high collar. - components: - - type: Sprite - sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi - - type: Clothing - sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi - -- type: entity - parent: - - CP14ClothingCloakBase - - ClothingSlotBase - id: CP14ClothingCloakCaptainJacket - name: captain's jacket - description: the colors white and gold tell you that you're looking at a higher power. - components: - - type: Sprite - sprite: _CP14/Clothing/Cloak/captain_jacket.rsi - - type: Clothing - sprite: _CP14/Clothing/Cloak/captain_jacket.rsi - -- type: entity - parent: CP14ClothingCloakBase - id: CP14ClothingCloakRitualAttireLeather - name: ritual attire with leather - description: The traditional attire of Southern mages who have undergone the ritual. - components: - - type: Sprite - sprite: _CP14/Clothing/Cloak/cheetah_skin.rsi - - type: Clothing - sprite: _CP14/Clothing/Cloak/cheetah_skin.rsi + sprite: _CP14/Clothing/Cloak/Roles/General/maid_apron.rsi - type: entity parent: CP14ClothingCloakBase diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/bank.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/bank.yml new file mode 100644 index 0000000000..7086d79e9b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/bank.yml @@ -0,0 +1,21 @@ +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadBowler + name: bowler hat + description: It has an aristocratic air about it... + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadBowlerGolden + name: golden bowler hat + description: What an exquisite hat. It's clearly a hat that only sophisticated people prefer to wear. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/bank.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/bank.yml new file mode 100644 index 0000000000..2184868458 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/bank.yml @@ -0,0 +1,10 @@ +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtBanker + name: banker's shirt + description: A white shirt with bronze inserts. Standard bank employee costume. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/Bank/banker.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/Bank/banker.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml new file mode 100644 index 0000000000..3e1f41e974 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml @@ -0,0 +1,81 @@ +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtCottonBlue + name: cotton blue shirt + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/blue.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/blue.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtCottonBlack + name: cotton black shirt + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/black.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/black.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtCottonPurple + name: cotton purple shirt + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/purple.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/purple.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtCottonRed + name: cotton red shirt + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/red.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/red.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtCottonWhite + name: cotton white shirt + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/white.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/white.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtCottonYellow + name: cotton yellow shirt + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/yellow.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/yellow.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtMercenary + name: mercenary shirt + description: A mercenary's colourful shirt. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/mercenary.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/mercenary.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtYellowWizard + name: yellow wizard shirt + description: A loose magician's shirt, comfortable and nice looking. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/yellow_wizard.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/yellow_wizard.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/base.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/base.yml new file mode 100644 index 0000000000..b516f9eb26 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/base.yml @@ -0,0 +1,14 @@ +- type: entity + abstract: true + parent: Clothing + id: CP14ClothingShirtBase + description: Pleasant to the touch material, in a comfortable loose shirt shape. + categories: [ ForkFiltered ] + components: + - type: Clothing + equipDelay: 1 + unequipDelay: 1 + slots: + - shirt + - type: Sprite + state: icon diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml deleted file mode 100644 index 41aedc0157..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml +++ /dev/null @@ -1,107 +0,0 @@ -- type: entity - abstract: true - parent: Clothing - id: CP14ClothingShirtBase - description: Pleasant to the touch material, in a comfortable loose shirt shape. - categories: [ ForkFiltered ] - components: - - type: Clothing - equipDelay: 1 - unequipDelay: 1 - slots: - - shirt - - type: Sprite - state: icon - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonBlue - name: cotton blue shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Cotton/blue.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Cotton/blue.rsi - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonBlack - name: cotton black shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Cotton/black.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Cotton/black.rsi - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonPurple - name: cotton purple shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Cotton/purple.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Cotton/purple.rsi - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonRed - name: cotton red shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Cotton/red.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Cotton/red.rsi - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonWhite - name: cotton white shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Cotton/white.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Cotton/white.rsi - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonYellow - name: cotton yellow shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Cotton/yellow.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Cotton/yellow.rsi - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtSteampunk - name: brass reinforced shirt - description: A white shirt with brass inserts - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/steampunk.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/steampunk.rsi - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtMercenary - name: mercenary shirt - description: A mercenary's colourful shirt. - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/mercenary.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/mercenary.rsi - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtYellowWizard - name: yellow wizard shirt - description: A loose magician's shirt, comfortable and nice looking. - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/yellow_wizard.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/yellow_wizard.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml index b1be764a6c..2b942f2117 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml @@ -51,7 +51,7 @@ - type: Sprite layers: - state: red - - sprite: _CP14/Clothing/Cloak/redguardarmor.rsi + - sprite: _CP14/Clothing/Cloak/Armor/redguardarmor.rsi state: icon - type: RandomSpawner prototypes: diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml index e1561b2beb..2aa2167845 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml @@ -43,32 +43,32 @@ # Bank - type: entity - id: CP14SpawnPointQuartermaster + id: CP14SpawnPointCommandant parent: CP14SpawnPointJobBase - name: quartermaster + name: commandant categories: - Spawner components: - type: SpawnPoint - job_id: CP14Quartermaster + job_id: CP14Commandant - type: Sprite layers: - state: green - - state: workman #TODO Replace + - state: commandant - type: entity - id: CP14SpawnPointMerchant + id: CP14SpawnPointBanker parent: CP14SpawnPointJobBase name: merchant categories: - Spawner components: - type: SpawnPoint - job_id: CP14Merchant + job_id: CP14Banker - type: Sprite layers: - state: green - - state: workman #TODO Replace + - state: banker # Mercenary diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml new file mode 100644 index 0000000000..7332c0b369 --- /dev/null +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml @@ -0,0 +1,67 @@ + +# Head + +- type: loadoutGroup + id: CP14BankHead + name: cp14-loadout-bank-head + minLimit: 0 + loadouts: + - CP14ClothingHeadBowler + +- type: loadout + id: CP14ClothingHeadBowler + equipment: + head: CP14ClothingHeadBowler + +- type: loadoutGroup + id: CP14CommandantHead + name: cp14-loadout-commandant-head + loadouts: + - CP14ClothingHeadBowlerGolden + +- type: loadout + id: CP14ClothingHeadBowlerGolden + equipment: + head: CP14ClothingHeadBowlerGolden + +# Cloak + +- type: loadoutGroup + id: CP14CommandantCloak + name: cp14-loadout-commandant-cloak + loadouts: + - CP14ClothingCloakCommandantJacket + +- type: loadout + id: CP14ClothingCloakCommandantJacket + equipment: + cloak: CP14ClothingCloakCommandantJacket + +# Shirt + +- type: loadoutGroup + id: CP14BankShirt + name: cp14-loadout-bank-shirt + loadouts: + - CP14ClothingShirtBanker + +- type: loadout + id: CP14ClothingShirtBanker + equipment: + shirt: CP14ClothingShirtBanker + +# Pants + +- type: loadoutGroup + id: CP14BankPants + name: cp14-loadout-bank-pants + loadouts: + - CP14ClothingPantsAristocratic + +# Shoes + +- type: loadoutGroup + id: CP14BankShoes + name: cp14-loadout-bank-shoes + loadouts: + - CP14ShoesAristocraticBlack \ 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 78870edd94..a38e6b086f 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -11,6 +11,7 @@ - CP14ClothingCloakFurcapeBlack - CP14ClothingCloakFurcapeBlue - CP14ClothingCloakMaidArpon + - CP14ClothingCloakRitualAttireLeather - type: loadout id: CP14ClothingCloakSimpleWhite @@ -42,6 +43,11 @@ equipment: cloak: CP14ClothingCloakMaidArpon +- type: loadout + id: CP14ClothingCloakRitualAttireLeather + equipment: + cloak: CP14ClothingCloakRitualAttireLeather + # Eyes - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 7b27bbe705..0ce454ead1 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -69,29 +69,24 @@ - CP14GeneralTrinkets - type: roleLoadout - id: JobCP14Quartermaster + id: JobCP14Commandant groups: - - CP14GeneralHead + - CP14CommandantHead - CP14GeneralEyes - - CP14GeneralMask - - CP14CaptainCloak # - - CP14GeneralGloves - - CP14GeneralShirt - - CP14GeneralPants - - CP14GeneralShoes + - CP14CommandantCloak + - CP14BankShirt + - CP14BankPants + - CP14BankShoes - CP14GeneralBack - CP14GeneralTrinkets - type: roleLoadout - id: JobCP14Merchant + id: JobCP14Banker groups: - - CP14GeneralHead + - CP14BankHead - CP14GeneralEyes - - CP14GeneralMask - - CP14GeneralCloak - - CP14GeneralGloves - - CP14GeneralShirt - - CP14GeneralPants - - CP14GeneralShoes + - CP14BankShirt + - CP14BankPants + - CP14BankShoes - CP14GeneralBack - CP14GeneralTrinkets \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Maps/arenas.yml b/Resources/Prototypes/_CP14/Maps/arenas.yml index acf89d02ed..6a02083b85 100644 --- a/Resources/Prototypes/_CP14/Maps/arenas.yml +++ b/Resources/Prototypes/_CP14/Maps/arenas.yml @@ -77,8 +77,8 @@ CP14Alchemist: [ 2, 3 ] CP14Innkeeper: [ 3, 4 ] CP14Captain: [1, 1] - CP14Quartermaster: [1, 1] - CP14Merchant: [3, 4] + CP14Commandant: [1, 1] + CP14Banker: [3, 4] #CP14GuardCommander: [1, 1] - type: CP14StationZLevels defaultMapLevel: 0 diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Bank/banker.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Bank/banker.yml new file mode 100644 index 0000000000..db09955480 --- /dev/null +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Bank/banker.yml @@ -0,0 +1,13 @@ +- type: job + id: CP14Banker + name: cp14-job-name-banker + description: cp14-job-desc-banker + playTimeTracker: CP14JobBanker + startingGear: CP14BankerGear + icon: "CP14JobIconBanker" + supervisors: cp14-job-supervisors-commandant + +- type: startingGear + id: CP14BankerGear + equipment: + belt1: CP14KeyRingInnkeeper \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Bank/commandant.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Bank/commandant.yml new file mode 100644 index 0000000000..38d817eb32 --- /dev/null +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Bank/commandant.yml @@ -0,0 +1,17 @@ +- type: job + id: CP14Commandant + name: cp14-job-name-commandant + description: cp14-job-desc-commandant + playTimeTracker: CP14JobCommandant + startingGear: CP14CommandantGear + icon: "CP14JobIconCommandant" + requireAdminNotify: true + joinNotifyCrew: true + canBeAntag: false + supervisors: cp14-job-supervisors-command + weight: 2 + +- type: startingGear + id: CP14CommandantGear + equipment: + belt1: CP14KeyRingInnkeeper \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Bank/merchant.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Bank/merchant.yml deleted file mode 100644 index 5dbc8cfe6e..0000000000 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Bank/merchant.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: job - id: CP14Merchant - name: cp14-job-name-merchant - description: cp14-job-desc-merchant - playTimeTracker: CP14JobMerchant - startingGear: CP14MerchantGear - icon: "CP14JobIconMerchant" - requireAdminNotify: true - joinNotifyCrew: true - canBeAntag: true - supervisors: cp14-job-supervisors-quartermaster - -- type: startingGear - id: CP14MerchantGear - equipment: - belt1: CP14KeyRingInnkeeper \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Bank/quartermaster.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Bank/quartermaster.yml deleted file mode 100644 index f42acec7a5..0000000000 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Bank/quartermaster.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: job - id: CP14Quartermaster - name: cp14-job-name-quartermaster - description: cp14-job-desc-quartermaster - playTimeTracker: CP14JobQuartermaster - startingGear: CP14QuartermasterGear - icon: "CP14JobIconQuartermaster" - requireAdminNotify: true - joinNotifyCrew: true - canBeAntag: false - supervisors: cp14-job-supervisors-command - weight: 2 - -- type: startingGear - id: CP14QuartermasterGear - equipment: - belt1: CP14KeyRingInnkeeper \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml index 11c279ae03..12c01abb6f 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml @@ -7,7 +7,7 @@ color: "#3ec8fa" roles: - CP14Captain - - CP14Quartermaster + - CP14Commandant - CP14GuardCommander - type: department @@ -17,8 +17,8 @@ weight: 9 color: "#fadb3e" roles: - - CP14Quartermaster - - CP14Merchant + - CP14Commandant + - CP14Banker - type: department id: CP14Mercenary diff --git a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml index 5744599b36..e553d28742 100644 --- a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml +++ b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml @@ -16,7 +16,7 @@ id: CP14JobGuardCommander - type: playTimeTracker - id: CP14JobQuartermaster + id: CP14JobCommandant - type: playTimeTracker - id: CP14JobMerchant \ No newline at end of file + id: CP14JobBanker \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/StatusIcon/job.yml b/Resources/Prototypes/_CP14/StatusIcon/job.yml index ceee48c128..43e8b21a53 100644 --- a/Resources/Prototypes/_CP14/StatusIcon/job.yml +++ b/Resources/Prototypes/_CP14/StatusIcon/job.yml @@ -47,16 +47,16 @@ - type: jobIcon parent: CP14JobIcon - id: CP14JobIconQuartermaster + id: CP14JobIconCommandant icon: sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi - state: Quartermaster - jobName: cp14-job-name-quartermaster + state: Commandant + jobName: cp14-job-name-commandant - type: jobIcon parent: CP14JobIcon - id: CP14JobIconMerchant + id: CP14JobIconBanker icon: sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi - state: Merchant - jobName: cp14-job-name-merchant + state: Banker + jobName: cp14-job-name-banker diff --git a/Resources/Prototypes/_CP14/Store/buy.yml b/Resources/Prototypes/_CP14/Store/buy.yml index 5923c56cf6..6dc06286c9 100644 --- a/Resources/Prototypes/_CP14/Store/buy.yml +++ b/Resources/Prototypes/_CP14/Store/buy.yml @@ -2,13 +2,13 @@ id: CP14AlchemyNormalizer name: cp14-store-buy-alchemy-normalizer-name desc: cp14-store-buy-alchemy-normalizer-desc - code: ALH-NRML + code: NORMALIZER icon: sprite: _CP14/Structures/Specific/Alchemy/normalizer.rsi state: base price: min: 400 - max: 500 + max: 800 services: - !type:CP14BuyItemsService product: @@ -18,7 +18,7 @@ id: CP14AlchemyVials name: cp14-store-buy-alchemy-vials-name desc: cp14-store-buy-alchemy-vials-desc - code: ALH-VIAL + code: VIALS icon: sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi state: vial @@ -28,4 +28,20 @@ services: - !type:CP14BuyItemsService product: - CP14BrassChestFilledAlchemy: 1 \ No newline at end of file + CP14BrassChestFilledAlchemy: 1 + +- type: storePositionBuy + id: CP14Bureaucracy + name: cp14-store-buy-alchemy-bureaucracy-name + desc: cp14-store-buy-alchemy-bureaucracy-desc + code: PAPER + icon: + sprite: _CP14/Objects/Bureaucracy/paper.rsi + state: folder_red + price: + min: 200 + max: 300 + services: + - !type:CP14BuyItemsService + product: + CP14BrassChestFilledBureaucracy: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/game_presets.yml b/Resources/Prototypes/_CP14/game_presets.yml index a40bcb5b9e..ef7dfb3140 100644 --- a/Resources/Prototypes/_CP14/game_presets.yml +++ b/Resources/Prototypes/_CP14/game_presets.yml @@ -30,5 +30,4 @@ cP14Allowed: true rules: - Sandbox - - CP14BanditsRule - CP14RoundObjectivesRule \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/secret_weights.yml b/Resources/Prototypes/_CP14/secret_weights.yml index 1ab1a74b9f..f58c13d9aa 100644 --- a/Resources/Prototypes/_CP14/secret_weights.yml +++ b/Resources/Prototypes/_CP14/secret_weights.yml @@ -1,5 +1,5 @@ - type: weightedRandom id: Secret weights: - CP14Sandbox: 0.5 - CP14Greenshift: 0.5 \ No newline at end of file + CP14Sandbox: 1 + CP14Greenshift: 0 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Armor/redguardarmor.rsi/equipped-CLOAK.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png rename to Resources/Textures/_CP14/Clothing/Cloak/Armor/redguardarmor.rsi/equipped-CLOAK.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Armor/redguardarmor.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Cloak/Armor/redguardarmor.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Armor/redguardarmor.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Armor/redguardarmor.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Cloak/alchemist_cloak.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi/equipped-CLOAK.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/alchemist_cloak.rsi/equipped-CLOAK.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi/equipped-CLOAK.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/alchemist_cloak.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/alchemist_cloak.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000000000000000000000000000000000..bc81bfa510a8659cf22f597519964184e2539855 GIT binary patch literal 916 zcmV;F18e+=P)Px&PDw;TRCt{2n!j(_P!Pwzt~zC@6a^+ihcJ*LMO9Q!S&>NRc#Fu|p$pE0`Ug~W z30)Z~RY7T&WGx_h%@l$VN-=|%0!y5Tk)^}ykUYx)8~foODAj!=BxFDC-hF+~&-e}? z2!bF8f>;1+q}bn^kBl`^ER1o_&A(+_&TcF;EN3^OasKGP*&eWxl5@0QQgW=>9tiuF z{0yqpH3k50w^L|V4)FE-_uTJFN{;Q9FVNM;0Dy8a@5{D`f2FVsV`!pTIl%Vjnsr_u zO|f6TKqj5Ud8;Gj-*b>X_)IzpV`$>fSrH$qSJrQ9s?1&=)~)kliZJWn3sL_sy#|zv zdFem>Z2)I32mtfECavd#?TDB z>_WK*Y;Uf`k^y#sX9Mr*WAr;cVVj=YpdIeu^5*u*ah?IVk0%4{a8df59`wd%;ol2o zz-jeZa#K03^tb!52fsf0hO5E7@b)Xb1f2GGo)OEWpa|T4S06tKeh)t#AJ6?Dv;;U# zO7}ax(4PL>cu4V2c(c1>1-=J7c`RQUUjG!s^ixuDuKx-Nf*=TjAP9mW2!bF8B1G&R z7=}4vHC0~uYpI$lGsB#)NV`LT`QZ77ixB5KI_`@H&p(li&}mA_Px$e@R3^R9J=WmAh&JK^R8Q1Pe(ixEqxuyhVeiU&zZTHa zG0|zXQ2olvxNI(;64kHJX|(p206?jj6RP480P%6`%UV@&iBd6V`WrAMuuRoc+d3W} z$LRJ(R+qCT(Cv+OCa_CvuL4bdK-E)2?@u@8zT29;2<&R4_oq}nwfPY|sK9d6%1Ho# zuwqWY&Js8`5(Ka?VHfHz$Gvte{7X8Rx00000NkvXXu0mjf0WrjH literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi/equipped-CLOAK.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/equipped-CLOAK.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi/equipped-CLOAK.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/alchemist_cloak.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/alchemist_cloak.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi/equipped-CLOAK.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/equipped-CLOAK.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi/equipped-CLOAK.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Cloak/cheetah_skin.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi/equipped-CLOAK.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/cheetah_skin.rsi/equipped-CLOAK.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi/equipped-CLOAK.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/cheetah_skin.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/cheetah_skin.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/cheetah_skin.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/cheetah_skin.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/dark_blue.rsi/equipped-CLOAK.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/equipped-CLOAK.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/dark_blue.rsi/equipped-CLOAK.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/dark_blue.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/Simple/dark_blue.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/dark_blue.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/dark_blue.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/dark_blue.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Cloak/furcape.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/equipped-CLOAK.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/furcape.rsi/equipped-CLOAK.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/equipped-CLOAK.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/furcape.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/furcape.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/furcape.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/furcape.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Cloak/furcape2.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/equipped-CLOAK.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/furcape2.rsi/equipped-CLOAK.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/equipped-CLOAK.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/furcape2.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/furcape2.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/furcape2.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/furcape2.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Cloak/maid_apron.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/maid_apron.rsi/equipped-CLOAK.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/maid_apron.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/maid_apron.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/maid_apron.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/maid_apron.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/white.rsi/equipped-CLOAK.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/equipped-CLOAK.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/white.rsi/equipped-CLOAK.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/white.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/Simple/white.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/General/white.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/white.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/white.rsi/meta.json new file mode 100644 index 0000000000..05e3ea0b31 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/white.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "CrystallPunk14, by TheShuEd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-CLOAK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..03bd326bf31fdb88f39e4f061a8eff721017b666 GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zBRpLkLn`LH zy<_Ob>?p$aATWo8yE*CwXV4N4Q5_b+BWB_T36EFi=GTaW*)(>$-`eCp3@*ZhiGduMR( zUlC`z@^ik(-iPPEhu^rB_vG4Zh0=eA`a{cvADs*>UsqRtlYjQ}r!keTtE&H9$dNtz zae?^b7pliDddu)v8SduXc++atQPC+@^$+*IShV20KmXMK>`TwZzwq91*Rng(>`d(G zO^F%h=d^0MrcK;`Vfu%6{~S3KTh^cdzH{rbbN5R2t^x{wP&WM;^Sh#Y?lrZ8`MFVdQ&MBb@08Bfx%>V!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..abbf5ccd40792a889f5be3dd8d09f73c18642fbd GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}4?SHRLoyoQ zUQy&e6d=I)EN!hz6D2wnR{v(=60@Irbc6l|y^e$lsm+C+&8K+s)^nua zYLeEz$9(X={=I{HAK%^W&H^+H2tLfuvg+zPCRcxqZ@0tg$kLZh!TEt1`?UV8Z7VtW zTzOg8ZH?a73U*;nh5f_g6!*olU77Q;a?_%=Wrx=noSWlzCi4i8KBX=>buc-a5| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/meta.json new file mode 100644 index 0000000000..a65c38e52c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "CrystallPunk14, by TheShuEd", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..13b99053c3aada032df6f65c6371fc368537c1e4 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zM={RFRWXnwP3_9)CX- znfbRj{FA@2CZj=EdT!3I4?AwiUAuRG+S-`ayc2((_s;*ZrNWNufB4?~MW5rR-20He z*K2zC<|{LoyoQ zUNz)vau8^JxP0T52`gIXHFe#%DG{~q!NomHdwb`qUv%OWnWVe1$;nLZ)SBM^;rl$> zW~P)+1nOsC_~E};z}Nitn#!~1mfM`ze(V}=`OSUie|Fcb=qx?#9-3v-AeC2m%%|7GZ%SE+E#3ihw6eE9Mkd z$B#|2XspFuKv~5r!o9}NH8pS-!CioF%mcMfKks-nz+J%D$jJX1XGK(MAX;SSL;Mty z@WQiNVZc)izyA(Ys+2i?GXCfj<-#)k1)Oa4aw}$T0@TTJ7?RA?_KdjZ`1R>V7&6RI zC&?3`Ge2opm&LDV#dkwUFSdH3`D&f`4p#Gg^?0s(w zw5h-0?Ke(|wvG34`~;AF{qnXn;hNJ!$!`8~6zg{E#fIu*c*>%n_DahP*ZohxH3OF1 zs<3^!Dh-84JXodjV$?0xg~tQS`YP}SR{^#4AIlsaXTnzr``N=NEZa zf-krUSYa{?8l4s!H*dg8mCs?RDRiBXM0|1T3}(HfH13LX=)pQh-P6;A6dqeqfXi*| zbNo9ho(YeWI1+D2OynYhS-|-&hp>Ki9<{BxCfc609Y@{qpRnZ40B)r$L(TRQ6lJf3 zS+Ajfk-RjISp=61c*RHipMI7x1x2E$H8~~dyy~L;yW@F*Nx+%{qp-GcF^W#u$+p0y zK_`~zld$|DH5Ek2lQw&?8hzKtX$DA~Ld-x@Z6#{#w}s9g7gH9PGw`%E1Lxl_!w;8+ zY5$gI63%gVNMMc;4pBtiyQL`J`aSjS-)W_D$kT4W&AL3BfIY9*VBeuSYLho97O_zM zd@5Qm`srA^SPmiI0 zZ~||B(hY?mgR<|%aNN%)x5H#@pf-tn>(!kR^I5-cw?Sp02YPEO=b?XIs-ocsx?fU%m*Www~$2Q5o@WSOiHFC-OihEx&FQHWM(}q zka6NSn6kJKm%!~ZXa6O1qF9y|%N{frtw2Q--B@*C1ez0+ja3W$ghBV za%$eVVR1ZgrC&Uu1StNQ$3q0OfbrlgZF9vp+dJw(aCTOFf)T_>U!EWr-2O@Ar|B^$ zW{MY>1xyD5lyvu0=*{0vUV73!KP9z)Ighc0HTQuR* z5zPj&8Rw6UA0`@q43i}mr)HT6#vg8RB8+K9oIoN1Lmg3csff6gb)bPQ?aH8Klu}!| zwp`CS&28vl@y9()S;CXtzURE}Ila$w-}80bNI?+rAR`hFI93IO8bJ}T4TO;0~?=>W-w4@&7o~hsH_mz@kWjKd$-I#C0BU74Y4_lW;oC zh>eY35_3BLWpNGof}4Pv@^wN|vTy9qOq-X)6CY9{DLDnT)hgkWrYUY&;FhjX(jlk+lJz;_ixsCI3Awiqe7&CY-)QAT!iouK*(gN zQiP*bO7v*2V|QK#n-3!B)2IH13o_WO7cn|zT3JKr!*f3fmHPnWga_7H49*`s;FHIKEGfw{??(R&SP+1<4uMnVXEh6Ge!0 zs>lX51>MX%6F`yom=Yu7zGKC0;-^>r{#@3FUj4dBskfIVVE48hvaS!YGJTTtJT%Z? z$LXE~=IbB1| zgFgd%%!R16dRe)$umDe`snDkzlX`n;0&d*4;#oBqnUl3;0$n00(JnIbXW^Rz)anfm zbSrzw5^7}aXnV1LNCk+X8xm;05E@xK+J5myCk2uOjGLyJ zrDVSB9VD-j8LUnx=lS*)Om-xK9x*zP`!WEFk+plZFgKvT6i5=#uNw=?S8o!;@`lvS zqiHV{asURPI;mjIt=n)(3 zo61hR6?dj5{W0F)CLl#76ZRBr$LyRPH%I=4(cxr%r^|)ZxL9mVe*%gG8Ea><+gH{q zL`l)}=hcBf;U?BH?+S=dkh**HA4CZPJE!s#!9{@0yTI%w@`SJ7nSpmc|= ltO^J CrystallPunk migration zone end